diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index bc84bf5..59d0753 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -59,6 +59,7 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
     <uses-permission android:name="android.permission.STATUS_BAR" />
+    <uses-permission android:name="android.permission.RECEIVE_SMS" />
     <uses-permission android:name="android.permission.READ_SMS" />
     <uses-permission android:name="android.permission.WRITE_SMS" />
     <uses-permission android:name="android.permission.SEND_SMS" />
@@ -97,7 +98,17 @@
     <uses-permission android:name="android.permission.DUMP" />
     <uses-permission android:name="android.permission.REGISTER_CALL_PROVIDER" />
     <uses-permission android:name="android.permission.REGISTER_SIM_SUBSCRIPTION" />
+    <uses-permission android:name="android.permission.BIND_CARRIER_CONFIG_SERVICE" />
     <uses-permission android:name="android.permission.BIND_CARRIER_MESSAGING_SERVICE" />
+    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
+    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
+    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
+    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+    <uses-permission android:name="com.android.voicemail.permission.ADD_VOICEMAIL" />
+    <uses-permission android:name="com.android.voicemail.permission.WRITE_VOICEMAIL" />
+    <uses-permission android:name="com.android.voicemail.permission.READ_VOICEMAIL" />
+
 
     <!-- This tells the activity manager to not delay any of our activity
          start requests, even if they happen immediately after the user
@@ -269,6 +280,18 @@
             </intent-filter>
         </activity>
 
+        <!-- Trampoline activity that handles the SIM_ACTIVATION_REQUEST intent. -->
+        <activity android:name="com.android.services.telephony.activation.SimActivationActivity"
+                android:permission="android.permission.PERFORM_SIM_ACTIVATION"
+                android:label="@string/phoneIconLabel"
+                android:theme="@android:style/Theme.NoDisplay"
+                android:excludeFromRecents="true">
+            <intent-filter>
+                <action android:name="android.intent.action.SIM_ACTIVATION_REQUEST" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <!-- "Mobile network settings" screen, used on both
              non-voice-capable tablets and regular phone devices. -->
         <activity android:name="MobileNetworkSettings"
@@ -388,7 +411,7 @@
 
         <activity android:name="com.android.phone.settings.fdn.GetPin2Screen"
                 android:label="@string/get_pin2"
-                android:theme="@style/SettingsLight"
+                android:theme="@style/DialerSettingsLight"
                 android:windowSoftInputMode="stateVisible">
         </activity>
 
@@ -427,7 +450,6 @@
                 <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.telecom.action.SHOW_CALL_SETTINGS" />
-                <action android:name="com.android.phone.CallFeaturesSetting.ADD_VOICEMAIL" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -440,6 +462,17 @@
             </intent-filter>
         </receiver>
 
+        <!-- "Accessibility" settings UI. Referenced by Dialer application. -->
+        <activity android:name="com.android.phone.settings.AccessibilitySettingsActivity"
+                android:label="@string/accessibility_settings_activity_title"
+                android:theme="@style/DialerSettingsLight">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.telecom.action.SHOW_CALL_ACCESSIBILITY_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <!-- CDMA Emergency Callback Mode -->
         <service android:name="EmergencyCallbackModeService">
         </service>
@@ -483,6 +516,15 @@
             </intent-filter>
         </receiver>
 
+        <activity android:name="com.android.services.telephony.sip.SipPhoneAccountSettingsActivity"
+                android:theme="@android:style/Theme.NoDisplay"
+                android:excludeFromRecents="true">
+            <intent-filter>
+                <action android:name="android.telecom.action.CONNECTION_SERVICE_CONFIGURE" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <activity android:label="Sip Settings"
                   android:name="com.android.services.telephony.sip.SipSettings"
                   android:theme="@style/DialerSettingsLight"
@@ -542,6 +584,10 @@
         <activity android:name="com.android.phone.settings.VoicemailSettingsActivity"
             android:label="@string/voicemail"
             android:theme="@style/DialerSettingsLight">
+            <intent-filter >
+                <!-- DO NOT RENAME. There are existing apps which use this string. -->
+                <action android:name="com.android.phone.CallFeaturesSetting.ADD_VOICEMAIL" />
+            </intent-filter>
         </activity>
 
         <!-- BroadcastReceiver for receiving Intents from Notification mechanism. -->
@@ -583,5 +629,49 @@
                 <action android:name="android.content.action.SEARCH_INDEXABLES_PROVIDER" />
             </intent-filter>
         </provider>
+        <receiver android:name="com.android.phone.vvm.omtp.sms.OmtpMessageReceiver"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.DATA_SMS_RECEIVED" />
+                <data android:scheme="sms" />
+            </intent-filter>
+        </receiver>
+        <service
+            android:name="com.android.phone.vvm.omtp.OmtpVvmSyncService"
+            android:exported="true"
+            android:process=":sync">
+            <intent-filter>
+                <action android:name="android.content.SyncAdapter"/>
+            </intent-filter>
+            <meta-data android:name="android.content.SyncAdapter"
+                    android:resource="@xml/syncadapter" />
+        </service>
+        <service
+            android:name="android.telecom.AuthenticatorService">
+            <intent-filter>
+                <action android:name="android.accounts.AccountAuthenticator"/>
+            </intent-filter>
+            <meta-data
+                android:name="android.accounts.AccountAuthenticator"
+                android:resource="@xml/authenticator" />
+       </service>
+       <receiver android:name="com.android.phone.vvm.omtp.SimChangeReceiver"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.telephony.action.CARRIER_CONFIG_CHANGED" />
+                <action android:name="android.intent.action.SIM_STATE_CHANGED" />
+            </intent-filter>
+       </receiver>
+       <receiver
+           android:name="com.android.phone.vvm.omtp.sync.FetchVoicemailReceiver"
+           android:exported="true">
+           <intent-filter>
+              <action android:name="android.intent.action.FETCH_VOICEMAIL" />
+               <data
+                   android:scheme="content"
+                   android:host="com.android.voicemail"
+                   android:mimeType="vnd.android.cursor.item/voicemail" />
+          </intent-filter>
+       </receiver>
     </application>
 </manifest>
diff --git a/res/color/default_sim_icon_tint_color.xml b/res/color/default_sim_icon_tint_color.xml
new file mode 100644
index 0000000..100a969
--- /dev/null
+++ b/res/color/default_sim_icon_tint_color.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="#FF555555"/>
+</selector>
diff --git a/res/drawable-hdpi/ic_signal_wifi_4_bar_24dp.png b/res/drawable-hdpi/ic_signal_wifi_4_bar_24dp.png
new file mode 100644
index 0000000..5a53192
--- /dev/null
+++ b/res/drawable-hdpi/ic_signal_wifi_4_bar_24dp.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_text_holo_dark.png b/res/drawable-hdpi/ic_text_holo_dark.png
deleted file mode 100644
index 6d21e42..0000000
--- a/res/drawable-hdpi/ic_text_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_text_holo_dark.png b/res/drawable-ldrtl-hdpi/ic_text_holo_dark.png
deleted file mode 100644
index b99073e..0000000
--- a/res/drawable-ldrtl-hdpi/ic_text_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_text_holo_dark.png b/res/drawable-ldrtl-mdpi/ic_text_holo_dark.png
deleted file mode 100644
index 4106c32..0000000
--- a/res/drawable-ldrtl-mdpi/ic_text_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_text_holo_dark.png b/res/drawable-ldrtl-xhdpi/ic_text_holo_dark.png
deleted file mode 100644
index 99e7e38..0000000
--- a/res/drawable-ldrtl-xhdpi/ic_text_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_signal_wifi_4_bar_24dp.png b/res/drawable-mdpi/ic_signal_wifi_4_bar_24dp.png
new file mode 100644
index 0000000..dd5a42f
--- /dev/null
+++ b/res/drawable-mdpi/ic_signal_wifi_4_bar_24dp.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_text_holo_dark.png b/res/drawable-mdpi/ic_text_holo_dark.png
deleted file mode 100644
index 80b95ee..0000000
--- a/res/drawable-mdpi/ic_text_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_signal_wifi_4_bar_24dp.png b/res/drawable-xhdpi/ic_signal_wifi_4_bar_24dp.png
new file mode 100644
index 0000000..28b5afa
--- /dev/null
+++ b/res/drawable-xhdpi/ic_signal_wifi_4_bar_24dp.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_text_holo_dark.png b/res/drawable-xhdpi/ic_text_holo_dark.png
deleted file mode 100644
index e80a042..0000000
--- a/res/drawable-xhdpi/ic_text_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_signal_wifi_4_bar_24dp.png b/res/drawable-xxhdpi/ic_signal_wifi_4_bar_24dp.png
new file mode 100644
index 0000000..f4105ec
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_signal_wifi_4_bar_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_signal_wifi_4_bar_24dp.png b/res/drawable-xxxhdpi/ic_signal_wifi_4_bar_24dp.png
new file mode 100644
index 0000000..58a4f9c
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_signal_wifi_4_bar_24dp.png
Binary files differ
diff --git a/res/layout/edit_fdn_contact_screen.xml b/res/layout/edit_fdn_contact_screen.xml
index 0a99152..24e0c6b 100644
--- a/res/layout/edit_fdn_contact_screen.xml
+++ b/res/layout/edit_fdn_contact_screen.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,78 +14,40 @@
      limitations under the License.
 -->
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/pinc"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="wrap_content"
+    android:layout_margin="16dp"
+    android:orientation="vertical"
+    android:gravity="center">
 
-    <!-- Keyboard Version -->
-    <!-- Modified for greater consistency with the rest of settings. -->
-    <LinearLayout android:id="@+id/pinc"
-        android:orientation="vertical"
+    <EditText android:id="@+id/fdn_name"
+        android:hint="@string/name"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:inputType="textPersonName"
+        android:imeOptions="actionNext"
+        android:singleLine="true"
+        android:scrollHorizontally="true"
+        android:autoText="false"
+        android:capitalize="words" />
 
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="15dip"
-            android:paddingBottom="5dip">
+    <EditText android:id="@+id/fdn_number"
+        android:hint="@string/number"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:inputType="phone"
+        android:imeOptions="actionDone"
+        android:singleLine="true"
+        android:scrollHorizontally="true"
+        android:autoText="false"
+        android:capitalize="none" />
 
-            <TextView
-                android:layout_width="100dip"
-                android:layout_height="wrap_content"
-                android:paddingStart="10dip"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:text="@string/name" />
+    <Button android:id="@+id/button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:text="@string/save" />
 
-            <EditText android:id="@+id/fdn_name"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="10dip"
-                android:inputType="textPersonName"
-                android:imeOptions="actionNext"
-                android:singleLine="true"
-                android:scrollHorizontally="true"
-                android:autoText="false"
-                android:capitalize="words" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="5dip"
-            android:paddingBottom="5dip">
-
-            <TextView
-                android:layout_width="100dip"
-                android:layout_height="wrap_content"
-                android:paddingStart="10dip"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:text="@string/number" />
-
-            <EditText android:id="@+id/fdn_number"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="10dip"
-                android:inputType="phone"
-                android:imeOptions="actionDone"
-                android:singleLine="true"
-                android:scrollHorizontally="true"
-                android:autoText="false"
-                android:capitalize="none" />
-
-        </LinearLayout>
-
-        <Button android:id="@+id/button"
-            android:layout_marginTop="8dip"
-            android:layout_marginStart="10dip"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/save" />
-
-    </LinearLayout>
-
-</RelativeLayout>
+</LinearLayout>
diff --git a/res/layout/emergency_dialer.xml b/res/layout/emergency_dialer.xml
index 5c721c5..acb7033 100644
--- a/res/layout/emergency_dialer.xml
+++ b/res/layout/emergency_dialer.xml
@@ -16,10 +16,102 @@
 
 <!-- Layout for the emergency dialer; see EmergencyDialer.java. -->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/top"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-    <include layout="@layout/dialpad_view" />
+        android:id="@+id/top"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp">
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="bottom"
+            android:orientation="vertical">
+
+        <!-- FrameLayout -->
+        <com.android.phone.EmergencyActionGroup
+                android:id="@+id/emergency_action_group"
+                android:layout_height="64dp"
+                android:layout_width="match_parent"
+                android:layout_marginTop="16dp"
+                android:layout_marginBottom="24dp">
+
+            <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+                <Button android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:id="@+id/action1"
+                        />
+                <Button android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:id="@+id/action2"
+                        />
+                <Button android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:id="@+id/action3"
+                        />
+            </LinearLayout>
+
+            <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:id="@+id/selected_container"
+                    android:visibility="invisible"
+                    android:focusable="true"
+                    android:clickable="true">
+
+                <View
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:backgroundTint="#ffe53935"
+                        android:focusable="false"
+                        android:clickable="false"
+                        style="?android:attr/buttonStyle"/>
+
+                <View
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:id="@+id/ripple_view"
+                        android:backgroundTint="#22000000"
+                        android:visibility="invisible"
+                        android:focusable="false"
+                        android:clickable="false"
+                        style="?android:attr/buttonStyle"/>
+
+                <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:orientation="vertical"
+                        android:focusable="false"
+                        android:clickable="false"
+                        android:backgroundTint="#00000000"
+                        style="?android:attr/buttonStyle">
+                    <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:id="@+id/selected_label"
+                            android:textAppearance="?android:attr/textAppearanceButton" />
+                    <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:id="@+id/launch_hint"
+                            android:text="@string/emergency_action_launch_hint"
+                            android:textStyle="italic" />
+                </LinearLayout>
+
+            </FrameLayout>
+
+        </com.android.phone.EmergencyActionGroup>
+
+        <include layout="@layout/dialpad_view_unthemed"
+                android:theme="@style/Dialpad_Dark" />
+
+    </LinearLayout>
+
     <FrameLayout
         android:id="@+id/floating_action_button_container"
         android:layout_width="@dimen/floating_action_button_width"
@@ -35,4 +127,5 @@
             android:contentDescription="@string/description_dial_button"
             android:src="@drawable/fab_ic_call"/>
     </FrameLayout>
+
 </FrameLayout>
diff --git a/res/layout/get_pin2_screen.xml b/res/layout/get_pin2_screen.xml
index 6268335..eecf736 100644
--- a/res/layout/get_pin2_screen.xml
+++ b/res/layout/get_pin2_screen.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,47 +14,29 @@
      limitations under the License.
 -->
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout  xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/pinc"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="wrap_content"
+    android:layout_margin="16dp"
+    android:orientation="vertical"
+    android:gravity="center">
 
-    <!-- Keyboard Version -->
-    <!-- Modified for greater consistency with the rest of settings. -->
-    <LinearLayout android:id="@+id/pinc"
-        android:orientation="vertical"
+    <EditText android:id="@+id/pin"
+        android:hint="@string/enter_pin2_text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="15dip"
-        android:layout_marginStart="15dip">
+        android:maxLines="1"
+        android:scrollHorizontally="true"
+        android:autoText="false"
+        android:capitalize="none"
+        android:password="true"
+        android:imeOptions="actionDone" />
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingBottom="5dip"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:text="@string/enter_pin2_text" />
+    <Button android:id="@+id/ok"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:text="@android:string/ok" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            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>
+</LinearLayout>
diff --git a/res/layout/otacall_card.xml b/res/layout/otacall_card.xml
index 74b31e8..fea2077 100644
--- a/res/layout/otacall_card.xml
+++ b/res/layout/otacall_card.xml
@@ -115,7 +115,8 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:layout_marginTop="1dip"
-                android:visibility="gone" >
+                android:visibility="gone"
+                android:theme="@style/Dialpad_Light">
 
             <!-- Note there's no "dtmfDialerField" EditText here;
                  in the OTA UI there's no visible "digits" display
diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
new file mode 100644
index 0000000..d1c7216
--- /dev/null
+++ b/res/values-af/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Globaal"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-af/config.xml b/res/values-af/config.xml
deleted file mode 100644
index bd8e53b..0000000
--- a/res/values-af/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"onwaar"</string>
-</resources>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 993688e..d37aa82 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -16,14 +16,14 @@
 
 <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">"Mobieldata"</string>
+    <string name="phoneAppLabel" product="tablet" msgid="1107073389495104784">"Sellulêre data"</string>
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Foon"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Noodbeller"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Foon"</string>
     <string name="fdnListLabel" msgid="8630418672279521003">"FDN-lys"</string>
     <string name="unknown" msgid="6878797917991465859">"Onbekend"</string>
     <string name="private_num" msgid="6713286113000232309">"Privaat nommer"</string>
-    <string name="payphone" msgid="1931775086311769314">"Betaalfoon"</string>
+    <string name="payphone" msgid="4793877574636445118">"Telefoonhokkie"</string>
     <string name="onHold" msgid="9035493194749959955">"Hou aan"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI-kode begin"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD-kode loop tans…"</string>
@@ -52,18 +52,41 @@
     <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="mobile_network_settings_not_available" msgid="7355254462995117896">"Mobiele netwerkinstellings is nie vir hierdie gebruiker beskikbaar nie"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Selnetwerkinstellings is nie vir hierdie gebruiker beskikbaar nie"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM-oproepinstellings"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"GSM-oproepinstellings (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA-oproepinstellings"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"CDMA-oproepinstellings (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Toegangspuntname"</string>
     <string name="settings_label" msgid="3876743539816984008">"Netwerkinstellings"</string>
-    <string name="connection_service" msgid="978745922583410219">"Verbindingsdiens wat gebruik moet word"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Oproeprekeninge"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Maak oproepe met"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Maak SIP-oproepe met"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Vra eers"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Instellings"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Kies rekeninge"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Foonrekeninge"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Voeg SIP-rekening by"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Stel rekeninginstellings op"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi-oproepe"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Moenie Wi-Fi vir oproepe gebruik nie"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Moenie belassistent gebruik nie"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Geen"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Belassistent"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Gebruik belassistent"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Kies belassistent"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Bestuur die netwerke wat vir oproepe gebruik word, met"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Laat programme of dienste netwerke wat vir oproepe gebruik word, bestuur"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Stel op"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Ingeboude verbindingsdiens"</string>
     <string name="voicemail" msgid="8693759337917898954">"Stemboodskap"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Stemboodskapdiens (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
     <string name="networks" msgid="8873030692174541976">"Netwerkoperateurs"</string>
-    <string name="call_settings" msgid="1630474923393095156">"Oproepinstellings"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Nooduitsendings"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Oproepinstellings"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Bykomende instellings"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Bykomende instellings (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Bykomende net-GSM-oproepinstellings"</string>
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Bykomende CDMA-oproepinstellings"</string>
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Bykomende net-CDMA-oproepinstellings"</string>
@@ -77,29 +100,32 @@
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Stel my tydens \'n oproep in kennis van inkomende oproepe"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Stel my tydens \'n oproep in kennis van inkomende oproepe"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Oproep-aanstuurinstellings"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Oproep-aanstuurinstellings (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Oproepaanstuur"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Stuur altyd aan"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Gebruik altyd hierdie nommer"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Stuur alle oproepe aan"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Stuur alle oproepe aan na <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Nommer is nie beskikbaar nie"</string>
-    <string name="sum_cfu_disabled" msgid="3698472522160364904">"Gedeaktiveer"</string>
-    <string name="labelCFB" msgid="218938523102207587">"Stuur aan wanneer besig"</string>
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Af"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Indien besig"</string>
     <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="sum_cfb_disabled" msgid="4913145177320506827">"Af"</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="labelCFNRy" msgid="1736067178393744351">"Indien onbeantwoord"</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="sum_cfnry_disabled" msgid="3884684060443538097">"Af"</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="labelCFNRc" msgid="2614827454402079766">"Indien 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="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="call_settings_primary_user_only" msgid="5679923943740900965">"Oproepinstellings kan net deur die primêre gebruiker verander word."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Oproepinstellings (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Oproepinstellingsfout"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Lees tans instellings…"</string>
     <string name="updating_settings" msgid="8171225533884883252">"Opdateer tans instellings…"</string>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"Skakel aan"</string>
+    <string name="disable" msgid="4678348128118573672">"Skakel af"</string>
     <string name="change_num" msgid="239476305819844391">"Opdateer"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Netwerkverstek"</item>
@@ -123,8 +149,8 @@
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Kon nie die huidige aanstuur-instellings opspoor en stoor nie.\nSkakel 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>
-    <string name="voicemail_default" msgid="5902099213882352338">"My draer"</string>
-    <string name="mobile_networks" msgid="5540397602919106177">"Mobiele netwerkinstellings"</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"Jou diensverskaffer"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Selnetwerkinstellings"</string>
     <string name="label_available" msgid="1181658289009300430">"Beskikbare netwerke"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Soek tans…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Geen netwerke gevind nie."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Voorkeurnetwerk-modus: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Voorkeurnetwerk-modus: Globaal"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Voorkeurnetwerk-modus: LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Voorkeurnetwerkmodus: LTE / GSM / UMTS"</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="7886739962255042385">"LTE / WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"Net GSM"</item>
     <item msgid="3817924849415716259">"GSM/WCDMA verkies"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Verbeterde 4G LTE-modus"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Gebruik LTE-dienste om stem- en ander kommunikasie te verbeter (aanbeveel)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Data geaktiveer"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Aktiveer datatoegang via mobiele netwerk"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Laat datagebruik toe"</string>
     <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="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="roaming_warning" msgid="1603164667540144353">"Dit kan baie duur wees."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Laat dataswerwing toe?"</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>
@@ -194,7 +225,7 @@
     <!-- no translation found for throttle_time_frame_subtext (7732763021560399960) -->
     <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="throttle_help_subtext" msgid="3633091498168446044">"Meer inligting oor jou diensverskaffer se beleid oor die gebruik van selnetwerkdata"</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>
@@ -307,7 +338,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Stel datadiens op"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Diensverskaffer-instellings"</string>
     <string name="fdn" msgid="7878832555095183202">"Belbeperking-nommers"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Vaste oproepnommers (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FDN-lys"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"FDN-lys (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FDN-aktivering"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Vaste skakelnommers is geaktiveer"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Vaste skakelnommers is gedeaktiveer"</string>
@@ -325,6 +358,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Stel TTY-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="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"TTY-modusverandering word nie tydens \'n video-oproep toegelaat nie"</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>
@@ -348,7 +382,7 @@
     <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="1846161429087789936">"Skakel vliegtuigmodus af om kontakte in te voer vanaf die SIM-kaart."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Skakel vliegtuigmodus af om kontakte van die SIM-kaart af in te voer."</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>
@@ -358,42 +392,40 @@
     <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="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="1796577128488773946">"Wagwoord verkeerd, PIN geblokkeer! PUK word versoek."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"Vee SIM-PIN uit"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"Stel SIM-PIN"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"Stel tans PIN …"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN is gestel"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN is uitgevee"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN is verkeerd"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN is opgedateer"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Wagwoord is verkeerd. PIN is nou geblokkeer. PUK is 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="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="1639666438836544393">"PIN2 suksesvol verander"</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"Sleutel PUK2-kode in"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Wagwoord verkeerd, PIN2 geblokkeer. Verander asseblief PIN2 en probeer weer!"</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"Wagwoord verkeerd, SIM is gesluit. PUK2 word versoek."</string>
+    <string name="badPuk2" msgid="7910064009531541708">"PUK2 is verkeerd. Probeer weer."</string>
+    <string name="badPin2" msgid="6646896629970023109">"Ou PIN2 is verkeerd. Probeer weer."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2\'s stem nie ooreen nie. Probeer weer."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Voer \'n PIN2 in wat 4 tot 6 syfers is."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Voer \'n PUK2 in wat 8 syfers is."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 is opgedateer"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Voer PUK2-kode in"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Wagwoord is verkeerd. PIN2 is nou geblokkeer. Verander PIN 2 om weer te probeer."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Wagwoord is verkeerd. SIM is nou geblokkeer. Voer PUK2 in."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 is permanent geblokkeer."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Daar is <xliff:g id="NUMBER">%d</xliff:g> oorblywende pogings."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 gedeblokkeer!"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"Jy het <xliff:g id="NUMBER">%d</xliff:g> oorblywende pogings."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 is nie meer geblokkeer nie"</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="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_redialing" msgid="8253487008234167266">"Herbel tans"</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_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>
     <string name="card_title_in_call" msgid="6346543933068225205">"In oproep"</string>
-    <string name="card_title_my_phone_number" msgid="112428362494434191">"My nommer is <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Bel"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Gemiste oproep"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Gemiste oproepe"</string>
@@ -411,25 +443,27 @@
     <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_power_off" msgid="2947938060513306698">"Skakel vliegtuigmodus af om \'n oproep te maak."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Skakel vliegtuigmodus af of koppel aan \'n draadlose netwerk om \'n oproep te maak."</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_error_out_of_service" msgid="4100065333878929223">"Sellulêre netwerk nie beskikbaar nie."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Sellulêre netwerk is nie beskikbaar nie. Koppel aan \'n draadlose netwerk om \'n oproep te maak."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Voer \'n geldige nommer in om \'n oproep te maak."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Kan nie bel nie."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Begin MMI-volgorde…"</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>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Onmoontlik om oproep deur te skakel."</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Diens word nie gesteun nie"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Kan nie oproepe wissel nie."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Kan nie oproep skei nie."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Kan nie deurskakel nie."</string>
     <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Kan nie konferensie-oproepe doen nie."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Kan nie oproep verwerp nie."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Kan nie oproepe los nie."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Internetoproep"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Kan nie oproep verwerp nie."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Kan nie oproep(e) vrystel nie."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Koppel aan \'n draadlose netwerk om \'n oproep te maak."</string>
     <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="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="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Geen sein nie. Probeer tans weer …"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Kan nie bel nie. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> is nie \'n noodnommer nie."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Kan nie bel nie. Skakel \'n noodnommer."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Gebruik sleutelbord om te bel"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Hou aan"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Einde"</string>
@@ -460,7 +494,8 @@
     <item msgid="899650777817315681">"Normaal"</item>
     <item msgid="2883365539347850535">"Lank"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Netwerkboodskap"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Netwerkboodskap"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Foutboodskap"</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\nDruk \"Aktiveer\" en luister dan na die instruksies om jou foon te aktiveer."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Aktiveer tans…"</string>
@@ -473,8 +508,8 @@
     <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_speaker" msgid="6904589278542719647">"Spreker"</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_progress" msgid="460876637828044519">"Programmeer tans jou foon …"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Kon nie jou foon programmeer nie"</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="8072141612635635357">"Jou foon het nie geaktiveer nie. \nJy moet dalk \'n area met beter dekking probeer (naby \'n venster of buite). \n\nProbeer weer of skakel kliëntediens vir meer opsies."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"OORMAAT SPC-MISLUKKINGS"</string>
@@ -485,18 +520,18 @@
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Noodterugbel-modus betree"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Noodterugbel-modus"</string>
     <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Dataverbinding gedeaktiveer"</string>
-  <plurals name="phone_in_ecm_notification_time">
-    <item quantity="one" msgid="4866221796252472622">"Geen dataverbinding vir <xliff:g id="COUNT">%s</xliff:g> minuut nie"</item>
-    <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="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="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>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other">Geen dataverbinding vir <xliff:g id="COUNT_1">%s</xliff:g> minute nie</item>
+      <item quantity="one">Geen dataverbinding vir <xliff:g id="COUNT_0">%s</xliff:g> minuut nie</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other">Die foon sal <xliff:g id="COUNT_1">%s</xliff:g> minute lank in noodterugbelmodus wees. Terwyl dit in hierdie modus is, kan geen programme gebruik word wat \'n dataverbinding gebruik nie. Wil jy nou uitgaan?</item>
+      <item quantity="one">Die foon sal <xliff:g id="COUNT_0">%s</xliff:g> minuut lank in noodterugbelmodus wees. Terwyl dit in hierdie modus is, kan geen programme gebruik word wat \'n dataverbinding gebruik nie. Wil jy nou uitgaan?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other">Die gekose handeling is nie beskikbaar terwyl die foon in die noodterugbelmodus is nie. Die foon sal <xliff:g id="COUNT_1">%s</xliff:g> minute lank in hierdie modus wees. Wil jy nou uitgaan?</item>
+      <item quantity="one">Die gekose handeling is nie beskikbaar terwyl die foon in die noodterugbelmodus is nie. Die foon sal <xliff:g id="COUNT_0">%s</xliff:g> minuut lank in hierdie modus wees. Wil jy nou uitgaan?</item>
+    </plurals>
     <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>
@@ -510,110 +545,23 @@
     <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_receive_calls" msgid="5635685570889971559">"Ontvang inkomende oproepe"</string>
-    <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Verminder batteryleeftyd"</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="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="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="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="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_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="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="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>
-    <string name="username_title" msgid="2479375923477682328">"Gebruikernaam"</string>
-    <string name="password_title" msgid="3323555249068171531">"Wagwoord"</string>
-    <string name="display_name_title" msgid="2459768196312249937">"Vertoonnaam"</string>
-    <string name="proxy_address_title" msgid="4828301345351614273">"Uitgaande-instaan-adres"</string>
-    <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="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>
-    <string name="auth_username_title" msgid="851473016307947120">"Stawingsgebruikernaam"</string>
-    <string name="auth_username_summary" msgid="6782012405225938629">"Gebruikernaam gebruik vir stawing"</string>
-    <string name="default_preference_summary" msgid="868766740121667450">"&lt;Nie gestel nie&gt;"</string>
-    <string name="display_name_summary" msgid="8636377460518225523">"&lt;Dieselfde as gebruikernaam&gt;"</string>
-    <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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"Stembel nie ondersteun nie"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Vinnige antwoorde"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"een"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"twee"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"drie"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"vier"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"vyf"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"ses"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"sewe"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"agt"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"nege"</string>
-    <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_dial_button" msgid="7459705245418435351">"bel"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"terugvee"</string>
-    <string name="description_target_answer" msgid="7205604197797472471">"Antwoord"</string>
-    <string name="description_target_send_sms" msgid="2098326025587950144">"Stuur SMS"</string>
-    <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="2609519527849101590">"Klank"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Verstek klank (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <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="dial_pad_autocomplete" msgid="494525952035761075">"Belblad outo-voltooi"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Luitoon en vibreer"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Gebruik Wi-Fi om oproep te maak?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Ja"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"Nee"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Ingeboude SIM-kaarte"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Ingeboude internetoproepe"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Skakel video-oproepe aan"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Jy moet Verbeterde 4G LTE-modus in netwerkinstellings aktiveer om video-oproepe aan te skakel."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Netwerkinstellings"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Maak toe"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Noodoproepe"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Net noodoproepe"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM-kaart, gleuf: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Toeganklikheid"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Inkomende Wi-Fi-oproep"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi-oproep"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Raak weer om oop te maak"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"Kon nie die boodskap dekodeer nie."</string>
 </resources>
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
new file mode 100644
index 0000000..1327d3d
--- /dev/null
+++ b/res/values-am/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"አለምአቀፍ"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-am/config.xml b/res/values-am/config.xml
deleted file mode 100644
index e8acbba..0000000
--- a/res/values-am/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"ውሸት"</string>
-</resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index e55e9ad..10cbf50 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -16,14 +16,14 @@
 
 <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="tablet" msgid="1107073389495104784">"የተንቀሳቃሽ ስልክ ውሂብ"</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">"የFDN ዝርዝር"</string>
     <string name="unknown" msgid="6878797917991465859">"ያልታወቀ"</string>
     <string name="private_num" msgid="6713286113000232309">"የግል ቁጥር"</string>
-    <string name="payphone" msgid="1931775086311769314">"የክፍያ ስልክ"</string>
+    <string name="payphone" msgid="4793877574636445118">"የሕዝብ ስልክ"</string>
     <string name="onHold" msgid="9035493194749959955">"ያዝናቆይ"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"የMMI ኮድ ጀምሯል"</string>
     <string name="ussdRunning" msgid="485588686340541690">"የUSSD ኮድ አሂድ ላይ ነው..."</string>
@@ -48,22 +48,45 @@
     <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>
-    <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="mobile_network_settings_not_available" msgid="7355254462995117896">"የተንቀሳቃሽ ስልክ አውታረ መረብ ቅንብሮች ቅንብሮች ለዚህ ተጠቃሚ አይገኙም"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"የተንቀሳቃሽ ስልክ አውታረ መረብ ቅንብሮች ለዚህ ተጠቃሚ አይገኙም"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"የGSM  ጥሪ ቅንብሮች"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"የጂኤስኤም ጥሪ ቅንብሮች (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA የጥሪ ቅንብሮች"</string>
-    <string name="apn_settings" msgid="9043423184895642077">"የድረስ ነጥብ ስም"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"የሲዲኤምኤ ጥሪ ቅንብሮች (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="apn_settings" msgid="9043423184895642077">"የመዳረሻ ነጥብ ስም"</string>
     <string name="settings_label" msgid="3876743539816984008">"የአውታረመረብ ቅንብሮች"</string>
-    <string name="connection_service" msgid="978745922583410219">"የሚጠቀሙት የግንኙነት አገልግሎት"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"የመደወያ መለያዎች"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"ከዚህ ጋር ጥሪዎችን አድርግ"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"SIP ጥሪዎችን ከዚህ ጋር አድርግ"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"በመጀመሪያ ጠይቅ"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"ቅንብሮች"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"መለያዎች ይምረጡ"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"የስልክ መለያዎች"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"የSIP መለያ ያክሉ"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"የመለያ ቅንብሮችን ይውቀሩ"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"የWi-Fi ጥሪ ማድረጊያ"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"የWi-Fi መደወያን አትጠቀም"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"የጥሪ ረዳትን አትጠቀም"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"ምንም"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"የጥሪ ረዳት"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"የጥሪ ረዳትን ተጠቀም"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"የጥሪ ረዳትን ምረጥ"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"ከሚከተለው ጋር ላሉ ጥሪዎች ጥቅም ላይ የዋሉ አውታረ መረቦችን ያስተዳድሩ"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"ለጥሪዎች ጥቅም ላይ የሚውሉ አውታረ መረቦችን ለማስተዳደር መተግበሪያዎችን ወይም አገልግሎቶችን ፍቀድላቸው"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"አዋቅር"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"አብሮ የተገነባ የግንኙነት አገልግሎት"</string>
     <string name="voicemail" msgid="8693759337917898954">"የድምፅ መልዕክት"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"የድምጽ መልዕክት (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
     <string name="networks" msgid="8873030692174541976">"የአውታረ መረብ ትእምርተ ከዋኝ"</string>
-    <string name="call_settings" msgid="1630474923393095156">"የጥሪ ቅንብሮች"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"የአስቸኳይ አደጋ ስርጭቶች"</string>
+    <string name="call_settings" msgid="6112441768261754562">"የጥሪ ቅንብሮች"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"ተጨማሪ ቅንብሮች"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"ተጨማሪ ቅንብሮች (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
@@ -77,29 +100,32 @@
     <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="call_forwarding_settings_with_label" msgid="8569489414006897127">"የጥሪ ማስተላለፊያ ቅንብሮች (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="sum_cfu_disabled" msgid="8384177689501334080">"ጠፍቷል"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"ባተሌ ሲኮን"</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="sum_cfb_disabled" msgid="4913145177320506827">"ጠፍቷል"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"ስልክህ ስራ ሲበዛበት የድምጽ ተያያዥ ሞደም አቅራቢህ  የጥሪ-ማስተላለፍን  አይደግፍም።"</string>
-    <string name="labelCFNRy" msgid="3646316323834351390">"ካልተነሳ አስላልፍ"</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"መልስ ሳይሰጥ ሲቀር"</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="sum_cfnry_disabled" msgid="3884684060443538097">"ጠፍቷል"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"ስልክህ በማይመልስበት ጊዜ የድምጽ ተያያዥ ሞደም አቅራቢህ  የጥሪ-ማስተላለፍን  አይደግፍም።"</string>
-    <string name="labelCFNRc" msgid="47183615370850000">"ሳይገኝአስተላልፍ"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"የማልገኝ ሲሆን"</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="5646361343094064333">"ስልክህ በማይደረስበት ጊዜ የድምጽ ተያያዥ ሞደምህ  የጥሪ-ማስተላለፍን አይደግፍም።"</string>
     <string name="updating_title" msgid="6146755386174019046">"የጥሪ ቅንብሮች"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"የጥሪ ቅንብሮች በተቀዳሚው ተጠቃሚ ብቻ ሊለወጡ ይችላሉ።"</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"የጥሪ ቅንብሮች (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"የጥሪ ቅንብሮች ስህተት"</string>
     <string name="reading_settings" msgid="1920291699287055284">"ቅንብሮች በማንበብ ላይ..."</string>
     <string name="updating_settings" msgid="8171225533884883252">"ቅንብሮችን በማዘመን ላይ…"</string>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"አብራ"</string>
+    <string name="disable" msgid="4678348128118573672">"አጥፋ"</string>
     <string name="change_num" msgid="239476305819844391">"አዘምን"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"ነባሪ አውታረመረብ"</item>
@@ -123,8 +149,8 @@
     <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="voicemail_default" msgid="2001233554889016880">"የእርስዎ ድምጸ ተያያዥ ሞደም"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"የተንቀሳቃሽ ስልክ አውታረ መረብ ቅንብሮች"</string>
     <string name="label_available" msgid="1181658289009300430">"የሚገኙ አውታረመረቦች"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"በመፈለግ ላይ…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"ምንም አውታረመረብ አልተገኘም።"</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"ተመራጭ የአውታረመረብ ሁኔታ ፡ CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"ተመራጭ የአውታረመረብ ፡ አለምአቀፍ"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"ተመራጭ የአውታረመረብ ሁኔታ፡ LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"ተመራጭ የአውታረ መረብ ሁነታ፦ LTE / GSM / UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"ተመራጭ የአውታረመረብ ፡LTE / CDMA ሁነታ"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="7886739962255042385">"LTE / WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,26 +199,29 @@
     <item msgid="1524224863879435516">"GSM ብቻ"</item>
     <item msgid="3817924849415716259">"GSM / WCDMA ተመራጭ"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"የተሻሻለ የ4ጂ LTE ሁነታ"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"የድምፅ እና ሌሎች የመልዕክት ልውውጦችን ለማሻሻል LTE አገልግሎቶችን ይጠቀሙ (የሚመከር)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"ውሂብ ነቅቷል"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"በተንቀሳቃሽ ስልክ አውታረ መረብ ላይ የውሂብ መድረስ አንቃ"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"የውሂብ አጠቃቀም ፍቀድ"</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="8913735676127858115">"የውሂብ ተያያዥነት የጠፋበት ምክንያት የቤትህን አውታረ መረብ እንቅስቃሴ ውሂብ በማጥፋትህ ነው።"</string>
-    <string name="roaming_warning" msgid="7820963598559553967">"የእንቅስቃሴ ላይ ውሂብ ይፈቀድ? ላቅ ያለ የእንቅስቃሴ ላይ ክፍያ ሊያክሉ ይችላሉ!"</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"ከፍተኛ ክፍያዎችን ሊያስከትልብዎት ይችላል።"</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"የውሂብ ዝውውር ፍቀድ?"</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_rate" msgid="4710388992676803508">"የውሂብ ደረጃ መመሪያ"</string>
     <string name="throttle_help" msgid="243651091785169900">"በተጨማሪ ለመረዳት"</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>٪)  <xliff:g id="USED_2">%3$s</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_0">%1$s</xliff:g> (<xliff:g id="USED_1">%2$d</xliff:g>٪) <xliff:g id="USED_2">%3$s</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="throttle_help_subtext" msgid="3633091498168446044">"ተጨማሪ የአገልግሎት አቅራቢዎ የተንቀሳቃሽ ስልክ አውታረ መረብዎ ውሂብ አጠቃቀም መመሪያ"</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>
@@ -303,7 +334,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"የውሂብ አግልግሎት አዋቅር"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"የድምጸ ተያያዥ ሞደም ቅንብሮች"</string>
     <string name="fdn" msgid="7878832555095183202">"በቋሚነት የሚደወልባቸው  ቁጥሮች"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"የተወሰኑ ቁጥሮች ላይ መደወል (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FDN ዝርዝር"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"የFDN ዝርዝር (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"የFDN አግብር"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"የቋሚ መደወያቁጥሮች ነቅተዋል"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"የቋሚ መደወያቁጥሮች ቦዝነዋል"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"TTY  ሁነት አዘጋጅ"</string>
     <string name="auto_retry_mode_title" msgid="4073265511427813322">"ራስ ዳግም ሞክር"</string>
     <string name="auto_retry_mode_summary" msgid="4973886004067532288">"ራስ ድጋሚ አስጀምር ሁናቴ አስችል"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"የTTY ሁነታ ለውጥ በቪዲዮ ጥሪ ጊዜ አይፈቀድም"</string>
     <string name="menu_add" msgid="1882023737425114762">"እውቅያዎች አክል"</string>
     <string name="menu_edit" msgid="7143003705504672374">"እውቅያ አርትዕ"</string>
     <string name="menu_delete" msgid="3977150783449642851">"እውቅያ ሰርዝ"</string>
@@ -344,7 +378,7 @@
     <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="1846161429087789936">"ከሲም ካርድ ላይ ዕውቂያዎችን ለማስመጣት፣ የአይሮፕላን ሁኔታን መጀመሪያ  አጥፋ፡፡"</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"ከሲም ካርድ ላይ እውቂያዎችን ለማስመጣት የአውሮፕላን ሁኔታን ያጥፉ።"</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>
@@ -354,42 +388,40 @@
     <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">"የ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="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="1796577128488773946">"የይለፍ ቃሉ የተሳሳተ ነው፣ ን ታግዷል! PUK ያስፈልጋል።"</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"SIM PIN አጽዳ"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"SIM PIN አቀናብር"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"PIN በማቀናበር ላይ…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN ተቀናብሯል"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN ጸድቷል"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN ልክ አይደለም"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN ዘምኗል"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"የይለፍ ቃል ልክ አይደለም። PIN አሁን ታግዷል። PUK ተጠይቋል።"</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">"አዲስ ፒን  አረጋግጥ"</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="1639666438836544393">"PIN2 በተሳካ ተለውጧል"</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"የPUK2 ኮድ ተይብ"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"የይለፍ ቃል ትክክል አይደለም፣ ፒን2 ታግዷል። እባክዎ ፒን2ን ይቀይሩ እና እንደገና ይሞክሩ።"</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"የተሳሳተ ይለፍ ቃል፣ SIM ተቆልፏል! PUK2 ይጠየቃል።"</string>
+    <string name="badPuk2" msgid="7910064009531541708">"PUK2 ልክ አይደለም። እንደገና ይሞክሩ።"</string>
+    <string name="badPin2" msgid="6646896629970023109">"አሮጌው PIN2 ልክ አይደለም። እንደገና ይሞክሩ።"</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2ዎች አይመሳሰሉም። እንደገና ይሞክሩ።"</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"ከ4 እስከ 8 ቁጥሮች የሆነ PIN2 ያስገቡ።"</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"8 ቁጥሮች የሆነ PUK2 ያስገቡ።"</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 ዘምኗል"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"PUK2 ኮድ ያስገቡ"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"የይለፍ ቃል ልክ አይደለም። PIN2 አሁን ታግዷል። እንደገና ይሞክሩ፣ PIN 2 ይለውጡ።"</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"የይለፍ ቃል ልክ አይደለም። SIM አሁን ተቆልፏል። PUK2 ያስገቡ።"</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"ፒን2 በቋሚነት ታግዷል።"</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n" <xliff:g id="NUMBER">%d</xliff:g> ቀሪ ሙከራዎች አሉ።"</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"ፒን2 እገዳው ተነስቷል!"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"እርስዎ <xliff:g id="NUMBER">%d</xliff:g> ቀሪ ሙከራዎች አልዎት።"</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 ከአሁን በኋላ አልታገደም"</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_redialing" msgid="8253487008234167266">"ዳግም በመደወል ላይ"</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_dialing" msgid="2107666444937350731">"በመደወል ላይ"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"ያመለጠጥሪ"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"ያመለጡ ጥሪዎች"</string>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"ጥሪ ለማድረግ የአውሮፕላን ሁነታን ያጥፉ።"</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"ጥሪ ለማድረግ የአውሮፕላን ሁኔታን ያጥፉ ወይም ወደ ሽቦ አልባ አውታረ መረብ ያገናኙ።"</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_error_out_of_service" msgid="4100065333878929223">"የተንቀሳቃሽ ስልክ አውታረ መረብ አይገኝም።"</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"የተንቀሳቃሽ ስልክ አውታረ መረብ አይገኝም። ጥሪ ለማድረግ ወደ ሽቦ አልባ አውታረ መረብ ያገናኙ።"</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"አንድ ጥሪ ለማድረግ የሚሰራ ቁጥር ያስገቡ።"</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"መደወል አልተቻለም።"</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"የMMI sequence…"</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_unknown" msgid="655570339115407698">"አገልግሎት አይደገፍም"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"ጥሪዎችን መቀያየር አልተቻለም።"</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"ጥሪን መለየት አልተቻለም።"</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"ማስተላለፍ አልተቻለም።"</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="incall_error_supp_service_reject" msgid="8998568661508655638">"ጥሪውን መዝጋት አልተቻለም።"</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"ጥሪ(ዎች)ን መልቀቅ አልተቻለም።"</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"ጥሪ ለማድረግ ወደ ሽቦ አልባ አውታረ መረብ ያገናኙ።"</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="7969515493359619960">"ጥሪ አልተላከም፣ <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> የአደጋ  ቁጥር አይደለም!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"ጥሪ አልተላከም፣ እባክህ የአደጋ ጊዜ ቁጥር ደውል።"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"ምንም አገልግሎት የለም። ዳግም በመሞከር ላይ…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"መደወል አልተቻለም። <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> የአስቸኳይ አደጋ ቁጥር አይደለም።"</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"መደወል አልተቻለም። ወደ የአስቸኳይ አደጋ ቁጥር ይደውሉ።"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"ለመደወል የሰሌዳ ቁልፍ ተጠቀም"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"ያዝ"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"መጨረሻ"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"መደበኛ"</item>
     <item msgid="2883365539347850535">"ረጅም"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"የአውታረ መረብ መልዕክት"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"የአውታረ መረብ መልዕክት"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"የስህተት መልዕክት"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"ስልክዎን ያግብሩ"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"የስልክዎን አገለግሎት ለማግበር ልዩ ጥሪ ያስፈልጋል።\n\n  \"አግብር\" ከተጫኑ በኋላ ስልክዎን ለማግበር የቀረቡትን መመሪያዎች ያዳምጡ።"</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"በማንቃት ላይ..."</string>
@@ -469,8 +504,8 @@
     <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="3420314892609254729">"ስልክህ ፍርግም የተደረገ እስኪሆን ድረስ ቆይ።"</string>
-    <string name="ota_failure" msgid="4311299546379674378">"መፈርገም አልተሳካም"</string>
+    <string name="ota_progress" msgid="460876637828044519">"ስልክዎን ፕሮግራም በማድረግ ላይ…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"ስልክዎን ፕሮግራም ማድረግ አልተቻለም"</string>
     <string name="ota_successful" msgid="1880780692887077407">"አሁን ስልክዎ አግብሯል።አገልግሎቱ ለመጀመር እስከ 15 ደቂቃዎች ሊፈጅ ይችላል።"</string>
     <string name="ota_unsuccessful" msgid="8072141612635635357">"ስልክህ አላገበረም።\n ጥሩ ሽፋን ያለበት አካባቢ ማግኘት ያስፈልግሃል (መስኮት፣ ወይም ውጪ አካባቢ)።ለበለጠ አማራጮች የደንበኞች አገልግሎት ደውል ወይም \n\nእንደገና ሞክር።"</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"ከልክ ያለፈ የSPC  መታወክ"</string>
@@ -481,23 +516,23 @@
     <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="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="2585506997024726599">"የአደጋ ጥሪ ሁናቴ በሚሆንበት ጊዜ የተመረጠው እርምጃ አይገኝም። ስልኩ ለ<xliff:g id="COUNT">%s</xliff:g> ደቂቃ በዚህ ሁናቴ ውስጥ ይሆናል። አሁን መውጣት ይፈልጋሉ?"</item>
-    <item quantity="other" msgid="6115622137771382224">"የአደጋ ጥሪ ሁናቴ በሚሆንበት ጊዜ የተመረጠው እርምጃ አይገኝም። ስልኩ ለ<xliff:g id="COUNT">%s</xliff:g> ደቂቃዎች በዚህ ሁናቴ ውስጥ ይሆናል። አሁን መውጣት ይፈልጋሉ?"</item>
-  </plurals>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="one">ለ <xliff:g id="COUNT_1">%s</xliff:g> ደቂቃዎች ምንም የውሂብ ተያያዥነት የለም</item>
+      <item quantity="other">ለ <xliff:g id="COUNT_1">%s</xliff:g> ደቂቃዎች ምንም የውሂብ ተያያዥነት የለም</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="one">ስልኩ በድንገተኛ ጥሪ መልሶ መደወያ ሁነታ ለ <xliff:g id="COUNT_1">%s</xliff:g> ደቂቃዎች ይቆያል። በዚህ ሁነታ ላይ በሚሆንበት ጊዜ የውሂብ ግንኙነትን የሚጠቀሙ ማናቸውም መተግበሪያዎች ጥቅም ላይ ሊውሉ አይችሉም። አሁን መውጣት ይፈልጋሉ?</item>
+      <item quantity="other">ስልኩ በድንገተኛ ጥሪ መልሶ መደወያ ሁነታ ለ <xliff:g id="COUNT_1">%s</xliff:g> ደቂቃዎች ይቆያል። በዚህ ሁነታ ላይ በሚሆንበት ጊዜ የውሂብ ግንኙነትን የሚጠቀሙ ማናቸውም መተግበሪያዎች ጥቅም ላይ ሊውሉ አይችሉም። አሁን መውጣት ይፈልጋሉ?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="one">የተመረጠው እርምጃ በአደጋ ጥሪ መልሶ መደወያ ሁነታ ላይ ባለበት ጊዜ ሊገኝ አይችልም። ስልኩ በድንገተኛ ጥሪ መልሶ መደወያ ሁነታ ለ <xliff:g id="COUNT_1">%s</xliff:g> ደቂቃዎች ይቆያል። አሁን መውጣት ይፈልጋሉ?</item>
+      <item quantity="other">የተመረጠው እርምጃ በአደጋ ጥሪ መልሶ መደወያ ሁነታ ላይ ባለበት ጊዜ ሊገኝ አይችልም። ስልኩ በድንገተኛ ጥሪ መልሶ መደወያ ሁነታ ለ<xliff:g id="COUNT_1">%s</xliff:g> ደቂቃዎች ይቆያል። አሁን መውጣት ይፈልጋሉ?</item>
+    </plurals>
     <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="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>
@@ -506,110 +541,23 @@
     <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="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="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="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_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="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="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>
-    <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">"keep-alive ላክ"</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">"&lt;አልተዘጋጀም &gt;"</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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"የድምፅ ጥሪ አይታገዝም"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"ፈጣን ምላሾች"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></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">"የኋሊት ደምሳሽ"</string>
-    <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_ringtone_title" msgid="2609519527849101590">"ድምፅ"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"ነባሪ ድምጽ (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</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="dial_pad_autocomplete" msgid="494525952035761075">"የመደወያ ሰሌዳ ራስ-ሙላ"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"የደወል ቅላጼ እና ንዘረት"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"ጥሪ ለማድረግ Wi-Fi ይጠቀሙ?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"አዎ"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"አይ"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"አብሮገነብ ሲም ካርዶች"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"አብሮ የተሰራ የበይነመረብ መደወያ"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"የቪዲዮ ጥሪ አብራ"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"የቪዲዮ ጥሪ ማድረግን ለማብራት፣ በአውታረ መረብ ቅንብሮች ውስጥ የተሻሻለ 4ጂ LTE ሁነታን ማንቃት ይኖርብዎታል።"</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"የአውታረመረብ ቅንብሮች"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"ዝጋ"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"የአደጋ ጥሪዎች"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"የአደጋ ጥሪዎችን ብቻ ለማድረግ"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM ካርድ፣ ማስገቢያ ቀዳዳ፦ <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"ተደራሽነት"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"ገቢ የWi-Fi ጥሪ"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"የWi-Fi ጥሪ"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"ለመክፈት ዳግም ይንኩ"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"መልዕክቱን በማመሳጠር ላይ ስህተት ነበር።"</string>
 </resources>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
new file mode 100644
index 0000000..acf94de
--- /dev/null
+++ b/res/values-ar/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"عام"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"٨"</item>
+    <item msgid="3494519853214024879">"٩"</item>
+  </string-array>
+</resources>
diff --git a/res/values-ar/config.xml b/res/values-ar/config.xml
deleted file mode 100644
index d41bd57..0000000
--- a/res/values-ar/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"خطأ"</string>
-</resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index ff32640..8622a25 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -16,14 +16,14 @@
 
 <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="tablet" msgid="1107073389495104784">"بيانات شبكة الجوّال"</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">"‏قائمة FDN"</string>
     <string name="unknown" msgid="6878797917991465859">"غير معروف"</string>
     <string name="private_num" msgid="6713286113000232309">"رقم خاص"</string>
-    <string name="payphone" msgid="1931775086311769314">"هاتف الدفع"</string>
+    <string name="payphone" msgid="4793877574636445118">"هاتف يعمل بالعملة"</string>
     <string name="onHold" msgid="9035493194749959955">"معلقة"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"‏بدأ رمز MMI"</string>
     <string name="ussdRunning" msgid="485588686340541690">"‏جارٍ تشغيل رمز USSD..."</string>
@@ -43,27 +43,50 @@
     <string name="pause_prompt_no" msgid="6686238803236884877">"لا"</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="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="puk_unlocked" msgid="2284912838477558454">"‏تم إلغاء حظر شريحة SIM. جارٍ إلغاء تأمين الهاتف..."</string>
     <string name="label_ndp" msgid="780479633159517250">"‏رمز PIN لإلغاء تأمين شبكة SIM"</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="mobile_network_settings_not_available" msgid="7355254462995117896">"لا تتوفّر إعدادات شبكة الجوّال للمستخدم الحالي."</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"لا تتوفّر إعدادات شبكة الجوّال لهذا المستخدم"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"‏إعدادات اتصال نظام GSM"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"‏إعدادات اتصال GSM (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"‏إعدادات اتصال CDMA"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"‏إعدادات اتصال CDMA (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"الدخول إلى أسماء النقاط"</string>
     <string name="settings_label" msgid="3876743539816984008">"إعدادات الشبكة"</string>
-    <string name="connection_service" msgid="978745922583410219">"خدمة الاتصال المقرر استخدامها"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"حسابات الاتصال"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"إجراء المكالمات باستخدام"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"‏إجراء اتصالات SIP باستخدام"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"السؤال أولاً"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"الإعدادات"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"اختيار الحسابات"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"حسابات الهاتف"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"‏إضافة حساب SIP"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"تهيئة إعدادات الحساب"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"‏الاتصال عبر Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"‏عدم استخدام الاتصال عبر Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"عدم استخدام مساعد الاتصال"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"بدون"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"مساعد الاتصال"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"استخدام مساعد الاتصال"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"اختيار مساعد الاتصال"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"إدارة الشبكات المستخدمة للمكالمات باستخدام"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"السماح للتطبيقات أو الخدمات بإدارة الشبكات المستخدمة لإجراء المكالمات"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"تهيئة"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"خدمة اتصال مدمجة"</string>
     <string name="voicemail" msgid="8693759337917898954">"البريد الصوتي"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"البريد الصوتي (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
     <string name="networks" msgid="8873030692174541976">"مشغلو الشبكة"</string>
-    <string name="call_settings" msgid="1630474923393095156">"إعدادات المكالمات"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"عمليات البث في حالات الطوارئ"</string>
+    <string name="call_settings" msgid="6112441768261754562">"إعدادات الاتصال"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"إعدادات إضافية"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"إعدادات إضافية (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
@@ -77,40 +100,43 @@
     <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="call_forwarding_settings_with_label" msgid="8569489414006897127">"إعدادات إعادة توجيه المكالمات (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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_cfu_disabled" msgid="8384177689501334080">"تم الإيقاف"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"عند الانشغال"</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="sum_cfb_disabled" msgid="4913145177320506827">"تم الإيقاف"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"لا يتيح مشغل شبكة الجوال تعطيل اعادة توجيه المكالمة عندما يكون هاتفك مشغولاً."</string>
-    <string name="labelCFNRy" msgid="3646316323834351390">"إعادة التوجيه عند عدم الرد"</string>
-    <string name="messageCFNRy" msgid="672317899884380374">"الرقم عندما لا يتم الرد"</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"عند عدم الرد"</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="sum_cfnry_disabled" msgid="3884684060443538097">"تم الإيقاف"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"لا يتيح مشغل شبكة الجوال تعطيل اعادة توجيه المكالمة عند عدم رد هاتفك."</string>
-    <string name="labelCFNRc" msgid="47183615370850000">"إعادة التوجيه عندما لا يمكن الوصول"</string>
-    <string name="messageCFNRc" msgid="6380695421020295119">"الرقم عندما لا يمكن الوصول"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"عند عدم الوصول"</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="5646361343094064333">"لا يتيح مشغل شبكة الجوال تعطيل اعادة توجيه المكالمة عند عدم التمكن من الوصول إلى هاتفك."</string>
     <string name="updating_title" msgid="6146755386174019046">"إعدادات الاتصال"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"لا يمكن تغيير إعدادات المكالمات إلا بواسطة المستخدم الأساسي."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"إعدادات المكالمات (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="exception_error" msgid="7027667130619518211">"‏خطأ في الشبكة أو في شريحة SIM"</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>
+    <string name="enable" msgid="7248657275000173526">"تشغيل"</string>
+    <string name="disable" msgid="4678348128118573672">"إيقاف"</string>
     <string name="change_num" msgid="239476305819844391">"تحديث"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"الشبكة الافتراضية"</item>
@@ -123,15 +149,15 @@
     <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="voicemail_default" msgid="2001233554889016880">"مشغل شبكة الجوّال"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"إعدادات شبكة الجوّال"</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="5613353860205691579">"‏لا تسمح بطاقة SIM بالاتصال بهذه الشبكة."</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="3494252551249882718">"اختر مشغل شبكة جوال"</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"‏وضع الشبكة المفضل: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"وضع الشبكة المفضل: عام"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"‏وضع الشبكة المفضل: LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"‏وضع الشبكة المفضل: LTE / GSM / UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"‏وضع الشبكة المفضل: LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="7886739962255042385">"LTE / WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"‏نظام GSM فقط"</item>
     <item msgid="3817924849415716259">"‏GSM/WCDMA المفضل"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"‏وضع 4G LTE المحسّن"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"‏استخدام خدمات LTE لتحسين الصوت والاتصالات الأخرى (مستحسن)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"تم تمكين البيانات"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"تمكين الدخول إلى البيانات عبر شبكة الجوال"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"السماح باستخدام البيانات"</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="8913735676127858115">"لقد فقدت اتصال البيانات نظرًا لأنك أوقفت تشغيل تجوال البيانات بشبكتك الرئيسية."</string>
-    <string name="roaming_warning" msgid="7820963598559553967">"هل تريد السماح بتجوال البيانات؟ قد يكلفك ذلك رسوم تجوال مرتفعة!"</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"قد يكلف ذلك رسومًا مرتفعة."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"السماح بتجوال البيانات؟"</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>
@@ -190,7 +221,7 @@
     <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> كيلوبايت/ثانية"</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> كيلوبايت/ثانية إذا تم تعدي حد البيانات"</string>
-    <string name="throttle_help_subtext" msgid="5217706521499010816">"مزيد من المعلومات حول سياسة استخدام بيانات شبكة جوال مشغل شبكة الجوال"</string>
+    <string name="throttle_help_subtext" msgid="3633091498168446044">"مزيد من المعلومات حول سياسة استخدام بيانات الشبكة لمشغل شبكة الجوّال"</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>
@@ -303,13 +334,15 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"إعداد خدمة البيانات"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"إعدادات مشغل شبكة الجوّال"</string>
     <string name="fdn" msgid="7878832555095183202">"أرقام الاتصال الثابتة"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"أرقام الاتصال الثابت (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"‏قائمة FDN"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"قائمة أرقام الاتصال الثابت (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"‏تنشيط FDN"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"تم تمكين أرقام الاتصال الثابتة"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"تم تعطيل أرقام الاتصال الثابتة"</string>
     <string name="enable_fdn" msgid="3740191529180493851">"‏تمكين FDN"</string>
     <string name="disable_fdn" msgid="7944020890722540616">"‏تعطيل FDN"</string>
-    <string name="change_pin2" msgid="2153563695382176676">"‏تغيير رمز PIN PIN2"</string>
+    <string name="change_pin2" msgid="2153563695382176676">"‏تغيير PIN2"</string>
     <string name="enable_fdn_ok" msgid="7215588870329688132">"‏تعطيل FDN"</string>
     <string name="disable_fdn_ok" msgid="5727046928930740173">"‏تمكين FDN"</string>
     <string name="sum_fdn" msgid="1959399454900272878">"إدارة أرقام الاتصال الثابتة"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"‏تعيين وضع TTY"</string>
     <string name="auto_retry_mode_title" msgid="4073265511427813322">"إعادة المحاولة تلقائيًا"</string>
     <string name="auto_retry_mode_summary" msgid="4973886004067532288">"تمكين وضع إعادة المحاولة التلقائي"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"‏لا يُسمح بتغيير وضع TTY أثناء مكالمة فيديو"</string>
     <string name="menu_add" msgid="1882023737425114762">"إضافة جهة اتصال"</string>
     <string name="menu_edit" msgid="7143003705504672374">"تعديل جهة الاتصال"</string>
     <string name="menu_delete" msgid="3977150783449642851">"حذف جهة الاتصال"</string>
@@ -341,10 +375,10 @@
     <string name="fdn_invalid_number" msgid="1494755047900009147">"‏لم يتم تحديث FDN لأن العدد لا يمكن أن يتجاوز 20 رقمًا."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"‏لم يتم تحديث FDN. رقم PIN2 غير صحيح، أو تم رفض رقم الهاتف."</string>
     <string name="fdn_failed" msgid="540018079008319747">"‏أخفقت عملية FDN!"</string>
-    <string name="simContacts_emptyLoading" msgid="2203331234764498011">"‏جارٍ القراءة من بطاقة SIM..."</string>
-    <string name="simContacts_empty" msgid="5270660846489561932">"‏ليس هناك جهات اتصال على بطاقة SIM."</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="1846161429087789936">"‏لاستيراد جهات اتصال من بطاقة SIM، الرجاء إيقاف وضع الطائرة أولاً."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"‏عليك إيقاف وضع الطائرة لاستيراد جهات الاتصال من شريحة 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>
@@ -354,42 +388,40 @@
     <string name="badPin" msgid="8955102849303984935">"‏رمز PIN القديم الذي كتبته غير صحيح. حاول مرة أخرى."</string>
     <string name="mismatchPin" msgid="5923253370683071889">"‏أرقام التعريف الشخصي PIN2 التي كتبتها غير متطابقة. حاول مرة أخرى."</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="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="1796577128488773946">"‏كلمة المرور غير صحيحة، تم حظر رقم التعريف الشخصي! يُرجى إدخال رمز PUK."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"‏محو رقم التعريف الشخصي لبطاقة SIM"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"‏تعيين رقم التعريف الشخصي لبطاقة SIM"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"جارٍ تعيين رقم التعريف الشخصي…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"تم تعيين رقم التعريف الشخصي"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"تم محو رقم التعريف الشخصي"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"رقم التعريف الشخصي غير صحيح"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"تم تحديث رقم التعريف الشخصي"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"‏كلمة المرور غير صحيحة. تم قفل رقم التعريف الشخصي الآن. رمز PUK مطلوب."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
-    <string name="oldPin2Label" msgid="8559146795026261502">"‏رمز PIN PIN2 القديم"</string>
+    <string name="oldPin2Label" msgid="8559146795026261502">"‏PIN2القديم"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"‏رقم تعريف شخصي PIN2 جديد"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"‏تأكيد رمز PIN PIN2 الجديد"</string>
-    <string name="badPuk2" msgid="4851734468010000418">"‏رقم PUK2 الذي كتبته غير صحيح. حاول مرة أخرى."</string>
-    <string name="badPin2" msgid="1041576234483629991">"‏رمز PIN PIN2 القديم الذي كتبته غير صحيح. الرجاء المحاولة مرة أخرى."</string>
-    <string name="mismatchPin2" msgid="523029155918113440">"‏أرقام التعريف الشخصي PIN2 التي كتبتها غير متطابقة. حاول مرة أخرى."</string>
-    <string name="invalidPin2" msgid="8237110107480395938">"‏اكتب رمز PIN PIN2 المكون من 4 إلى 8 أرقام."</string>
-    <string name="invalidPuk2" msgid="1290977391033057871">"‏اكتب PUK2 يتكون من 8 أحرف."</string>
-    <string name="pin2_changed" msgid="1639666438836544393">"‏تم تغيير رمز PIN PIN2 بنجاح."</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"‏اكتب رمز PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"‏كلمة المرور غير صحيحة، تم حظر PIN2. الرجاء تغيير رمز PIN2 وإعادة المحاولة!"</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"‏كلمة المرور غير صحيحة، تم تأمين بطاقة SIM. رقم PUK2 مطلوب."</string>
+    <string name="badPuk2" msgid="7910064009531541708">"‏رمز PUK2 غير صحيح. أعد المحاولة."</string>
+    <string name="badPin2" msgid="6646896629970023109">"‏رمز PIN2 القديم غير صحيح. أعد المحاولة."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"‏رمزا PIN2 غير متطابقين. أعد المحاولة."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"‏أدخل رمز PIN2 المكوّن من 4 إلى 8 أرقام."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"‏أدخل رمز PUK2 المكوّن من 8 أرقام."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"‏تم تحديث رمز PIN2"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"‏أدخل رمز PUK2"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"‏كلمة المرور غير صحيحة. أصبح PIN2 محظور الآن. لإعادة المحاولة، عليك تغيير PIN2."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"‏كلمة المرور غير صحيحة. تم قفل شريحة SIM الآن. أدخل رمز PUK2."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"‏تم حظر PUK2 بشكل دائم."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"يتبقى لديك <xliff:g id="NUMBER">%d</xliff:g> من المحاولات."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"‏تمت إزالة حظر PIN2!"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"يتبقى لديك <xliff:g id="NUMBER">%d</xliff:g> من المحاولات."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"‏لم يعد رمز PIN2 محظورًا"</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_redialing" msgid="8253487008234167266">"جارٍ إعادة الطلب"</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_dialing" msgid="2107666444937350731">"جارٍ الطلب"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"مكالمة فائتة"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"المكالمات الفائتة"</string>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"عليك إيقاف وضع الطائرة لإجراء مكالمة."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"عليك إيقاف وضع الطائرة أو الاتصال بشبكة لاسلكية لإجراء مكالمة."</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_error_out_of_service" msgid="4100065333878929223">"شبكة الجوّال غير متاحة."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"شبكة الجوّال ليست متوفرة. اتصل بشبكة لاسلكية لإجراء مكالمة."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"لإجراء مكالمة، أدخل رقمًا صالحًا."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"يتعذر الاتصال."</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_unknown" msgid="655570339115407698">"الخدمة ليست متوفرة"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"يتعذر تبديل المكالمات."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"يتعذر فصل المكالمة."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"يتعذر النقل."</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="incall_error_supp_service_reject" msgid="8998568661508655638">"يتعذر رفض المكالمة."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"يتعذر تحرير المكالمات."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"اتصل بشبكة لاسلكية لإجراء مكالمة."</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="7969515493359619960">"لم يتم إرسال المكالمة. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ليس رقم طوارئ."</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"لم يتم إرسال الاتصال. اطلب رقم طوارئ."</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"لا تتوفر خدمة. جارٍ إعادة المحاولة…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"يتعذر الاتصال. لا يعد <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> رقم طوارئ."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"يتعذر الاتصال. يمكنك طلب رقم طوارئ."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"استخدام لوحة المفاتيح للطلب"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"تعليق"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"الانتهاء"</string>
@@ -440,7 +474,7 @@
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"مكالمة فيديو"</string>
     <string name="importSimEntry" msgid="6614358325359736031">"استيراد"</string>
     <string name="importAllSimEntries" msgid="1503181169636198673">"استيراد الكل"</string>
-    <string name="importingSimContacts" msgid="7374056215462575769">"‏استيراد جهات اتصال بطاقة SIM"</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>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"عادي"</item>
     <item msgid="2883365539347850535">"طويلة"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"رسالة الشبكة"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"رسالة الشبكة"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"رسالة الخطأ"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"تنشيط الهاتف"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"يلزم إجراء اتصال خاص لتنشيط خدمة الهاتف. \n\nبعد الضغط على \"تنشيط\"، استمع إلى الإرشادات المقدمة لتنشيط هاتفك."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"جارٍ التنشيط..."</string>
@@ -469,8 +504,8 @@
     <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="3420314892609254729">"انتظر حتى تتم برمجة هاتفك."</string>
-    <string name="ota_failure" msgid="4311299546379674378">"لم تنجح البرمجة"</string>
+    <string name="ota_progress" msgid="460876637828044519">"جارٍ برمجة هاتفك…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"تتعذر برمجة هاتفك"</string>
     <string name="ota_successful" msgid="1880780692887077407">"تم تنشيط هاتفك الآن. قد يستغرق بدء الخدمة ما يصل إلى 15 دقيقة."</string>
     <string name="ota_unsuccessful" msgid="8072141612635635357">"لم يتم تنشيط الهاتف. \nربما يلزمك البحث عن منطقة بها تغطية أفضل (بجانب نافذة أو بالخارج). \n\nحاول مرة أخرى أو اتصل بخدمة العملاء للحصول على مزيد من الخيارات."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"إخفاقات في المواصفات الزائدة"</string>
@@ -481,18 +516,30 @@
     <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="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="2585506997024726599">"الإجراء المحدد ليس متاحًا أثناء استخدام وضع معاودة الاتصال بالطوارئ. سيظل الهاتف في هذا الوضع لمدة <xliff:g id="COUNT">%s</xliff:g> دقائق. هل تريد الخروج الآن؟"</item>
-    <item quantity="other" msgid="6115622137771382224">"الإجراء المحدد ليس متاحًا أثناء استخدام وضع معاودة الاتصال بالطوارئ. سيظل الهاتف في هذا الوضع لمدة <xliff:g id="COUNT">%s</xliff:g> دقائق. هل تريد الخروج الآن؟"</item>
-  </plurals>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="zero">لن يتوفر اتصال بالبيانات لمدة <xliff:g id="COUNT_1">%s</xliff:g> من الدقائق</item>
+      <item quantity="two">لن يتوفر اتصال بالبيانات لمدة دقيقتين (<xliff:g id="COUNT_1">%s</xliff:g>)</item>
+      <item quantity="few">لن يتوفر اتصال بالبيانات لمدة <xliff:g id="COUNT_1">%s</xliff:g> دقائق</item>
+      <item quantity="many">لن يتوفر اتصال بالبيانات لمدة <xliff:g id="COUNT_1">%s</xliff:g> دقيقة</item>
+      <item quantity="other">لن يتوفر اتصال بالبيانات لمدة <xliff:g id="COUNT_1">%s</xliff:g> من الدقائق</item>
+      <item quantity="one">لن يتوفر اتصال بالبيانات لمدة <xliff:g id="COUNT_0">%s</xliff:g> دقيقة</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="zero">سيكون الهاتف في وضع الرد على مكالمة الطوارئ لمدة <xliff:g id="COUNT_1">%s</xliff:g> من الدقائق. وأثناء هذا الوضع، لا يمكن استخدام أي تطبيقات تستخدم اتصال بيانات. هل تريد الخروج الآن؟</item>
+      <item quantity="two">سيكون الهاتف في وضع الرد على مكالمة الطوارئ لمدة دقيقتين (<xliff:g id="COUNT_1">%s</xliff:g>). وأثناء هذا الوضع، لا يمكن استخدام أي تطبيقات تستخدم اتصال بيانات. هل تريد الخروج الآن؟</item>
+      <item quantity="few">سيكون الهاتف في وضع الرد على مكالمة الطوارئ لمدة <xliff:g id="COUNT_1">%s</xliff:g> دقائق. وأثناء هذا الوضع، لا يمكن استخدام أي تطبيقات تستخدم اتصال بيانات. هل تريد الخروج الآن؟</item>
+      <item quantity="many">سيكون الهاتف في وضع الرد على مكالمة الطوارئ لمدة <xliff:g id="COUNT_1">%s</xliff:g> دقيقة. وأثناء هذا الوضع، لا يمكن استخدام أي تطبيقات تستخدم اتصال بيانات. هل تريد الخروج الآن؟</item>
+      <item quantity="other">سيكون الهاتف في وضع الرد على مكالمة الطوارئ لمدة <xliff:g id="COUNT_1">%s</xliff:g> من الدقائق. وأثناء هذا الوضع، لا يمكن استخدام أي تطبيقات تستخدم اتصال بيانات. هل تريد الخروج الآن؟</item>
+      <item quantity="one">سيكون الهاتف في وضع الرد على مكالمة الطوارئ لمدة <xliff:g id="COUNT_0">%s</xliff:g> دقيقة. وأثناء هذا الوضع، لا يمكن استخدام أي تطبيقات تستخدم اتصال بيانات. هل تريد الخروج الآن؟</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="zero">الإجراء المحدد ليس متاحًا أثناء تشغيل وضع الرد على مكالمة الطوارئ. وسيكون الهاتف في هذا الوضع لمدة <xliff:g id="COUNT_1">%s</xliff:g> من الدقائق. هل تريد الخروج الآن؟</item>
+      <item quantity="two">الإجراء المحدد ليس متاحًا أثناء تشغيل وضع الرد على مكالمة الطوارئ. وسيكون الهاتف في هذا الوضع لمدة دقيقتين (<xliff:g id="COUNT_1">%s</xliff:g>). هل تريد الخروج الآن؟</item>
+      <item quantity="few">الإجراء المحدد ليس متاحًا أثناء تشغيل وضع الرد على مكالمة الطوارئ. وسيكون الهاتف في هذا الوضع لمدة <xliff:g id="COUNT_1">%s</xliff:g> دقائق. هل تريد الخروج الآن؟</item>
+      <item quantity="many">الإجراء المحدد ليس متاحًا أثناء تشغيل وضع الرد على مكالمة الطوارئ. وسيكون الهاتف في هذا الوضع لمدة <xliff:g id="COUNT_1">%s</xliff:g> دقيقة. هل تريد الخروج الآن؟</item>
+      <item quantity="other">الإجراء المحدد ليس متاحًا أثناء تشغيل وضع الرد على مكالمة الطوارئ. وسيكون الهاتف في هذا الوضع لمدة <xliff:g id="COUNT_1">%s</xliff:g> من الدقائق. هل تريد الخروج الآن؟</item>
+      <item quantity="one">الإجراء المحدد ليس متاحًا أثناء تشغيل وضع الرد على مكالمة الطوارئ. وسيكون الهاتف في هذا الوضع لمدة <xliff:g id="COUNT_0">%s</xliff:g> دقيقة. هل تريد الخروج الآن؟</item>
+    </plurals>
     <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>
@@ -506,110 +553,23 @@
     <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="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="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="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_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="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="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>
-    <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">"‏&lt;لم يتم تعيينه&gt;"</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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"الاتصال الصوتي غير معتمد"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"الردود السريعة"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></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">"مسافة للخلف"</string>
-    <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_ringtone_title" msgid="2609519527849101590">"الصوت"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"الصوت الافتراضي (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</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="dial_pad_autocomplete" msgid="494525952035761075">"الإكمال التلقائي للوحة الاتصال"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"نغمة الرنين والاهتزاز"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"‏هل تريد استخدام Wi-Fi لإجراء مكالمة؟"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"نعم"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"لا"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"‏بطاقات SIM مدمجة"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"اتصال مدمج بالإنترنت"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"تشغيل مكالمات الفيديو"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"‏لتشغيل مكالمات الفيديو، يجب عليك تمكين وضع 4G LTE المحسّن في إعدادات الشبكة."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"إعدادات الشبكة"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"إغلاق"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"مكالمات الطوارئ"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"مكالمات الطوارئ فقط"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"‏شريحة SIM، المنفذ: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"إمكانية الوصول"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"‏مكالمة واردة عبر Wi-Fi"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"‏مكالمة عبر Wi-Fi"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"المس مرة أخرى للفتح"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"حدث خطأ أثناء فك ترميز الرسالة."</string>
 </resources>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index 015a27d..1b146b9 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -547,7 +547,6 @@
     <string name="domain_address_title" msgid="9071787581316160480">"Server"</string>
     <string name="username_title" msgid="2479375923477682328">"İstifadəçi adı"</string>
     <string name="password_title" msgid="3323555249068171531">"Parol"</string>
-    <string name="display_name_title" msgid="2459768196312249937">"Ad göstərin"</string>
     <string name="proxy_address_title" msgid="4828301345351614273">"Gedən proksi ünvan"</string>
     <string name="port_title" msgid="5952939408078626657">"Port nömrəsi"</string>
     <string name="transport_title" msgid="8253139511847746640">"Nəqliyyat növü"</string>
@@ -572,34 +571,13 @@
     <string name="sip_system_decide" msgid="368030746310423471">"Avtomatik"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Həmişə göndərin"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Səsli zəng dəstəklənmir"</string>
-    <string name="respond_via_sms_canned_response_1" msgid="2461606462788380215">"İndi danışmaq olmur. Nə olub?"</string>
-    <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Özüm zəng edəcəm."</string>
-    <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Özüm sonra zəng edəcəm."</string>
-    <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"İndi danışa bilmirəm. Sonra zəng edin."</string>
     <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Özünüzünkünü yazın"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Tez cavablar"</string>
-    <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Tez cavablara düzəliş edin"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"Tez cavab"</string>
     <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
     <skip />
     <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Mesaj <xliff:g id="PHONE_NUMBER">%s</xliff:g> nömrəsinə göndərildi."</string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"bir"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"iki"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"üç"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"dörd"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"beş"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"altı"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"yeddi"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"səkkiz"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"doqquz"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"ulduz"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"sıfır"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"funt"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"Yığ"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"geri düyməsi"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Spikerfon aktivdir."</string>
-    <string name="accessibility_call_muted" msgid="2776111226185342220">"Səssiz zəng edin."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Cavab"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS göndər"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Rədd et"</string>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
new file mode 100644
index 0000000..2fc378a
--- /dev/null
+++ b/res/values-bg/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Глобални"</item>
+    <item msgid="6753774959494729275">"LTE/CDMA"</item>
+    <item msgid="8658695584186942227">"LTE/GSM/UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-bg/config.xml b/res/values-bg/config.xml
deleted file mode 100644
index 3cddd0f..0000000
--- a/res/values-bg/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"невярно"</string>
-</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index f0c101c..edfc778 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -16,14 +16,14 @@
 
 <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="tablet" msgid="1107073389495104784">"Клетъчни данни"</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">"Списък с FDN"</string>
     <string name="unknown" msgid="6878797917991465859">"Неизвестен номер"</string>
     <string name="private_num" msgid="6713286113000232309">"Частен номер"</string>
-    <string name="payphone" msgid="1931775086311769314">"Импулсен телефон"</string>
+    <string name="payphone" msgid="4793877574636445118">"Обществен телефон"</string>
     <string name="onHold" msgid="9035493194749959955">"Задържане на обаждането"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI кодът бе стартиран"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD кодът се изпълнява…"</string>
@@ -52,18 +52,41 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Изпраща се заявка за отключване на мрежата..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Заявката за отключване на мрежата не бе успешна."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Отключването на мрежата бе успешно."</string>
-    <string name="mobile_network_settings_not_available" msgid="7355254462995117896">"Настройките за мобилната мрежа не са налице за този потребител"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Настройките за клетъчна мрежа не са налице за този потребител"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Настройки за обаждане с GSM"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"Настройки за обаждане с GSM (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Настройки за обаждане в CDMА"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"Настройки за обаждане със CDMA (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Имена на точки за достъп"</string>
     <string name="settings_label" msgid="3876743539816984008">"Настройки на мрежата"</string>
-    <string name="connection_service" msgid="978745922583410219">"Услуга за свързване, която да се използва"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Профили за обаждане"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Извършване на обажданията чрез"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Извършване на обажданията през SIP чрез"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Първо да се извежда запитване"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Настройки"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Избиране на профили"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Профили за телефонни услуги"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Добавяне на профил за SIP"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Конфигуриране на настройките на профила"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Обаждания през Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Без използване на услуга за обаждане през Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Без използване на помощник за обаждания"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Без"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Помощник за обаждания"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Използване на помощник за обаждания"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Избиране на помощник за обаждания"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Управление на използваните за обаждания мрежи с/ъс"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Разрешаване на приложения или услуги да управляват използваните за обаждания мрежи"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Конфигуриране"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Вградена услуга за свързване"</string>
     <string name="voicemail" msgid="8693759337917898954">"Гласова поща"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Гласова поща (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
     <string name="networks" msgid="8873030692174541976">"Мрежови оператори"</string>
-    <string name="call_settings" msgid="1630474923393095156">"Настройки за обаждане"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Спешни излъчвания"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Настройки за обаждане"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Допълнителни настройки"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Допълнителни настройки (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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">"Допълнителни настройки само за обаждане в CDMА"</string>
@@ -77,29 +100,32 @@
     <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="call_forwarding_settings_with_label" msgid="8569489414006897127">"Настройки за прехвърляне на обаждане (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="sum_cfu_disabled" msgid="8384177689501334080">"Изключено"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"При заета линия"</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="sum_cfb_disabled" msgid="4913145177320506827">"Изключено"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Операторът ви не поддържа деактивиране на пренасочването на обаждания по време на разговор."</string>
-    <string name="labelCFNRy" msgid="3646316323834351390">"Пренасочване, когато няма отговор"</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"Когато няма отговор"</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="sum_cfnry_disabled" msgid="3884684060443538097">"Изключено"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Операторът ви не поддържа деактивиране на пренасочването на обаждания, когато телефонът ви не отговаря."</string>
-    <string name="labelCFNRc" msgid="47183615370850000">"Пренасочване, когато няма връзка"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"Когато не може да се установи връзка"</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="5646361343094064333">"Операторът ви не поддържа деактивиране на пренасочването на обаждания, когато няма връзка с телефона."</string>
     <string name="updating_title" msgid="6146755386174019046">"Настройки за обаждане"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"Само основният потребител може да променя настройките за обаждане."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Настройки за обаждане (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Грешка в настройките за обаждане"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Извършва се четене на настройки…"</string>
     <string name="updating_settings" msgid="8171225533884883252">"Настройките се актуализират…"</string>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"Включване"</string>
+    <string name="disable" msgid="4678348128118573672">"Изключване"</string>
     <string name="change_num" msgid="239476305819844391">"Актуализиране"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Мрежа по подразбиране"</item>
@@ -123,8 +149,8 @@
     <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="voicemail_default" msgid="2001233554889016880">"Вашият оператор"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Настройки за клетъчна мрежа"</string>
     <string name="label_available" msgid="1181658289009300430">"Налични мрежи"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Търси се…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Не са намерени мрежи."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Предпочитан режим на мрежата: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Предпочитан режим на мрежата: Глобален"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Предпочитан режим на мрежата: LTE/WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Предпочитан мрежов режим: LTE/GSM/UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Предпочитан режим на мрежата: LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="7886739962255042385">"LTE/WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"Само GSM"</item>
     <item msgid="3817924849415716259">"Предпочита се GSM/WCDMA"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Подобрен режим с 4G LTE"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Ползване на LTE услуги за подобряване на гласовите и др. комуникации (препоръч.)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Данните са активирани"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Активиране на достъп до данните в мобилната мрежа"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Разрешаване на преноса на данни"</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="8913735676127858115">"Изгубихте връзката за данни, защото сте излезли от домашната си мрежа при изключен роуминг."</string>
-    <string name="roaming_warning" msgid="7820963598559553967">"Да се разреши ли роуминг на данни? Това може да доведе до висока такса за роуминг!"</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"Това може да доведе до високи такси."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Да се разреши ли роуминг на данни?"</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>
@@ -190,7 +221,7 @@
     <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> Кб/сек"</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> Кб/сек, ако се превиши съответното ограничение"</string>
-    <string name="throttle_help_subtext" msgid="5217706521499010816">"Още информация за правилата за използване на данни на оператора ви"</string>
+    <string name="throttle_help_subtext" msgid="3633091498168446044">"Още информация относно правилата за пренос на данни през клетъчната мрежа на оператора ви"</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>
@@ -303,7 +334,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Настройка на услугата за данни"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Настройки за оператора"</string>
     <string name="fdn" msgid="7878832555095183202">"Фиксирани номера за набиране"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Фиксирани номера за набиране (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Списък с FDN"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"Списък с фиксирани номера за набиране (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Активиране на FDN"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Фиксираните номера за набиране са активирани"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Фиксираните номера за набиране са деактивирани"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Задаване на режим TTY"</string>
     <string name="auto_retry_mode_title" msgid="4073265511427813322">"Автоматичен нов опит"</string>
     <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Активиране на режим „Автоматичен нов опит“"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"Промяната на режима на TTY не е разрешена по време на видеообаждане"</string>
     <string name="menu_add" msgid="1882023737425114762">"Добавяне на контакт"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Редактиране на контакт"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Изтриване на контакта"</string>
@@ -344,7 +378,7 @@
     <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="1846161429087789936">"За да импортирате контакти от SIM картата, първо изключете самолетния режим."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Изключете самолетния режим, за да импортирате контактите от 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>
@@ -354,42 +388,40 @@
     <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="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="1796577128488773946">"Паролата не е правилна, ПИН кодът е блокиран! Въведете PUK."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"Изчистване на ПИН кода за SIM картата"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"Задаване на ПИН код за SIM картата"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"ПИН кодът се задава…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"ПИН кодът е зададен"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"ПИН кодът е изчистен"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"ПИН кодът е неправилен"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"ПИН кодът е актуализиран"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Паролата е неправилна. ПИН кодът вече е блокиран. Изисква се PUK."</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="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="1639666438836544393">"PIN2 бе променен успешно."</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"Въвеждане на PUK2 код"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Паролата не е правилна, PIN2 е блокиран. Моля, променете го и опитайте отново!"</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"Паролата не е правилна. SIM картата е заключена. Въведете PUK2."</string>
+    <string name="badPuk2" msgid="7910064009531541708">"PUK2 кодът е неправилен. Опитайте отново."</string>
+    <string name="badPin2" msgid="6646896629970023109">"Старият ПИН2 код е неправилен. Опитайте отново."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"ПИН2 кодовете не са идентични. Опитайте отново."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Въведете ПИН2 код с дължина от 4 до 8 цифри."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Въведете 8-цифрен PUK2 код."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"ПИН2 кодът е актуализиран"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Въведете PUK2 код"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Паролата е неправилна. ПИН2 кодът вече е блокиран. За да опитате отново, го променете."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Паролата е неправилна. SIM картата вече е заключена. Въведете PUK2 кода."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 е блокиран завинаги."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Остават <xliff:g id="NUMBER">%d</xliff:g> опита."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 е отблокиран!"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"Остават ви <xliff:g id="NUMBER">%d</xliff:g> опита."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"ПИН2 кодът вече не е блокиран"</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_redialing" msgid="8253487008234167266">"Набира се отново"</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_dialing" msgid="2107666444937350731">"Набира се"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Пропуснато обаждане"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Пропуснати обаждания"</string>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"Изключете самолетния режим, за да осъществите обаждане."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Изключете самолетния режим или се свържете с безжична мрежа, за да осъществите обаждане."</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_error_out_of_service" msgid="4100065333878929223">"Няма достъп до клетъчната мрежа."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Не е налице клетъчна мрежа. Свържете се с безжична, за да осъществите обаждане."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"За да извършите обаждане, въведете валиден номер."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Не може да се извърши обаждане."</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_unknown" msgid="655570339115407698">"Услугата не се поддържа"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Обажданията не могат да се превключат."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Обаждането не може да се отдели."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Не може да се прехвърли."</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="incall_error_supp_service_reject" msgid="8998568661508655638">"Обаждането не може да се отхвърли."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Обаждането или съответно обажданията не могат да се освободят."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Свържете се с безжична мрежа, за да осъществите обаждане."</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="7969515493359619960">"Обаждането не е извършено. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> не е спешен номер!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Обаждането не е извършено. Наберете спешен номер!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Няма услуга. Извършва се нов опит…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Не може да се извърши обаждане. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> не е номер за спешни случаи."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Не може да се извърши обаждане. Наберете номер за спешни случаи."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Използвайте клавиатурата за набиране"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Задържане"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Край"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"Нормална"</item>
     <item msgid="2883365539347850535">"Продължително"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Мрежово съобщение"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Мрежово съобщение"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Съобщение за грешка"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Активиране на вашия телефон"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"За активиране на телефонните услуги трябва да направите специално обаждане. \n\nСлед като натиснете „Активиране“, чуйте предоставените инструкции за тази цел."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Активира се..."</string>
@@ -469,8 +504,8 @@
     <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="3420314892609254729">"Изчакайте, докато телефонът ви се програмира."</string>
-    <string name="ota_failure" msgid="4311299546379674378">"Програмирането не бе успешно"</string>
+    <string name="ota_progress" msgid="460876637828044519">"Телефонът ви се програмира…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Телефонът ви не можа да се програмира"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Телефонът ви вече е активиран. Стартирането на услугата може да отнеме до 15 минути."</string>
     <string name="ota_unsuccessful" msgid="8072141612635635357">"Телефонът ви не се активира. \nНамерете място с по-добро покритие (близо до прозорец или навън). \n\nОпитайте отново или се обадете за отдела за обслужване на клиенти за още опции."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"ПРЕКАЛЕНО МНОГО ГРЕШКИ В SPC"</string>
@@ -481,18 +516,18 @@
     <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="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="2585506997024726599">"Избраното действие не е налично в режим на обратно спешно обаждане. Телефонът ще бъде в този режим в продължение на <xliff:g id="COUNT">%s</xliff:g> минута. Искате ли да излезете сега?"</item>
-    <item quantity="other" msgid="6115622137771382224">"Избраното действие не е налично в режим на спешно обратно обаждане. Телефонът ще бъде в този режим в продължение на <xliff:g id="COUNT">%s</xliff:g> минути. Искате ли да излезете сега?"</item>
-  </plurals>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other">Няма връзка за данни в продължение на <xliff:g id="COUNT_1">%s</xliff:g> минути</item>
+      <item quantity="one">Няма връзка за данни в продължение на <xliff:g id="COUNT_0">%s</xliff:g> минута</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other">Телефонът ще бъде в режим за обратно обаждане при спешност в продължение на <xliff:g id="COUNT_1">%s</xliff:g> минути. В този режим не могат да се използват приложения, работещи с връзка за данни. Искате ли да излезете сега?</item>
+      <item quantity="one">Телефонът ще бъде в режим за обратно обаждане при спешност в продължение на <xliff:g id="COUNT_0">%s</xliff:g> минута. В този режим не могат да се използват приложения, работещи с връзка за данни. Искате ли да излезете сега?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other">Избраното действие не е налице в режима за обратно обаждане при спешност. Телефонът ще бъде в този режим в продължение на <xliff:g id="COUNT_1">%s</xliff:g> минути. Искате ли да излезете сега?</item>
+      <item quantity="one">Избраното действие не е налице в режима за обратно обаждане при спешност. Телефонът ще бъде в този режим в продължение на <xliff:g id="COUNT_0">%s</xliff:g> минута. Искате ли да излезете сега?</item>
+    </plurals>
     <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>
@@ -506,110 +541,23 @@
     <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="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="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="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_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="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="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>
-    <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">"&lt;Не е зададено&gt;"</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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"Гласови обаждания не се поддържат"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Бързи отговори"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></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="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_ringtone_title" msgid="2609519527849101590">"Звук"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Стандартен звук (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</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="dial_pad_autocomplete" msgid="494525952035761075">"Авт. довършване на клавиат. за набиране"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Мелодия и вибриране"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Да се използва ли Wi-Fi за извършване на обаждането?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Да"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"Не"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Вградени SIM карти"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Вградена услуга за интернет обаждания"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Включване на видеообажданията"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"За да включите услугата за видеообаждания, трябва да активирате подобрения режим с 4G LTE от настройките за мрежата."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Настройки на мрежата"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Затваряне"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Спешни обаждания"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Само спешни обаждания"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM карта, слот: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Достъпност"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Вход. обаждане през Wi-Fi"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Обаждане през Wi-Fi"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Докоснете отново за отваряне"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"При декодирането на съобщението възникна грешка."</string>
 </resources>
diff --git a/res/values-bn-rBD/arrays.xml b/res/values-bn-rBD/arrays.xml
new file mode 100644
index 0000000..1e7ef6e
--- /dev/null
+++ b/res/values-bn-rBD/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"গ্লোবাল"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"১০"</item>
+    <item msgid="6103348346295810336">"৮"</item>
+    <item msgid="3494519853214024879">"৯"</item>
+  </string-array>
+</resources>
diff --git a/res/values-bn-rBD/config.xml b/res/values-bn-rBD/config.xml
deleted file mode 100644
index 64d04ce..0000000
--- a/res/values-bn-rBD/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"মিথ্যা"</string>
-</resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index 464c8d0..50539db 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -16,14 +16,14 @@
 
 <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="tablet" msgid="1107073389495104784">"সেলুলার ডেটা"</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">"FDN তালিকা"</string>
     <string name="unknown" msgid="6878797917991465859">"অজানা"</string>
     <string name="private_num" msgid="6713286113000232309">"ব্যক্তিগত নম্বর"</string>
-    <string name="payphone" msgid="1931775086311769314">"অর্থের বিনিময়ে কল করার ফোন"</string>
+    <string name="payphone" msgid="4793877574636445118">"পে ফোন"</string>
     <string name="onHold" msgid="9035493194749959955">"সাময়িকভাবে স্থগিত রাখা হয়েছে"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI কোড শুরু করা হয়েছে"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD কোড চলছে…"</string>
@@ -43,27 +43,50 @@
     <string name="pause_prompt_no" msgid="6686238803236884877">"না"</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="no_vm_number_msg" msgid="1300729501030053828">"সিম কার্ডটিতে কোনো ভয়েসমেল নম্বর সংরক্ষিত নেই৷"</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="puk_unlocked" msgid="2284912838477558454">"আপনার সিম কার্ডকে অবরোধ মুক্ত করা হয়েছে৷ আপনার ফোন আনলক করা হচ্ছে..."</string>
+    <string name="label_ndp" msgid="780479633159517250">"সিম নেটওয়ার্ক আনলক 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="mobile_network_settings_not_available" msgid="7355254462995117896">"মোবাইল নেটওয়ার্কের সেটিংস এই ব্যবহারকারীর জন্য উপলব্ধ নয়"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"এই ব্যবহারকারীর জন্য সেলুলার নেটওয়ার্ক সেটিংস উপলব্ধ নয়"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM কল সেটিংস"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"GSM কল সেটিংস (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA কল সেটিংস"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"CDMA কল সেটিংস (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"অ্যাক্সেস পয়েন্টের নামগুলি"</string>
     <string name="settings_label" msgid="3876743539816984008">"নেটওয়ার্ক সেটিংস"</string>
-    <string name="connection_service" msgid="978745922583410219">"ব্যবহার করার জন্য সংযোগ পরিষেবা"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"কলিং অ্যাকাউন্টগুলি"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"এর দ্বারা কল করুন"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"SIP র দ্বারা কল করুন"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"প্রথমে জিজ্ঞাসা করুন"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"সেটিংস"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"অ্যাকাউন্টগুলি চয়ন করুন"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"ফোন অ্যাকাউন্টগুলি"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"SIP অ্যাকাউন্ট যোগ করুন"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"অ্যাকাউন্ট সেটিংস কনফিগার করুন"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi কলিং"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Wi-Fi কলিং ব্যবহার করবেন না"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"কল সহায়ক ব্যবহার করবেন না"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"একবারও না"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"কল সহায়ক"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"কল সহায়ক ব্যবহার করুন"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"কল সহায়ক চয়ন করুন"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"এর সাথে কলগুলির জন্য নেটওয়ার্কগুলি পরিচালনা করুন"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"অ্যাপ্লিকেশান বা পরিষেবাগুলিকে কলগুলি করার জন্য ব্যবহৃত নেটওয়ার্কগুলিকে পরিচালনা করতে দিন"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"কনফিগার করুন"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"বিল্ট-ইন সংযোগ পরিষেবা"</string>
     <string name="voicemail" msgid="8693759337917898954">"ভয়েসমেল"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"ভয়েসমেল (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
     <string name="networks" msgid="8873030692174541976">"নেটওয়ার্ক অপারেটর"</string>
-    <string name="call_settings" msgid="1630474923393095156">"কল সেটিংস"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"জরুরী সম্প্রচার"</string>
+    <string name="call_settings" msgid="6112441768261754562">"কল সেটিংস"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"অতিরিক্ত সেটিংস"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"অতিরিক্ত সেটিংস (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
@@ -77,40 +100,43 @@
     <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="call_forwarding_settings_with_label" msgid="8569489414006897127">"কল ফরওয়ার্ড করার সেটিংস <xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>"</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="sum_cfu_disabled" msgid="8384177689501334080">"বন্ধ আছে"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"যখন ব্যস্ত থাকে"</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="sum_cfb_disabled" msgid="4913145177320506827">"বন্ধ আছে"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"আপনার অপারেটর আপনার ফোন ব্যস্ত থাকাকালীন কল ফরওয়ার্ডিংকে অক্ষম করা সমর্থন করে না৷"</string>
-    <string name="labelCFNRy" msgid="3646316323834351390">"উত্তর না দিলে ফরওয়ার্ড করুন"</string>
-    <string name="messageCFNRy" msgid="672317899884380374">"যখন উত্তর করছে না তখনকার নম্বর"</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"যখন উত্তর দেয় না"</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="sum_cfnry_disabled" msgid="3884684060443538097">"বন্ধ আছে"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"আপনার অপারেটর আপনার ফোনে যখন উত্তর করা যাচ্ছে না তখন কল ফরওয়ার্ডিংকে অক্ষম করা সমর্থন করে না৷"</string>
-    <string name="labelCFNRc" msgid="47183615370850000">"সংযোগ স্থাপনে ব্যর্থ হলে ফরওয়ার্ড করুন"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"যখন অনুপলব্ধ থাকে"</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="5646361343094064333">"আপনার ক্যারিয়ার আপনার ফোনের সাথে যখন সংযোগ স্থাপন করা যাচ্ছে না সেই অবস্থায় কল ফরওয়ার্ডিংকে অক্ষম করা সমর্থন করে না৷"</string>
     <string name="updating_title" msgid="6146755386174019046">"কল সেটিংস"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"কেবলমাত্র প্রাথমিক ব্যবহারকারী কল সেটিংস পরিবর্তন করতে পারবেন৷"</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"কল সেটিংস (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="exception_error" msgid="7027667130619518211">"নেটওয়ার্ক বা সিম কার্ড ত্রুটি৷"</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>
+    <string name="enable" msgid="7248657275000173526">"চালু করুন"</string>
+    <string name="disable" msgid="4678348128118573672">"বন্ধ করুন"</string>
     <string name="change_num" msgid="239476305819844391">"আপডেট করুন"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"নেটওয়ার্ক ডিফল্ট"</item>
@@ -123,15 +149,15 @@
     <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="voicemail_default" msgid="2001233554889016880">"আপনার পরিষেবা প্রদানকারী"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"সেলুলার নেটওয়ার্ক সেটিংস"</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="5613353860205691579">"আপনার SIM কার্ড এই নেটওয়ার্কে সংযোগ স্থাপনের অনুমতি দেয় না৷"</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="3494252551249882718">"একটি নেটওয়ার্ক অপারেটর চয়ন করুন"</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"পছন্দের নেটওয়ার্ক মোড: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"পছন্দের নেটওয়ার্ক মোড: গ্লোবাল"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"পছন্দের নেটওয়ার্ক মোড: LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"পছন্দের নেটওয়ার্ক মোড: LTE / GSM / UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"পছন্দের নেটওয়ার্ক মোড: LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="7886739962255042385">"LTE / WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"শুধুমাত্র GSM"</item>
     <item msgid="3817924849415716259">"GSM/WCDMA সুবিধাজনক"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"উন্নত 4G LTE মোড"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"ভয়েস এবং অন্যান্য যোগাযোগব্যবস্থা উন্নত করতে LTE পরিষেবা ব্যবহার করুন (প্রস্তাবিত)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"ডেটা সক্ষম করা হয়েছে"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"মোবাইল নেটওয়ার্কের মাধ্যমে ডেটা অ্যাক্সেস সক্ষম করুন"</string>
-    <string name="roaming" msgid="8871412572928323707">"ডেটা রোমিং"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"ডেটা ব্যবহারের অনুমতি দিন"</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="8913735676127858115">"আপনি ডেটা রোমিং বন্ধ করে আপনার হোম নেটওয়ার্কের বাইরে চলে আসায় আপনার ডেটা সংযোগ হারিয়ে ফেলেছেন৷"</string>
-    <string name="roaming_warning" msgid="7820963598559553967">"ডেটা রোমিং অনুমোদিত করবেন? রোমিং বাবদ উল্লেখযোগ্য পরিমাণে চার্জ বসানো হতে পারে!"</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"আপনাকে উল্লেখযোগ্য পরিমাণে চার্জ করা হতে পারে৷"</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"ডেটা রোমিংয়ের অনুমতি দেবেন?"</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>
@@ -190,7 +221,7 @@
     <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="throttle_help_subtext" msgid="3633091498168446044">"আপনার পরিষেবা প্রদানকারীর সেলুলার নেটওয়ার্ক ডেটা ব্যবহারের নীতি সম্বন্ধে আরো তথ্য"</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>
@@ -289,10 +320,10 @@
     <item msgid="1205664026446156265">"স্বয়ংক্রিয়"</item>
   </string-array>
     <string name="cdma_subscription_title" msgid="1162564010076763284">"CDMA সদস্যতা"</string>
-    <string name="cdma_subscription_summary" msgid="2530890766115781140">"RUIM/SIM এবং NV এর মধ্যে পরিবর্তন করুন"</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/SIM"</item>
+    <item msgid="2258014151300708431">"RUIM/সিম"</item>
     <item msgid="5127722015571873880">"NV"</item>
   </string-array>
   <string-array name="cdma_subscription_values">
@@ -303,7 +334,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"ডেটা পরিষেবা সেট আপ করুন"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"ক্যারিয়ার সেটিংস"</string>
     <string name="fdn" msgid="7878832555095183202">"স্থায়ী ডায়ালের নম্বরগুলি"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"ফিক্সড ডায়ালিং নাম্বার (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FDN তালিকা"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"FDN তালিকা (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FDN সক্রিয়করণ"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"স্থায়ী ডায়ালের নম্বরগুলি সক্ষম করা হয়েছে"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"স্থায়ী ডায়ালের নম্বরগুলি অক্ষম করা হয়েছে৷"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"TTY মোড সেট করুন"</string>
     <string name="auto_retry_mode_title" msgid="4073265511427813322">"স্বয়ংক্রিয় পুনরায় প্রচেষ্টা"</string>
     <string name="auto_retry_mode_summary" msgid="4973886004067532288">"স্বয়ংক্রিয়ভাবে পুনরায় চেষ্টা করার মোড সক্ষম করুন"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"একটি ভিডিও কল করার সময় TTY মোড পরিবর্তন করার অনুমতি দেওয়া হয় না"</string>
     <string name="menu_add" msgid="1882023737425114762">"পরিচিতি যোগ করুন"</string>
     <string name="menu_edit" msgid="7143003705504672374">"পরিচিতি সম্পাদনা করুন"</string>
     <string name="menu_delete" msgid="3977150783449642851">"পরিচিতি মুছুন"</string>
@@ -341,55 +375,53 @@
     <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN আপডেট করা হয়নি কারণ নম্বরটি ২০ সংখ্যার বেশি হলে চলবে না৷"</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN আপডেট করা হয়নি৷ PIN2 ভুল ছিল, বা ফোন নম্বর বাতিল করা হয়েছে৷"</string>
     <string name="fdn_failed" msgid="540018079008319747">"FDN অপারেশন ব্যর্থ হয়েছে৷"</string>
-    <string name="simContacts_emptyLoading" msgid="2203331234764498011">"SIM কার্ড থেকে পড়া হচ্ছে…"</string>
-    <string name="simContacts_empty" msgid="5270660846489561932">"আপনার SIM কার্ডে কোনো পরিচিত নেই৷"</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="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="simContacts_airplaneMode" msgid="5254946758982621072">"SIM কার্ডটি থেকে পরিচিতিগুলি আমদানি করতে বিমান মোড বন্ধ করুন৷"</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="8955102849303984935">"আপনার দ্বারা টাইপ করা পুরানো PIN সঠিক নয়৷ আবার চেষ্টা করুন৷"</string>
     <string name="mismatchPin" msgid="5923253370683071889">"আপনার টাইপ করা PINগুলি মিলছে না৷ আবার চেষ্টা করুন৷"</string>
     <string name="invalidPin" msgid="5981171102258684792">"৪ থেকে ৮ সংখ্যা বিশিষ্ট একটি 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="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="1796577128488773946">"পাসওয়ার্ড ভুল, PIN অবরুদ্ধ করা হয়েছে! PUK এর জন্য অনুরোধ করা হয়েছে৷"</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"SIM এর PIN সাফ করুন"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"SIM এর PIN সেট করুন"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"PIN সেটিং…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN সেট করুন"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN সাফ করা হয়েছে"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN ভুল"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN আপডেট হয়েছে"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"পাসওয়ার্ডটি ভুল৷ PIN এখন অবরুদ্ধ৷ PUK এর জন্য অনুরোধ করা হয়েছে৷"</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="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="1639666438836544393">"PIN2 সফলভাবে পরিবর্তিত হয়েছে৷"</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"PUK2 কোড টাইপ করুন"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"পাসওয়ার্ড ভুল, PIN2 অবরুদ্ধ করা হয়েছে৷ দয়া করে PIN2 পরিবর্তন করে আবার চেষ্টা করুন!"</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"পাসওয়ার্ড ভুল, SIM লক হয়ে আছে৷ PUK2 এর জন্য অনুরোধ করা হয়েছে৷"</string>
+    <string name="badPuk2" msgid="7910064009531541708">"PUK2 ভুল৷ আবার চেষ্টা করুন৷"</string>
+    <string name="badPin2" msgid="6646896629970023109">"পুরানো PIN2 ভুল৷ আবার চেষ্টা করুন৷"</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2s মেলে নি৷ আবার চেষ্টা করুন৷"</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"৪ থেকে ৮ সংখ্যার একটি PIN2 লিখুন৷"</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"৮ সংখ্যার একটি PIN2 লিখুন৷"</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 আপডেট হয়েছে"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"PUK2 কোড লিখুন"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"পাসওয়ার্ডটি ভুল৷ PIN2 এখন অবরুদ্ধ৷ আবার চেষ্টা করতে, PIN 2 পরিবর্তন করুন৷"</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"পাসওয়ার্ডটি ভুল৷ SIM এখন অবরুদ্ধ৷ PUK2 লিখুন৷"</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 স্থায়ীভাবে অবরুদ্ধ করা হয়েছে৷"</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">"আর \n<xliff:g id="NUMBER">%d</xliff:g>বার চেষ্টা করতে পারবেন৷"</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 অবরোধ মুক্ত করা হয়েছে!"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"আপনার কাছে <xliff:g id="NUMBER">%d</xliff:g>টি প্রচেষ্টা অবশিষ্ট রয়েছে৷"</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 এখন আর অবরুদ্ধ নয়"</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_redialing" msgid="8253487008234167266">"পুনরায় ডায়াল করা হচ্ছে"</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_dialing" msgid="2107666444937350731">"ডায়াল করা হচ্ছে"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"মিসড কল"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"মিসড কলগুলি"</string>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"কল করতে বিমান মোড বন্ধ করুন৷"</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"বিমান মোড বন্ধ করুন বা কল করতে কোনো ওয়্যারলেস নেটওয়ার্কে সংযোগ করুন৷"</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_error_out_of_service" msgid="4100065333878929223">"সেলুলার নেটওয়ার্ক উপলব্ধ নয়।"</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"মোবাইল নেটওয়ার্ক উপলব্ধ নেই৷ একটি কল করতে কোনো ওয়্যারলেস নেটওয়ার্কে সংযোগ করুন৷"</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"কোনো কল স্থাপন করতে, একটি বৈধ নম্বর লিখুন৷"</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"কল করা যাবে না৷"</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_unknown" msgid="655570339115407698">"পরিষেবা সমর্থিত নয়"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"কলগুলি স্যুইচ করা যাবে না৷"</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"কল আলাদা করা যাবে না৷"</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"হস্তান্তর করা যাবে না৷"</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="incall_error_supp_service_reject" msgid="8998568661508655638">"কল প্রত্যাখ্যান কলা যাবে না৷"</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"কল(গুলি) কাটা যাবে না৷"</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"একটি কল করতে কোনো ওয়্যারলেস নেটওয়ার্কে সংযোগ করুন৷"</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="7969515493359619960">"কল করা যায়নি৷ <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> একটি জরুরি নম্বর নয়!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"কল করা যায়নি৷ একটি জরুরি নম্বরে ডায়াল করুন!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"কোন পরিষেবা নেই৷ আবার চেষ্টা করা হচ্ছে..."</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"কল করা যাবে না৷ <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> কোনো জরুরী নম্বর নয়৷"</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"কল করা যাবে না৷ কোনো জরুরী নম্বর ডায়াল করুন৷"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"ডায়াল করতে কীবোর্ড ব্যবহার করুন"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"ধরে থাকুন"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"শেষ করুন"</string>
@@ -440,7 +474,7 @@
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"ভিডিও কল"</string>
     <string name="importSimEntry" msgid="6614358325359736031">"আমদানি করুন"</string>
     <string name="importAllSimEntries" msgid="1503181169636198673">"সবকিছু আমদানি করুন"</string>
-    <string name="importingSimContacts" msgid="7374056215462575769">"SIM পরিচিতিগুলি আমদানি করা হচ্ছে"</string>
+    <string name="importingSimContacts" msgid="7374056215462575769">"সিম পরিচিতিগুলি আমদানি করা হচ্ছে"</string>
     <string name="importToFDNfromContacts" msgid="2130620207013368580">"পরিচিতিগুলি থেকে আমদানি করুন"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"শ্রবণ যন্ত্রগুলি"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"শ্রবণ যন্ত্র উপযুক্ততা চালু করুন"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"স্বাভাবিক"</item>
     <item msgid="2883365539347850535">"দীর্ঘ"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"নেটওয়ার্ক বার্তা"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"নেটওয়ার্ক বার্তা"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"ত্রুটি বার্তা"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"আপনার ফোন সক্রিয় করুন"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"আপনার ফোনের পরিষেবা সক্রিয় করার জন্য একটি বিশেষ কল করতে হবে৷ \n\n\"সক্রিয় করুন\" টেপার পরে, আপনার ফোন সক্রিয় করার জন্য প্রদত্ত নির্দেশাবলী শুনুন৷"</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"সক্রিয় হচ্ছে..."</string>
@@ -469,8 +504,8 @@
     <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="3420314892609254729">"আপনার ফোনে প্রোগ্রামিং সংক্রান্ত কাজ চলাকালীন অপেক্ষা করুন৷"</string>
-    <string name="ota_failure" msgid="4311299546379674378">"প্রোগ্রামিং অসফল হয়েছে"</string>
+    <string name="ota_progress" msgid="460876637828044519">"আপনার ফোন প্রোগ্রাম করা হচ্ছে..."</string>
+    <string name="ota_failure" msgid="7713756181204620397">"আপনার ফোন প্রোগ্রাম করা যায়নি"</string>
     <string name="ota_successful" msgid="1880780692887077407">"আপনার ফোন এখন সক্ষম৷ পরিষেবা শুরু হতে ১৫ মিনিট পর্যন্ত সময় লাগতে পারে৷"</string>
     <string name="ota_unsuccessful" msgid="8072141612635635357">"আপনার ফোন সক্রিয় করা যায়নি৷ \nআপনাকে অপেক্ষাকৃত উন্নত কভারেজ রয়েছে এমন একটি জায়গায় যেতে হতে পারে (একটি জানালার কাছে, অথবা বাইরে)৷ \n\nআবার চেষ্টা করুন অথবা আরো বিকল্পের জন্য গ্রাহক পরিষেবার সাথে যোগাযোগ করুন৷"</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"এক্সেস SPC ব্যর্থতাগুলি"</string>
@@ -481,18 +516,18 @@
     <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="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="2585506997024726599">"জরুরি কলব্যাক মোডে থাকাকালীন নির্বাচিত কার্যটি উপলব্ধ থাকবে না৷ ফোনটি <xliff:g id="COUNT">%s</xliff:g> মিনিট পর্যন্ত এই মোডে থাকবে৷ আপনি কি এখুনি এর থেকে বেরিয়ে যেতে চান?"</item>
-    <item quantity="other" msgid="6115622137771382224">"জরুরি কলব্যাক মোডে থাকাকালীন নির্বাচিত কার্যটি উপলব্ধ থাকবে না৷ ফোনটি <xliff:g id="COUNT">%s</xliff:g> মিনিট পর্যন্ত এই মোডে থাকবে৷ আপনি কি এখুনি এর থেকে বেরিয়ে যেতে চান?"</item>
-  </plurals>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> মিনিট পর্যন্ত কোনো ডেটা সংযোগ থাকবে না</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> মিনিট পর্যন্ত কোনো ডেটা সংযোগ থাকবে না</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="one">ফোনটি <xliff:g id="COUNT_1">%s</xliff:g> মিনিটের জন্য জরুরী কলব্যাক মোডে থাকবে৷ এই মোডে থাকাকালীন একটি ডেটা সংযোগ ব্যবহার করে কোনো অ্যাপ্লিকেশান ব্যবহার করা যাবে না৷ আপনি কি এখনই প্রস্থান করতে চান?</item>
+      <item quantity="other">ফোনটি <xliff:g id="COUNT_1">%s</xliff:g> মিনিটের জন্য জরুরী কলব্যাক মোডে থাকবে৷ এই মোডে থাকাকালীন একটি ডেটা সংযোগ ব্যবহার করে কোনো অ্যাপ্লিকেশান ব্যবহার করা যাবে না৷ আপনি কি এখনই প্রস্থান করতে চান?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="one">জরুরী কলব্যাক মোডে থাকাকালীন নির্বাচিত অ্যাকশন উপলব্ধ থাকবে না৷ ফোনটি <xliff:g id="COUNT_1">%s</xliff:g> মিনিটের জন্য এই মোডে থাকবে৷ আপনি কি এখনই প্রস্থান করতে চান?</item>
+      <item quantity="other">জরুরী কলব্যাক মোডে থাকাকালীন নির্বাচিত অ্যাকশন উপলব্ধ থাকবে না৷ ফোনটি <xliff:g id="COUNT_1">%s</xliff:g> মিনিটের জন্য এই মোডে থাকবে৷ আপনি কি এখনই প্রস্থান করতে চান?</item>
+    </plurals>
     <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>
@@ -506,110 +541,23 @@
     <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="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="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="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_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="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="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>
-    <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">"&lt;সেট করা নেই&gt;"</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="6839103946505432390">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> প্রয়োজনীয় এবং এটিকে খালি রাখা যাবে না৷"</string>
-    <string name="not_a_valid_port" msgid="4796149266434630292">"পোর্ট নম্বরটিকে ১০০০ ও ৬৫৫৩৪ এর মধ্যে হতে হবে৷"</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="7877142631803238549">"একটি ইন্টারনেট কল করার জন্য প্রথমে আপনার ইন্টারনেট সংযোগ পরীক্ষা করুন৷"</string>
-    <string name="no_wifi_available" msgid="1225073547318465713">"ইন্টারনেট কলগুলি করার জন্য আপনাকে একটি Wi-Fi নেটওয়ার্কের সাথে সংযোগ স্থাপন করতে হবে (বেতার &amp; নেটওয়ার্ক সেটিংস ব্যবহার করুন)৷"</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_setting_title" msgid="3754000371039709383">"দ্রুত প্রতিক্রিয়াগুলি"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></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">"ব্যাক-স্পেস"</string>
-    <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_ringtone_title" msgid="2609519527849101590">"শব্দ"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"ডিফল্ট শব্দ (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</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="dial_pad_autocomplete" msgid="494525952035761075">"স্বয়ংসম্পূর্ণ ডায়াল প্যাড"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"রিংটোন ও কম্পন"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"কল করার জন্য Wi-Fi ব্যবহার করতে চান?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"হ্যাঁ"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"না"</string>
-    <string name="pstn_connection_service_label" msgid="1743245930577325900">"বিল্ট-ইন SIM কার্ডগুলি"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"বিল্ট-ইন ইন্টারনেট কলিং"</string>
+    <string name="pstn_connection_service_label" msgid="1743245930577325900">"বিল্ট-ইন সিম কার্ডগুলি"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"ভিডিও কলিং চালু করুন"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"ভিডিও কলিং চালু করতে আপনাকে নেটওয়ার্ক সেটিংস-এ উন্নত 4G LTE মোড সক্ষম করতে হবে৷"</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"নেটওয়ার্ক সেটিংস"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"বন্ধ করুন"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"জরুরি কলগুলি"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"শুধুমাত্র জরুরী কলিং"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM কার্ড, স্লট: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"অ্যাক্সেসযোগ্যতা"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"আগত Wi-Fi কল"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi কল"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"খোলার জন্য আবার স্পর্শ করুন"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"বার্তাটি ডিকোড করার সময় একটি ত্রুটি ঘটেছে৷"</string>
 </resources>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
new file mode 100644
index 0000000..dafd4d0
--- /dev/null
+++ b/res/values-ca/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Mundial"</item>
+    <item msgid="6753774959494729275">"LTE/CDMA"</item>
+    <item msgid="8658695584186942227">"LTE/GSM/UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-ca/config.xml b/res/values-ca/config.xml
deleted file mode 100644
index 5ce58e3..0000000
--- a/res/values-ca/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"fals"</string>
-</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index c082332..d8047a7 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -16,14 +16,14 @@
 
 <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">"Dades mòbils"</string>
+    <string name="phoneAppLabel" product="tablet" msgid="1107073389495104784">"Dades mòbils"</string>
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Telèfon"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Marcador d\'emergència"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Telèfon"</string>
     <string name="fdnListLabel" msgid="8630418672279521003">"Llista FDN"</string>
     <string name="unknown" msgid="6878797917991465859">"Desconegut"</string>
     <string name="private_num" msgid="6713286113000232309">"Número privat"</string>
-    <string name="payphone" msgid="1931775086311769314">"Telèfon de monedes"</string>
+    <string name="payphone" msgid="4793877574636445118">"Telèfon públic"</string>
     <string name="onHold" msgid="9035493194749959955">"En espera"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Codi MMI iniciat"</string>
     <string name="ussdRunning" msgid="485588686340541690">"S\'està executant el codi USSD..."</string>
@@ -52,18 +52,41 @@
     <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="mobile_network_settings_not_available" msgid="7355254462995117896">"La configuració de la xarxa per a mòbils no està disponible per a aquest usuari."</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"La configuració de la xarxa mòbil no està disponible per a aquest usuari."</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Configuració de trucades GSM"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"Configuració de trucades GSM (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Configuració de trucades CDMA"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"Configuració de trucades CDMA (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"APN"</string>
     <string name="settings_label" msgid="3876743539816984008">"Configuració de xarxa"</string>
-    <string name="connection_service" msgid="978745922583410219">"Servei de connexió que s\'ha d\'utilitzar"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Comptes de trucades"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Truca amb"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Fes trucades SIP amb"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Pregunta primer"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Configuració"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Tria els comptes"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Comptes del telèfon"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Afegeix un compte SIP"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Configura les opcions del compte"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Trucades per Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"No facis servir les trucades per Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"No facis servir l\'assistent de trucades"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Cap"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Assistent de trucades"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Fes servir l\'assistent de trucades"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Tria l\'assistent de trucades"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Gestiona les xarxes que s\'utilitzen per a les trucades amb"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Permet que les aplicacions o els serveis gestionin les xarxes que es fan servir per a les trucades"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Configura"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Servei de connexió incorporat"</string>
     <string name="voicemail" msgid="8693759337917898954">"Correu de veu"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Bústia de veu (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"CV:"</string>
     <string name="networks" msgid="8873030692174541976">"Operadors de xarxa"</string>
-    <string name="call_settings" msgid="1630474923393095156">"Configuració de trucada"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Missatges d\'emergència"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Configuració de trucada"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Configuració addicional"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Configuració addicional (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Configuració addicional de trucades només GSM"</string>
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Configuració addicional de trucades CDMA"</string>
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Configuració addicional de trucades només CDMA"</string>
@@ -77,29 +100,32 @@
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Durant una trucada, avisa\'m de les trucades entrants"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Durant una trucada, avisa\'m de les trucades entrants"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Configuració de la desviació de trucades"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Configuració de la desviació de trucada (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Desviació de trucades"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Desvia sempre"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Utilitza sempre aquest número"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Es desvien totes les trucades"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Totes les trucades es desvien a <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"El número no està disponible"</string>
-    <string name="sum_cfu_disabled" msgid="3698472522160364904">"Desactivat"</string>
-    <string name="labelCFB" msgid="218938523102207587">"Desvia quan comuniqui"</string>
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Desactivat"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Quan estigui ocupat"</string>
     <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="sum_cfb_disabled" msgid="4913145177320506827">"Desactivat"</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="labelCFNRy" msgid="1736067178393744351">"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="sum_cfnry_disabled" msgid="3884684060443538097">"Desactivat"</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="labelCFNRc" msgid="2614827454402079766">"Quan no estigui disponible"</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="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="call_settings_primary_user_only" msgid="5679923943740900965">"Només l\'usuari principal pot canviar la configuració de trucades."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Configuració de trucades (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
     <string name="updating_settings" msgid="8171225533884883252">"S\'està actualitzant la configuració..."</string>
@@ -109,8 +135,8 @@
     <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">"Per veure aquesta configuració, has d\'activar el senyal mòbil."</string>
     <string name="close_dialog" msgid="2365884406356986917">"D\'acord"</string>
-    <string name="enable" msgid="1059008390636773574">"Activa"</string>
-    <string name="disable" msgid="7274240979164762320">"Desactiva"</string>
+    <string name="enable" msgid="7248657275000173526">"Activa"</string>
+    <string name="disable" msgid="4678348128118573672">"Desactiva"</string>
     <string name="change_num" msgid="239476305819844391">"Actualitza"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Predeterminat de la xarxa"</item>
@@ -123,8 +149,8 @@
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"No s\'ha pogut recuperar ni desar la configuració actual del número de desviació.\nVols 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>
-    <string name="voicemail_default" msgid="5902099213882352338">"El meu operador"</string>
-    <string name="mobile_networks" msgid="5540397602919106177">"Configuració de la xarxa mòbil"</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"Operador"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Configuració de la xarxa mòbil"</string>
     <string name="label_available" msgid="1181658289009300430">"Xarxes disponibles"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"S\'està cercant…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"No s\'ha trobat cap xarxa."</string>
@@ -134,14 +160,14 @@
     <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="3494252551249882718">"Selecciona un operador de xarxa"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Tria un operador de xarxa"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Cerca totes les xarxes disponibles"</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="2336624679902659306">"Tipus de xarxa preferida"</string>
+    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Tipus de xarxa preferit"</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="4048082093347807230">"Tipus de xarxa preferida"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Tipus de xarxa preferit"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Mode de xarxa preferit: WCDMA preferit"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Mode de xarxa preferit: només GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Mode de xarxa preferit: només WCDMA"</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Mode de xarxa preferit: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Mode de xarxa preferit: Global"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Mode de xarxa preferit: LTE/WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Mode de xarxa preferit: LTE/GSM/UMTS"</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="7886739962255042385">"LTE/WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"Només GSM"</item>
     <item msgid="3817924849415716259">"GSM/WCDMA preferit"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Mode 4G LTE millorat"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Utilitza els serveis LTE per millorar la veu i la comunicació (opció recomanada)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Dades activades"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Permet l\'accés a dades a les través de la xarxa mòbil"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Permet l\'ús de dades"</string>
     <string name="roaming" msgid="8871412572928323707">"Itinerància de dades"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Estableix connexió amb serveis de dades en itinerància"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Estableix connexió amb serveis de dades en itinerància"</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="roaming_reenable_message" msgid="8913735676127858115">"Has perdut la connectivitat de dades, perquè has abandonat la xarxa domèstica i la itinerància de dades està desactivada."</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"És possible que se\'t facturin càrrecs elevats."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Vols permetre la itinerància de dades?"</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>
@@ -190,7 +221,7 @@
     <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"<xliff:g id="USED_0">%1$s</xliff:g> màxim superat\nVelocitat de dades reduïda a <xliff:g id="USED_1">%2$d</xliff:g> kbps"</string>
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"<xliff:g id="USED_0">%1$d</xliff:g>٪ del cicle transcorregut\nEl 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="throttle_help_subtext" msgid="3633091498168446044">"Més informació sobre la política d\'us de dades de la xarxa mòbil de l\'operador de telefonia mòbil"</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>
@@ -303,7 +334,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Configuració del servei de dades"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Configuració d\'operador"</string>
     <string name="fdn" msgid="7878832555095183202">"Números de marcatge fix"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Números de marcatge fix (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Llista FDN"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"Llista FDN (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Activació d\'FDN"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Números de marcatge fix activats"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Números de marcatge fix desactivats"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Defineix el mode TTY"</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="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"No es pot canviar al mode de TTY durant una videotrucada"</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>
@@ -344,7 +378,7 @@
     <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="1846161429087789936">"Per importar contactes des de la targeta SIM, primer has de desactivar el mode d\'avió."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Per importar contactes de la targeta SIM, desactiva 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>
@@ -354,42 +388,40 @@
     <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="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="1796577128488773946">"La contrasenya no és correcta; s\'ha bloquejat el PIN. S\'ha sol·licitat el PUK."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"Esborrar el PIN de la SIM"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"Definir el PIN de la SIM"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"S\'està configurant el PIN…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"El PIN s\'ha definit."</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"El PIN s\'ha esborrat."</string>
+    <string name="pin_failed" msgid="5644377896213584760">"El PIN no és correcte."</string>
+    <string name="pin_changed" msgid="4455736268023261662">"El PIN s\'ha actualitzat."</string>
+    <string name="puk_requested" msgid="5921393215789090200">"La contrasenya no és correcta i el PIN s\'ha bloquejat. Introdueix el PUK."</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="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="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="3674058967950559397">"La contrasenya no és correcta; s\'ha bloquejat el PIN2. 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="badPuk2" msgid="7910064009531541708">"El PUK2 no és correcte. Torna-ho a provar."</string>
+    <string name="badPin2" msgid="6646896629970023109">"El PIN2 anterior no és correcte. Torna-ho a provar."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"Els codis PIN2 no coincideixen. Torna-ho a provar."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Introdueix un PIN2 d\'entre 4 i 8 nombres."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Introdueix un PUK2 de 8 números."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"El PIN2 s\'ha actualitzat."</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Introdueix el codi PUK2"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"La contrasenya no és correcta i el PIN2 s\'ha bloquejat. Per tornar-ho a provar, canvia el PIN2."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"La contrasenya no és correcta i la SIM s\'ha bloquejat. Introdueix el PUK2."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"El PUK2 s\'ha bloquejat de manera permanent."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Queden <xliff:g id="NUMBER">%d</xliff:g> intents."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"S\'ha desbloquejat el PIN2."</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"Et queden <xliff:g id="NUMBER">%d</xliff:g> intents."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"El PIN2 ja no està bloquejat."</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="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_redialing" msgid="8253487008234167266">"S\'està tornant a marcar"</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_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>
     <string name="card_title_in_call" msgid="6346543933068225205">"En una trucada"</string>
-    <string name="card_title_my_phone_number" msgid="112428362494434191">"El meu número és <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Marcatge"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Trucada perduda"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Trucades perdudes"</string>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"Per fer una trucada, desactiva el mode d\'avió."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Per fer una trucada, desactiva el mode d\'avió o connecta amb una xarxa sense fil."</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_error_out_of_service" msgid="4100065333878929223">"La xarxa mòbil no està disponible."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"La xarxa mòbil no està disponible. Per fer una trucada, connecta amb una xarxa sense fil."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Per realitzar una trucada, introdueix un número vàlid."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"No es pot trucar."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"S\'està iniciant la seqüència MMI..."</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>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"No es pot transferir la trucada."</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"El servei no és compatible."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"No es pot canviar de trucada."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"No es pot separar la trucada."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"No es poden realitzar transferències."</string>
     <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"No es poden fer trucades de conferència."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"No es pot rebutjar la trucada."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"No es pot alliberar les trucades."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Trucada per Internet"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"No es pot rebutjar la trucada."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"No es poden alliberar trucades."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Per fer una trucada, connecta amb una xarxa sense fil."</string>
     <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 el senyal mòbil..."</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="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="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"No hi ha servei. S\'està tornant a provar..."</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"No es pot trucar. <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="9130194953830414638">"No es pot trucar. Marca un número d\'emergència."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Utilitzeu el teclat per marcar"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Posa en espera"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Final"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"Normal"</item>
     <item msgid="2883365539347850535">"Llarg"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Missatge de xarxa"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Missatge de xarxa"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Missatge d\'error"</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\nDesprés de prémer \"Activa\", escolteu les instruccions proporcionades per activar el telèfon."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"S\'està activant..."</string>
@@ -469,8 +504,8 @@
     <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_speaker" msgid="6904589278542719647">"Altaveu"</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_progress" msgid="460876637828044519">"S\'està programant el telèfon..."</string>
+    <string name="ota_failure" msgid="7713756181204620397">"No s\'ha pogut programar el telèfon."</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="8072141612635635357">"El telèfon no s\'ha activat. \nPot ser que t\'hagis de desplaçar a una zona amb més cobertura (a prop d\'una finestra o a l\'exterior). \n\nTorna-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>
@@ -481,18 +516,18 @@
     <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>
     <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Connexió de dades desactivada"</string>
-  <plurals name="phone_in_ecm_notification_time">
-    <item quantity="one" msgid="4866221796252472622">"No hi ha hagut connexió de dades durant <xliff:g id="COUNT">%s</xliff:g> minut"</item>
-    <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="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="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>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other">No hi ha hagut connexió de dades durant <xliff:g id="COUNT_1">%s</xliff:g> minuts</item>
+      <item quantity="one">No hi ha hagut connexió de dades durant <xliff:g id="COUNT_0">%s</xliff:g> minut</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other">El telèfon estarà en mode de devolució de trucades d\'emergència durant <xliff:g id="COUNT_1">%s</xliff:g> minuts. Durant aquest temps, no es podrà utilitzar cap aplicació que faci servir una connexió de dades. Vols sortir ara?</item>
+      <item quantity="one">El telèfon estarà en mode de devolució de trucades d\'emergència durant <xliff:g id="COUNT_0">%s</xliff:g> minut. Durant aquest temps, no es podrà utilitzar cap aplicació que faci servir una connexió de dades. Vols sortir ara?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other">L\'acció seleccionada no està disponible amb el mode de devolució de trucades d\'emergència. El telèfon tindrà aquest mode activat durant <xliff:g id="COUNT_1">%s</xliff:g> minuts. Vols sortir ara?</item>
+      <item quantity="one">L\'acció seleccionada no està disponible amb el mode de devolució de trucades d\'emergència. El telèfon tindrà aquest mode activat durant <xliff:g id="COUNT_0">%s</xliff:g> minut. Vols sortir ara?</item>
+    </plurals>
     <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>
@@ -506,110 +541,23 @@
     <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_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_title" msgid="27433718808839672">"Trucades per Internet"</string>
-    <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Trucades per Internet (només Wi-Fi)"</string>
-    <string name="sip_call_options_entry_1" msgid="6556668894178520760">"Per a totes les trucades quan hi hagi xarxes de dades disponibles"</string>
-    <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Només trucades per Internet"</string>
-    <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Pregunta cada vegada"</string>
-    <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"Per a totes les trucades"</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="5523030209803567922">"Pots canviar el compte de trucades per Internet que vols utilitzar de manera predeterminada, accedeix a Telèfon &gt; Configuració &gt; Configuració de 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="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="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_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="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="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>
-    <string name="username_title" msgid="2479375923477682328">"Nom d\'usuari"</string>
-    <string name="password_title" msgid="3323555249068171531">"Contrasenya"</string>
-    <string name="display_name_title" msgid="2459768196312249937">"Nom de visualització"</string>
-    <string name="proxy_address_title" msgid="4828301345351614273">"Adreça de servidor intermediari de sortida"</string>
-    <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="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>
-    <string name="auth_username_title" msgid="851473016307947120">"Nom d\'usuari utilitzat per a l\'autenticació"</string>
-    <string name="auth_username_summary" msgid="6782012405225938629">"Nom d\'usuari utilitzat per a l\'autenticació"</string>
-    <string name="default_preference_summary" msgid="868766740121667450">"&lt;No definit&gt;"</string>
-    <string name="display_name_summary" msgid="8636377460518225523">"&lt;Igual que el nom d\'usuari&gt;"</string>
-    <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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"No s\'admeten les trucades de veu"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Respostes ràpides"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"un"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"dos"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"tres"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"quatre"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"cinc"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"sis"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"set"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"vuit"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"nou"</string>
-    <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_dial_button" msgid="7459705245418435351">"marca"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"retrocés"</string>
-    <string name="description_target_answer" msgid="7205604197797472471">"Resposta"</string>
-    <string name="description_target_send_sms" msgid="2098326025587950144">"Envia SMS"</string>
-    <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="2609519527849101590">"So"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"So predeterminat (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_title" msgid="6374978286202084684">"So de trucada"</string>
-    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrar en sonar"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Sonar en marcar els números"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Autocompletar amb teclat"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"So i vibració"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Vols fer servir la connexió Wi-Fi per fer trucades?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Sí"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"No"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Targetes SIM integrades"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Trucades d\'Internet integrades"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Activa les videotrucades"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Per activar les videotrucades, cal que activis el Mode 4G LTE millorat a la configuració de la xarxa."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Configuració de xarxa"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Tanca"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Trucades d\'emergència"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Només trucades d\'emergència"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"Targeta SIM, ranura: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Accessibilitat"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Trucada per Wi-Fi entrant"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Trucada per Wi-Fi"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Toca-ho de nou per obrir"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"S\'ha produït un error en descodificar el missatge."</string>
 </resources>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
new file mode 100644
index 0000000..248f253
--- /dev/null
+++ b/res/values-cs/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Globální"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-cs/config.xml b/res/values-cs/config.xml
deleted file mode 100644
index 7cefc32..0000000
--- a/res/values-cs/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"nepravda"</string>
-</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index dddf17e..8d3dad7 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -16,14 +16,14 @@
 
 <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">"Mobilní data"</string>
+    <string name="phoneAppLabel" product="tablet" msgid="1107073389495104784">"Mobilní data"</string>
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Telefon"</string>
-    <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Tísňové vytáčení"</string>
+    <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Tísňové volání"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Telefon"</string>
     <string name="fdnListLabel" msgid="8630418672279521003">"Seznam povolených telefonních čísel"</string>
     <string name="unknown" msgid="6878797917991465859">"Neznámý volající"</string>
     <string name="private_num" msgid="6713286113000232309">"Soukromé číslo"</string>
-    <string name="payphone" msgid="1931775086311769314">"Veřejný telefon"</string>
+    <string name="payphone" msgid="4793877574636445118">"Telefonní automat"</string>
     <string name="onHold" msgid="9035493194749959955">"Přidržený hovor"</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>
@@ -52,18 +52,41 @@
     <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="mobile_network_settings_not_available" msgid="7355254462995117896">"Nastavení mobilní sítě pro tohoto uživatele není dostupné."</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Nastavení mobilní sítě pro tohoto uživatele není dostupné."</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Nastavení hovorů GSM"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"Nastavení hovorů GSM (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Nastavení hovorů CDMA"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"Nastavení hovorů CDMA (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="connection_service" msgid="978745922583410219">"Služba připojení, která se má použít"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Účty pro volání"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Volat pomocí"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Volat prostřednictvím protokolu SIP pomocí"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Nejdříve se zeptat"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Nastavení"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Zvolit účty"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Telefonní účty"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Přidat účet SIP"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Konfigurace nastavení účtu"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Volání přes Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Nepoužívat volání pomocí Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Nepoužívat asistenta pro volání"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Žádný"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Asistent pro volání"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Používat asistenta pro volání"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Zvolit asistenta pro volání"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Správa sítí používaných pro volání pomocí"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Nechat aplikace nebo služby spravovat sítě používané pro volání"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Konfigurovat"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Integrovaná služba připojení"</string>
     <string name="voicemail" msgid="8693759337917898954">"Hlasová schránka"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Hlasová schránka (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="1630474923393095156">"Nastavení hovorů"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Výstražné zprávy o výjimečné situaci"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Nastavení hovorů"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Další nastavení"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Další nastavení (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Další nastavení hovorů, pouze GSM"</string>
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Další nastavení hovorů CDMA"</string>
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Další nastavení hovorů, pouze CDMA"</string>
@@ -77,29 +100,32 @@
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Oznamuje příchozí hovory i při probíhajícím hovoru"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Oznamovat příchozí hovory i při probíhajícím hovoru"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Nastavení přesměrování hovorů"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Nastavení přesměrování hovorů (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Přesměrování hovorů"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Přesměrovat vždy"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Vždy používat toto číslo"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Všechny hovory budou přesměrovány"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Všechny hovory budou přesměrovány na číslo <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Číslo není k dispozici"</string>
-    <string name="sum_cfu_disabled" msgid="3698472522160364904">"Vypnuto"</string>
-    <string name="labelCFB" msgid="218938523102207587">"Přesměrovat, je-li obsazeno"</string>
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Vypnuto"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Pokud je obsazeno"</string>
     <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="sum_cfb_disabled" msgid="4913145177320506827">"Vypnuto"</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="labelCFNRy" msgid="1736067178393744351">"Pokud hovor není přijat"</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="sum_cfnry_disabled" msgid="3884684060443538097">"Vypnuto"</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="labelCFNRc" msgid="2614827454402079766">"Při nedostupnosti"</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="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="call_settings_primary_user_only" msgid="5679923943740900965">"Nastavení hovorů může změnit pouze primární uživatel."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Nastavení hovorů (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"Zapnout"</string>
+    <string name="disable" msgid="4678348128118573672">"Vypnout"</string>
     <string name="change_num" msgid="239476305819844391">"Aktualizovat"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Výchozí nastavení sítě"</item>
@@ -123,8 +149,8 @@
     <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.\nChcete 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>
-    <string name="voicemail_default" msgid="5902099213882352338">"Můj operátor"</string>
-    <string name="mobile_networks" msgid="5540397602919106177">"Nastavení mobilní sítě"</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"Váš operátor"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Nastavení mobilní sítě"</string>
     <string name="label_available" msgid="1181658289009300430">"Dostupné sítě"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Vyhledávání..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Žádná síť nebyla nalezena."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Preferovaný režim sítě: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Preferovaný režim sítě: Globální"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Preferovaný režim sítě: LTE/WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Preferovaný režim sítě: LTE / GSM / UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Upřednostňovaný režim sítě: LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="7886739962255042385">"LTE/WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"Pouze GSM"</item>
     <item msgid="3817924849415716259">"GSM/WCDMA – preferováno"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Vylepšený režim 4G LTE"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Používat ke zlepšení hlasové a další komunikace služby LTE (doporučeno)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Dat. přenosy aktivovány"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Aktivovat datový přístup prostřednictvím mobilní sítě"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Povolit používání dat"</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="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="roaming_warning" msgid="1603164667540144353">"Mohou vám být účtovány vysoké poplatky."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Povolit datový roaming?"</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>
@@ -190,7 +221,7 @@
     <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"Byl překročen limit <xliff:g id="USED_0">%1$s</xliff:g>\nPřenosová rychlost byla snížena na <xliff:g id="USED_1">%2$d</xliff:g> kb/s"</string>
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"Uplynulo <xliff:g id="USED_0">%1$d</xliff:g>٪ cyklu\nPoč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="throttle_help_subtext" msgid="3633091498168446044">"Další informace o zásadách využití dat v mobilní síti vašeho mobilního operátora"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"Zprávy SMS informační služby"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"Zprávy SMS informační služby"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"Zprávy SMS informační služby povoleny"</string>
@@ -302,16 +333,18 @@
     <string name="cdma_activate_device" msgid="3793805892364814518">"Aktivovat zařízení"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Nastavit datovou službu"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Nastavení operátora"</string>
-    <string name="fdn" msgid="7878832555095183202">"Povolená telefonní čísla"</string>
+    <string name="fdn" msgid="7878832555095183202">"Povolená tel. čísla"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Povolená tel. čísla (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Seznam povolených telefonních čísel"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"Seznam povolených telefonních čísel (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Aktivace povolených telefonních čísel"</string>
-    <string name="fdn_enabled" msgid="5238109009915521240">"Funkce Povolená telefonní čísla je zapnuta"</string>
-    <string name="fdn_disabled" msgid="4700049736675368279">"Funkce Povolená telefonní čísla je vypnuta"</string>
-    <string name="enable_fdn" msgid="3740191529180493851">"Zapnout funkci Povolená telefonní čísla"</string>
-    <string name="disable_fdn" msgid="7944020890722540616">"Vypnout funkci Povolená telefonní čísla"</string>
+    <string name="fdn_enabled" msgid="5238109009915521240">"Funkce Povolená tel. čísla je zapnuta"</string>
+    <string name="fdn_disabled" msgid="4700049736675368279">"Funkce Povolená tel. čísla je vypnuta"</string>
+    <string name="enable_fdn" msgid="3740191529180493851">"Zapnout funkci Povolená tel. čísla"</string>
+    <string name="disable_fdn" msgid="7944020890722540616">"Vypnout funkci Povolená tel. čísla"</string>
     <string name="change_pin2" msgid="2153563695382176676">"Změna kódu PIN2"</string>
-    <string name="enable_fdn_ok" msgid="7215588870329688132">"Vypnout funkci Povolená telefonní čísla"</string>
-    <string name="disable_fdn_ok" msgid="5727046928930740173">"Zapnout funkci Povolená telefonní čísla"</string>
+    <string name="enable_fdn_ok" msgid="7215588870329688132">"Vypnout funkci Povolená tel. čísla"</string>
+    <string name="disable_fdn_ok" msgid="5727046928930740173">"Zapnout funkci Povolená tel. čísla"</string>
     <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>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Nastavit režim TTY"</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="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"Během videohovoru změna režimu TTY není povolena"</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>
@@ -337,14 +371,14 @@
     <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="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="pin2_invalid" msgid="5470854099230755944">"Funkce Povolená tel. čísla nebyla aktualizována, protože jste zadali chybný kód PIN."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"Funkce Povolená tel. čísla nebyla aktualizována, protože číslo nesmí obsahovat více než 20 číslic."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Povolená tel. čísla (FDN) nebyla aktualizována. Kód PIN2 byl nesprávný nebo bylo telefonní číslo odmítnuto."</string>
     <string name="fdn_failed" msgid="540018079008319747">"Operace s čísly FDN se nezdařila."</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="1846161429087789936">"Chcete-li importovat kontakty ze SIM karty, vypněte nejprve režim V letadle."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Chcete-li importovat kontakty ze SIM karty, vypněte režim Letadlo."</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>
@@ -354,42 +388,40 @@
     <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 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="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="1796577128488773946">"Nesprávné heslo, kód PIN je zablokován. Je požadován kód PUK."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"Vymazat PIN SIM karty"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"Nastavit PIN SIM karty"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"Nastavování kódu PIN…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN je nastaven."</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN byl vymazán."</string>
+    <string name="pin_failed" msgid="5644377896213584760">"Nesprávný PIN"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN byl aktualizován"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Nesprávné heslo. PIN je nyní zablokován. Je požadován kód PUK."</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="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="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="3674058967950559397">"Nesprávné heslo, kód PIN2 je zablokován. 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="badPuk2" msgid="7910064009531541708">"Kód PUK2 byl zadán nesprávně. Zkuste to znovu."</string>
+    <string name="badPin2" msgid="6646896629970023109">"Starý kód PIN2 byl zadán nesprávně. Zkuste to znovu."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"Kódy PIN2 se neshodují. Zkuste to znovu."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Zadejte PIN2 o délce 4 až 8 číslic."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Zadejte PUK2 o délce 8 číslic."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 byl aktualizován"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Zadejte kód PUK2"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Nesprávné heslo. PIN2 je nyní zablokován. Chcete-li to zkusit znovu, změňte PIN 2."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Nesprávné heslo. SIM karta je nyní uzamčena. Zadejte kód PUK2."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 je trvale zablokován."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Počet zbývajících pokusů: <xliff:g id="NUMBER">%d</xliff:g>"</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"Kód PIN2 byl odblokován!"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"Počet zbývajících pokusů: <xliff:g id="NUMBER">%d</xliff:g>."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 již není blokován"</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="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_redialing" msgid="8253487008234167266">"Opakované vytáčení"</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_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>
+    <string name="card_title_hanging_up" msgid="3999101620995182450">"Ukončování hovoru"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Probíhá hovor"</string>
-    <string name="card_title_my_phone_number" msgid="112428362494434191">"Moje číslo je <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Vytáčení"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Zmeškaný hovor"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Zmeškané hovory"</string>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"Chcete-li provést hovor, vypněte režim Letadlo."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Chcete-li se připojit k bezdrátové síti a provést hovor, vypněte režim Letadlo."</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_error_out_of_service" msgid="4100065333878929223">"Mobilní síť je nedostupná."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Mobilní síť není k dispozici. Chcete-li provést hovor, připojte se k bezdrátové síti."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Chcete-li uskutečnit hovor, zadejte platné telefonní číslo."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Hovor nelze uskutečnit."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Spouštění sekvence MMI..."</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>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Hovor nelze předat."</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Služba není podporována."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Hovory nelze přepnout."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Hovor nelze rozdělit."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Hovor nelze předat."</string>
     <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Hovory nelze spojit do konferenčního hovoru."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Hovor nelze odmítnout."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Hovor není možné uvolnit."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Internetový hovor"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Hovor nelze odmítnout."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Hovor nelze ukončit."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Chcete-li provést hovor, připojte se k bezdrátové síti."</string>
     <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="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="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Služba je nedostupná. Probíhá další pokus…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Hovor nelze uskutečnit. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> není číslo tísňového volání."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Hovor nelze uskutečnit. Vytočte číslo tísňového volání."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Číslo vytočíte pomocí klávesnice."</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Přidržet"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Ukončit"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"Normální"</item>
     <item msgid="2883365539347850535">"Dlouhé"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Zpráva sítě"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Zpráva sítě"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Chybová zpráva"</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\nStiskněte tlačítko Aktivovat a aktivujte telefon podle pokynů, které vám budou sděleny."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Aktivace..."</string>
@@ -469,8 +504,8 @@
     <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_speaker" msgid="6904589278542719647">"Hlasitě"</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_progress" msgid="460876637828044519">"Programování telefonu…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Naprogramování telefonu 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="8072141612635635357">"Váš telefon nebyl aktivován.\nMožná bude nutné vyhledat místo s lepším pokrytím (blízko okna nebo venku). \n\nZkuste 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>
@@ -481,18 +516,24 @@
     <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>
     <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Datové spojení zakázáno"</string>
-  <plurals name="phone_in_ecm_notification_time">
-    <item quantity="one" msgid="4866221796252472622">"Žádné datové připojení po dobu <xliff:g id="COUNT">%s</xliff:g> min"</item>
-    <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="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="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>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="few"><xliff:g id="COUNT_1">%s</xliff:g> minuty nebude k dispozici datové připojení</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%s</xliff:g> minuty nebude k dispozici datové připojení</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> minut nebude k dispozici datové připojení</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> minutu nebude k dispozici datové připojení</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="few">]Telefon bude <xliff:g id="COUNT_1">%s</xliff:g> minuty v režimu zpětného tísňového volání. V tomto režimu nelze používat aplikace, které používají datové připojení. Chcete akci nyní ukončit?</item>
+      <item quantity="many">]Telefon bude <xliff:g id="COUNT_1">%s</xliff:g> minuty v režimu zpětného tísňového volání. V tomto režimu nelze používat aplikace, které používají datové připojení. Chcete akci nyní ukončit?</item>
+      <item quantity="other">]Telefon bude <xliff:g id="COUNT_1">%s</xliff:g> minut v režimu zpětného tísňového volání. V tomto režimu nelze používat aplikace, které používají datové připojení. Chcete akci nyní ukončit?</item>
+      <item quantity="one">Telefon bude <xliff:g id="COUNT_0">%s</xliff:g> minutu v režimu zpětného tísňového volání. V tomto režimu nelze používat aplikace, které používají datové připojení. Chcete akci nyní ukončit?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="few">V režimu zpětného tísňového volání vybraná akce není k dispozici. Telefon v tomto režimu bude <xliff:g id="COUNT_1">%s</xliff:g> minuty. Chcete akci nyní ukončit?</item>
+      <item quantity="many">V režimu zpětného tísňového volání vybraná akce není k dispozici. Telefon v tomto režimu bude <xliff:g id="COUNT_1">%s</xliff:g> minuty. Chcete akci nyní ukončit?</item>
+      <item quantity="other">V režimu zpětného tísňového volání vybraná akce není k dispozici. Telefon v tomto režimu bude <xliff:g id="COUNT_1">%s</xliff:g> minut. Chcete akci nyní ukončit?</item>
+      <item quantity="one">V režimu zpětného tísňového volání vybraná akce není k dispozici. Telefon v tomto režimu bude <xliff:g id="COUNT_0">%s</xliff:g> minutu. Chcete akci nyní ukončit?</item>
+    </plurals>
     <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>
@@ -506,110 +547,23 @@
     <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_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_title" msgid="27433718808839672">"Používat internetové volání"</string>
-    <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Používat internetové volání (jen přes 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="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="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="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="52903398217017954">"Ukládání účtu..."</string>
-    <string name="removing_account" msgid="7183999896088628100">"Odstraňování účtu..."</string>
-    <string name="sip_menu_save" msgid="5842531129356014943">"Ulož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_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="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="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>
-    <string name="username_title" msgid="2479375923477682328">"Uživatelské jméno"</string>
-    <string name="password_title" msgid="3323555249068171531">"Heslo"</string>
-    <string name="display_name_title" msgid="2459768196312249937">"Zobrazované jméno"</string>
-    <string name="proxy_address_title" msgid="4828301345351614273">"Adresa odchozího serveru proxy"</string>
-    <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="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>
-    <string name="auth_username_title" msgid="851473016307947120">"Ověřovací uživatelské jméno"</string>
-    <string name="auth_username_summary" msgid="6782012405225938629">"Uživatelské jméno používané k ověření"</string>
-    <string name="default_preference_summary" msgid="868766740121667450">"&lt;Nenastaveno&gt;"</string>
-    <string name="display_name_summary" msgid="8636377460518225523">"&lt;Stejné jako uživatelské jméno&gt;"</string>
-    <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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"Hlasové volání není podporováno"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Rychlé odpovědi"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"jedna"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"dvě"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"tři"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"čtyři"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"pět"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"šest"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"sedm"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"osm"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"devět"</string>
-    <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_dial_button" msgid="7459705245418435351">"vytáčení"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="description_target_answer" msgid="7205604197797472471">"Odpověď"</string>
-    <string name="description_target_send_sms" msgid="2098326025587950144">"Odeslat SMS"</string>
-    <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="2609519527849101590">"Zvuk"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Výchozí zvuk (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <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="dial_pad_autocomplete" msgid="494525952035761075">"Autom. doplňování číselníku"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Vyzvánění a vibrace"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Uskutečňovat hovory přes Wi-Fi?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Ano"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"Ne"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Vestavěné SIM karty"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Vestavěné internetové volání"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Zapnout videohovory"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Chcete-li zapnout videohovory, musíte v nastavení sítě povolit Vylepšený režim 4G LTE."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Nastavení sítě"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Zavřít"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Tísňová volání"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Pouze tísňová volání"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM karta, slot: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Usnadnění"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Příchozí hovor přes Wi-Fi"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Volání přes Wi-Fi"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Otevřete opětovným klepnutím"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"Při dekódování zprávy došlo k chybě."</string>
 </resources>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
new file mode 100644
index 0000000..b8c69ca
--- /dev/null
+++ b/res/values-da/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Globalt"</item>
+    <item msgid="6753774959494729275">"LTE/CDMA"</item>
+    <item msgid="8658695584186942227">"LTE/GSM/UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-da/config.xml b/res/values-da/config.xml
deleted file mode 100644
index 0605cd7..0000000
--- a/res/values-da/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"false"</string>
-</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 4580b6e..0ec783a 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -16,14 +16,14 @@
 
 <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">"Mobildata"</string>
+    <string name="phoneAppLabel" product="tablet" msgid="1107073389495104784">"Mobildata"</string>
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Telefon"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Nødopkald"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Telefon"</string>
     <string name="fdnListLabel" msgid="8630418672279521003">"Liste over numre til begrænset opkald"</string>
     <string name="unknown" msgid="6878797917991465859">"Ukendt"</string>
     <string name="private_num" msgid="6713286113000232309">"Privat nummer"</string>
-    <string name="payphone" msgid="1931775086311769314">"Betalingstelefon"</string>
+    <string name="payphone" msgid="4793877574636445118">"Mønttelefon"</string>
     <string name="onHold" msgid="9035493194749959955">"Ventende"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI-nummer er startet"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD-kode kører ..."</string>
@@ -48,25 +48,48 @@
     <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">"Pinkode til oplåsning af SIM-netværket"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Lås op"</string>
-    <string name="sim_ndp_dismiss_text" msgid="1604823375752456947">"Annuller"</string>
+    <string name="sim_ndp_dismiss_text" msgid="1604823375752456947">"Luk"</string>
     <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="mobile_network_settings_not_available" msgid="7355254462995117896">"Denne bruger har ikke adgang til mobilnetværksindstillinger"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Denne bruger har ikke adgang til mobilnetværksindstillinger"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Indstillinger for GSM-opkald"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"Indstillinger for GSM-opkald (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Indstillinger for CDMA-opkald"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"Indstillinger for CDMA-opkald (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Adgangspunkter"</string>
     <string name="settings_label" msgid="3876743539816984008">"Indstillinger for netværk"</string>
-    <string name="connection_service" msgid="978745922583410219">"Forbindelsestjeneste, der skal bruges"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Opkaldskonti"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Foretag opkald med"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Foretag SIP-opkald med"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Spørg først"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Indstillinger"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Vælg konti"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Telefonkonti"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Tilføj en SIP-konto"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Konfigurer kontoindstillinger"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Opkald via Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Undlad at bruge Wi-Fi-opkald"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Undlad at bruge opkaldsassistent"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Ingen"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Opkaldsassistent"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Brug opkaldsassistent"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Vælg opkaldsassistent"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Administration af de netværk, der anvendes ved opkald"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Lad apps eller tjenester administrere netværk, der bruges til opkald"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Konfigurer"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Indbygget forbindelsestjeneste"</string>
     <string name="voicemail" msgid="8693759337917898954">"Telefonsvarer"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Talebesked (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
     <string name="networks" msgid="8873030692174541976">"Netværksudbydere"</string>
-    <string name="call_settings" msgid="1630474923393095156">"Indstillinger for opkald"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Nødudsendelser"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Indstillinger for opkald"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Yderligere indstillinger"</string>
-    <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Yderligere indstillinger for opkald er for kun GSM"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Yderligere indstillinger (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Yderligere indstillinger for GSM-opkald"</string>
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Yderligere CDMA-opkaldsindstillinger"</string>
-    <string name="sum_cdma_call_settings" msgid="284753265979035549">"Yderligere indstillinger for opkald er for kun CDMA"</string>
+    <string name="sum_cdma_call_settings" msgid="284753265979035549">"Yderligere indstillinger for CDMA-opkald"</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>
@@ -77,40 +100,43 @@
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Fortæl mig om indgående opkald under et opkald"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Fortæl mig om indgående opkald under et opkald"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Indstillinger for viderestilling af opkald"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Indstillinger for viderestilling af opkald (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Viderestilling af opkald"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Viderestil altid"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Brug altid dette nummer"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Viderestiller alle opkald"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Viderestiller alle opkald til <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Nummeret er ikke tilgængeligt"</string>
-    <string name="sum_cfu_disabled" msgid="3698472522160364904">"Deaktiveret"</string>
-    <string name="labelCFB" msgid="218938523102207587">"Viderestil ved optaget"</string>
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Fra"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Ved optaget"</string>
     <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="sum_cfb_disabled" msgid="4913145177320506827">"Fra"</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="labelCFNRy" msgid="1736067178393744351">"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="sum_cfnry_disabled" msgid="3884684060443538097">"Fra"</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="labelCFNRc" msgid="2614827454402079766">"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="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="call_settings_primary_user_only" msgid="5679923943740900965">"Opkaldsindstillinger kan kun ændres af den primære bruger."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Opkaldsindstillinger (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Fejl i indstillinger for opkald"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Læser indstillinger ..."</string>
     <string name="updating_settings" msgid="8171225533884883252">"Opdaterer indstillinger ..."</string>
     <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_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="fdn_check_failure" msgid="18200614306525434">"Indstillingen Begrænset opkald i appen Telefon er aktiveret. Derfor fungerer nogle opkaldsfunktioner 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">"Aktivér"</string>
-    <string name="disable" msgid="7274240979164762320">"Deaktiver"</string>
+    <string name="enable" msgid="7248657275000173526">"Aktivér"</string>
+    <string name="disable" msgid="4678348128118573672">"Deaktiver"</string>
     <string name="change_num" msgid="239476305819844391">"Opdater"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Netværksstandard"</item>
@@ -123,8 +149,8 @@
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"De aktuelle indstillinger til viderestillingsnummer kunne ikke hentes og gemmes.\nVil 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 telefonsvarertjeneste"</string>
-    <string name="voicemail_default" msgid="5902099213882352338">"Min udbyder"</string>
-    <string name="mobile_networks" msgid="5540397602919106177">"Indstillinger for mobilnetværk"</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"Dit mobilselskab"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Mobilnetværksindstillinger"</string>
     <string name="label_available" msgid="1181658289009300430">"Tilgængelige netværk"</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>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Foretrukken netværkstilstand: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Foretrukken netværkstilstand: Global"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Foretrukken netværkstilstand: LTE/WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Foretrukket netværkstilstand: LTE/GSM/UMTS"</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="7886739962255042385">"LTE/WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"Kun GSM"</item>
     <item msgid="3817924849415716259">"GSM/WCDMA foretrækkes"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Forbedret 4G LTE-tilstand"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Anvend LTE-tjenester til at forbedre tale og anden kommunikation (anbefalet)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Data aktiveret"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Aktivér dataadgang via mobilnetværk"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Tillad dataforbrug"</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="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="roaming_warning" msgid="1603164667540144353">"Du kan risikere at skulle betale høje gebyrer."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Vil du tillade 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>
@@ -196,7 +227,7 @@
     <!-- no translation found for throttle_time_frame_subtext (7732763021560399960) -->
     <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="throttle_help_subtext" msgid="3633091498168446044">"Flere oplysninger om mobilselskabets politik vedrørende dataforbrug på netværket"</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 aktiveret"</string>
@@ -308,25 +339,28 @@
     <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="carrier_settings_title" msgid="9028166176523012300">"Indst. for mobilselskab"</string>
-    <string name="fdn" msgid="7878832555095183202">"Faste opkaldsnumre"</string>
+    <string name="fdn" msgid="7878832555095183202">"Numre til begrænset opkald"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Begrænset opkald (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Liste over numre til begrænset opkald"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"Liste over faste opkald (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Aktivering af begrænset 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="fdn_enabled" msgid="5238109009915521240">"Numre til begrænset opkald er aktiveret"</string>
+    <string name="fdn_disabled" msgid="4700049736675368279">"Numre til begrænset opkald er deaktiveret"</string>
     <string name="enable_fdn" msgid="3740191529180493851">"Aktivér begrænsede opkald"</string>
     <string name="disable_fdn" msgid="7944020890722540616">"Deaktiver begrænset opkald"</string>
     <string name="change_pin2" msgid="2153563695382176676">"Skift PIN2-kode"</string>
     <string name="enable_fdn_ok" msgid="7215588870329688132">"Deaktiver begrænset opkald"</string>
     <string name="disable_fdn_ok" msgid="5727046928930740173">"Aktivér begrænset opkald"</string>
-    <string name="sum_fdn" msgid="1959399454900272878">"Administrer faste opkaldsnumre"</string>
+    <string name="sum_fdn" msgid="1959399454900272878">"Administrer numre til begrænset opkald"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Skift pinkode for at få adgang til begrænset opkald."</string>
-    <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Administrer telefonnummerliste"</string>
+    <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Administrer liste over telefonnumre"</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="4073265511427813322">"Prøv automatisk igen"</string>
     <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Aktivér automatisk gentagelsestilstand"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"Det er ikke tilladt at ændre TTY-tilstanden under et videoopkald"</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>
@@ -350,7 +384,7 @@
     <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="1846161429087789936">"Du skal først slukke Flytilstand for at importere kontaktpersoner fra SIM-kortet."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Slå flytilstand fra for at importere kontaktpersoner fra SIM-kortet."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Aktiver/deaktiver pinkode til SIM-kort"</string>
     <string name="change_pin" msgid="9174186126330785343">"Skift pinkode til SIM-kort"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"Pinkode til SIM-kort:"</string>
@@ -360,42 +394,40 @@
     <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 pinkode på mellem 4 og 8 tal."</string>
-    <string name="disable_sim_pin" msgid="3992926931620188855">"Deaktiver pinkode til SIM-kort"</string>
-    <string name="enable_sim_pin" msgid="5803702443844458831">"Aktivér pinkode 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="1796577128488773946">"Forkert adgangskode. Pinkoden blev blokeret. PUK-koden skal indtastes."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"Ryd SIM-kortets pinkode"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"Indstil SIM-kortets pinkode"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"Pinkoden indstilles…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"Pinkoden er indstillet"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"Pinkoden er ryddet"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"Pinkoden er forkert"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"Pinkoden er opdateret"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Forkert adgangskode. Pinkoden er nu blokeret. Der anmodes om PUK-kode."</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="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="1639666438836544393">"PIN2-koden blev ændret."</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"Indtast PUK2-kode"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Forkert adgangskode. PIN2 blev blokeret. Skift PIN2-koden, 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="badPuk2" msgid="7910064009531541708">"PUK-kode 2 er forkert. Prøv igen."</string>
+    <string name="badPin2" msgid="6646896629970023109">"Gammel pinkode 2 er forkert. Prøv igen."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"De to pinkode 2 stemmer ikke overens. Prøv igen."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Indtast en pinkode 2, som indeholder 4 til 8 cifre."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Indtast en PUK-kode 2, som indeholder 8 cifre."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"Pinkode 2 er opdateret"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Indtast PUK-kode 2"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Forkert adgangskode. Pinkode 2 er nu blokeret. For at prøve igen skal du ændre pinkode 2."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Forkert adgangskode. SIM-kortet er nu låst. Indtast PUK-kode 2."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 er permanent blokeret."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Der er <xliff:g id="NUMBER">%d</xliff:g> forsøg tilbage."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"Blokeringen af PIN2 blev ophævet."</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"Du har <xliff:g id="NUMBER">%d</xliff:g> forsøg tilbage."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"Pinkode 2 er ikke længere blokeret"</string>
     <string name="doneButton" msgid="2859593360997984240">"Afslut"</string>
-    <string name="caller_manage_header" msgid="3231519674734638786">"Telefonmøde <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Telefonsvarernummer"</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_redialing" msgid="8253487008234167266">"Ringer op 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_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>
     <string name="card_title_in_call" msgid="6346543933068225205">"Opkald i gang"</string>
-    <string name="card_title_my_phone_number" msgid="112428362494434191">"Mit nummer er <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Ringer op"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Ubesvarede opkald"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Ubesvarede opkald"</string>
@@ -413,25 +445,27 @@
     <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_power_off" msgid="2947938060513306698">"Slå flytilstand fra for at foretage et opkald."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Slå flytilstand fra, eller opret forbindelse til et trådløst netværk 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_error_out_of_service" msgid="4100065333878929223">"Mobilnetværket er ikke tilgængeligt."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Mobilnetværk er ikke tilgængeligt. Opret forbindelse til et trådløst netværk for at foretage et opkald."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Indtast et gyldigt nummer for at foretage et opkald."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Kan ikke ringe op."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Starter MMI-sekvens ..."</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>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Opkaldet kunne ikke overføres."</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Tjenesten er ikke understøttet"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Kan ikke skifte opkald."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Kan ikke adskille opkald."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Kan ikke overføre."</string>
     <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Der kunne ikke oprettes mødeopkald."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Opkaldet kunne ikke afvises."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Der kunne ikke foretages opkald."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Internetopkald"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Kan ikke afvise opkaldet."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Kan ikke frigive et eller flere opkald."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Opret forbindelse til et trådløst netværk for at foretage et opkald."</string>
     <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">"Uden for dækning. Prøver igen ..."</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="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Ingen tjeneste. Prøver igen..."</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Kan ikke ringe op. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> er ikke et alarmnummer."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Kan ikke ringe op. Ring til et alarmnummer."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Brug tastatur til at ringe op"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Hold"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Afslut"</string>
@@ -462,7 +496,8 @@
     <item msgid="899650777817315681">"Normal"</item>
     <item msgid="2883365539347850535">"Lang"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Netværksbesked"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Netværksbesked"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Fejlmeddelelse"</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_hfa_activation_title" msgid="2234246934160473981">"Aktiverer..."</string>
@@ -475,8 +510,8 @@
     <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_speaker" msgid="6904589278542719647">"Højttaler"</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_progress" msgid="460876637828044519">"Telefonen programmeres…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Telefonen kunne ikke programmeres"</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="8072141612635635357">"Din telefon blev ikke aktiveret. \nDu skal muligvis finde et område med bedre dækning (ved et vindue eller udenfor). \n\nPrø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>
@@ -487,23 +522,23 @@
     <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>
     <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Dataforbindelsen er deaktiveret"</string>
-  <plurals name="phone_in_ecm_notification_time">
-    <item quantity="one" msgid="4866221796252472622">"Ingen dataforbindelse i <xliff:g id="COUNT">%s</xliff:g> minut"</item>
-    <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="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="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>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="one">Ingen dataforbindelse i <xliff:g id="COUNT_1">%s</xliff:g> minutter</item>
+      <item quantity="other">Ingen dataforbindelse i <xliff:g id="COUNT_1">%s</xliff:g> minutter</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="one">Telefonen vil være i tilstanden Nødopkald i <xliff:g id="COUNT_1">%s</xliff:g> minutter. Mens denne tilstand er aktiveret, kan du ikke bruge nogen applikationer, der kræver dataforbindelse. Vil du afslutte denne tilstand nu?</item>
+      <item quantity="other">Telefonen vil være i tilstanden Nødopkald i <xliff:g id="COUNT_1">%s</xliff:g> minutter. Mens denne tilstand er aktiveret, kan du ikke bruge nogen applikationer, der kræver dataforbindelse. Vil du afslutte denne tilstand nu?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="one">Den valgte handling er ikke tilgængelig i tilstanden Nødopkald. Telefonen vil være i denne tilstand i <xliff:g id="COUNT_1">%s</xliff:g> minutter. Vil du afslutte denne tilstand nu?</item>
+      <item quantity="other">Den valgte handling er ikke tilgængelig i tilstanden Nødopkald. Telefonen vil være i denne tilstand i <xliff:g id="COUNT_1">%s</xliff:g> minutter. Vil du afslutte denne tilstand nu?</item>
+    </plurals>
     <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="alert_dialog_dismiss" msgid="2491494287075907171">"Luk"</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>
@@ -512,110 +547,23 @@
     <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_receive_calls" msgid="5635685570889971559">"Modtag opkald"</string>
-    <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Reducerer batteriets levetid"</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="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="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="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="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_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="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="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>
-    <string name="username_title" msgid="2479375923477682328">"Brugernavn"</string>
-    <string name="password_title" msgid="3323555249068171531">"Adgangskode"</string>
-    <string name="display_name_title" msgid="2459768196312249937">"Visningsnavn"</string>
-    <string name="proxy_address_title" msgid="4828301345351614273">"Udgående proxyadresse"</string>
-    <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="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>
-    <string name="auth_username_title" msgid="851473016307947120">"Brugernavn til godkendelse"</string>
-    <string name="auth_username_summary" msgid="6782012405225938629">"Brugernavn bruges til godkendelse"</string>
-    <string name="default_preference_summary" msgid="868766740121667450">"&lt;Ikke angivet&gt;"</string>
-    <string name="display_name_summary" msgid="8636377460518225523">"&lt;Samme som brugernavn&gt;"</string>
-    <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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"Taleopkald understøttes ikke"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Hurtige svar"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"en"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"to"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"tre"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"fire"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"fem"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"seks"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"syv"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"otte"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"ni"</string>
-    <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_dial_button" msgid="7459705245418435351">"ring op"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"tilbage"</string>
-    <string name="description_target_answer" msgid="7205604197797472471">"Svar"</string>
-    <string name="description_target_send_sms" msgid="2098326025587950144">"Send sms"</string>
-    <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="2609519527849101590">"Lyd"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Standardlyd (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <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="dial_pad_autocomplete" msgid="494525952035761075">"Autofuldfør på num. tastatur"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Ringetone og vibration"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Vil du bruge Wi-Fi til at foretage opkald?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Ja"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"Nej"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Indbyggede SIM-kort"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Indbygget internetopkald"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Slå videoopkald til"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Før du kan slå videoopkald til, skal du aktivere Forbedret 4G LTE-tilstand i netværksindstillinger."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Netværksindstillinger"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Luk"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Nødopkald"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Kun nødopkald"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM-kortholder: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Hjælpefunktioner"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Indgående Wi-Fi-opkald"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi-opkald"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Tryk igen for at åbne"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"Der opstod en fejl under afkodning af beskeden."</string>
 </resources>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
new file mode 100644
index 0000000..807c757
--- /dev/null
+++ b/res/values-de/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Global"</item>
+    <item msgid="6753774959494729275">"LTE/CDMA"</item>
+    <item msgid="8658695584186942227">"LTE/GSM/UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-de/config.xml b/res/values-de/config.xml
deleted file mode 100644
index 0605cd7..0000000
--- a/res/values-de/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"false"</string>
-</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 4c25b7c..b177bdc 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -16,14 +16,14 @@
 
 <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">"Mobilfunk"</string>
+    <string name="phoneAppLabel" product="tablet" msgid="1107073389495104784">"Mobilfunkdaten"</string>
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Telefon"</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="payphone" msgid="4793877574636445118">"Münztelefon"</string>
     <string name="onHold" msgid="9035493194749959955">"Gehaltener Anruf"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI-Code gestartet"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD-Code wird ausgeführt..."</string>
@@ -52,18 +52,41 @@
     <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="mobile_network_settings_not_available" msgid="7355254462995117896">"Mobile Netzwerkeinstellungen sind für diesen Nutzer nicht verfügbar."</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Die Einstellungen für Mobilfunknetze sind für diesen Nutzer nicht verfügbar."</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM-Anrufeinstellungen"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"GSM-Anrufeinstellungen (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA-Anrufeinstellungen"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"CDMA-Anrufeinstellungen (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Zugangspunkte (APNs)"</string>
     <string name="settings_label" msgid="3876743539816984008">"Netzwerkeinstellungen"</string>
-    <string name="connection_service" msgid="978745922583410219">"Zu verwendender Verbindungsdienst"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Anrufkonten"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Telefonieren mit"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"SIP-Anrufe tätigen mit"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Erst fragen"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Einstellungen"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Konten auswählen"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Telefonkonten"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"SIP-Konto hinzufügen"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Kontoeinstellungen konfigurieren"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"WLAN-Telefonie"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Keine WLAN-Anrufe nutzen"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Keinen Anrufassistenten nutzen"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Ohne"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Anrufassistent"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Anrufassistent verwenden"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Anrufassistent auswählen"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Verwaltung der Netzwerke für Anrufe mit"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Verwaltung der für Anrufe verwendeten Netzwerke durch Apps oder Dienste zulassen"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Konfigurieren"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Integrierter Verbindungsdienst"</string>
     <string name="voicemail" msgid="8693759337917898954">"Mailbox"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Mailbox (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"MB:"</string>
     <string name="networks" msgid="8873030692174541976">"Mobilfunkanbieter"</string>
-    <string name="call_settings" msgid="1630474923393095156">"Anrufeinstellungen"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Notfallbenachrichtigungen"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Anrufeinstellungen"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Zusätzliche Einstellungen"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Weitere Einstellungen (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Zusätzliche Anrufeinstellungen nur für GSM"</string>
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Zusätzliche CDMA-Anrufeinstellungen"</string>
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Zusätzliche Anrufeinstellungen nur für CDMA"</string>
@@ -77,29 +100,32 @@
     <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="call_forwarding_settings_with_label" msgid="8569489414006897127">"Anrufweiterleitungseinstellungen (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Rufweiterleitung"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Immer weiterleiten"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Diese Nummer immer verwenden"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Alle Anrufe weiterleiten"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Alle Anrufe an <xliff:g id="PHONENUMBER">{0}</xliff:g> weiterleiten"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Nummer nicht verfügbar"</string>
-    <string name="sum_cfu_disabled" msgid="3698472522160364904">"Deaktiviert"</string>
-    <string name="labelCFB" msgid="218938523102207587">"Weiterleiten falls besetzt"</string>
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Aus"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Wenn besetzt"</string>
     <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="sum_cfb_disabled" msgid="4913145177320506827">"Aus"</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">"Weiterleiten falls keine Antwort"</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"Wenn keine Antwort"</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="sum_cfnry_disabled" msgid="3884684060443538097">"Aus"</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">"Weiterleiten falls nicht erreichbar"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"Wenn nicht erreichbar"</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="5646361343094064333">"Ihr Mobilfunkanbieter unterstützt die Deaktivierung der Anrufweiterleitung bei Nichterreichbarkeit nicht."</string>
     <string name="updating_title" msgid="6146755386174019046">"Anrufeinstellungen"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"Anrufeinstellungen können nur vom primären Nutzer geändert werden."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Anrufeinstellungen (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Fehler bei Anrufeinstellungen"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Einstellungen werden gelesen…"</string>
     <string name="updating_settings" msgid="8171225533884883252">"Einstellungen werden aktualisiert…"</string>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"Aktivieren"</string>
+    <string name="disable" msgid="4678348128118573672">"Deaktivieren"</string>
     <string name="change_num" msgid="239476305819844391">"Aktualisieren"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Netzwerk-Standardeinstellung"</item>
@@ -123,8 +149,8 @@
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Die aktuellen Einstellungen der Weiterleitungsnummern konnten nicht abgerufen und gespeichert werden.\nMö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>
-    <string name="voicemail_default" msgid="5902099213882352338">"Mein Mobilfunkanbieter"</string>
-    <string name="mobile_networks" msgid="5540397602919106177">"Einstellungen für Mobilfunknetze"</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"Mobilfunkanbieter"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Einstellungen für Mobilfunknetze"</string>
     <string name="label_available" msgid="1181658289009300430">"Verfügbare Netzwerke"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Suche läuft..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Keine Netzwerke gefunden"</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Bevorzugter Netzwerkmodus: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Bevorzugter Netzwerkmodus: Global"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Bevorzugter Netzwerkmodus: LTE/WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Bevorzugter Netzwerkmodus: LTE/GSM/UMTS"</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="7886739962255042385">"LTE/WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"Nur GSM"</item>
     <item msgid="3817924849415716259">"GSM/WCDMA bevorzugt"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Erweiterter 4G LTE-Modus"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Zur Verbesserung von Sprache und Kommunikation LTE-Dienste verwenden (empfohlen)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Daten aktiviert"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Datenzugriff über Mobilfunknetz"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Datennutzung zulassen"</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="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 hohe Roaming-Gebühren anfallen!"</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"Es können hohe Gebühren anfallen."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Daten-Roaming zulassen?"</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>
@@ -194,7 +225,7 @@
     <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"Maximum von <xliff:g id="USED_0">%1$s</xliff:g> wurde überschritten.\nDatenrate wurde auf <xliff:g id="USED_1">%2$d</xliff:g> kbit/s reduziert."</string>
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"<xliff:g id="USED_0">%1$d</xliff:g> % des Zyklus sind verstrichen. \nDer 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="throttle_help_subtext" msgid="3633091498168446044">"Weitere Informationen zu den Richtlinien Ihres Mobilfunkanbieters zur Nutzung der Mobilfunkdaten"</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>
@@ -307,7 +338,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Datendienst einrichten"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Anbietereinstellungen"</string>
     <string name="fdn" msgid="7878832555095183202">"Anrufbegrenzung"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Zugelassene Rufnummern (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Zugelassene Rufnummern"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"Liste der zugelassenen Rufnummern (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Aktivierung der Anrufbegrenzung"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Anrufbegrenzung ist aktiviert"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Anrufbegrenzung ist deaktiviert"</string>
@@ -325,6 +358,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"TTY-Modus einstellen"</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="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"Die Änderung des TTY-Modus ist während eines Videoanrufs nicht zulässig."</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>
@@ -348,7 +382,7 @@
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"SIM-Karte wird ausgelesen..."</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="1846161429087789936">"Deaktivieren Sie zum Importieren der Kontakte von der SIM-Karte zunächst den Flugmodus."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Deaktivieren Sie den Flugmodus, um Kontakte von der SIM-Karte zu importieren."</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>
@@ -358,42 +392,40 @@
     <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="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="1796577128488773946">"Falsches Passwort, PIN wurde gesperrt. PUK ist erforderlich."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"PIN der SIM-Karte löschen"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"PIN der SIM-Karte festlegen"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"PIN wird festgelegt…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN festgelegt"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN gelöscht"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN falsch"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN aktualisiert"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Passwort falsch. PIN ist jetzt gesperrt. PUK 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="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="1639666438836544393">"PIN2 geändert"</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"PUK2 eingeben"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Falsches Passwort. PIN2 wurde gesperrt. Bitte ä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="badPuk2" msgid="7910064009531541708">"Falscher PUK2. Bitte versuchen Sie es erneut."</string>
+    <string name="badPin2" msgid="6646896629970023109">"Falsche PIN2. Bitte versuchen Sie es erneut."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2-Eingaben stimmen nicht überein. Bitte versuchen Sie es erneut."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Geben Sie eine 4- bis 8-stellige PIN2 ein."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Geben Sie einen 4- bis 8-stelligen PUK2 ein."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 aktualisiert"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"PUK2 eingeben"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Falsches Passwort. PIN2 ist jetzt gesperrt. Ändern Sie PIN2, um es erneut zu versuchen."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Passwort falsch. SIM-Karte ist jetzt gesperrt. Bitte PUK2 eingeben."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 wurde endgültig gesperrt."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Sie haben noch <xliff:g id="NUMBER">%d</xliff:g> Versuche."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 entsperrt"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"Sie haben noch <xliff:g id="NUMBER">%d</xliff:g> Versuche."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 nicht mehr gesperrt"</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="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_redialing" msgid="8253487008234167266">"Wahlwiederholung"</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_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>
     <string name="card_title_in_call" msgid="6346543933068225205">"Anruf"</string>
-    <string name="card_title_my_phone_number" msgid="112428362494434191">"Meine Nummer lautet <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>."</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Verbindung wird aufgebaut..."</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Entgangener Anruf"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Entgangene Anrufe"</string>
@@ -411,25 +443,27 @@
     <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_power_off" msgid="2947938060513306698">"Deaktivieren Sie zum Telefonieren den Flugmodus."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Deaktivieren Sie zum Telefonieren den Flugmodus oder stellen Sie eine WLAN-Verbindung her."</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_error_out_of_service" msgid="4100065333878929223">"Mobilfunknetz nicht verfügbar"</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Es ist kein Mobilfunknetz verfügbar. Stellen Sie zum Telefonieren eine WLAN-Verbindung her."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Geben Sie eine gültige Nummer ein."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Anruf nicht möglich."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI-Sequenz 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>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Anruf kann nicht übertragen werden."</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Dienst wird nicht unterstützt"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Anruf kann nicht gewechselt werden."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Anruf kann nicht getrennt werden."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Anruf kann nicht übergeben werden."</string>
     <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Keine Telefonkonferenz möglich."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Anruf kann nicht abgelehnt werden."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Anrufe können nicht freigegeben werden."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Internetanruf"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Anruf kann nicht abgelehnt werden."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Anrufe können nicht freigegeben werden."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Stellen Sie zum Telefonieren eine WLAN-Verbindung her."</string>
     <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="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="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Kein Service. Erneuter Versuch..."</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Anruf nicht möglich. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ist keine Notrufnummer."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Anruf nicht möglich. Wählen Sie eine Notrufnummer."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Zum Wählen Tastatur verwenden"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Halten"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Ende"</string>
@@ -460,7 +494,8 @@
     <item msgid="899650777817315681">"Normal"</item>
     <item msgid="2883365539347850535">"Lang"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Netzwerknachricht"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Netzwerknachricht"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Fehlermeldung"</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\nWählen Sie \"Aktivieren\" und folgen Sie der Anleitung zur Aktivierung Ihres Telefons."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Wird aktiviert..."</string>
@@ -473,8 +508,8 @@
     <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_speaker" msgid="6904589278542719647">"Lautspr."</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_progress" msgid="460876637828044519">"Telefon wird programmiert…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Telefon konnte nicht programmiert werden."</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="8072141612635635357">"Ihr Telefon wurde nicht aktiviert. \nSuchen Sie einen Bereich auf, in dem Sie besseren Empfang haben, zum Beispiel in der Nähe eines Fensters oder unter freiem Himmel. \n\nVersuchen Sie es bitte noch einmal oder rufen Sie den Kundenservice an."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"ZU VIELE SPC-FEHLER"</string>
@@ -485,18 +520,18 @@
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Notfallrückrufmodus aktiviert"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Notfallrückrufmodus"</string>
     <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Datenverbindung deaktiviert"</string>
-  <plurals name="phone_in_ecm_notification_time">
-    <item quantity="one" msgid="4866221796252472622">"<xliff:g id="COUNT">%s</xliff:g> Minute lang keine Datenverbindung"</item>
-    <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="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="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>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> Minuten lang keine Datenverbindung</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> Minute lang keine Datenverbindung</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other">Das Smartphone wird <xliff:g id="COUNT_1">%s</xliff:g> Minuten lang in den Notfallrückrufmodus versetzt. In dieser Zeit können Apps mit Datenverbindung nicht genutzt werden. Möchten Sie den Vorgang jetzt abbrechen?</item>
+      <item quantity="one">Das Smartphone wird <xliff:g id="COUNT_0">%s</xliff:g> Minute lang in den Notfallrückrufmodus versetzt. In dieser Zeit können Apps mit Datenverbindung nicht genutzt werden. Möchten Sie den Vorgang jetzt abbrechen?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other">Die ausgewählte Aktion ist im Notfallrückrufmodus nicht verfügbar. Das Smartphone ist <xliff:g id="COUNT_1">%s</xliff:g> Minuten lang in diesem Modus. Möchten Sie den Vorgang jetzt abbrechen?</item>
+      <item quantity="one">Die ausgewählte Aktion ist im Notfallrückrufmodus nicht verfügbar. Das Smartphone ist <xliff:g id="COUNT_0">%s</xliff:g> Minute lang in diesem Modus. Möchten Sie den Vorgang jetzt abbrechen?</item>
+    </plurals>
     <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>
@@ -510,110 +545,23 @@
     <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_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_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="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="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="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="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_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="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="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-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="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>
-    <string name="auth_username_title" msgid="851473016307947120">"Nutzername für Authentifizierung"</string>
-    <string name="auth_username_summary" msgid="6782012405225938629">"Für Authentifizierung verwendeter Nutzername"</string>
-    <string name="default_preference_summary" msgid="868766740121667450">"&lt;Nicht festgelegt&gt;"</string>
-    <string name="display_name_summary" msgid="8636377460518225523">"&lt;Wie Nutzername&gt;"</string>
-    <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="6839103946505432390">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> ist ein Pflichtfeld. 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="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_setting_title" msgid="3754000371039709383">"Kurzantworten"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"Eins"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"Zwei"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"Drei"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"Vier"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"Fünf"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"Sechs"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"Sieben"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"Acht"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"Neun"</string>
-    <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_dial_button" msgid="7459705245418435351">"Wählen"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"Rücktaste"</string>
-    <string name="description_target_answer" msgid="7205604197797472471">"Antworten"</string>
-    <string name="description_target_send_sms" msgid="2098326025587950144">"SMS senden"</string>
-    <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="2609519527849101590">"Töne"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Standardklingelton (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <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="dial_pad_autocomplete" msgid="494525952035761075">"Autovervollst. für Wähltasten"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Klingelton &amp; Vibration"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Über WLAN anrufen?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Ja"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"Nein"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Integrierte SIM-Karten"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Integrierte Internettelefonie"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Videoanrufe aktivieren"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Zur Aktivierung der Videotelefonie müssen Sie in den Netzwerkeinstellungen den erweiterten 4G LTE-Modus aktivieren."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Netzwerkeinstellungen"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Schließen"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Notrufe"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Nur Notrufe"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM-Karte, Schacht: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Bedienungshilfen"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Eingehender WLAN-Anruf"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"WLAN-Anruf"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Zum Öffnen erneut berühren"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"Beim Entschlüsseln der Nachricht ist ein Fehler aufgetreten."</string>
 </resources>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
new file mode 100644
index 0000000..fa46f6e
--- /dev/null
+++ b/res/values-el/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Παγκοσμίως"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-el/config.xml b/res/values-el/config.xml
deleted file mode 100644
index 72ba256..0000000
--- a/res/values-el/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"όχι"</string>
-</resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index f408b0b..990ddc5 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -16,14 +16,14 @@
 
 <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="tablet" msgid="1107073389495104784">"Δεδομένα κινητής τηλεφωνίας"</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">"Λίστα FDN"</string>
     <string name="unknown" msgid="6878797917991465859">"Άγνωστος"</string>
     <string name="private_num" msgid="6713286113000232309">"Απόκρυψη"</string>
-    <string name="payphone" msgid="1931775086311769314">"Καρτοτηλέφωνο"</string>
+    <string name="payphone" msgid="4793877574636445118">"Τηλέφωνο με χρέωση"</string>
     <string name="onHold" msgid="9035493194749959955">"Σε αναμονή"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Έναρξη κώδικα MMI"</string>
     <string name="ussdRunning" msgid="485588686340541690">"Ο κώδικας USSD εκτελείται..."</string>
@@ -52,18 +52,41 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Αίτηση ξεκλειδώματος δικτύου..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Ανεπιτυχές αίτημα ξεκλειδώματος δικτύου."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Το ξεκλείδωμα δικτύου ήταν επιτυχές."</string>
-    <string name="mobile_network_settings_not_available" msgid="7355254462995117896">"Οι ρυθμίσεις δικτύου κινητής τηλεφωνίας δεν είναι διαθέσιμες γι\' αυτόν το χρήστη"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Οι ρυθμίσεις δικτύου κινητής τηλεφωνίας δεν είναι διαθέσιμες για αυτόν το χρήστη"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Ρυθμίσεις κλήσης GSM"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"Ρυθμίσεις κλήσης GSM (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Ρυθμίσεις κλήσης CDMA"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"Ρυθμίσεις κλήσης CDMA (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Ονόματα σημείου πρόσβασης"</string>
     <string name="settings_label" msgid="3876743539816984008">"Ρυθμίσεις δικτύου"</string>
-    <string name="connection_service" msgid="978745922583410219">"Υπηρεσία σύνδεσης για χρήση"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Λογαριασμοί κλήσης"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Πραγματοποίηση κλήσεων με"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Πραγματοποίηση κλήσεων SIP με"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Να γίνεται ερώτηση πρώτα"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Ρυθμίσεις"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Επιλογή λογαριασμών"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Λογαριασμοί τηλεφώνου"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Προσθήκη λογαριασμού SIP"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Διαμόρφωση ρυθμίσεων λογαριασμού"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Κλήση Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Να μη χρησιμοποιηθεί η κλήση μέσω Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Να μη χρησιμοποιηθεί βοηθός κλήσης"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Κανένας"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Βοηθός κλήσης"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Χρήση βοηθού κλήσης"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Επιλογή βοηθού κλήσης"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Διαχείριση των δικτύων που χρησιμοποιούνται για τις κλήσεις με"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Να επιτρέπεται σε εφαρμογές ή υπηρεσίες η διαχείριση των δικτύων που χρησιμοποιούνται για κλήσεις"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Διαμόρφωση"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Ενσωματωμένη υπηρεσία σύνδεσης"</string>
     <string name="voicemail" msgid="8693759337917898954">"Αυτόματος τηλεφωνητής"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Αυτόματος τηλεφωνητής (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"ΑΤ:"</string>
     <string name="networks" msgid="8873030692174541976">"Εταιρείες δικτύου"</string>
-    <string name="call_settings" msgid="1630474923393095156">"Ρυθμίσεις κλήσεων"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Εκπομπές έκτακτης ανάγκης"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Ρυθμίσεις κλήσης"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Πρόσθετες ρυθμίσεις"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Επιπλέον ρυθμίσεις (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
@@ -77,40 +100,43 @@
     <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="call_forwarding_settings_with_label" msgid="8569489414006897127">"Ρυθ. προώθ. κλήσης (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="sum_cfu_disabled" msgid="8384177689501334080">"Ανενεργό"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Όταν η γραμμή είναι απασχολημένη"</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="sum_cfb_disabled" msgid="4913145177320506827">"Ανενεργό"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Ο φορέας σας δεν υποστηρίζει την απενεργοποίηση της προώθησης κλήσεων όταν το τηλέφωνό σας είναι απασχολημένο."</string>
-    <string name="labelCFNRy" msgid="3646316323834351390">"Προώθηση όταν δεν απαντάω"</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"Όταν δεν απαντά"</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="sum_cfnry_disabled" msgid="3884684060443538097">"Ανενεργό"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Η εταιρεία σας δεν υποστηρίζει την απενεργοποίηση της προώθησης κλήσεων όταν το τηλέφωνό σας δεν απαντάει."</string>
-    <string name="labelCFNRc" msgid="47183615370850000">"Προώθηση όταν δεν είμαι διαθέσιμος/η"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"Όταν είναι αδύνατη η επικοινωνία"</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="5646361343094064333">"Η εταιρεία κινητής τηλεφωνίας δεν υποστηρίζει την απενεργοποίηση της προώθησης κλήσεων όταν το τηλέφωνό σας δεν έχει σήμα."</string>
     <string name="updating_title" msgid="6146755386174019046">"Ρυθμίσεις κλήσης"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"Οι ρυθμίσεις κλήσεων μπορούν να αλλάξουν μόνο από τον κύριο χρήστη."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Ρυθ/σεις (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="fdn_check_failure" msgid="18200614306525434">"Έχει ενεργοποιηθεί η ρύθμιση αριθμών κλήσης καθορισμένων αριθμών της εφαρμογής του τηλεφώνου σας. Γι αυτόν τον λόγο δεν λειτουργούν ορισμένες λειτουργίες που σχετίζονται με τις κλήσεις."</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>
+    <string name="enable" msgid="7248657275000173526">"Ενεργοποίηση"</string>
+    <string name="disable" msgid="4678348128118573672">"Απενεργοποίηση"</string>
     <string name="change_num" msgid="239476305819844391">"Ενημέρωση"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Προεπιλογή δικτύου"</item>
@@ -123,8 +149,8 @@
     <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="voicemail_default" msgid="2001233554889016880">"Η εταιρεία σας κινητής τηλεφωνίας"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Ρυθμίσεις δικτύου κινητής τηλεφωνίας"</string>
     <string name="label_available" msgid="1181658289009300430">"Διαθέσιμα δίκτυα"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Αναζήτηση..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Δεν βρέθηκαν δίκτυα."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Προτιμώμενη λειτουργία δικτύου: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Προτιμώμενη λειτουργία δικτύου: Παγκόσμια"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Προτιμώμενη λειτουργία δικτύου: LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Προτιμώμενη λειτουργία δικτύου: LTE / GSM / UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Προτιμώμενη λειτουργία δικτύου: LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="7886739962255042385">"LTE / WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"Μόνο GSM"</item>
     <item msgid="3817924849415716259">"Προτιμώνται GSM/WCDMA"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Βελτιωμένη λειτουργία 4G LTE"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Χρήση υπηρεσιών LTE για τη βελτίωση της φωνητικής επικοινωνίας και άλλου είδους επικοινωνιών (συνιστάται)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Ενεργοποίηση δεδομένων"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Ενεργοποίηση της πρόσβασης δεδομένων μέσω του δικτύου κινητής τηλεφωνίας"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Επιτρέπεται η χρήση δεδομένων"</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="8913735676127858115">"Χάσατε τη σύνδεση δεδομένων επειδή φύγατε από το οικείο δίκτυο έχοντας την περιαγωγή δεδομένων απενεργοποιημένη."</string>
-    <string name="roaming_warning" msgid="7820963598559553967">"Να επιτρέπεται η περιαγωγή δεδομένων; Ενδέχεται να επιβαρυνθείτε με σημαντικά έξοδα περιαγωγής!"</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"Ενδέχεται να επιβαρυνθείτε με σημαντικές χρεώσεις."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Να επιτρέπεται η περιαγωγή δεδομένων;"</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>
@@ -190,7 +221,7 @@
     <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="throttle_help_subtext" msgid="3633091498168446044">"Περισσότερες πληροφορίες σχετικά με την πολιτική χρήσης δεδομένων στο δίκτυο της εταιρείας κινητής τηλεφωνίας που χρησιμοποιείτε"</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>
@@ -302,17 +333,19 @@
     <string name="cdma_activate_device" msgid="3793805892364814518">"Ενεργοποίηση συσκευής"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Ρύθμιση υπηρεσίας δεδομένων"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Ρυθμ. εταιρ. κιν. τηλεφ."</string>
-    <string name="fdn" msgid="7878832555095183202">"Αριθμοί κλήσης καθορισμένων αριθμών"</string>
+    <string name="fdn" msgid="7878832555095183202">"Προκ/νοι αριθμοί κλήσης"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Προκ/νοι αριθμοί κλήσης (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Λίστα FDN"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"Λίστα προκαθορισμένων αριθμών κλήσης (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Ενεργοποίηση FDN"</string>
-    <string name="fdn_enabled" msgid="5238109009915521240">"Οι αριθμοί κλήσης καθορισμένων αριθμών είναι ενεργοποιημένοι"</string>
-    <string name="fdn_disabled" msgid="4700049736675368279">"Οι αριθμοί κλήσης καθορισμένων αριθμών είναι απενεργοποιημένοι"</string>
+    <string name="fdn_enabled" msgid="5238109009915521240">"Οι αριθμοί προκαθορισμένων κλήσεων είναι ενεργοποιημένοι"</string>
+    <string name="fdn_disabled" msgid="4700049736675368279">"Οι αριθμοί προκαθορισμένων κλήσεων είναι απενεργοποιημένοι"</string>
     <string name="enable_fdn" msgid="3740191529180493851">"Ενεργοποίηση FDN"</string>
     <string name="disable_fdn" msgid="7944020890722540616">"Απενεργοποίηση του FDN"</string>
     <string name="change_pin2" msgid="2153563695382176676">"Αλλαγή του αριθμού PIN2"</string>
     <string name="enable_fdn_ok" msgid="7215588870329688132">"Απενεργοποίηση του FDN"</string>
     <string name="disable_fdn_ok" msgid="5727046928930740173">"Ενεργοποίηση FDN"</string>
-    <string name="sum_fdn" msgid="1959399454900272878">"Διαχείριση αριθμών κλήσης καθορισμένων αριθμών"</string>
+    <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="3776841382844614716">"Απόρρητο φωνής"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Ορισμός λειτουργίας TTY"</string>
     <string name="auto_retry_mode_title" msgid="4073265511427813322">"Αυτόματη επανάληψη"</string>
     <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Ενεργοποίηση λειτουργίας αυτόματης επανάληψης"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"Δεν επιτρέπεται αλλαγή της λειτουργίας TTY κατά τη διάρκεια μιας βιντεοκλήσης"</string>
     <string name="menu_add" msgid="1882023737425114762">"Προσθήκη επαφής"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Επεξεργασία επαφής"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Διαγραφή επαφής"</string>
@@ -344,7 +378,7 @@
     <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="1846161429087789936">"Για την εισαγωγή επαφών από την κάρτα SIM, απενεργοποιήστε πρώτα τη λειτουργία πτήσης."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Απενεργοποιήστε τη λειτουργία πτήσης για να εισαγάγετε επαφές από την κάρτα 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>
@@ -354,42 +388,40 @@
     <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="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="1796577128488773946">"Εσφαλμένος κωδικός πρόσβασης. Ο κωδικός PIN έχει μπλοκαριστεί! Απαιτείται η εισαγωγή του κωδικού PUK."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"Εκκαθάριση SIM PIN"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"Ορισμός SIM PIN"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"Ορισμός PIN..."</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"Το PIN ορίστηκε"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"Έγινε εκκαθάριση του PIN"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"Το PIN είναι λανθασμένο"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"Το PIN ενημερώθηκε"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Ο κωδικός πρόσβασης είναι λανθασμένος. Η SIM κλειδώθηκε. Ζητήθηκε PUK."</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="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="1639666438836544393">"Η αλλαγή του αριθμού PIN2 ήταν επιτυχημένη."</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"Πληκτρολογήστε τον κώδικα PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Εσφαλμένος κωδικός πρόσβασης. Ο κωδικός PIN2 έχει μπλοκαριστεί. Αλλάξτε κωδικό PIN2 και προσπαθήστε ξανά!"</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"Λανθασμένος κωδικός πρόσβασης, η κάρτα SIM κλειδώθηκε. Ζητήθηκε κωδικός PUK2."</string>
+    <string name="badPuk2" msgid="7910064009531541708">"Το PUK2 είναι λανθασμένο. Δοκιμάστε ξανά."</string>
+    <string name="badPin2" msgid="6646896629970023109">"Το παλιό PIN2 είναι λανθασμένο. Δοκιμάστε ξανά."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"Τα PIN2 δεν ταυτίζονται. Δοκιμάστε ξανά."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Καταχωρίστε ένα PIN2 με 4 έως 8 αριθμούς."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Καταχωρίστε ένα PUK2 με 8 αριθμούς."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"Το PIN2 ενημερώθηκε"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Καταχώριση κωδικού PUK2"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Ο κωδικός πρόσβασης είναι λανθασμένος: Το PIN2 αποκλείστηκε. Για να δοκιμάσετε ξανά, αλλάξτε το PIN 2."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Ο κωδικός πρόσβασης είναι λανθασμένος. Η SIM κλειδώθηκε. Καταχωρίστε το PUK2."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"Ο κωδικός PUK2 έχει μπλοκαριστεί οριστικά."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Απομένουν <xliff:g id="NUMBER">%d</xliff:g> προσπάθειες."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"Απεμπλοκή PIN2!"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"Απομένουν <xliff:g id="NUMBER">%d</xliff:g> προσπάθειες."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"Το PIN2 δεν είναι πλέον αποκλεισμένο"</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_redialing" msgid="8253487008234167266">"Επανάκληση"</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_dialing" msgid="2107666444937350731">"Κλήση"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Αναπάντητη κλήση"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Αναπάντητες κλήσεις"</string>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"Απενεργοποιήστε τη λειτουργία κλήσης για να πραγματοποιήσετε μια κλήση."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Απενεργοποιήστε τη λειτουργία πτήσης ή συνδεθείτε σε ένα ασύρματο δίκτυο για να πραγματοποιήσετε μια κλήση."</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_error_out_of_service" msgid="4100065333878929223">"Το δίκτυο κινητής τηλεφωνίας δεν είναι διαθέσιμο."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Το δίκτυο κινητής τηλεφωνίας δεν είναι διαθέσιμο. Συνδεθείτε σε ένα ασύρματο δίκτυο για να πραγματοποιήσετε μια κλήση."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Για να πραγματοποιήσετε κλήση, εισαγάγετε έναν έγκυρο αριθμό."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Δεν είναι δυνατή η κλήση."</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_unknown" msgid="655570339115407698">"Η υπηρεσία δεν υποστηρίζεται"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Δεν είναι δυνατή η εναλλαγή κλήσεων."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Δεν είναι δυνατός ο διαχωρισμός της κλήσης."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Δεν είναι δυνατή η μεταφορά."</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="incall_error_supp_service_reject" msgid="8998568661508655638">"Δεν είναι δυνατή η απόρριψη της κλήσης."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Δεν είναι δυνατή η πραγματοποίηση κλήσεων."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Συνδεθείτε σε ασύρματο δίκτυο για να πραγματοποιήσετε μια κλήση."</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="7969515493359619960">"Η κλήση δεν πραγματοποιήθηκε. Το <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> δεν είναι αριθμός έκτακτης ανάγκης!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Η κλήση δεν πραγματοποιήθηκε. Καλέστε έναν αριθμό επείγουσας ανάγκης!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Δεν υπάρχει υπηρεσία. Νέα προσπάθεια…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Δεν είναι δυνατή η κλήση. Το <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> δεν είναι αριθμός έκτακτης ανάγκης."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Δεν είναι δυνατή η κλήση. Πληκτρολογήστε έναν αριθμό έκτακτης ανάγκης."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Χρησιμοποιήστε το πληκτρολόγιο για να πραγματοποιήσετε καλέσετε έναν αριθμό"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Αναμονή"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Τέλος"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"Κανονική"</item>
     <item msgid="2883365539347850535">"Συνεχόμενος"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Μήνυμα δικτύου"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Μήνυμα δικτύου"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Μήνυμα σφάλματος"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Ενεργοποίηση του τηλεφώνου σας"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Πρέπει να γίνει ειδική κλήση για την ενεργοποίηση της υπηρεσίας του τηλεφώνου που διαθέτετε. \n\nΑφού πατήσετε την \"Ενεργοποίηση\", ακούστε τις οδηγίες που παρέχονται για να ενεργοποιήσετε το τηλέφωνό σας."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Ενεργοποίηση…"</string>
@@ -469,8 +504,8 @@
     <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="3420314892609254729">"Περιμένετε μέχρι να ολοκληρωθεί ο προγραμματισμός του τηλεφώνου σας."</string>
-    <string name="ota_failure" msgid="4311299546379674378">"Μη επιτυχής προγραμματισμός"</string>
+    <string name="ota_progress" msgid="460876637828044519">"Προγραμματισμός του τηλεφώνου σας..."</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Δεν ήταν δυνατός ο προγραμματισμός του τηλεφώνου σας"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Το τηλέφωνό σας ενεργοποιήθηκε. Ενδέχεται να χρειαστούν έως και 15 λεπτά για την έναρξη της υπηρεσίας."</string>
     <string name="ota_unsuccessful" msgid="8072141612635635357">"Το τηλέφωνό σας δεν ενεργοποιήθηκε \nΊσως χρειάζεται να βρείτε μια περιοχή με καλύτερη κάλυψη (κοντά σε ένα παράθυρο ή σε εξωτερικό χώρο). \n\nΔοκιμάστε ξανά ή καλέστε την υπηρεσία εξυπηρέτησης πελατών για περισσότερες επιλογές."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"EXCESS SPC FAILURES"</string>
@@ -481,18 +516,18 @@
     <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="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="2585506997024726599">"Η επιλεγμένη ενέργεια δεν είναι διαθέσιμη σε λειτουργία επιστροφής κλήσης έκτακτης ανάγκης. Το τηλέφωνο θα βρίσκεται σε αυτήν τη λειτουργία για <xliff:g id="COUNT">%s</xliff:g> λεπτό. Θέλετε να εξέλθετε τώρα;"</item>
-    <item quantity="other" msgid="6115622137771382224">"Η επιλεγμένη ενέργεια δεν είναι διαθέσιμη στη λειτουργία επιστροφής κλήσης έκτακτης ανάγκης. Το τηλέφωνο θα βρίσκεται σε αυτήν τη λειτουργία για <xliff:g id="COUNT">%s</xliff:g> λεπτά. Θέλετε να εξέλθετε τώρα;"</item>
-  </plurals>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other">Δεν θα υπάρχει σύνδεση δεδομένων για <xliff:g id="COUNT_1">%s</xliff:g> λεπτά</item>
+      <item quantity="one">Δεν θα υπάρχει σύνδεση δεδομένων για <xliff:g id="COUNT_0">%s</xliff:g> λεπτό</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other">Το τηλέφωνο θα βρίσκεται σε κατάσταση \"Επείγουσας επιστροφής κλήσης\" για <xliff:g id="COUNT_1">%s</xliff:g> λεπτά. Σε αυτήν την κατάσταση, δεν είναι δυνατή η χρήση εφαρμογών που χρησιμοποιούν σύνδεση δεδομένων. Θέλετε να εξέλθετε τώρα;</item>
+      <item quantity="one">Το τηλέφωνο θα βρίσκεται σε κατάσταση \"Επείγουσας επιστροφής κλήσης\" για <xliff:g id="COUNT_0">%s</xliff:g> λεπτό. Σε αυτήν την κατάσταση, δεν είναι δυνατή η χρήση εφαρμογών που χρησιμοποιούν σύνδεση δεδομένων. Θέλετε να εξέλθετε τώρα;</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other">Η επιλεγμένη ενέργεια δεν είναι διαθέσιμη όταν η συσκευή βρίσκεται σε κατάσταση \"Επείγουσας επιστροφής κλήσης\". Το τηλέφωνο θα βρίσκεται σε αυτήν την κατάσταση για <xliff:g id="COUNT_1">%s</xliff:g> λεπτά. Θέλετε να εξέλθετε τώρα;</item>
+      <item quantity="one">Η επιλεγμένη ενέργεια δεν είναι διαθέσιμη όταν η συσκευή βρίσκεται σε κατάσταση \"Επείγουσας επιστροφής κλήσης\". Το τηλέφωνο θα βρίσκεται σε αυτήν την κατάσταση για <xliff:g id="COUNT_0">%s</xliff:g> λεπτό. Θέλετε να εξέλθετε τώρα;</item>
+    </plurals>
     <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>
@@ -506,110 +541,23 @@
     <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="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="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="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_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="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="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>
-    <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">"Αποστολή μηνυμάτων \"keep-alive\""</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">"&lt;Δεν έχει οριστεί&gt;"</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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"Η φωνητική κλήση δεν υποστηρίζεται"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Γρήγορες απαντήσεις"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></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="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_ringtone_title" msgid="2609519527849101590">"Ήχος"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Προεπιλεγμένος ήχος (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</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="dial_pad_autocomplete" msgid="494525952035761075">"Αυτόματη συμπλήρωση πληκτρολογίου κλήσης"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Ήχος κλήσης &amp; δόνηση"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Χρήση του Wi-Fi για την πραγματοποίηση της κλήσης;"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Ναι"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"Όχι"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Ενσωματωμένες κάρτες SIM"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Ενσωματωμένες κλήσεις διαδικτύου"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Ενεργοποίηση βιντεοκλήσεων"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Για να ενεργοποιήσετε τις βιντεοκλήσεις, θα πρέπει να ενεργοποιήσετε τη Βελτιωμένη λειτουργία 4G LTE στις ρυθμίσεις δικτύου."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Ρυθμίσεις δικτύου"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Κλείσιμο"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Κλήσεις έκτακτης ανάγκης"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Μόνο κλήσεις έκτακτης ανάγκης"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"Κάρτα SIM, υποδοχή: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Προσβασιμότητα"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Εισερχ. κλήση μέσω Wi-Fi"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Κλήση μέσω Wi-Fi"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Αγγίξτε ξανά για άνοιγμα"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"Παρουσιάστηκε κάποιο σφάλμα κατά την αποκωδικοποίηση του μηνύματος."</string>
 </resources>
diff --git a/res/values-en-rAU/arrays.xml b/res/values-en-rAU/arrays.xml
new file mode 100644
index 0000000..807c757
--- /dev/null
+++ b/res/values-en-rAU/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Global"</item>
+    <item msgid="6753774959494729275">"LTE/CDMA"</item>
+    <item msgid="8658695584186942227">"LTE/GSM/UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-en-rAU/config.xml b/res/values-en-rAU/config.xml
deleted file mode 100644
index 0605cd7..0000000
--- a/res/values-en-rAU/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"false"</string>
-</resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..09dd8a0
--- /dev/null
+++ b/res/values-en-rAU/strings.xml
@@ -0,0 +1,563 @@
+<?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="1107073389495104784">"Mobile Data"</string>
+    <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Phone"</string>
+    <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Emergency Dialler"</string>
+    <string name="phoneIconLabel" msgid="2331230813161304895">"Phone"</string>
+    <string name="fdnListLabel" msgid="8630418672279521003">"FDN list"</string>
+    <string name="unknown" msgid="6878797917991465859">"Unknown"</string>
+    <string name="private_num" msgid="6713286113000232309">"Private number"</string>
+    <string name="payphone" msgid="4793877574636445118">"Payphone"</string>
+    <string name="onHold" msgid="9035493194749959955">"On hold"</string>
+    <string name="mmiStarted" msgid="6347869857061147003">"MMI code started"</string>
+    <string name="ussdRunning" msgid="485588686340541690">"USSD code running…"</string>
+    <string name="mmiCancelled" msgid="2771923949751842276">"MMI code cancelled"</string>
+    <string name="cancel" msgid="5044513931633602634">"Cancel"</string>
+    <string name="enter_input" msgid="1810529547726803893">"USSD message must be between <xliff:g id="MIN_LEN">%d</xliff:g> and <xliff:g id="MAX_LEN">%d</xliff:g> characters. Please try again."</string>
+    <string name="manageConferenceLabel" msgid="4691922394301969053">"Manage conference call"</string>
+    <string name="ok" msgid="3811371167865772377">"OK"</string>
+    <string name="audio_mode_speaker" msgid="27649582100085266">"Speaker"</string>
+    <string name="audio_mode_earpiece" msgid="4156527186373869107">"Handset earpiece"</string>
+    <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="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="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="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>
+    <string name="sim_ndp_dismiss_text" msgid="1604823375752456947">"Dismiss"</string>
+    <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="mobile_network_settings_not_available" msgid="3831911315358856062">"Mobile network settings are not available for this user"</string>
+    <string name="labelGSMMore" msgid="5930842194056092106">"GSM call settings"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"GSM call settings (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA call settings"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"CDMA call settings (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="apn_settings" msgid="9043423184895642077">"Access point names"</string>
+    <string name="settings_label" msgid="3876743539816984008">"Network settings"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Calling accounts"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Make calls with"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Make SIP calls with"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Ask first"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Settings"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Choose accounts"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Phone accounts"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Add SIP account"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Configure account settings"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi Calling"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Do not use Wi-Fi calling"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Do not use call assistant"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"None"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Call assistant"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Use call assistant"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Choose call assistant"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Manage the networks used for calls with"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Let apps or services manage networks used for calls"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Configure"</string>
+    <string name="connection_service_default_label" msgid="1498481943805913754">"Built-in connection service"</string>
+    <string name="voicemail" msgid="8693759337917898954">"Voicemail"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Voicemail (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
+    <string name="networks" msgid="8873030692174541976">"Network operators"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Emergency broadcasts"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Call settings"</string>
+    <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Additional settings"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Additional settings (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Additional GSM-only call settings"</string>
+    <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Additional CDMA call settings"</string>
+    <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>
+    <string name="labelCW" msgid="6120513814915920200">"Call waiting"</string>
+    <string name="sum_cw_enabled" msgid="8083061901633671397">"During a call, notify me of incoming calls"</string>
+    <string name="sum_cw_disabled" msgid="3648693907300104575">"During a call, notify me of incoming calls"</string>
+    <string name="call_forwarding_settings" msgid="3378927671091537173">"Call-forwarding settings"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Call forwarding settings (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="labelCF" msgid="2574386948026924737">"Call forwarding"</string>
+    <string name="labelCFU" msgid="8147177368148660600">"Always forward"</string>
+    <string name="messageCFU" msgid="3560082430662923687">"Always use this number"</string>
+    <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Forwarding all calls"</string>
+    <string name="sum_cfu_enabled" msgid="2450052502198827927">"Forwarding all calls to <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
+    <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Number is unavailable"</string>
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Off"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"When busy"</string>
+    <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="4913145177320506827">"Off"</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="1736067178393744351">"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="3884684060443538097">"Off"</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="2614827454402079766">"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="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="call_settings_primary_user_only" msgid="5679923943740900965">"Call settings can only be changed by the primary user."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Call settings (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="error_updating_title" msgid="7970259216988931777">"Call settings error"</string>
+    <string name="reading_settings" msgid="1920291699287055284">"Reading settings…"</string>
+    <string name="updating_settings" msgid="8171225533884883252">"Updating settings…"</string>
+    <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_check_failure" msgid="18200614306525434">"Your Phone app\'s fixed dialling 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="7248657275000173526">"Turn on"</string>
+    <string name="disable" msgid="4678348128118573672">"Turn off"</string>
+    <string name="change_num" msgid="239476305819844391">"Update"</string>
+  <string-array name="clir_display_values">
+    <item msgid="5560134294467334594">"Network default"</item>
+    <item msgid="7876195870037833661">"Hide number"</item>
+    <item msgid="1108394741608734023">"Show number"</item>
+  </string-array>
+    <string name="vm_changed" msgid="380744030726254139">"Voicemail number changed."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"Couldn\'t change the voicemail number.\nContact your operator if this problem persists."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"Couldn\'t change the forwarding number.\nContact 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.\nSwitch 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>
+    <string name="voicemail_default" msgid="2001233554889016880">"Your operator"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Mobile network settings"</string>
+    <string name="label_available" msgid="1181658289009300430">"Available networks"</string>
+    <string name="load_networks_progress" msgid="5230707536168902952">"Searching…"</string>
+    <string name="empty_networks_list" msgid="4249426905018815316">"No networks found."</string>
+    <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="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="3494252551249882718">"Choose a network operator"</string>
+    <string name="sum_search_networks" msgid="2921092249873272715">"Search for all available networks"</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="2336624679902659306">"Preferred network type"</string>
+    <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Change the network operating mode"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Preferred network type"</string>
+    <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Preferred network mode: WCDMA preferred"</string>
+    <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Preferred network mode: GSM only"</string>
+    <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Preferred network mode: WCDMA only"</string>
+    <string name="preferred_network_mode_gsm_wcdma_summary" msgid="3161255745326408587">"Preferred network mode: GSM/WCDMA"</string>
+    <string name="preferred_network_mode_cdma_summary" msgid="3175690187294334241">"Preferred network mode: CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Preferred network mode: CDMA/EvDo"</string>
+    <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Preferred network mode: CDMA only"</string>
+    <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Preferred network mode: EvDo only"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Preferred network mode: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Preferred network mode: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Preferred network mode: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Preferred network mode: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Preferred network mode: Global"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Preferred network mode: LTE/WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Preferred network mode: LTE/GSM/UMTS"</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="7886739962255042385">"LTE/WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"Global"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"EvDo only"</item>
+    <item msgid="1508557726283094448">"CDMA w/o EvDo"</item>
+    <item msgid="4341433122263841224">"CDMA/EvDo auto"</item>
+    <item msgid="5958053792390386668">"GSM/WCDMA auto"</item>
+    <item msgid="7913148405605373434">"WCDMA only"</item>
+    <item msgid="1524224863879435516">"GSM only"</item>
+    <item msgid="3817924849415716259">"GSM/WCDMA preferred"</item>
+  </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Enhanced 4G LTE Mode"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Use LTE services to improve voice and other communications (recommended)"</string>
+    <string name="data_enabled" msgid="5972538663568715366">"Data enabled"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Allow data usage"</string>
+    <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="8913735676127858115">"You have lost data connectivity because you left your home network with data roaming turned off."</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"You may incur significant charges."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Allow data roaming?"</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_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>
+    <string name="throttle_help" msgid="243651091785169900">"Learn more"</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>٪) of <xliff:g id="USED_2">%3$s</xliff:g> period maximum\nNext period starts in <xliff:g id="USED_3">%4$d</xliff:g> days (<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> (<xliff:g id="USED_1">%2$d</xliff:g>٪) of <xliff:g id="USED_2">%3$s</xliff:g> period maximum"</string>
+    <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"<xliff:g id="USED_0">%1$s</xliff:g> maximum exceeded\nData rate reduced to <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>٪ of cycle elapsed\nNext 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="3633091498168446044">"More information about your operator\'s mobile network data use policy"</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>
+    <string name="cell_bc_sms_disable" msgid="3398365088309408749">"Mobile Broadcast SMS disabled"</string>
+    <string name="cb_sms_settings" msgid="651715019785107312">"Mobile Broadcast SMS settings"</string>
+    <string name="enable_disable_emergency_broadcast" msgid="2157014609041245335">"Emergency Broadcast"</string>
+    <string name="emergency_broadcast_enable" msgid="2645980025414010211">"Emergency Broadcast enabled"</string>
+    <string name="emergency_broadcast_disable" msgid="3665199821267569426">"Emergency Broadcast disabled"</string>
+    <string name="enable_disable_administrative" msgid="6501582322182059412">"Administrative"</string>
+    <string name="administrative_enable" msgid="1750086122962032235">"Administrative enabled"</string>
+    <string name="administrative_disable" msgid="8433273857248698539">"Administrative disabled"</string>
+    <string name="enable_disable_maintenance" msgid="1819693083025106678">"Maintenance"</string>
+    <string name="maintenance_enable" msgid="8566636458770971189">"Maintenance enabled"</string>
+    <string name="maintenance_disable" msgid="7340189100885066077">"Maintenance disabled"</string>
+    <string name="general_news_settings" msgid="4968779723948432978">"General News"</string>
+    <string name="bf_news_settings" msgid="3935593091894685267">"Business and Financial News"</string>
+    <string name="sports_news_settings" msgid="7649399631270052835">"Sports News"</string>
+    <string name="entertainment_news_settings" msgid="5051153952959405035">"Entertainment News"</string>
+    <string name="enable_disable_local" msgid="7890281063123416120">"Local"</string>
+    <string name="local_enable" msgid="6370463247609136359">"Local news enabled"</string>
+    <string name="local_disable" msgid="4405691986943795798">"Local news disabled"</string>
+    <string name="enable_disable_regional" msgid="4905652414535565872">"Regional"</string>
+    <string name="regional_enable" msgid="4434680415437834759">"Regional news enabled"</string>
+    <string name="regional_disable" msgid="5359325527213850077">"Regional news disabled"</string>
+    <string name="enable_disable_national" msgid="236278090206880734">"National"</string>
+    <string name="national_enable" msgid="1172443648912246952">"National news enabled"</string>
+    <string name="national_disable" msgid="326018148178601166">"National news disabled"</string>
+    <string name="enable_disable_international" msgid="7535348799604565592">"International"</string>
+    <string name="international_enable" msgid="5855356769925044927">"International news enabled"</string>
+    <string name="international_disable" msgid="2850648591041088931">"International news disabled"</string>
+    <string name="list_language_title" msgid="2841683501919760043">"Language"</string>
+    <string name="list_language_summary" msgid="8109546531071241601">"Select the news language"</string>
+  <string-array name="list_language_entries">
+    <item msgid="6137851079727305485">"English"</item>
+    <item msgid="1151988412809572526">"French"</item>
+    <item msgid="577840534704312665">"Spanish"</item>
+    <item msgid="8385712091143148180">"Japanese"</item>
+    <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>
+    <string name="local_weather_enable" msgid="6199315114382448922">"Local Weather enabled"</string>
+    <string name="local_weather_disable" msgid="2510158089142626480">"Local Weather disabled"</string>
+    <string name="enable_disable_atr" msgid="8339572391278872343">"Area Traffic Reports"</string>
+    <string name="atr_enable" msgid="5541757457789181799">"Area Traffic Reports enabled"</string>
+    <string name="atr_disable" msgid="7085558154727596455">"Area Traffic Reports disabled"</string>
+    <string name="enable_disable_lafs" msgid="668189073721277199">"Local Airport Flight Schedules"</string>
+    <string name="lafs_enable" msgid="2791978667205137052">"Local Airport Flight Schedules enabled"</string>
+    <string name="lafs_disable" msgid="2391212397725495350">"Local Airport Flight Schedules disabled"</string>
+    <string name="enable_disable_restaurants" msgid="6240381945336814024">"Restaurants"</string>
+    <string name="restaurants_enable" msgid="5137657479469118847">"Restaurants enabled"</string>
+    <string name="restaurants_disable" msgid="3678480270938424092">"Restaurants disabled"</string>
+    <string name="enable_disable_lodgings" msgid="1822029172658551202">"Lodgings"</string>
+    <string name="lodgings_enable" msgid="3230042508992850322">"Lodgings enabled"</string>
+    <string name="lodgings_disable" msgid="3387879742320682391">"Lodgings disabled"</string>
+    <string name="enable_disable_retail_directory" msgid="1357809784475660303">"Retail Directory"</string>
+    <string name="retail_directory_enable" msgid="3280626290436111496">"Retail Directory enabled"</string>
+    <string name="retail_directory_disable" msgid="6479739816662879027">"Retail Directory disabled"</string>
+    <string name="enable_disable_advertisements" msgid="5999495926176182128">"Advertisements"</string>
+    <string name="advertisements_enable" msgid="2050305021264683786">"Advertisements enabled"</string>
+    <string name="advertisements_disable" msgid="8350985908788707935">"Advertisements disabled"</string>
+    <string name="enable_disable_stock_quotes" msgid="6397810445293533603">"Share Quotes"</string>
+    <string name="stock_quotes_enable" msgid="4384802470887170543">"Share Quotes enabled"</string>
+    <string name="stock_quotes_disable" msgid="4781450084565594998">"Share Quotes disabled"</string>
+    <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="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>
+    <string name="enable_disable_multi_category" msgid="626771003122899280">"Multi-category"</string>
+    <string name="multi_category_enable" msgid="1179299804641721768">"Multi-category enabled"</string>
+    <string name="multi_category_disable" msgid="880104702904139505">"Multi-category disabled"</string>
+    <string name="network_lte" msgid="7702681952521375754">"LTE (recommended)"</string>
+    <string name="network_4G" msgid="2723512640529983138">"4G (recommended)"</string>
+    <string name="network_global" msgid="1323190488685355309">"Global"</string>
+    <string name="cdma_system_select_title" msgid="5757657769327732833">"System select"</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_subscription_title" msgid="1162564010076763284">"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>
+    <string name="carrier_settings_title" msgid="9028166176523012300">"Provider settings"</string>
+    <string name="fdn" msgid="7878832555095183202">"Fixed dialling numbers"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Fixed dialling numbers (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="manage_fdn_list" msgid="8777755791892122369">"FDN list"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"FDN list (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="fdn_activation" msgid="2156479741307463576">"FDN activation"</string>
+    <string name="fdn_enabled" msgid="5238109009915521240">"Fixed dialling numbers are enabled"</string>
+    <string name="fdn_disabled" msgid="4700049736675368279">"Fixed dialling numbers are disabled"</string>
+    <string name="enable_fdn" msgid="3740191529180493851">"Enable FDN"</string>
+    <string name="disable_fdn" msgid="7944020890722540616">"Disable FDN"</string>
+    <string name="change_pin2" msgid="2153563695382176676">"Change PIN2"</string>
+    <string name="enable_fdn_ok" msgid="7215588870329688132">"Disable FDN"</string>
+    <string name="disable_fdn_ok" msgid="5727046928930740173">"Enable FDN"</string>
+    <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="3776841382844614716">"Voice privacy"</string>
+    <string name="voice_privacy_summary" msgid="3159383389833516214">"Enable enhanced privacy 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="4073265511427813322">"Auto-retry"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Enable Auto-retry mode"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"TTY Mode change is not allowed during a video call"</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="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>
+    <string name="add_fdn_contact" msgid="2481915899633353976">"Add fixed dialling number"</string>
+    <string name="adding_fdn_contact" msgid="7627379633721940991">"Adding fixed dialling number…"</string>
+    <string name="fdn_contact_added" msgid="7458335758501736665">"Fixed dialling number added."</string>
+    <string name="edit_fdn_contact" msgid="7976936035587081480">"Edit fixed dialling number"</string>
+    <string name="updating_fdn_contact" msgid="8370929876849803600">"Updating fixed dialling number…"</string>
+    <string name="fdn_contact_updated" msgid="5497828782609005017">"Fixed dialling number updated."</string>
+    <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="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="fdn_failed" msgid="540018079008319747">"FDN operation failed."</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="5254946758982621072">"Turn off aeroplane mode to import contacts from the SIM card."</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="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="3419351358300716472">"Clear SIM PIN"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"Set SIM PIN"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"Setting PIN…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN set"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN cleared"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN incorrect"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN updated"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Password incorrect. PIN now blocked. PUK 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="7910064009531541708">"PUK2 incorrect. Try again."</string>
+    <string name="badPin2" msgid="6646896629970023109">"Old PIN2 incorrect. Try again."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2s don\'t match. Try again."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Enter a PIN2 that is 4 to 8 numbers."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Enter a PUK2 that is 8 numbers."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 updated"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Enter PUK2 code"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Password incorrect. PIN2 now Blocked. To try again, change PIN 2."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Password incorrect. SIM now locked. Enter PUK2."</string>
+    <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 is permanently blocked."</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"You have <xliff:g id="NUMBER">%d</xliff:g> remaining attempts."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 no longer blocked"</string>
+    <string name="doneButton" msgid="2859593360997984240">"Done"</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="8253487008234167266">"Redialling"</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_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>
+    <string name="card_title_in_call" msgid="6346543933068225205">"In call"</string>
+    <string name="notification_dialing" msgid="2107666444937350731">"Dialling"</string>
+    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Missed call"</string>
+    <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" 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>
+    <string name="notification_voicemail_title_count" msgid="4366360747660929916">"New voicemail (<xliff:g id="COUNT">%d</xliff:g>)"</string>
+    <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Dial <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
+    <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="2947938060513306698">"Turn off aeroplane mode to make a call."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Turn off aeroplane mode or connect to a wireless network to make a call."</string>
+    <string name="incall_error_emergency_only" msgid="4678640422710818317">"Not registered on network."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Mobile network not available."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Mobile network is not available. Connect to a wireless network to make a call."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"To place a call, enter a valid number."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Can\'t call."</string>
+    <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Starting MMI sequence…"</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Service not supported"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Can\'t switch calls."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Can\'t separate call."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Can\'t transfer."</string>
+    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Unable to conference calls."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Can\'t reject call."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Can\'t release call(s)."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Connect to a wireless network to make a call."</string>
+    <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="5960061579996526883">"No service. Trying again…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Can\'t call. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> is not an emergency number."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Can\'t call. Dial an emergency number."</string>
+    <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Use keyboard to dial"</string>
+    <string name="onscreenHoldText" msgid="2285258239691145872">"Hold"</string>
+    <string name="onscreenEndCallText" msgid="4403855834875398585">"End"</string>
+    <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Dial pad"</string>
+    <string name="onscreenMuteText" msgid="5011369181754261374">"Mute"</string>
+    <string name="onscreenAddCallText" msgid="5140385634712287403">"Add call"</string>
+    <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Merge calls"</string>
+    <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Swap"</string>
+    <string name="onscreenManageCallsText" msgid="5473231160123254154">"Manage calls"</string>
+    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Manage conference"</string>
+    <string name="onscreenAudioText" msgid="1710087112800041743">"Audio"</string>
+    <string name="onscreenVideoCallText" msgid="4800924186056115442">"Video call"</string>
+    <string name="importSimEntry" msgid="6614358325359736031">"Import"</string>
+    <string name="importAllSimEntries" msgid="1503181169636198673">"Import all"</string>
+    <string name="importingSimContacts" msgid="7374056215462575769">"Importing SIM contacts"</string>
+    <string name="importToFDNfromContacts" msgid="2130620207013368580">"Import from contacts"</string>
+    <string name="hac_mode_title" msgid="8740268574688743289">"Hearing aids"</string>
+    <string name="hac_mode_summary" msgid="6833851160514929341">"Turn on hearing-aid compatibility"</string>
+  <string-array name="tty_mode_entries">
+    <item msgid="512950011423868021">"TTY Off"</item>
+    <item msgid="3971695875449640648">"TTY Full"</item>
+    <item msgid="1937509904407445684">"TTY HCO"</item>
+    <item msgid="5644925873488772224">"TTY VCO"</item>
+  </string-array>
+    <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_info_message" msgid="7738596060242881930">"Network message"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Error 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\nAfter pressing “Activate”, listen to the instructions provided to activate your phone."</string>
+    <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Activating..."</string>
+    <string name="ota_hfa_activation_dialog_message" msgid="8092479227918463415">"The phone is activating your mobile data service.\n\nThis can take up to 5 minutes."</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_activate" msgid="1368528132525626264">"Activate"</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_speaker" msgid="6904589278542719647">"Speaker"</string>
+    <string name="ota_progress" msgid="460876637828044519">"Programming your phone…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Couldn\'t programme your phone"</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="8072141612635635357">"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 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="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>
+    <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Data connection disabled"</string>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other">No data connection for <xliff:g id="COUNT_1">%s</xliff:g> minutes</item>
+      <item quantity="one">No data connection for <xliff:g id="COUNT_0">%s</xliff:g> minute</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other">The phone will be in Emergency Callback mode for <xliff:g id="COUNT_1">%s</xliff:g> minutes. While in this mode no applications using a data connection can be used. Do you want to exit now?</item>
+      <item quantity="one">The phone will be in Emergency Callback mode for <xliff:g id="COUNT_0">%s</xliff:g> minute. While in this mode no apps using a data connection can be used. Do you want to exit now?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <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_1">%s</xliff:g> minutes. Do you want 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_0">%s</xliff:g> minute. Do you want to exit now?</item>
+    </plurals>
+    <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_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="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="not_voice_capable" msgid="2739898841461577811">"Voice calling not supported"</string>
+    <string name="description_dial_button" msgid="7459705245418435351">"dial"</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="2609519527849101590">"Sound"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Ringtone &amp; Vibrate"</string>
+    <string name="pstn_connection_service_label" msgid="1743245930577325900">"Built-in SIM cards"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Turn on video calling"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"To turn on video calling, you need to enable Enhanced 4G LTE Mode in network settings."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Network settings"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Close"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Emergency calls"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Emergency calling only"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM card, slot: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Accessibility"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Incoming Wi-Fi call"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi call"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Touch again to open"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"There was an error while decoding the message."</string>
+</resources>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
new file mode 100644
index 0000000..807c757
--- /dev/null
+++ b/res/values-en-rGB/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Global"</item>
+    <item msgid="6753774959494729275">"LTE/CDMA"</item>
+    <item msgid="8658695584186942227">"LTE/GSM/UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-en-rGB/config.xml b/res/values-en-rGB/config.xml
deleted file mode 100644
index 0605cd7..0000000
--- a/res/values-en-rGB/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"false"</string>
-</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 4dd8118..09dd8a0 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -16,14 +16,14 @@
 
 <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">"Mobile Data"</string>
+    <string name="phoneAppLabel" product="tablet" msgid="1107073389495104784">"Mobile Data"</string>
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Phone"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Emergency Dialler"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Phone"</string>
     <string name="fdnListLabel" msgid="8630418672279521003">"FDN list"</string>
     <string name="unknown" msgid="6878797917991465859">"Unknown"</string>
     <string name="private_num" msgid="6713286113000232309">"Private number"</string>
-    <string name="payphone" msgid="1931775086311769314">"Phonebox"</string>
+    <string name="payphone" msgid="4793877574636445118">"Payphone"</string>
     <string name="onHold" msgid="9035493194749959955">"On hold"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI code started"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD code running…"</string>
@@ -52,18 +52,41 @@
     <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="mobile_network_settings_not_available" msgid="7355254462995117896">"Mobile network settings are not available for this user"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Mobile network settings are not available for this user"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM call settings"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"GSM call settings (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA call settings"</string>
-    <string name="apn_settings" msgid="9043423184895642077">"Access Point Names"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"CDMA call settings (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="apn_settings" msgid="9043423184895642077">"Access point names"</string>
     <string name="settings_label" msgid="3876743539816984008">"Network settings"</string>
-    <string name="connection_service" msgid="978745922583410219">"Connection service to use"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Calling accounts"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Make calls with"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Make SIP calls with"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Ask first"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Settings"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Choose accounts"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Phone accounts"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Add SIP account"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Configure account settings"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi Calling"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Do not use Wi-Fi calling"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Do not use call assistant"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"None"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Call assistant"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Use call assistant"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Choose call assistant"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Manage the networks used for calls with"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Let apps or services manage networks used for calls"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Configure"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Built-in connection service"</string>
     <string name="voicemail" msgid="8693759337917898954">"Voicemail"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Voicemail (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
     <string name="networks" msgid="8873030692174541976">"Network operators"</string>
-    <string name="call_settings" msgid="1630474923393095156">"Call Settings"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Emergency broadcasts"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Call settings"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Additional settings"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Additional settings (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Additional GSM-only call settings"</string>
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Additional CDMA call settings"</string>
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Additional CDMA-only call settings"</string>
@@ -77,40 +100,43 @@
     <string name="sum_cw_enabled" msgid="8083061901633671397">"During a call, notify me of incoming calls"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"During a call, notify me of incoming calls"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Call-forwarding settings"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Call forwarding settings (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Call forwarding"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Always forward"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Always use this number"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Forwarding all calls"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Forwarding all calls to <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Number is unavailable"</string>
-    <string name="sum_cfu_disabled" msgid="3698472522160364904">"Disabled"</string>
-    <string name="labelCFB" msgid="218938523102207587">"Forward when busy"</string>
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Off"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"When busy"</string>
     <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="sum_cfb_disabled" msgid="4913145177320506827">"Off"</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="labelCFNRy" msgid="1736067178393744351">"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="sum_cfnry_disabled" msgid="3884684060443538097">"Off"</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="labelCFNRc" msgid="2614827454402079766">"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="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="call_settings_primary_user_only" msgid="5679923943740900965">"Call settings can only be changed by the primary user."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Call settings (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Call settings error"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Reading settings…"</string>
     <string name="updating_settings" msgid="8171225533884883252">"Updating settings…"</string>
     <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_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="fdn_check_failure" msgid="18200614306525434">"Your Phone app\'s fixed dialling 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>
+    <string name="enable" msgid="7248657275000173526">"Turn on"</string>
+    <string name="disable" msgid="4678348128118573672">"Turn off"</string>
     <string name="change_num" msgid="239476305819844391">"Update"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Network default"</item>
@@ -123,8 +149,8 @@
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Couldn\'t retrieve and save current forwarding number settings.\nSwitch 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>
-    <string name="voicemail_default" msgid="5902099213882352338">"My operator"</string>
-    <string name="mobile_networks" msgid="5540397602919106177">"Mobile network settings"</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"Your operator"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Mobile network settings"</string>
     <string name="label_available" msgid="1181658289009300430">"Available networks"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Searching…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"No networks found."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Preferred network mode: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Preferred network mode: Global"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Preferred network mode: LTE/WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Preferred network mode: LTE/GSM/UMTS"</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="7886739962255042385">"LTE/WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"GSM only"</item>
     <item msgid="3817924849415716259">"GSM/WCDMA preferred"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Enhanced 4G LTE Mode"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Use LTE services to improve voice and other communications (recommended)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Data enabled"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Enable data access over Mobile network"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Allow data usage"</string>
     <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="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="roaming_warning" msgid="1603164667540144353">"You may incur significant charges."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Allow data roaming?"</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>
@@ -190,7 +221,7 @@
     <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"<xliff:g id="USED_0">%1$s</xliff:g> maximum exceeded\nData rate reduced to <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>٪ of cycle elapsed\nNext 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="throttle_help_subtext" msgid="3633091498168446044">"More information about your operator\'s mobile network data use policy"</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>
@@ -302,17 +333,19 @@
     <string name="cdma_activate_device" msgid="3793805892364814518">"Activate device"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Set up data service"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Provider settings"</string>
-    <string name="fdn" msgid="7878832555095183202">"Fixed Dialling Numbers"</string>
+    <string name="fdn" msgid="7878832555095183202">"Fixed dialling numbers"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Fixed dialling numbers (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FDN list"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"FDN list (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FDN activation"</string>
-    <string name="fdn_enabled" msgid="5238109009915521240">"Fixed Dialling Numbers are enabled"</string>
-    <string name="fdn_disabled" msgid="4700049736675368279">"Fixed Dialling Numbers are disabled"</string>
+    <string name="fdn_enabled" msgid="5238109009915521240">"Fixed dialling numbers are enabled"</string>
+    <string name="fdn_disabled" msgid="4700049736675368279">"Fixed dialling numbers are disabled"</string>
     <string name="enable_fdn" msgid="3740191529180493851">"Enable FDN"</string>
     <string name="disable_fdn" msgid="7944020890722540616">"Disable FDN"</string>
     <string name="change_pin2" msgid="2153563695382176676">"Change PIN2"</string>
     <string name="enable_fdn_ok" msgid="7215588870329688132">"Disable FDN"</string>
     <string name="disable_fdn_ok" msgid="5727046928930740173">"Enable FDN"</string>
-    <string name="sum_fdn" msgid="1959399454900272878">"Manage Fixed Dialling Numbers"</string>
+    <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="3776841382844614716">"Voice privacy"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Set TTY 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="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"TTY Mode change is not allowed during a video call"</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>
@@ -344,7 +378,7 @@
     <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="1846161429087789936">"To import contacts from the SIM card, first turn off Aeroplane mode."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Turn off aeroplane mode to import contacts from the SIM card."</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>
@@ -354,42 +388,40 @@
     <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="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="1796577128488773946">"Password incorrect, PIN Blocked! PUK requested."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"Clear SIM PIN"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"Set SIM PIN"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"Setting PIN…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN set"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN cleared"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN incorrect"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN updated"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Password incorrect. PIN now blocked. PUK 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="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="1639666438836544393">"PIN2 changed successfully."</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"Type PUK2 code"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Password incorrect, PIN2 Blocked. Please change PIN2 and retry!"</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"Password incorrect, SIM is locked. PUK2 requested."</string>
+    <string name="badPuk2" msgid="7910064009531541708">"PUK2 incorrect. Try again."</string>
+    <string name="badPin2" msgid="6646896629970023109">"Old PIN2 incorrect. Try again."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2s don\'t match. Try again."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Enter a PIN2 that is 4 to 8 numbers."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Enter a PUK2 that is 8 numbers."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 updated"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Enter PUK2 code"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Password incorrect. PIN2 now Blocked. To try again, change PIN 2."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Password incorrect. SIM now locked. Enter PUK2."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 is permanently blocked."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"There are <xliff:g id="NUMBER">%d</xliff:g> remaining attempts."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 Unblocked!"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"You have <xliff:g id="NUMBER">%d</xliff:g> remaining attempts."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 no longer blocked"</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="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_redialing" msgid="8253487008234167266">"Redialling"</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_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>
     <string name="card_title_in_call" msgid="6346543933068225205">"In call"</string>
-    <string name="card_title_my_phone_number" msgid="112428362494434191">"My number is <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Dialling"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Missed call"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Missed calls"</string>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"Turn off aeroplane mode to make a call."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Turn off aeroplane mode or connect to a wireless network to make a call."</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_error_out_of_service" msgid="4100065333878929223">"Mobile network not available."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Mobile network is not available. Connect to a wireless network to make a call."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"To place a call, enter a valid number."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Can\'t call."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Starting MMI 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>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Unable to transfer call."</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Service not supported"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Can\'t switch calls."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Can\'t separate call."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Can\'t transfer."</string>
     <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Unable to conference calls."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Unable to reject call."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Unable to release call(s)."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Internet call"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Can\'t reject call."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Can\'t release call(s)."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Connect to a wireless network to make a call."</string>
     <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="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="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"No service. Trying again…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Can\'t call. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> is not an emergency number."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Can\'t call. Dial an emergency number."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Use keyboard to dial"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Hold"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"End"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"Normal"</item>
     <item msgid="2883365539347850535">"Long"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Network message"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Network message"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Error 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\nAfter pressing “Activate”, listen to the instructions provided to activate your phone."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Activating..."</string>
@@ -469,8 +504,8 @@
     <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_speaker" msgid="6904589278542719647">"Speaker"</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_progress" msgid="460876637828044519">"Programming your phone…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Couldn\'t programme your phone"</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="8072141612635635357">"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 name="ota_spc_failure" msgid="3909983542575030796">"EXCESS SPC FAILURES"</string>
@@ -481,18 +516,18 @@
     <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>
     <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Data connection disabled"</string>
-  <plurals name="phone_in_ecm_notification_time">
-    <item quantity="one" msgid="4866221796252472622">"No data connection for <xliff:g id="COUNT">%s</xliff:g> minute"</item>
-    <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="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="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>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other">No data connection for <xliff:g id="COUNT_1">%s</xliff:g> minutes</item>
+      <item quantity="one">No data connection for <xliff:g id="COUNT_0">%s</xliff:g> minute</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other">The phone will be in Emergency Callback mode for <xliff:g id="COUNT_1">%s</xliff:g> minutes. While in this mode no applications using a data connection can be used. Do you want to exit now?</item>
+      <item quantity="one">The phone will be in Emergency Callback mode for <xliff:g id="COUNT_0">%s</xliff:g> minute. While in this mode no apps using a data connection can be used. Do you want to exit now?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <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_1">%s</xliff:g> minutes. Do you want 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_0">%s</xliff:g> minute. Do you want to exit now?</item>
+    </plurals>
     <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>
@@ -506,110 +541,23 @@
     <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_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_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="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="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="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="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_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="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="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>
-    <string name="username_title" msgid="2479375923477682328">"Username"</string>
-    <string name="password_title" msgid="3323555249068171531">"Password"</string>
-    <string name="display_name_title" msgid="2459768196312249937">"Display name"</string>
-    <string name="proxy_address_title" msgid="4828301345351614273">"Outgoing proxy address"</string>
-    <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="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>
-    <string name="auth_username_title" msgid="851473016307947120">"Authentication username"</string>
-    <string name="auth_username_summary" msgid="6782012405225938629">"Username used for authentication"</string>
-    <string name="default_preference_summary" msgid="868766740121667450">"&lt;Not set&gt;"</string>
-    <string name="display_name_summary" msgid="8636377460518225523">"&lt;Same as username&gt;"</string>
-    <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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"Voice calling not supported"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Quick responses"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"one"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"two"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"three"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"four"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"five"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"six"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"seven"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"eight"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"nine"</string>
-    <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_dial_button" msgid="7459705245418435351">"dial"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="description_target_answer" msgid="7205604197797472471">"Answer"</string>
-    <string name="description_target_send_sms" msgid="2098326025587950144">"Send SMS"</string>
-    <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="2609519527849101590">"Sound"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Default sound (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <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="dial_pad_autocomplete" msgid="494525952035761075">"Dial pad autocomplete"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Ringtone &amp; Vibrate"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Use Wi-Fi to place call?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Yes"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"No"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Built-in SIM cards"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Built-in Internet calling"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Turn on video calling"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"To turn on video calling, you need to enable Enhanced 4G LTE Mode in network settings."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Network settings"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Close"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Emergency calls"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Emergency calling only"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM card, slot: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Accessibility"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Incoming Wi-Fi call"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi call"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Touch again to open"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"There was an error while decoding the message."</string>
 </resources>
diff --git a/res/values-en-rIN/arrays.xml b/res/values-en-rIN/arrays.xml
new file mode 100644
index 0000000..807c757
--- /dev/null
+++ b/res/values-en-rIN/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Global"</item>
+    <item msgid="6753774959494729275">"LTE/CDMA"</item>
+    <item msgid="8658695584186942227">"LTE/GSM/UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-en-rIN/config.xml b/res/values-en-rIN/config.xml
deleted file mode 100644
index 0605cd7..0000000
--- a/res/values-en-rIN/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"false"</string>
-</resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 4dd8118..09dd8a0 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -16,14 +16,14 @@
 
 <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">"Mobile Data"</string>
+    <string name="phoneAppLabel" product="tablet" msgid="1107073389495104784">"Mobile Data"</string>
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Phone"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Emergency Dialler"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Phone"</string>
     <string name="fdnListLabel" msgid="8630418672279521003">"FDN list"</string>
     <string name="unknown" msgid="6878797917991465859">"Unknown"</string>
     <string name="private_num" msgid="6713286113000232309">"Private number"</string>
-    <string name="payphone" msgid="1931775086311769314">"Phonebox"</string>
+    <string name="payphone" msgid="4793877574636445118">"Payphone"</string>
     <string name="onHold" msgid="9035493194749959955">"On hold"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI code started"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD code running…"</string>
@@ -52,18 +52,41 @@
     <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="mobile_network_settings_not_available" msgid="7355254462995117896">"Mobile network settings are not available for this user"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Mobile network settings are not available for this user"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM call settings"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"GSM call settings (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA call settings"</string>
-    <string name="apn_settings" msgid="9043423184895642077">"Access Point Names"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"CDMA call settings (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="apn_settings" msgid="9043423184895642077">"Access point names"</string>
     <string name="settings_label" msgid="3876743539816984008">"Network settings"</string>
-    <string name="connection_service" msgid="978745922583410219">"Connection service to use"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Calling accounts"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Make calls with"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Make SIP calls with"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Ask first"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Settings"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Choose accounts"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Phone accounts"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Add SIP account"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Configure account settings"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi Calling"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Do not use Wi-Fi calling"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Do not use call assistant"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"None"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Call assistant"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Use call assistant"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Choose call assistant"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Manage the networks used for calls with"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Let apps or services manage networks used for calls"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Configure"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Built-in connection service"</string>
     <string name="voicemail" msgid="8693759337917898954">"Voicemail"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Voicemail (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
     <string name="networks" msgid="8873030692174541976">"Network operators"</string>
-    <string name="call_settings" msgid="1630474923393095156">"Call Settings"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Emergency broadcasts"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Call settings"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Additional settings"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Additional settings (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Additional GSM-only call settings"</string>
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Additional CDMA call settings"</string>
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Additional CDMA-only call settings"</string>
@@ -77,40 +100,43 @@
     <string name="sum_cw_enabled" msgid="8083061901633671397">"During a call, notify me of incoming calls"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"During a call, notify me of incoming calls"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Call-forwarding settings"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Call forwarding settings (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Call forwarding"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Always forward"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Always use this number"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Forwarding all calls"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Forwarding all calls to <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Number is unavailable"</string>
-    <string name="sum_cfu_disabled" msgid="3698472522160364904">"Disabled"</string>
-    <string name="labelCFB" msgid="218938523102207587">"Forward when busy"</string>
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Off"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"When busy"</string>
     <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="sum_cfb_disabled" msgid="4913145177320506827">"Off"</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="labelCFNRy" msgid="1736067178393744351">"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="sum_cfnry_disabled" msgid="3884684060443538097">"Off"</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="labelCFNRc" msgid="2614827454402079766">"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="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="call_settings_primary_user_only" msgid="5679923943740900965">"Call settings can only be changed by the primary user."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Call settings (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Call settings error"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Reading settings…"</string>
     <string name="updating_settings" msgid="8171225533884883252">"Updating settings…"</string>
     <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_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="fdn_check_failure" msgid="18200614306525434">"Your Phone app\'s fixed dialling 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>
+    <string name="enable" msgid="7248657275000173526">"Turn on"</string>
+    <string name="disable" msgid="4678348128118573672">"Turn off"</string>
     <string name="change_num" msgid="239476305819844391">"Update"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Network default"</item>
@@ -123,8 +149,8 @@
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Couldn\'t retrieve and save current forwarding number settings.\nSwitch 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>
-    <string name="voicemail_default" msgid="5902099213882352338">"My operator"</string>
-    <string name="mobile_networks" msgid="5540397602919106177">"Mobile network settings"</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"Your operator"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Mobile network settings"</string>
     <string name="label_available" msgid="1181658289009300430">"Available networks"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Searching…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"No networks found."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Preferred network mode: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Preferred network mode: Global"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Preferred network mode: LTE/WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Preferred network mode: LTE/GSM/UMTS"</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="7886739962255042385">"LTE/WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"GSM only"</item>
     <item msgid="3817924849415716259">"GSM/WCDMA preferred"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Enhanced 4G LTE Mode"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Use LTE services to improve voice and other communications (recommended)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Data enabled"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Enable data access over Mobile network"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Allow data usage"</string>
     <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="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="roaming_warning" msgid="1603164667540144353">"You may incur significant charges."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Allow data roaming?"</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>
@@ -190,7 +221,7 @@
     <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"<xliff:g id="USED_0">%1$s</xliff:g> maximum exceeded\nData rate reduced to <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>٪ of cycle elapsed\nNext 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="throttle_help_subtext" msgid="3633091498168446044">"More information about your operator\'s mobile network data use policy"</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>
@@ -302,17 +333,19 @@
     <string name="cdma_activate_device" msgid="3793805892364814518">"Activate device"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Set up data service"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Provider settings"</string>
-    <string name="fdn" msgid="7878832555095183202">"Fixed Dialling Numbers"</string>
+    <string name="fdn" msgid="7878832555095183202">"Fixed dialling numbers"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Fixed dialling numbers (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FDN list"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"FDN list (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FDN activation"</string>
-    <string name="fdn_enabled" msgid="5238109009915521240">"Fixed Dialling Numbers are enabled"</string>
-    <string name="fdn_disabled" msgid="4700049736675368279">"Fixed Dialling Numbers are disabled"</string>
+    <string name="fdn_enabled" msgid="5238109009915521240">"Fixed dialling numbers are enabled"</string>
+    <string name="fdn_disabled" msgid="4700049736675368279">"Fixed dialling numbers are disabled"</string>
     <string name="enable_fdn" msgid="3740191529180493851">"Enable FDN"</string>
     <string name="disable_fdn" msgid="7944020890722540616">"Disable FDN"</string>
     <string name="change_pin2" msgid="2153563695382176676">"Change PIN2"</string>
     <string name="enable_fdn_ok" msgid="7215588870329688132">"Disable FDN"</string>
     <string name="disable_fdn_ok" msgid="5727046928930740173">"Enable FDN"</string>
-    <string name="sum_fdn" msgid="1959399454900272878">"Manage Fixed Dialling Numbers"</string>
+    <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="3776841382844614716">"Voice privacy"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Set TTY 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="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"TTY Mode change is not allowed during a video call"</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>
@@ -344,7 +378,7 @@
     <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="1846161429087789936">"To import contacts from the SIM card, first turn off Aeroplane mode."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Turn off aeroplane mode to import contacts from the SIM card."</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>
@@ -354,42 +388,40 @@
     <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="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="1796577128488773946">"Password incorrect, PIN Blocked! PUK requested."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"Clear SIM PIN"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"Set SIM PIN"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"Setting PIN…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN set"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN cleared"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN incorrect"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN updated"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Password incorrect. PIN now blocked. PUK 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="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="1639666438836544393">"PIN2 changed successfully."</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"Type PUK2 code"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Password incorrect, PIN2 Blocked. Please change PIN2 and retry!"</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"Password incorrect, SIM is locked. PUK2 requested."</string>
+    <string name="badPuk2" msgid="7910064009531541708">"PUK2 incorrect. Try again."</string>
+    <string name="badPin2" msgid="6646896629970023109">"Old PIN2 incorrect. Try again."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2s don\'t match. Try again."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Enter a PIN2 that is 4 to 8 numbers."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Enter a PUK2 that is 8 numbers."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 updated"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Enter PUK2 code"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Password incorrect. PIN2 now Blocked. To try again, change PIN 2."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Password incorrect. SIM now locked. Enter PUK2."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 is permanently blocked."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"There are <xliff:g id="NUMBER">%d</xliff:g> remaining attempts."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 Unblocked!"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"You have <xliff:g id="NUMBER">%d</xliff:g> remaining attempts."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 no longer blocked"</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="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_redialing" msgid="8253487008234167266">"Redialling"</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_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>
     <string name="card_title_in_call" msgid="6346543933068225205">"In call"</string>
-    <string name="card_title_my_phone_number" msgid="112428362494434191">"My number is <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Dialling"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Missed call"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Missed calls"</string>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"Turn off aeroplane mode to make a call."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Turn off aeroplane mode or connect to a wireless network to make a call."</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_error_out_of_service" msgid="4100065333878929223">"Mobile network not available."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Mobile network is not available. Connect to a wireless network to make a call."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"To place a call, enter a valid number."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Can\'t call."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Starting MMI 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>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Unable to transfer call."</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Service not supported"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Can\'t switch calls."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Can\'t separate call."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Can\'t transfer."</string>
     <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Unable to conference calls."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Unable to reject call."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Unable to release call(s)."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Internet call"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Can\'t reject call."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Can\'t release call(s)."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Connect to a wireless network to make a call."</string>
     <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="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="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"No service. Trying again…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Can\'t call. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> is not an emergency number."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Can\'t call. Dial an emergency number."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Use keyboard to dial"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Hold"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"End"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"Normal"</item>
     <item msgid="2883365539347850535">"Long"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Network message"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Network message"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Error 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\nAfter pressing “Activate”, listen to the instructions provided to activate your phone."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Activating..."</string>
@@ -469,8 +504,8 @@
     <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_speaker" msgid="6904589278542719647">"Speaker"</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_progress" msgid="460876637828044519">"Programming your phone…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Couldn\'t programme your phone"</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="8072141612635635357">"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 name="ota_spc_failure" msgid="3909983542575030796">"EXCESS SPC FAILURES"</string>
@@ -481,18 +516,18 @@
     <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>
     <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Data connection disabled"</string>
-  <plurals name="phone_in_ecm_notification_time">
-    <item quantity="one" msgid="4866221796252472622">"No data connection for <xliff:g id="COUNT">%s</xliff:g> minute"</item>
-    <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="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="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>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other">No data connection for <xliff:g id="COUNT_1">%s</xliff:g> minutes</item>
+      <item quantity="one">No data connection for <xliff:g id="COUNT_0">%s</xliff:g> minute</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other">The phone will be in Emergency Callback mode for <xliff:g id="COUNT_1">%s</xliff:g> minutes. While in this mode no applications using a data connection can be used. Do you want to exit now?</item>
+      <item quantity="one">The phone will be in Emergency Callback mode for <xliff:g id="COUNT_0">%s</xliff:g> minute. While in this mode no apps using a data connection can be used. Do you want to exit now?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <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_1">%s</xliff:g> minutes. Do you want 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_0">%s</xliff:g> minute. Do you want to exit now?</item>
+    </plurals>
     <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>
@@ -506,110 +541,23 @@
     <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_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_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="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="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="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="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_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="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="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>
-    <string name="username_title" msgid="2479375923477682328">"Username"</string>
-    <string name="password_title" msgid="3323555249068171531">"Password"</string>
-    <string name="display_name_title" msgid="2459768196312249937">"Display name"</string>
-    <string name="proxy_address_title" msgid="4828301345351614273">"Outgoing proxy address"</string>
-    <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="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>
-    <string name="auth_username_title" msgid="851473016307947120">"Authentication username"</string>
-    <string name="auth_username_summary" msgid="6782012405225938629">"Username used for authentication"</string>
-    <string name="default_preference_summary" msgid="868766740121667450">"&lt;Not set&gt;"</string>
-    <string name="display_name_summary" msgid="8636377460518225523">"&lt;Same as username&gt;"</string>
-    <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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"Voice calling not supported"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Quick responses"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"one"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"two"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"three"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"four"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"five"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"six"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"seven"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"eight"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"nine"</string>
-    <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_dial_button" msgid="7459705245418435351">"dial"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="description_target_answer" msgid="7205604197797472471">"Answer"</string>
-    <string name="description_target_send_sms" msgid="2098326025587950144">"Send SMS"</string>
-    <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="2609519527849101590">"Sound"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Default sound (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <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="dial_pad_autocomplete" msgid="494525952035761075">"Dial pad autocomplete"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Ringtone &amp; Vibrate"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Use Wi-Fi to place call?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Yes"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"No"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Built-in SIM cards"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Built-in Internet calling"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Turn on video calling"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"To turn on video calling, you need to enable Enhanced 4G LTE Mode in network settings."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Network settings"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Close"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Emergency calls"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Emergency calling only"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM card, slot: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Accessibility"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Incoming Wi-Fi call"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi call"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Touch again to open"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"There was an error while decoding the message."</string>
 </resources>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
new file mode 100644
index 0000000..807c757
--- /dev/null
+++ b/res/values-es-rUS/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Global"</item>
+    <item msgid="6753774959494729275">"LTE/CDMA"</item>
+    <item msgid="8658695584186942227">"LTE/GSM/UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-es-rUS/config.xml b/res/values-es-rUS/config.xml
deleted file mode 100644
index a842be4..0000000
--- a/res/values-es-rUS/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"falso"</string>
-</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index ef0d433..38f1d26 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -16,14 +16,14 @@
 
 <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">"Datos de celulares"</string>
+    <string name="phoneAppLabel" product="tablet" msgid="1107073389495104784">"Datos móviles"</string>
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Teléfono"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Marcador de emergencia"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Teléfono"</string>
     <string name="fdnListLabel" msgid="8630418672279521003">"Lista de NMF"</string>
     <string name="unknown" msgid="6878797917991465859">"Desconocida"</string>
     <string name="private_num" msgid="6713286113000232309">"Número privado"</string>
-    <string name="payphone" msgid="1931775086311769314">"Teléfono pago"</string>
+    <string name="payphone" msgid="4793877574636445118">"Teléfono público"</string>
     <string name="onHold" msgid="9035493194749959955">"En espera"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Código de MMI iniciado"</string>
     <string name="ussdRunning" msgid="485588686340541690">"Ejecutando código USSD..."</string>
@@ -52,18 +52,41 @@
     <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="mobile_network_settings_not_available" msgid="7355254462995117896">"La configuración de la red móvil no está disponible para este usuario."</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"La configuración de la red móvil no está disponible para este usuario."</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Config. de llam. GSM"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"Configuración de llamadas de GSM (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Configuración de llamadas de CDMA"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"Configuración de llamadas de CDMA (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Nombres de puntos de acceso"</string>
     <string name="settings_label" msgid="3876743539816984008">"Configuración de red"</string>
-    <string name="connection_service" msgid="978745922583410219">"Servicio de conexión para utilizar"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Cuentas telefónicas"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Realizar llamadas con"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Realizar llamadas SIP con"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Preguntar primero"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Configuración"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Elegir cuentas"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Cuentas telefónicas"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Agregar cuenta SIP"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Cómo configurar la cuenta"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Llamada por Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"No utilizar llamadas por Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"No utilizar asistente de llamadas"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Ninguno"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Asistente de llamadas"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Usar asistente de llamadas"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Elegir asistente de llamadas"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Administrar las redes usadas para llamadas con"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Permitir que las aplicaciones o los servicios administren las redes utilizadas para llamadas"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Configurar"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Servicio de conexión integrado"</string>
     <string name="voicemail" msgid="8693759337917898954">"Correo de voz"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Buzón de voz (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"Correo de voz:"</string>
     <string name="networks" msgid="8873030692174541976">"Operadores de red"</string>
-    <string name="call_settings" msgid="1630474923393095156">"Configuración de llamadas"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Transmisiones de emergencia"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Configuración de llamada"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Configuración adicional"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Configuración adicional (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Configuración de llamadas de GSM adicionales únicamente"</string>
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Configuración de llamadas de CDMA adicionales"</string>
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Configuración de llamadas de CDMA adicionales únicamente"</string>
@@ -77,29 +100,32 @@
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Durante una llamada, notificarme sobre las llamadas entrantes"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Durante una llamada, notificarme sobre las llamadas entrantes"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Configuración de reenvío de llamadas"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Configuración de desvío de llamada (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Desvío de llamadas"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Reenviar siempre"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Usar siempre este número"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Reenviar todas las llamadas"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Reenviar todas las llamadas a <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"El número no está disponible"</string>
-    <string name="sum_cfu_disabled" msgid="3698472522160364904">"Desactivado"</string>
-    <string name="labelCFB" msgid="218938523102207587">"Reenviar cuando está ocupado"</string>
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Desactivado"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Cuando está ocupado"</string>
     <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="sum_cfb_disabled" msgid="4913145177320506827">"Desactivado"</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="labelCFNRy" msgid="1736067178393744351">"Cuando no hay respuesta"</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="sum_cfnry_disabled" msgid="3884684060443538097">"Desactivado"</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">"Reenviar si no llega"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"Cuando está inaccesible"</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="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="call_settings_primary_user_only" msgid="5679923943740900965">"Solo el usuario principal puede cambiar la configuración de llamadas."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Configuración de llamadas (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
     <string name="updating_settings" msgid="8171225533884883252">"Actualizando configuración..."</string>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"Activar"</string>
+    <string name="disable" msgid="4678348128118573672">"Desactivar"</string>
     <string name="change_num" msgid="239476305819844391">"Actualizar"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Red predeterminada"</item>
@@ -123,8 +149,8 @@
     <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>
-    <string name="voicemail_default" msgid="5902099213882352338">"Mi proveedor"</string>
-    <string name="mobile_networks" msgid="5540397602919106177">"Configuración de red móvil"</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"Tu proveedor"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Configuración de la red móvil"</string>
     <string name="label_available" msgid="1181658289009300430">"Redes disponibles"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Buscando..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"No se encontraron redes."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Modo de red preferido: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Modo de red preferido: Global"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Modo de red preferido: LTE/WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Modo de red preferido: LTE/GSM/UMTS"</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="7886739962255042385">"LTE/WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"GSM solamente"</item>
     <item msgid="3817924849415716259">"GSM/WCDMA preferido"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Modo 4G LTE mejorado"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Usa servicios de LTE para mejorar comunicaciones de voz y otras (recomendado)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Usar paquete de datos"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Activar acceso a datos para red móvil"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Permitir el uso de datos"</string>
     <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="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="roaming_warning" msgid="1603164667540144353">"Puede ocasionar gastos importantes."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"¿Deseas permitir el roaming de datos?"</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>
@@ -190,7 +221,7 @@
     <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"<xliff:g id="USED_0">%1$s</xliff:g>máximo excedido\nLa velocidad de la transferencia de datos se redujo a <xliff:g id="USED_1">%2$d</xliff:g> kb/seg."</string>
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"<xliff:g id="USED_0">%1$d</xliff:g>% del ciclo transcurrido\nEl 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="throttle_help_subtext" msgid="3633091498168446044">"Más información sobre la política de uso de datos móviles del proveedor"</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>
@@ -303,7 +334,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Configurar servicio de datos"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Config. del proveedor"</string>
     <string name="fdn" msgid="7878832555095183202">"Números de marc. fijos"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Números de marcación fija (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Lista de NMF"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"Lista de FDN (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Activación de NMF"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Los números de marcación fija están activados"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Los números de marcación fija (NMF) están desactivados"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Establecer modo de TTY"</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="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"No se permite cambiar el modo TTY durante una videollamada."</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>
@@ -344,7 +378,7 @@
     <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="1846161429087789936">"Para importar contactos de la tarjeta SIM, desactiva primero el modo avión."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Desactivar el modo de avión para importar contactos de la tarjeta SIM"</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>
@@ -354,42 +388,40 @@
     <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="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="1796577128488773946">"La contraseña es incorrecta; se bloqueó el PIN. Ingresa el código PUK."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"Borrar PIN de SIM"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"Configurar PIN de SIM"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"Configurando PIN…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN configurado"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN borrado"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN incorrecto"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN actualizado"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Contraseña incorrecta. PIN bloqueado. Se requiere PUK."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"PIN2 anterior"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"PIN2 nuevo"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Confirmar PIN2 nuevo"</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="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="3674058967950559397">"La contraseña es incorrecta; se bloqueó el PIN2. 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="badPuk2" msgid="7910064009531541708">"PUK2 incorrecto. Inténtalo de nuevo."</string>
+    <string name="badPin2" msgid="6646896629970023109">"PIN2 antiguo incorrecto. Inténtalo de nuevo."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"Los PIN2 no coinciden. Inténtalo de nuevo."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Ingresa un PIN2 que tenga de 4 a 8 números."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Ingresa un PUK2 que tenga 8 números."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 actualizado"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Ingresa el código PUK2"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Contraseña incorrecta. PIN2 bloqueado. Para intentarlo de nuevo, cambia el PIN 2."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Contraseña incorrecta. SIM bloqueada. Ingresa el PUK2."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"El código PUK2 se bloqueó de forma permanente."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Te quedan <xliff:g id="NUMBER">%d</xliff:g> intentos."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 desbloqueado"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"Te quedan <xliff:g id="NUMBER">%d</xliff:g> intentos."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"El PIN2 ya no está bloqueado."</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="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_redialing" msgid="8253487008234167266">"Volviendo a marcar"</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_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>
     <string name="card_title_in_call" msgid="6346543933068225205">"En llamada"</string>
-    <string name="card_title_my_phone_number" msgid="112428362494434191">"Mi número es <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Marcando"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Llamada perdida"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Llamadas perdidas"</string>
@@ -407,25 +439,27 @@
     <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 avión."</string>
+    <string name="incall_error_power_off" msgid="2947938060513306698">"Desactivar modo de avión para hacer una llamada"</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Desactivar el modo de avión o conectarse a una red inalámbrica para hacer una llamada"</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_error_out_of_service" msgid="4100065333878929223">"Red móvil no disponible"</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"La red móvil no está disponible. Conéctate a una red inalámbrica para realizar una llamada."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Para realizar una llamada, ingresa un número válido."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"No se puede realizar la llamada."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Iniciar la secuencia de MMI"</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>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"No es posible transferir la llamada."</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Servicio no compatible"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"No se puede cambiar llamadas."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"No se puede desviar la llamada."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"No se puede transferir."</string>
     <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"No es posible realizar llamadas en conferencia."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"No es posible rechazar la llamada."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"No es posible publicar la(s) llamada(s)."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"llamada por Internet"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"No se puede rechazar la llamada."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"No se puede liberar llamadas."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Conectarse a una red inalámbrica para hacer una llamada"</string>
     <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="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="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"No hay servicio. Vuelve a intentarlo."</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"No se puede realizar 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="9130194953830414638">"No se puede realizar la llamada. Marca un número de emergencia."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Utilizar teclado para marcar"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Retener"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Finalizar"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"Normal"</item>
     <item msgid="2883365539347850535">"Largo"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Mensaje de red"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Mensaje de red"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Mensaje de error"</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\nLuego de presionar \"Activar\", escucha las instrucciones suministradas para activar tu teléfono."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Activando…"</string>
@@ -469,8 +504,8 @@
     <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_speaker" msgid="6904589278542719647">"Altavoces"</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_progress" msgid="460876637828044519">"Programando el teléfono…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"No se pudo programar el teléfono"</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="8072141612635635357">"No se activó tu teléfono. \nPuede que tengas que trasladarte hasta un área con mejor cobertura (cerca de una ventana o afuera). \n\nVuelve 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>
@@ -481,18 +516,18 @@
     <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>
     <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"La conexión de datos se ha desactivado"</string>
-  <plurals name="phone_in_ecm_notification_time">
-    <item quantity="one" msgid="4866221796252472622">"Sin conexión de datos por <xliff:g id="COUNT">%s</xliff:g> minuto"</item>
-    <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="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="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>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other">Sin conexión de datos por <xliff:g id="COUNT_1">%s</xliff:g> minutos</item>
+      <item quantity="one">Sin conexión de datos por <xliff:g id="COUNT_0">%s</xliff:g> minuto</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other">El teléfono estará en el modo de llamada de emergencia durante <xliff:g id="COUNT_1">%s</xliff:g> minutos. Mientras esté en este modo, no se podrá utilizar ninguna aplicación que utilice una conexión de datos. ¿Quieres salir ahora?</item>
+      <item quantity="one">El teléfono estará en el modo de llamada de emergencia durante <xliff:g id="COUNT_0">%s</xliff:g> minuto. Mientras esté en este modo, no se podrá utilizar ninguna aplicación que utilice una conexión de datos. ¿Quieres salir ahora?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other">La acción seleccionada no está disponible en el modo de llamada de emergencia. El teléfono estará en este modo durante <xliff:g id="COUNT_1">%s</xliff:g> minutos. ¿Quieres salir ahora?</item>
+      <item quantity="one">La acción seleccionada no está disponible en el modo de llamada de emergencia. El teléfono estará en este modo durante <xliff:g id="COUNT_0">%s</xliff:g> minuto. ¿Quieres salir ahora?</item>
+    </plurals>
     <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>
@@ -506,110 +541,23 @@
     <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_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_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="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="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="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="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_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="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="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>
-    <string name="username_title" msgid="2479375923477682328">"Nombre de usuario"</string>
-    <string name="password_title" msgid="3323555249068171531">"Contraseña"</string>
-    <string name="display_name_title" msgid="2459768196312249937">"Mostrar el nombre"</string>
-    <string name="proxy_address_title" msgid="4828301345351614273">"Dirección proxy saliente"</string>
-    <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="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>
-    <string name="auth_username_title" msgid="851473016307947120">"Autenticación de usuario"</string>
-    <string name="auth_username_summary" msgid="6782012405225938629">"Nombre de usuario utilizado para la autenticación"</string>
-    <string name="default_preference_summary" msgid="868766740121667450">"&lt;No establecido&gt;"</string>
-    <string name="display_name_summary" msgid="8636377460518225523">"&lt;Igual que el nombre de usuario&gt;"</string>
-    <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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"No admite llamadas de voz."</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Respuestas rápidas"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"uno"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"dos"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"tres"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"cuatro"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"cinco"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"seis"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"siete"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"ocho"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"nueve"</string>
-    <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_dial_button" msgid="7459705245418435351">"marcar"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"retroceso"</string>
-    <string name="description_target_answer" msgid="7205604197797472471">"Responder"</string>
-    <string name="description_target_send_sms" msgid="2098326025587950144">"Enviar un mensaje 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">"Vibrar"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Sonido"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Sonido predeterminado (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <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"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Completar automáticamente con teclado"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Tono y vibración"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"¿Usar Wi-Fi para hacer llamadas?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Sí"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"No"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Tarjetas SIM integradas"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Llamadas por Internet integradas"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Activar videollamadas"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Para activar la videollamada, debes habilitar el modo 4G LTE mejorado en la configuración de red."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Configuración de red"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Cerrar"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Llamadas de emergencia"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Solo llamada de emergencia"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"Tarjeta SIM, ranura: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Accesibilidad"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Llamada Wi-Fi entrante"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Llamada por Wi-Fi"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Vuelve a tocar para realizar la acción."</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"Se produjo un error al decodificar el mensaje."</string>
 </resources>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
new file mode 100644
index 0000000..e3c067d
--- /dev/null
+++ b/res/values-es/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Mundial"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-es/config.xml b/res/values-es/config.xml
deleted file mode 100644
index a842be4..0000000
--- a/res/values-es/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"falso"</string>
-</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index c6b1325..89981da 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -16,14 +16,14 @@
 
 <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">"Datos móviles"</string>
+    <string name="phoneAppLabel" product="tablet" msgid="1107073389495104784">"Datos móviles"</string>
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Teléfono"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Llamada de emergencia"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Teléfono"</string>
     <string name="fdnListLabel" msgid="8630418672279521003">"Lista de FDN"</string>
     <string name="unknown" msgid="6878797917991465859">"Desconocido"</string>
     <string name="private_num" msgid="6713286113000232309">"Número privado"</string>
-    <string name="payphone" msgid="1931775086311769314">"Teléfono público"</string>
+    <string name="payphone" msgid="4793877574636445118">"Teléfono público"</string>
     <string name="onHold" msgid="9035493194749959955">"En espera"</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>
@@ -52,18 +52,41 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Solicitando desbloqueo de red..."</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="mobile_network_settings_not_available" msgid="7355254462995117896">"Los ajustes de red móvil no están disponibles para este usuario"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Los ajustes de red móvil no están disponibles para este usuario"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Ajustes de llamadas GSM"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"Ajustes de llamada GSM (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Ajustes de llamadas CDMA"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"Ajustes de llamada de CDMA (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"APN"</string>
     <string name="settings_label" msgid="3876743539816984008">"Configuración de red"</string>
-    <string name="connection_service" msgid="978745922583410219">"Servicio de conexión que se utilizará"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Cuentas de llamadas"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Realizar llamadas con"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Realizar llamadas SIP con"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Preguntar primero"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Ajustes"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Elegir cuentas"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Cuentas de teléfono"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Añadir cuenta SIP"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Configurar ajustes de cuenta"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Llamadas Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"No usar llamadas Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"No usar asistente de llamadas"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Nunca"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Asistente de llamadas"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Usar asistente de llamadas"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Elegir asistente de llamadas"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Administrar las redes utilizadas para realizar llamadas con"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Dejar que aplicaciones o servicios administren las redes usadas para las llamadas"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Configurar"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Servicio de conexión integrado"</string>
     <string name="voicemail" msgid="8693759337917898954">"Buzón de voz"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Buzón de voz (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="1630474923393095156">"Ajustes de llamada"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Difusiones de emergencia"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Ajustes de llamadas"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Configuración adicional"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Ajustes adicionales (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Configuración adicional de llamadas solo GSM"</string>
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Configuración adicional de llamadas CDMA"</string>
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Configuración adicional de llamadas solo CDMA"</string>
@@ -72,34 +95,37 @@
     <string name="sum_loading_settings" msgid="1826692909391168620">"Cargando ajustes…"</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="sum_default_caller_id" msgid="1954518825510901365">"Utilizar la configuración predeterminada del operador 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">"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="sum_cw_disabled" msgid="3648693907300104575">"Notificar si hay una llamada entrante durante una llamada"</string>
+    <string name="call_forwarding_settings" msgid="3378927671091537173">"Ajustes de desvío de llamadas"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Ajustes de reenvío de llamadas (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Desvío de llamada"</string>
-    <string name="labelCFU" msgid="8147177368148660600">"Siempre"</string>
+    <string name="labelCFU" msgid="8147177368148660600">"Desviar siempre"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Utilizar siempre este número"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Desviar todas las llamadas"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Desviando todas las llamadas a <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Número no disponible"</string>
-    <string name="sum_cfu_disabled" msgid="3698472522160364904">"Inhabilitado"</string>
-    <string name="labelCFB" msgid="218938523102207587">"Línea ocupada"</string>
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Desactivado"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Cuando esté ocupado"</string>
     <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="sum_cfb_disabled" msgid="4913145177320506827">"Desactivado"</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="labelCFNRy" msgid="1736067178393744351">"Cuando no responda"</string>
+    <string name="messageCFNRy" msgid="672317899884380374">"Número cuando no se responda 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="sum_cfnry_disabled" msgid="3884684060443538097">"Desactivado"</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="labelCFNRc" msgid="2614827454402079766">"Cuando no esté disponible"</string>
+    <string name="messageCFNRc" msgid="6380695421020295119">"Número cuando no se pueda 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="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="call_settings_primary_user_only" msgid="5679923943740900965">"El usuario principal es el único que puede cambiar los ajustes de llamadas."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Ajustes de llamadas (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"Activar"</string>
+    <string name="disable" msgid="4678348128118573672">"Desactivar"</string>
     <string name="change_num" msgid="239476305819844391">"Actualizar"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Valor predeterminado de red"</item>
@@ -123,8 +149,8 @@
     <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="voicemail_default" msgid="2001233554889016880">"Tu operador"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Ajustes 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="empty_networks_list" msgid="4249426905018815316">"No se ha encontrado ninguna red."</string>
@@ -134,14 +160,14 @@
     <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="3494252551249882718">"Seleccionar un operador de red"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Selecciona un operador de red"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Buscar todas las redes disponibles"</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..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Tipo de red preferido"</string>
+    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Tipo de red preferida"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Cambiar el modo operativo de la red"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Tipo de red preferido"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Tipo de red preferida"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Modo de red preferido: WCDMA preferido"</string>
     <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>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Modo de red preferido: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Modo de red preferido: Global"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Modo de red preferido: LTE/WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Modo de red preferido: LTE / GSM / UMTS"</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="7886739962255042385">"LTE/WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"Solo GSM"</item>
     <item msgid="3817924849415716259">"Preferencia de GSM/WCDMA"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Modo 4G LTE mejorado"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Usar servicios LTE para mejorar la voz y otras comunicaciones (recomendado)"</string>
     <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="data_enable_summary" msgid="2382798156640007971">"Permitir uso de datos"</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_enable" msgid="7331106985174381987">"Conectarse a servicios de datos en itinerancia"</string>
+    <string name="roaming_disable" msgid="1843417228755568110">"Conectarse a servicios de datos en itinerancia"</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="roaming_warning" msgid="1603164667540144353">"El coste de este servicio puede ser significativo."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"¿Permitir itinerancia de datos?"</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>
@@ -194,7 +225,7 @@
     <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"Máx de <xliff:g id="USED_0">%1$s</xliff:g> superado.\nFrec datos reducida 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 transcurrido.\nPró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="throttle_help_subtext" msgid="3633091498168446044">"Más información sobre la política de uso de datos móviles de tu operador"</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>
@@ -307,7 +338,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Configurar servicio de datos"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Ajustes del operador"</string>
     <string name="fdn" msgid="7878832555095183202">"Marcación fija"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Números de marcación fija (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Lista de FDN"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"Lista FDN (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
@@ -317,7 +350,7 @@
     <string name="enable_fdn_ok" msgid="7215588870329688132">"Inhabilitar FDN"</string>
     <string name="disable_fdn_ok" msgid="5727046928930740173">"Habilitar FDN"</string>
     <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_change_pin" msgid="6666549734792827932">"Cambiar PIN para el 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="3776841382844614716">"Privacidad de voz"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Habilitar modo de privacidad mejorado"</string>
@@ -325,6 +358,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Establecer modo TTY"</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="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"No se puede cambiar el modo TTY durante una videollamada"</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>
@@ -348,7 +382,7 @@
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Leyendo desde tarjeta SIM…"</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="1846161429087789936">"Para importar contactos de la tarjeta SIM, desactiva el modo avión."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Desactiva el modo avión para importar contactos de la tarjeta SIM."</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>
@@ -358,42 +392,40 @@
     <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="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="1796577128488773946">"Contraseña incorrecta, PIN bloqueado. Debes introducir el PUK."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"Borrar PIN de la SIM"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"Establecer PIN de la SIM"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"Estableciendo PIN…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN establecido"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN borrado"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN incorrecto"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN actualizado"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Contraseña incorrecta. PIN bloqueado. PUK solicitado."</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="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="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="3674058967950559397">"Contraseña incorrecta, PIN2 bloqueado. Cambia el 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="badPuk2" msgid="7910064009531541708">"PUK2 incorrecto. Inténtalo de nuevo."</string>
+    <string name="badPin2" msgid="6646896629970023109">"PIN2 anterior incorrecto. Inténtalo de nuevo."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"Los PIN2 no coinciden. Inténtalo de nuevo."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Introduce el PIN2 (entre 4 y 8 números)."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Introduce el PUK2 (8 números)."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 actualizado"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Introducir código PUK2"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Contraseña incorrecta. PIN2 bloqueado. Para intentarlo de nuevo, cambia el PIN2."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Contraseña incorrecta. SIM bloqueada. Introducir PUK2."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"El PUK2 se ha bloqueado de forma permanente."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Quedan <xliff:g id="NUMBER">%d</xliff:g> intentos."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 desbloqueado"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"Quedan <xliff:g id="NUMBER">%d</xliff:g> intentos."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 desbloqueado"</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="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_redialing" msgid="8253487008234167266">"Marcando otra vez"</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_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>
     <string name="card_title_in_call" msgid="6346543933068225205">"Llamada entrante"</string>
-    <string name="card_title_my_phone_number" msgid="112428362494434191">"Mi número es <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>."</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Llamando..."</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Llamada perdida"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Llamadas perdidas"</string>
@@ -411,25 +443,27 @@
     <string name="notification_action_end_call" msgid="6069460915123531620">"Colgar"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"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_power_off" msgid="2947938060513306698">"Desactiva el modo avión parra hacer llamadas."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Desactiva el modo avión o conéctate a una red inalámbrica para hacer llamadas."</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_error_out_of_service" msgid="4100065333878929223">"La red móvil no está disponible."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"La red móvil no está disponible. Conéctate a una red inalámbrica para hacer llamadas."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Para realizar una llamada, introduce un número válido."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"No se puede establecer la llamada."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Iniciando secuencia MMI..."</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>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"No se ha podido transferir la llamada."</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Servicio no admitido"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"No se pueden intercambiar llamadas."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"No se pueden separar llamadas."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"No se puede transferir."</string>
     <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"No se ha podido realizar la conferencia telefónica."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"No se ha podido rechazar la llamada."</string>
-    <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="incall_error_supp_service_reject" msgid="8998568661508655638">"No se puede rechazar la llamada."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"No se pueden hacer llamadas."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Conéctate a una red inalámbrica para hacer llamadas."</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="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="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Sin servicio. Reintentado…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"No se puede establecer 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="9130194953830414638">"No se puede establecer la llamada. Marcar un número de emergencia."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Utilizar teclado para marcar"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Retener"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Finalizar"</string>
@@ -460,7 +494,8 @@
     <item msgid="899650777817315681">"Normal"</item>
     <item msgid="2883365539347850535">"Largo"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Mensaje de red"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Mensaje de red"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Mensaje de error"</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\nTras pulsar \"Activar\", escucha las instrucciones sobre cómo activar el teléfono."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Activando..."</string>
@@ -473,8 +508,8 @@
     <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_speaker" msgid="6904589278542719647">"Altavoz"</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_progress" msgid="460876637828044519">"Programando el teléfono..."</string>
+    <string name="ota_failure" msgid="7713756181204620397">"No se ha podido programar el teléfono"</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="8072141612635635357">"El teléfono no se ha activado. \nEs posible que tengas que situarte en una zona con más cobertura (cerca de una ventana o en el exterior). \n\nInté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>
@@ -485,18 +520,18 @@
     <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>
     <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Conexión de datos inhabilitada"</string>
-  <plurals name="phone_in_ecm_notification_time">
-    <item quantity="one" msgid="4866221796252472622">"Ninguna conexión de datos durante <xliff:g id="COUNT">%s</xliff:g> minuto"</item>
-    <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="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="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>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other">Ninguna conexión de datos durante <xliff:g id="COUNT_1">%s</xliff:g> minutos</item>
+      <item quantity="one">Ninguna conexión de datos durante <xliff:g id="COUNT_0">%s</xliff:g> minuto</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other">Se activará el modo de devolución de llamada de emergencia en el teléfono durante <xliff:g id="COUNT_1">%s</xliff:g> minutos. En este modo, no se puede utilizar ninguna aplicación que emplee una conexión de datos. ¿Quieres salir?</item>
+      <item quantity="one">Se activará el modo de devolución de llamada de emergencia en el teléfono durante <xliff:g id="COUNT_0">%s</xliff:g> minuto. En este modo, no se puede utilizar ninguna aplicación que emplee una conexión de datos. ¿Quieres salir?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other">La acción seleccionada no está disponible en el modo de devolución de llamada de emergencia. Se activará este modo en el teléfono durante <xliff:g id="COUNT_1">%s</xliff:g> minutos. ¿Quieres salir?</item>
+      <item quantity="one">La acción seleccionada no está disponible en el modo de devolución de llamada de emergencia. Se activará este modo en el teléfono durante <xliff:g id="COUNT_0">%s</xliff:g> minuto. ¿Quieres salir?</item>
+    </plurals>
     <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>
@@ -510,110 +545,23 @@
     <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_receive_calls" msgid="5635685570889971559">"Recibir llamadas"</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 para llamadas de 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="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="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="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="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_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="4288401139400232968">"Registrando..."</string>
-    <string name="registration_status_still_trying" msgid="3185581992666091911">"Seguimos intentándolo..."</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="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>
-    <string name="username_title" msgid="2479375923477682328">"Nombre de usuario"</string>
-    <string name="password_title" msgid="3323555249068171531">"Contraseña"</string>
-    <string name="display_name_title" msgid="2459768196312249937">"Mostrar nombre"</string>
-    <string name="proxy_address_title" msgid="4828301345351614273">"Dirección proxy saliente"</string>
-    <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="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>
-    <string name="auth_username_title" msgid="851473016307947120">"Nombre de usuario de autenticación"</string>
-    <string name="auth_username_summary" msgid="6782012405225938629">"Nombre de usuario utilizado para la autenticación"</string>
-    <string name="default_preference_summary" msgid="868766740121667450">"&lt;Sin definir&gt;"</string>
-    <string name="display_name_summary" msgid="8636377460518225523">"&lt;Igual que el nombre de usuario&gt;"</string>
-    <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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"Llamadas de voz no admitidas"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Respuestas rápidas"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"uno"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"dos"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"tres"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"cuatro"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"cinco"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"seis"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"siete"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"ocho"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"nueve"</string>
-    <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_dial_button" msgid="7459705245418435351">"marcar"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"retroceder un espacio"</string>
-    <string name="description_target_answer" msgid="7205604197797472471">"Responder"</string>
-    <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">"Vibrar"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Sonido"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Sonido predeterminado (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <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="dial_pad_autocomplete" msgid="494525952035761075">"Autocompletar con teclado"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Tono y vibración"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"¿Usar Wi-Fi para hacer llamadas?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Sí"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"No"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Tarjetas SIM integradas"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Llamadas por Internet integradas"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Activar videollamadas"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Para activar las videollamadas, debes habilitar el modo 4G LTE en los ajustes de red."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Configuración de red"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Cerrar"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Llamadas de emergencia"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Solo llamadas de emergencia"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"Tarjeta SIM, ranura: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Accesibilidad"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Llamada Wi-Fi entrante"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Llamada Wi-Fi"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Vuelve a tocar para abrir"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"Se ha producido un error al decodificar el mensaje."</string>
 </resources>
diff --git a/res/values-et-rEE/arrays.xml b/res/values-et-rEE/arrays.xml
new file mode 100644
index 0000000..e47e38a
--- /dev/null
+++ b/res/values-et-rEE/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Üldine"</item>
+    <item msgid="6753774959494729275">"LTE/CDMA"</item>
+    <item msgid="8658695584186942227">"LTE/GSM/UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-et-rEE/config.xml b/res/values-et-rEE/config.xml
deleted file mode 100644
index 0605cd7..0000000
--- a/res/values-et-rEE/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"false"</string>
-</resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 19c49f5..d5fe424 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -16,14 +16,14 @@
 
 <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">"Mobiilne andmeside"</string>
+    <string name="phoneAppLabel" product="tablet" msgid="1107073389495104784">"Mobiilne andmeside"</string>
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Telefon"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Hädaabikõne valija"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Telefon"</string>
     <string name="fdnListLabel" msgid="8630418672279521003">"FDN-i loend"</string>
     <string name="unknown" msgid="6878797917991465859">"Tundmatu"</string>
     <string name="private_num" msgid="6713286113000232309">"Varjatud number"</string>
-    <string name="payphone" msgid="1931775086311769314">"Telefoniautomaat"</string>
+    <string name="payphone" msgid="4793877574636445118">"Telefoniautomaat"</string>
     <string name="onHold" msgid="9035493194749959955">"Ootel"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI-kood käivitus"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD-kood töötab ..."</string>
@@ -52,18 +52,41 @@
     <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="mobile_network_settings_not_available" msgid="7355254462995117896">"Mobiilsidevõrgu seaded pole selle kasutaja jaoks saadaval"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Mobiilsidevõrgu seaded pole selle kasutaja jaoks saadaval"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM-kõneseaded"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"GSM-i kõneseaded (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA-kõneseaded"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"CDMA kõneseaded (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Pääsupunktide nimed"</string>
     <string name="settings_label" msgid="3876743539816984008">"Võrguseaded"</string>
-    <string name="connection_service" msgid="978745922583410219">"Kasutatav ühendusteenus"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Kõnekontod"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Kõnede tegemine kontoga"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"SIP-kõnede tegemine kontoga"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Küsi esmalt"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Seaded"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Valige kontod"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Telefoni kontod"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"SIP-konto lisamine"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Konto seadete seadistamine"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"WiFi-kõned"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Ärge kasutage WiFi-kõnesid"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Ärge kasutage kõneabi"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Puudub"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Kõneabi"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Kasutage kõneabi"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Valige kõneabi"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Helistamiseks kasutatavate võrkude haldamine:"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Laske rakendustel või teenustel kõnede tegemiseks kasutatavaid võrke hallata"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Seadistamine"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Sisseehitatud ühendusteenus"</string>
     <string name="voicemail" msgid="8693759337917898954">"Kõnepost"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Kõnepost (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"KP:"</string>
     <string name="networks" msgid="8873030692174541976">"Võrguoperaatorid"</string>
-    <string name="call_settings" msgid="1630474923393095156">"Kõne seaded"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Hädaolukorra ülekanded"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Kõneseaded"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Lisaseaded"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Lisaseaded (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Täiendavad „ainult GSM” kõneseaded"</string>
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Täiendavad CDMA kõneseaded"</string>
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Täiendavad „ainult CDMA” kõneseaded"</string>
@@ -77,29 +100,32 @@
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Teavita mind kõne ajal sissetulevatest kõnedest"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Teavita mind kõne ajal sissetulevatest kõnedest"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Kõnesuunamise seaded"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Kõne suunamise seaded (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Kõnede suunamine"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Suuna alati"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Kasuta alati seda numbrit"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Kõigi kõnede suunamine"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Kõigi kõnede edastamine numbrile <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Number ei ole kättesaadav"</string>
-    <string name="sum_cfu_disabled" msgid="3698472522160364904">"Keelatud"</string>
-    <string name="labelCFB" msgid="218938523102207587">"Suuna, kui on hõivatud"</string>
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Väljas"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Kui olen hõivatud"</string>
     <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="sum_cfb_disabled" msgid="4913145177320506827">"Väljas"</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="labelCFNRy" msgid="1736067178393744351">"Kui kõnele ei vastata"</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="sum_cfnry_disabled" msgid="3884684060443538097">"Väljas"</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="labelCFNRc" msgid="2614827454402079766">"Kui mind ei saa kätte"</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="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="call_settings_primary_user_only" msgid="5679923943740900965">"Kõne seadeid saab muuta ainult peamine kasutaja."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Kõne seaded (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Kõneseadete viga"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Seadete lugemine ..."</string>
     <string name="updating_settings" msgid="8171225533884883252">"Seadete värskendamine ..."</string>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"Lülita sisse"</string>
+    <string name="disable" msgid="4678348128118573672">"Lülita välja"</string>
     <string name="change_num" msgid="239476305819844391">"Värskenda"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Vaikevõrk"</item>
@@ -123,8 +149,8 @@
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Praeguste edastusnumbri seadete toomine ja salvestamine ebaõnnestus.\nKas 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>
-    <string name="voicemail_default" msgid="5902099213882352338">"Minu operaator"</string>
-    <string name="mobile_networks" msgid="5540397602919106177">"Mobiilsidevõrgu seaded"</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"Teie operaator"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Mobiilsidevõrgu seaded"</string>
     <string name="label_available" msgid="1181658289009300430">"Saadaolevad võrgud"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Otsimine ..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Võrke ei leitud."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Eelistatud võrgurežiim: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Eelistatud võrgurežiim: globaalne"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Eelistatud võrgurežiim: LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Eelistatud võrgurežiim: LTE/GSM/UMTS"</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="7886739962255042385">"LTE/WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"Ainult GSM"</item>
     <item msgid="3817924849415716259">"Eelistatud GSM/WCDMA"</item>
   </string-array>
-    <string name="data_enabled" msgid="5972538663568715366">"Andmed lubatud"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Luba juurdepääs andmetele mobiilsidevõrgu kaudu"</string>
-    <string name="roaming" msgid="8871412572928323707">"Andmerändlus"</string>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Tõhustatud 4G LTE režiim"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Kasutage hääl- ja muu suhtluse täiustamiseks LTE-teenuseid (soovitatav)"</string>
+    <string name="data_enabled" msgid="5972538663568715366">"Andmeside lubatud"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Luba andmekasutus"</string>
+    <string name="roaming" msgid="8871412572928323707">"Andmesiderä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="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="roaming_reenable_message" msgid="8913735676127858115">"Andmesideühendus katkes, kuna lahkusite koduvõrgust ja andmesiderändlus oli välja lülitatud."</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"Lisanduda võivad suured tasud."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Kas lubada andmeside rändlus?"</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>
@@ -190,7 +221,7 @@
     <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"<xliff:g id="USED_0">%1$s</xliff:g> maksimaalne ületatud\nAndmeedastuskiirus vähendatud määrale <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>?? tsüklist möödunud\nJä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="throttle_help_subtext" msgid="3633091498168446044">"Lisateave teie operaatori mobiilsidevõrgu andmete kasutuse eeskirjade kohta"</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>
@@ -303,7 +334,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Andmesideteenuse häälestamine"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Operaatori seaded"</string>
     <string name="fdn" msgid="7878832555095183202">"Fikseeritud valimisnumbrid"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Fikseeritud valimisnumbrid (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FDN-i loend"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"FDN-i loend (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FDN-i aktiveerimine"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Fikseeritud valimisnumbrid on lubatud"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Fikseeritud valimisnumbrid on keelatud"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Määra TTY-rež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="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"TTY-režiimi muutmine pole videokõne ajal lubatud"</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>
@@ -344,9 +378,9 @@
     <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="1846161429087789936">"Kontaktide importimiseks SIM-kaardilt lülitage esmalt välja lennukirežiim."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Kontaktide importimiseks SIM-kaardilt lülitage lennukirežiim välja."</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="change_pin" msgid="9174186126330785343">"Muuda SIM-kaardi 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>
@@ -354,42 +388,40 @@
     <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="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="1796577128488773946">"Parool on vale, PIN-kood on blokeeritud. PUK-kood on nõutav."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"SIM-i PIN-koodi kustutamine"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"SIM-i PIN-koodi seadistamine"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"PIN-koodi seadistamine …"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN-kood on seadistatud"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN-kood on kustutatud"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN-kood on vale"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN-kood on värskendatud"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Parool on vale. PIN-kood on nüüd blokeeritud. Vaja on PUK-koodi."</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="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="1639666438836544393">"PIN2-koodi muutmine õnnestus."</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"Sisestage PUK2-kood"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Parool on vale, PIN2 on blokeeritud. Muutke PIN2 ja proovige uuesti."</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"Parool on vale, SIM-kaart on lukus. Sisestage PUK2-kood."</string>
+    <string name="badPuk2" msgid="7910064009531541708">"PUK-kood 2 on vale. Proovige uuesti."</string>
+    <string name="badPin2" msgid="6646896629970023109">"Vana PIN-kood 2 on vale. Proovige uuesti."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN-kood 2 ei sobi. Proovige uuesti."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Sisestage PIN-kood 2, milles on 4 kuni 8 numbrit."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Sisestage PUK-kood 2, milles on 8 numbrit."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN-kood 2 on värskendatud"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Sisestage PUK-kood 2 kood"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Parool on vale. PIN-kood 2 on nüüd blokeeritud. Uuesti proovimiseks muutke PIN-kood 2."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Parool on vale. SIM on nüüd lukus. Sisestage PUK-kood 2."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 on püsivalt blokeeritud."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Alles on jäänud <xliff:g id="NUMBER">%d</xliff:g> katset."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 on deblokeeritud."</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"Teil on veel <xliff:g id="NUMBER">%d</xliff:g> katset."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN-kood 2 ei ole enam blokeeritud"</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="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_redialing" msgid="8253487008234167266">"Uuestivalimine"</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_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>
     <string name="card_title_in_call" msgid="6346543933068225205">"Kõne"</string>
-    <string name="card_title_my_phone_number" msgid="112428362494434191">"Minu number on <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Valimine"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Vastamata kõne"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Vastamata kõned"</string>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"Helistamiseks lülitage lennukirežiim välja."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Helistamiseks lülitage lennukirežiim välja või looge ühendus traadita võrguga."</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_error_out_of_service" msgid="4100065333878929223">"Mobiilsidevõrk pole saadaval."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Mobiilivõrk pole saadaval. Helistamiseks looge ühendus traadita võrguga."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Helistamiseks sisestage kehtiv number."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Ei saa helistada."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI-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>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Kõne ei saa üle kanda."</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Teenust ei toetata"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Kõnesid ei saa vahetada."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Kõnet ei saa eraldada."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Ei saa üle kanda."</string>
     <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Konverentskõnesid ei saa teha."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Kõnest ei saa keelduda."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Kõne(sid) ei saa vabastada"</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Interneti-kõne"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Kõnet ei saa tagasi lükata."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Kõnet (kõnesid) ei saa vabastada."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Helistamiseks looge ühendus traadita võrguga."</string>
     <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="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="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Teenus puudub. Uuesti proovimine ..."</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Ei saa helistada. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ei ole hädaabikõne number."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Ei saa helistada. Valige hädaabinumber."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Kasutage valimiseks klaviatuuri"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Pane ootele"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Lõpeta"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"Tavaline"</item>
     <item msgid="2883365539347850535">"Pikk"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Võrgusõnum"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Võrgusõnum"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Veateade"</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\nPärast käsu “Aktiveeri“ puudutamist kuulake telefoni aktiveerimise juhiseid."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Aktiveerimine ..."</string>
@@ -469,8 +504,8 @@
     <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_speaker" msgid="6904589278542719647">"Kõlar"</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_progress" msgid="460876637828044519">"Telefoni programmeerimine …"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Telefoni programmeerimine ei õnnestunud"</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="8072141612635635357">"Teie telefoni ei aktiveeritud. \nLeidke parema leviga piirkond (akna lähedal või õues). \n\nProovige uuesti või helistage klienditeenindusse."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"LIIGSED SPC NURJUMISED"</string>
@@ -481,18 +516,18 @@
     <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>
     <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Andmeühendus keelatud"</string>
-  <plurals name="phone_in_ecm_notification_time">
-    <item quantity="one" msgid="4866221796252472622">"Andmeühendus puudub <xliff:g id="COUNT">%s</xliff:g> minutiks"</item>
-    <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="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="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>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other">Andmesideühendus puudub <xliff:g id="COUNT_1">%s</xliff:g> minutit</item>
+      <item quantity="one">Andmesideühendus puudub <xliff:g id="COUNT_0">%s</xliff:g> minuti</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other">Telefon on <xliff:g id="COUNT_1">%s</xliff:g> minutit hädaabikõne tagasihelistamise režiimis. Selles režiimis olles ei saa kasutada ühtegi rakendust, mis kasutab andmesideühendust. Kas soovite kohe väljuda?</item>
+      <item quantity="one">Telefon on <xliff:g id="COUNT_0">%s</xliff:g> minuti hädaabikõne tagasihelistamise režiimis. Selles režiimis olles ei saa kasutada ühtegi rakendust, mis kasutab andmesideühendust. Kas soovite kohe väljuda?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other">Valitud toiming pole hädaabikõne tagasihelistamise režiimis saadaval. Telefon on selles režiimis <xliff:g id="COUNT_1">%s</xliff:g> minutit. Kas soovite kohe väljuda?</item>
+      <item quantity="one">Valitud toiming pole hädaabikõne tagasihelistamise režiimis saadaval. Telefon on selles režiimis <xliff:g id="COUNT_0">%s</xliff:g> minuti. Kas soovite kohe väljuda?</item>
+    </plurals>
     <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>
@@ -506,110 +541,23 @@
     <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_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_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="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="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="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="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_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="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="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>
-    <string name="username_title" msgid="2479375923477682328">"Kasutajanimi"</string>
-    <string name="password_title" msgid="3323555249068171531">"Parool"</string>
-    <string name="display_name_title" msgid="2459768196312249937">"Kuvatav nimi"</string>
-    <string name="proxy_address_title" msgid="4828301345351614273">"Väljuvate puhverserveri aadress"</string>
-    <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="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>
-    <string name="auth_username_title" msgid="851473016307947120">"Autentimise kasutajanimi"</string>
-    <string name="auth_username_summary" msgid="6782012405225938629">"Autentimiseks kasutatav kasutajanimi"</string>
-    <string name="default_preference_summary" msgid="868766740121667450">"&lt;Määramata&gt;"</string>
-    <string name="display_name_summary" msgid="8636377460518225523">"&lt;Sama kui kasutajanimi&gt;"</string>
-    <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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"Tavakõnesid ei toetata"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Kiirvastused"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"üks"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"kaks"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"kolm"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"neli"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"viis"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"kuus"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"seitse"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"kaheksa"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"üheksa"</string>
-    <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_dial_button" msgid="7459705245418435351">"helista"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"tagasilüke"</string>
-    <string name="description_target_answer" msgid="7205604197797472471">"Vastamine"</string>
-    <string name="description_target_send_sms" msgid="2098326025587950144">"SMS-i saatmine"</string>
-    <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="2609519527849101590">"Heli"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Vaikeheli (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <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="dial_pad_autocomplete" msgid="494525952035761075">"Valimisklahvistiku automaatne täitmine"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Helin ja vibratsioon"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Kas kasutada helistamiseks WiFi-t?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Jah"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"Ei"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Sisseehitatud SIM-kaardid"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Sisseehitatud Interneti-kõne funktsioon"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Videokõnede sisselülitamine"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Videokõne sisselülitamiseks peate lubama võrgustikuseadetes tõhustatud 4G LTE režiimi."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Võrguseaded"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Sule"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Hädaabikõned"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Ainult hädaabikõned"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM-kaart, pilu: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Juurdepääsetavus"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Sissetulev WiFi-kõne"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"WiFi-kõne"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Avamiseks puudutage uuesti"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"Sõnumi dekodeerimisel ilmnes viga."</string>
 </resources>
diff --git a/res/values-eu-rES/arrays.xml b/res/values-eu-rES/arrays.xml
new file mode 100644
index 0000000..48e8dab
--- /dev/null
+++ b/res/values-eu-rES/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Orokorra"</item>
+    <item msgid="6753774959494729275">"LTE/CDMA"</item>
+    <item msgid="8658695584186942227">"LTE/GSM/UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-eu-rES/config.xml b/res/values-eu-rES/config.xml
deleted file mode 100644
index 721ba3a..0000000
--- a/res/values-eu-rES/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"gezurra"</string>
-</resources>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index bc9e35f..5e00781 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -16,14 +16,14 @@
 
 <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">"Datu mugikorrak"</string>
+    <string name="phoneAppLabel" product="tablet" msgid="1107073389495104784">"Mugikorreko datuak"</string>
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Telefonoa"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Larrialdietarako telefonoa"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Telefonoa"</string>
     <string name="fdnListLabel" msgid="8630418672279521003">"FDN zerrenda"</string>
     <string name="unknown" msgid="6878797917991465859">"Ezezaguna"</string>
     <string name="private_num" msgid="6713286113000232309">"Zenbaki pribatua"</string>
-    <string name="payphone" msgid="1931775086311769314">"Telefono publikoa"</string>
+    <string name="payphone" msgid="4793877574636445118">"Telefono publikoa"</string>
     <string name="onHold" msgid="9035493194749959955">"Zain"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI kodea hasi da"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD kodea exekutatzen…"</string>
@@ -35,7 +35,7 @@
     <string name="audio_mode_speaker" msgid="27649582100085266">"Bozgorailua"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Aurikularrak"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Kabledun entzungailua"</string>
-    <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetootha"</string>
+    <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"Ondorengo tonuak bidali?\n"</string>
     <string name="pause_prompt_str" msgid="1789964702154314806">"Tonuak bidaltzen\n"</string>
     <string name="send_button" msgid="4106860097497818751">"Bidali"</string>
@@ -52,18 +52,41 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Sarea desblokeatzeko eskatzen…"</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Sarea desblokeatzeko eskaerak ez du arrakastarik izan."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Sarea desblokeatu egin da."</string>
-    <string name="mobile_network_settings_not_available" msgid="7355254462995117896">"Erabiltzaile honek ez dauzka sare mugikorraren ezarpenak erabilgarri"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Erabiltzaile honek ez dauzka sare mugikorraren ezarpenak erabilgarri"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM deien ezarpenak"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"GSM deien ezarpenak (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA deien ezarpenak"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"CDMA deien ezarpenak (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Sarbide-puntuen izenak"</string>
     <string name="settings_label" msgid="3876743539816984008">"Sareko ezarpenak"</string>
-    <string name="connection_service" msgid="978745922583410219">"Konektatzeko erabili beharreko zerbitzua"</string>
-    <string name="connection_service_default_label" msgid="1498481943805913754">"Konektatzeko zerbitzu bateratua"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Deiak egiteko kontuak"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Egin deiak honekin:"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Egin SIP deiak honekin:"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Galdetu lehendabizi"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Ezarpenak"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Aukeratu kontuak"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Telefonoko kontuak"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Gehitu SIP kontua"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Konfiguratu kontuaren ezarpenak"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi bidezko deiak"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Ez erabili Wi-Fi bidezko deiak"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Ez erabili deiak egiteko laguntzailea"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Bat ere ez"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Deiak egiteko laguntzailea"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Erabili deiak egiteko laguntzailea"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Aukeratu deiak egiteko laguntzailea"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Kudeatu txartel honekin egindako deietarako erabili beharreko sareak:"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Utzi aplikazioei edo zerbitzuei deiak egiteko erabili beharreko sareak kudeatzen"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Konfiguratu"</string>
+    <string name="connection_service_default_label" msgid="1498481943805913754">"Konektatzeko zerbitzu integratua"</string>
     <string name="voicemail" msgid="8693759337917898954">"Erantzungailua"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Erantzungailua (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"Erantzungailua:"</string>
     <string name="networks" msgid="8873030692174541976">"Sare-operadoreak"</string>
-    <string name="call_settings" msgid="1630474923393095156">"Deien ezarpenak"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Larrialdietako igorpenak"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Deien ezarpenak"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Ezarpen gehigarriak"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Ezarpen gehigarriak (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="sum_gsm_call_settings" msgid="4076647190996778012">"GSM deietarako ezarpen gehigarriak"</string>
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"CDMA deien ezarpen gehigarriak"</string>
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"CDMA soilik motako deietarako ezarpen gehigarriak"</string>
@@ -77,29 +100,32 @@
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Deiak abian dauden bitartean, eman sarrerako deien berri"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Deiak abian dauden bitartean, eman sarrerako deien berri"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Dei-desbideratzeen ezarpenak"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Deiak desbideratzeko ezarpenak (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Dei-desbideratzea"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Desbideratu beti"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Erabili beti zenbaki hau"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Dei guztiak desbideratzen"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Dei guztiak <xliff:g id="PHONENUMBER">{0}</xliff:g> zenbakira desbideratzen"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Zenbakia ez dago eskuragarri"</string>
-    <string name="sum_cfu_disabled" msgid="3698472522160364904">"Desgaituta"</string>
-    <string name="labelCFB" msgid="218938523102207587">"Desbideratu telefonoa okupatuta dagoenean"</string>
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Desaktibatuta"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Okupatuta nagoenean"</string>
     <string name="messageCFB" msgid="3711089705936187129">"Okupatuta dagoenerako zenbakia"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"<xliff:g id="PHONENUMBER">{0}</xliff:g> zenbakira desbideratzen"</string>
-    <string name="sum_cfb_disabled" msgid="227440009979537651">"Desgaituta"</string>
+    <string name="sum_cfb_disabled" msgid="4913145177320506827">"Desaktibatuta"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Operadoreak ez du dei-desbideratzeak desgaitzea onartzen telefonoa okupatuta dagoen bitartean."</string>
-    <string name="labelCFNRy" msgid="3646316323834351390">"Desbideratu erantzunik ez dagoenean"</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"Erantzuten ez dudanean"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Erantzunik jasotzen ez denerako zenbakia"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"<xliff:g id="PHONENUMBER">{0}</xliff:g> zenbakira desbideratzen"</string>
-    <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Desgaituta"</string>
+    <string name="sum_cfnry_disabled" msgid="3884684060443538097">"Desaktibatuta"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Operadoreak ez du dei-desbideratzeak desgaitzea onartzen telefonoak erantzuten ez duenean."</string>
-    <string name="labelCFNRc" msgid="47183615370850000">"Desbideratu telefonoa eskuragarri ez dagoenean"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"Konektatu gabe nagoenean"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Eskuragarri ez dagoenerako zenbakia"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"<xliff:g id="PHONENUMBER">{0}</xliff:g> zenbakira desbideratzen"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Desgaituta"</string>
     <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Operadoreak ez du dei-desbideratzeak desgaitzea onartzen telefonoa eskuragarri ez dagoen bitartean."</string>
     <string name="updating_title" msgid="6146755386174019046">"Deien ezarpenak"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"Erabiltzaile nagusiak soilik alda ditzake deien ezarpenak."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Deien ezarpenak (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Deien ezarpenen errorea"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Ezarpenak irakurtzen…"</string>
     <string name="updating_settings" msgid="8171225533884883252">"Ezarpenak eguneratzen…"</string>
@@ -109,8 +135,8 @@
     <string name="fdn_check_failure" msgid="18200614306525434">"Telefonoa aplikazioaren Markatze finkoko zenbakiak ezarpena aktibatuta duzu. Ondorioz, deiekin lotutako eginbide batzuk ez dira funtzionatzen ari."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Ezarpenak ikusi aurretik, piztu irratia."</string>
     <string name="close_dialog" msgid="2365884406356986917">"Ados"</string>
-    <string name="enable" msgid="1059008390636773574">"Gaitu"</string>
-    <string name="disable" msgid="7274240979164762320">"Desgaitu"</string>
+    <string name="enable" msgid="7248657275000173526">"Aktibatu"</string>
+    <string name="disable" msgid="4678348128118573672">"Desaktibatu"</string>
     <string name="change_num" msgid="239476305819844391">"Eguneratu"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Sarearen balio lehenetsia"</item>
@@ -123,8 +149,8 @@
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Ezin izan dira desbideratze-zenbakiaren ezarpenak eskuratu eta gorde.\nHala ere, hornitzaile berrira aldatu nahi duzu?"</string>
     <string name="no_change" msgid="3186040086622435212">"Ez da aldaketarik egin."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Aukeratu erantzungailu-zerbitzua"</string>
-    <string name="voicemail_default" msgid="5902099213882352338">"Nire operadorea"</string>
-    <string name="mobile_networks" msgid="5540397602919106177">"Sare mugikorren ezarpenak"</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"Operadorea"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Sare mugikorraren ezarpenak"</string>
     <string name="label_available" msgid="1181658289009300430">"Sare erabilgarriak"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Bilatzen…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Ez da sarerik aurkitu."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Sare modu hobetsia: CDMA + LTE / EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Sare modu hobetsia: orokorra"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Sare modu hobetsia: LTE/WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Sareko modu hobetsia: LTE/GSM/UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Sare modu hobetsia: LTE/CDMA"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="7886739962255042385">"LTE/WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"GSM soilik"</item>
     <item msgid="3817924849415716259">"GSM/WCDMA hobetsita"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"4G LTE modu hobetua"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Erabili LTE zerbitzuak ahotsa eta bestelako komunikazioak hobetzeko (gomendatua)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Datuak gaituta"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Gaitu sare mugikorren bidezko datu-sarbidea"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Onartu datuak erabiltzea"</string>
     <string name="roaming" msgid="8871412572928323707">"Ibiltaritzako datuak"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Konektatu datu-zerbitzuetara ibiltaritzan"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Konektatu datu-zerbitzuetara ibiltaritzan"</string>
     <string name="roaming_reenable_message" msgid="8913735676127858115">"Datu-konexioa galdu duzu ibiltaritza desaktibatuta izanda etxeko saretik irten zarelako."</string>
-    <string name="roaming_warning" msgid="7820963598559553967">"Ibiltaritzako datuak baimendu nahi dituzu? Baliteke ibiltaritzak gastu handia sortzea!"</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"Baliteke kostu handiak ordaindu behar izatea."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Ibiltaritzako datuak baimendu nahi dituzu?"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"GSM/UMTS aukerak"</string>
     <string name="cdma_options" msgid="4016822858172249884">"CDMA aukerak"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Datuen erabilera"</string>
@@ -196,7 +227,7 @@
     <!-- no translation found for throttle_time_frame_subtext (7732763021560399960) -->
     <skip />
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"Datuak erabiltzeko muga gainditzen bada, datu-abiadura <xliff:g id="USED">%1$d</xliff:g> Kb/s izango da"</string>
-    <string name="throttle_help_subtext" msgid="5217706521499010816">"Informazio gehiago zure operadoreak sare mugikorretako datu-erabileraren inguruan dituen gidalerroei buruz"</string>
+    <string name="throttle_help_subtext" msgid="3633091498168446044">"Informazio gehiago zure operadoreak sare mugikorretako datu-erabileraren inguruan dituen gidalerroei buruz"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"Sare mugikor bidezko SMS igorpenak"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"Sare mugikor bidezko SMS igorpenak"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"Sare mugikor bidezko SMS igorpena gaituta"</string>
@@ -309,7 +340,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Konfiguratu datuen zerbitzua"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Operadorearen ezarpenak"</string>
     <string name="fdn" msgid="7878832555095183202">"Markatze finkoko zenbakiak"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Markatze finkoko zenbakiak (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FDN zerrenda"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"Markatze finkoko zenbakiak (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FDN aktibazioa"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Markatze finkoko zenbakiak gaituta daude"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Markatze finkoko zenbakiak desgaituta daude"</string>
@@ -327,6 +360,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Ezarri TTY modua"</string>
     <string name="auto_retry_mode_title" msgid="4073265511427813322">"Saiatu berriro automatikoki"</string>
     <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Gaitu automatikoki berriro saiatzeko modua"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"Ezin da aldatu TTY modua bideo-deiak abian direnean"</string>
     <string name="menu_add" msgid="1882023737425114762">"Gehitu kontaktua"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Editatu kontaktua"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Ezabatu kontaktua"</string>
@@ -350,7 +384,7 @@
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"SIM txarteletik irakurtzen…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Ez duzu kontakturik SIM txartelean."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Aukeratu inportatu beharreko kontaktuak"</string>
-    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"SIM txarteleko kontaktuak inportatzeko, Hegaldi modua desaktibatu behar duzu."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"SIM txarteleko kontaktuak inportatzeko, desaktibatu hegaldi modua."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Gaitu/Desgaitu SIM txartelaren PIN kodea"</string>
     <string name="change_pin" msgid="9174186126330785343">"Aldatu SIM txartelaren PIN kodea"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"SIM txartelaren PIN kodea:"</string>
@@ -360,42 +394,40 @@
     <string name="badPin" msgid="8955102849303984935">"Idatzi duzun PIN kode zaharra ez da zuzena. Saiatu berriro."</string>
     <string name="mismatchPin" msgid="5923253370683071889">"Idatzi dituzun PIN kodeak ez datoz bat. Saiatu berriro."</string>
     <string name="invalidPin" msgid="5981171102258684792">"Idatzi 4 eta 8 zenbaki arteko PIN kodea."</string>
-    <string name="disable_sim_pin" msgid="3992926931620188855">"Desgaitu SIM txartelaren PIN kodea"</string>
-    <string name="enable_sim_pin" msgid="5803702443844458831">"Gaitu SIM txartelaren PIN kodea"</string>
-    <string name="enable_in_progress" msgid="3695303775100109650">"Itxaron, mesedez…"</string>
-    <string name="enable_pin_ok" msgid="9166061915030865848">"SIM txartelaren PIN kodea gaituta."</string>
-    <string name="disable_pin_ok" msgid="5596999379593924850">"SIM txartelaren PIN kodea desgaituta."</string>
-    <string name="pin_failed" msgid="2298841192582192277">"Idatzi duzun PIN kodea ez da zuzena."</string>
-    <string name="pin_changed" msgid="4365538014588501049">"SIM txartelaren PIN kodea behar bezala aldatu da."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Pasahitza okerra da; PIN kodea blokeatu da! PUK kodea behar da."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"Garbitu SIM txartelaren PIN kodea"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"Ezarri SIM txartelaren PIN kodea"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"PIN kodea ezartzen…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN kodea ezarri da"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN kodea garbitu da"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN kodea ez da zuzena"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN kodea eguneratu da"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Pasahitza ez da zuzena. PIN kodea blokeatu egin da. PUK kodea behar da."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2 kodea"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"PIN2 kode zaharra"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"PIN2 berria"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Berretsi PIN2 kode berria"</string>
-    <string name="badPuk2" msgid="4851734468010000418">"Idatzi duzun PUK2 kode zaharra ez da zuzena. Saiatu berriro."</string>
-    <string name="badPin2" msgid="1041576234483629991">"Idatzi duzun PIN2 kode zaharra ez da zuzena. Saiatu berriro."</string>
-    <string name="mismatchPin2" msgid="523029155918113440">"Idatzi dituzun PIN2 kodeak ez datoz bat. Saiatu berriro."</string>
-    <string name="invalidPin2" msgid="8237110107480395938">"Idatzi 4 eta 8 zenbaki arteko PIN2 kodea."</string>
-    <string name="invalidPuk2" msgid="1290977391033057871">"Idatzi 4 eta 8 zenbaki arteko PUK2 kodea."</string>
-    <string name="pin2_changed" msgid="1639666438836544393">"PIN2 kodea behar bezala aldatu da."</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"Idatzi PUK2 kodea"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Pasahitza okerra da eta PIN2 kodea blokeatu da. Aldatu PIN2 kodea eta saiatu berriro."</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"Pasahitza okerra da; SIM txartela blokeatuta dago. PUK2 kodea behar da."</string>
+    <string name="badPuk2" msgid="7910064009531541708">"PUK2 kodea ez da zuzena. Saiatu berriro."</string>
+    <string name="badPin2" msgid="6646896629970023109">"PIN2 kode zaharra ez da zuzena. Saiatu berriro."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2 kodeak ez datoz bat. Saiatu berriro."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Idatzi 4-8 zenbakiko PIN2 kodea."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Idatzi 8 zenbakiko PUK2 kodea."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 kodea eguneratu da"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Idatzi PUK2 kodea"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Pasahitza ez da zuzena. PIN2 kodea blokeatu egin da. Berriro saiatzeko, aldatu PIN2 kodea."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Pasahitza ez da zuzena. SIM txartela blokeatu egin da. Idatzi PUK2 kodea."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 kodea betirako blokeatu da."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"<xliff:g id="NUMBER">%d</xliff:g> saiakera geratzen dira."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 kodea desblokeatuta"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"<xliff:g id="NUMBER">%d</xliff:g> saiakera gelditzen zaizkizu."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 kodea desblokeatu da"</string>
     <string name="doneButton" msgid="2859593360997984240">"Eginda"</string>
-    <string name="caller_manage_header" msgid="3231519674734638786">"Konferentzia-deiaren iraupena: <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Erantzungailuaren zenbakia"</string>
-    <string name="card_title_dialing" msgid="5769417478498348054">"Markatzen"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Berriro saiatzen"</string>
+    <string name="card_title_dialing" msgid="5769417478498348054">"Deitzen"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Berriro markatzen"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Konferentzia-deia"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Sarrerako deia"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Deia amaitu da"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"Zain"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Deia amaitzen"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Deia abian"</string>
-    <string name="card_title_my_phone_number" msgid="112428362494434191">"Nire zenbakia <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g> da"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Markatzen"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Dei galdua"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Dei galduak"</string>
@@ -413,25 +445,27 @@
     <string name="notification_action_end_call" msgid="6069460915123531620">"Amaitu deia"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Erantzun deiari"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Mezua"</string>
-    <string name="incall_error_power_off" msgid="6550191216405193368">"Dei bat egiteko, Hegaldi modua desaktibatu behar duzu."</string>
+    <string name="incall_error_power_off" msgid="2947938060513306698">"Deia egiteko, desaktibatu hegaldi modua."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Deia egiteko, desaktibatu hegaldi modua edo konektatu haririk gabeko sare batera."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Ez dago sarean erregistratuta."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Sare mugikorra ez dago erabilgarri."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Ez da deia bidali ez delako baliozko zenbakirik idatzi."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Ez da deia bidali."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Sare mugikorra ez dago erabilgarri."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Sare mugikorra ez dago erabilgarri. Deia egiteko, konektatu haririk gabeko sare batera."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Deitzeko, idatzi balio duen zenbaki bat."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Ezin da deitu."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI sekuentzia hasten…"</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Ez da zerbitzua onartzen."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Ezin da dei batetik bestera pasa."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Ezin da deia banandu."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Ezin da deia transferitu."</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Ez da zerbitzua onartzen"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Ezin da deiz aldatu."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Ezin da deia bereizi."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Ezin da transferitu."</string>
     <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Ezin da konferentzia-deirik egin."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Ezin da deia baztertu."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Ezin dira deiak askatu."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Interneteko deia"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Ezin da deia baztertu."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Ezin dira deiak bereizi."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Deia egiteko, konektatu haririk gabeko sare batera."</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Larrialdi-deia"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Irratia pizten…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Zerbitzu-eremutik kanpo; berriro saiatzen…"</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"Ez da deia bidali. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ez da larrialdietarako zenbaki bat!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Ez da deia bidali. Markatu larrialdietarako zenbaki bat!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Ez dago zerbitzurik. Berriro saiatzen…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Ezin da deitu. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ez da larrialdietarako zenbakia."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Ezin da deitu. Markatu larrialdietarako zenbakia."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Erabili teklatua markatzeko"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Utzi zain"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Amaitu"</string>
@@ -462,7 +496,8 @@
     <item msgid="899650777817315681">"Normala"</item>
     <item msgid="2883365539347850535">"Luzea"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Sareko mezua"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Sareko mezua"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Errore-mezua"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Aktibatu telefonoa"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Telefono-zerbitzua aktibatzeko, dei berezi bat egin behar da.\n\n\"Aktibatu\" sakatu ondoren, telefonoa aktibatzeko, entzun ematen zaizkizun argibideak."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Aktibatzen…"</string>
@@ -475,8 +510,8 @@
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Arazo bat gertatu da aktibazioarekin"</string>
     <string name="ota_listen" msgid="162923839877584937">"Jarraitu hitzezko argibideei aktibazioa osatu dela entzun arte."</string>
     <string name="ota_speaker" msgid="6904589278542719647">"Bozgorailua"</string>
-    <string name="ota_progress" msgid="3420314892609254729">"Itxaron telefonoa programatzen den bitartean."</string>
-    <string name="ota_failure" msgid="4311299546379674378">"Programazioak huts egin du"</string>
+    <string name="ota_progress" msgid="460876637828044519">"Telefonoa programatzen…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Ezin izan da programatu telefonoa"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Telefonoa aktibatu egin da. Zerbitzua hasteko 15 minutu ere behar izan daitezke."</string>
     <string name="ota_unsuccessful" msgid="8072141612635635357">"Ez duzu telefonoa aktibatu.\nBaliteke estaldura gehiago duen eremu bat aurkitu behar izatea (leiho baten ondoan edo kanpoan).\n\nSaiatu berriro edo, aukera gehiago ezagutzeko, deitu bezeroarentzako zerbitzura."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"SPC HUTSEGITE GEHIEGI"</string>
@@ -487,18 +522,18 @@
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Larrialdi-deiak soilik jasotzeko modua aktibatu da"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Larrialdi-deiak soilik jasotzeko modua"</string>
     <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Datu-konexioa desgaituta"</string>
-  <plurals name="phone_in_ecm_notification_time">
-    <item quantity="one" msgid="4866221796252472622">"Ez da datu-konexiorik egin <xliff:g id="COUNT">%s</xliff:g> minutuan"</item>
-    <item quantity="other" msgid="3122217344579273583">"Ez da datu-konexiorik egin <xliff:g id="COUNT">%s</xliff:g> minutuan"</item>
-  </plurals>
-  <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="8060210887681426682">"Telefonoa Larrialdi-deiak soilik jasotzeko moduan egongo da <xliff:g id="COUNT">%s</xliff:g> minutuz. Modu horretan dagoen bitartean, ezingo duzu datu-konexioa behar duen aplikaziorik erabili. Irten nahi duzu?"</item>
-    <item quantity="other" msgid="8617116564023933114">"Telefonoa Larrialdi-deiak soilik jasotzeko moduan egongo da <xliff:g id="COUNT">%s</xliff:g> minutuz. Modu horretan dagoen bitartean, ezingo duzu datu-konexioa behar duen aplikaziorik erabili. Irten nahi duzu?"</item>
-  </plurals>
-  <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="2585506997024726599">"Hautatutako ekintza ez dago Larrialdi-deiak soilik jasotzeko moduan erabilgarri. Telefonoa <xliff:g id="COUNT">%s</xliff:g> minutuz egongo da modu horretan. Irten nahi duzu?"</item>
-    <item quantity="other" msgid="6115622137771382224">"Hautatutako ekintza ez dago Larrialdi-deiak soilik jasotzeko moduan erabilgarri. Telefonoa <xliff:g id="COUNT">%s</xliff:g> minutuz egongo da modu horretan. Irten nahi duzu?"</item>
-  </plurals>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other">Ez da datu-konexiorik egin <xliff:g id="COUNT_1">%s</xliff:g> minututan</item>
+      <item quantity="one">Ez da datu-konexiorik egin <xliff:g id="COUNT_0">%s</xliff:g> minutuan</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other">Telefonoa larrialdi-deiak soilik jasotzeko moduan egongo da <xliff:g id="COUNT_1">%s</xliff:g> minutuz. Modu horretan dagoen bitartean, ezingo duzu datu-konexioa behar duen aplikaziorik erabili. Irten nahi duzu?</item>
+      <item quantity="one">Telefonoa larrialdi-deiak soilik jasotzeko moduan egongo da <xliff:g id="COUNT_0">%s</xliff:g> minutuz. Modu horretan dagoen bitartean, ezingo duzu datu-konexioa behar duen aplikaziorik erabili. Irten nahi duzu?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other">Hautatutako ekintza ez dago larrialdi-deiak soilik jasotzeko moduan erabilgarri. Telefonoa <xliff:g id="COUNT_1">%s</xliff:g> minutuz egongo da modu horretan. Irten nahi duzu?</item>
+      <item quantity="one">Hautatutako ekintza ez dago larrialdi-deiak soilik jasotzeko moduan erabilgarri. Telefonoa <xliff:g id="COUNT_0">%s</xliff:g> minutuz egongo da modu horretan. Irten nahi duzu?</item>
+    </plurals>
     <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"Hautatutako ekintza ez dago erabilgarri larrialdi-deia egiten ari den bitartean."</string>
     <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Larrialdi-deiak soilik jasotzeko modutik irteten"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Bai"</string>
@@ -512,110 +547,23 @@
     <string name="contactPhoto" msgid="4713193418046639466">"kontaktuaren argazkia"</string>
     <string name="goPrivate" msgid="865837794424530980">"bihurtu pribatu"</string>
     <string name="selectContact" msgid="781975788478987237">"hautatu kontaktua"</string>
-    <string name="sip_settings" msgid="6699045718560859691">"Internet bidezko deien ezarpenak"</string>
-    <string name="sip_accounts" msgid="2097054001288457163">"Internet bidez deitzeko (SIP) kontuak"</string>
-    <string name="sip_accounts_title" msgid="1212889069281054570">"Kontuak"</string>
-    <string name="sip_receive_calls" msgid="5635685570889971559">"Jaso sarrerako deiak"</string>
-    <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Bateriaren iraupena murrizten du"</string>
-    <string name="sip_call_options_title" msgid="27433718808839672">"Erabili Internet bidezko deiak"</string>
-    <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Erabili Internet bidezko deiak (Wi-Fi soilik)"</string>
-    <string name="sip_call_options_entry_1" msgid="6556668894178520760">"Dei guztietan datu-sarea erabilgarri dagoenean"</string>
-    <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Internet bidezko deietan soilik"</string>
-    <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Galdetu deitzen den bakoitzean"</string>
-    <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"Dei guztietan"</string>
-    <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Egin deia"</string>
-    <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"Erabili Internet bidez deitzeko kontua:"</string>
-    <string name="remember_my_choice" msgid="7058059586169290705">"Erabili beti Internet bidezko deiak egiteko"</string>
-    <string name="reset_my_choice_hint" msgid="5523030209803567922">"Internet bidezko deiak egiteko kontu lehenetsia alda dezakezu Telefonoa &gt; Ezarpenak &gt; Internet bidezko deien ezarpenak &gt; Kontuak atalean."</string>
-    <string name="pstn_phone" msgid="8782554491484326429">"Telefono mugikorra"</string>
-    <string name="internet_phone" msgid="1147922660195095810">"Interneteko deia"</string>
-    <string name="no_sip_account_found_title" msgid="6266249392379373628">"Ez dago Internet bidez deitzeko konturik"</string>
-    <string name="no_sip_account_found" msgid="724325811961769997">"Ez dago Internet bidez deitzeko konturik telefono honetan. Kontu bat gehitu nahi duzu?"</string>
-    <string name="sip_menu_add" msgid="8757508498518881500">"Gehitu"</string>
-    <string name="add_sip_account" msgid="5904858426290097611">"Gehitu kontua"</string>
-    <string name="remove_sip_account" msgid="7645900420385682570">"Kendu kontua"</string>
-    <string name="sip_account_list" msgid="5480058210652194306">"SIP kontuak"</string>
-    <string name="saving_account" msgid="52903398217017954">"Kontua gordetzen…"</string>
-    <string name="removing_account" msgid="7183999896088628100">"Kontua kentzen…"</string>
-    <string name="sip_menu_save" msgid="5842531129356014943">"Gorde"</string>
-    <string name="sip_menu_discard" msgid="524075892158789701">"Baztertu"</string>
-    <string name="alert_dialog_close" msgid="7759635137627626235">"Itxi profila"</string>
-    <string name="alert_dialog_ok" msgid="3580379406983564080">"Ados"</string>
-    <string name="close_profile" msgid="6886968271423155284">"Itxi"</string>
-    <string name="primary_account_summary_with" msgid="1633960536212343187">"Kontu nagusia. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
-    <string name="registration_status_checking_status" msgid="3381868307694056727">"Egoera egiaztatzen…"</string>
-    <string name="registration_status_registering" msgid="4288401139400232968">"Erregistratzen…"</string>
-    <string name="registration_status_still_trying" msgid="3185581992666091911">"Oraindik saiatzen…"</string>
-    <string name="registration_status_not_receiving" msgid="4185572774980557758">"Ez da deirik jasotzen."</string>
-    <string name="registration_status_no_data" msgid="4901476962360656611">"Kontu-erregistratzea gelditu da ez dagoelako Interneteko konexiorik."</string>
-    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"Kontu-erregistratzea gelditu da ez dagoelako Wi-Fi konexiorik."</string>
-    <string name="registration_status_not_running" msgid="4824867184446232131">"Ez da kontua erregistratu."</string>
-    <string name="registration_status_done" msgid="884630717456439280">"Deiak jaso daitezke."</string>
-    <string name="registration_status_failed_try_later" msgid="5214474354451220581">"Ez da kontua erregistratu: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>). Geroago saiatuko gara berriro."</string>
-    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"Ez da kontua erregistratu: erabiltzaile-izena edota pasahitza ez dira zuzenak."</string>
-    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"Ez da kontua erregistratu: egiaztatu zerbitzari-izena."</string>
-    <string name="third_party_account_summary" msgid="2532526738862533028">"Une honetan, <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> jabearen aplikazioa erabiltzen ari da kontua."</string>
-    <string name="sip_edit_title" msgid="489288416435014385">"SIP kontuaren xehetasunak"</string>
-    <string name="sip_edit_new_title" msgid="3659149255856520385">"SIP kontuaren xehetasunak"</string>
-    <string name="domain_address_title" msgid="9071787581316160480">"Zerbitzaria"</string>
-    <string name="username_title" msgid="2479375923477682328">"Erabiltzaile-izena"</string>
-    <string name="password_title" msgid="3323555249068171531">"Pasahitza"</string>
-    <string name="display_name_title" msgid="2459768196312249937">"Bistaratzeko izena"</string>
-    <string name="proxy_address_title" msgid="4828301345351614273">"Irteerako proxyaren helbidea"</string>
-    <string name="port_title" msgid="5952939408078626657">"Ataka-zenbakia"</string>
-    <string name="transport_title" msgid="8253139511847746640">"Garraio mota"</string>
-    <string name="send_keepalive_title" msgid="7533342573918645113">"Bidali konexioa mantentzeko mezua"</string>
-    <string name="set_primary_title" msgid="5351892327447571451">"Ezarri kontu nagusi gisa"</string>
-    <string name="set_primary_summary" msgid="2219064654523258577">"Irteerako deiak egiteko erabiltzen da"</string>
-    <string name="advanced_settings" msgid="8350631795335495338">"Aukerako ezarpenak"</string>
-    <string name="auth_username_title" msgid="851473016307947120">"Autentifikatzeko erabiltzaile-izena"</string>
-    <string name="auth_username_summary" msgid="6782012405225938629">"Autentifikatzeko erabili den erabiltzaile-izena"</string>
-    <string name="default_preference_summary" msgid="868766740121667450">"&lt;Ezarri gabe&gt;"</string>
-    <string name="display_name_summary" msgid="8636377460518225523">"&lt;Erabiltzaile-izenaren berdina&gt;"</string>
-    <string name="optional_summary" msgid="1464058793789832411">"&lt;Aukerakoa&gt;"</string>
-    <string name="advanced_settings_show" msgid="4668880308290857597">"▷ Guztiak erakusteko, ukitu"</string>
-    <string name="advanced_settings_hide" msgid="217398292824758079">"▽ Guztiak ezkutatzeko, ukitu"</string>
-    <string name="empty_alert" msgid="6839103946505432390">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> beharrezkoa da eta ezin da hutsik utzi."</string>
-    <string name="not_a_valid_port" msgid="4796149266434630292">"Ataka-zenbakiak 1000 eta 65534 artean egon beharko luke."</string>
-    <string name="no_internet_available_title" msgid="3327109242858406165">"Ez duzu Interneteko konexiorik"</string>
-    <string name="no_wifi_available_title" msgid="747881033089378758">"Ez dago Wi-Fi konexiorik"</string>
-    <string name="no_internet_available" msgid="7877142631803238549">"Internet bidezko dei bat egin aurretik Interneteko konexioa egiaztatu behar duzu."</string>
-    <string name="no_wifi_available" msgid="1225073547318465713">"Internet bidezko deiak egiteko, Wi-Fi sare batera konektatuta egon behar duzu (erabili Hari gabekoak eta sarea ataleko ezarpenak)."</string>
-    <string name="no_voip" msgid="8901474054537199865">"Ez dira Internet bidezko deiak onartzen"</string>
-    <string name="sip_system_decide" msgid="368030746310423471">"Automatikoa"</string>
-    <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Bidali beti"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Ez dira ahots-deiak onartzen"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Erantzun bizkorrak"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"bat"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"bi"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"hiru"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"lau"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"bost"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"sei"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"zazpi"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"zortzi"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"bederatzi"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"izarra"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"zero"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"libra"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"markatu"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"atzera tekla"</string>
-    <string name="description_target_answer" msgid="7205604197797472471">"Erantzun"</string>
-    <string name="description_target_send_sms" msgid="2098326025587950144">"Bidali SMS mezua"</string>
-    <string name="description_target_decline" msgid="4789834364389731957">"Baztertu"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Egin dar-dar"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Egin dar-dar"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Soinua"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Soinu lehenetsia (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_title" msgid="6374978286202084684">"Telefonoaren tonua"</string>
-    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Egin dar-dar tonua jotzean"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Markagailuaren ukipen-tonuak"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Osatu markagailua automatikoki"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Tonua eta dardara"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Deia Wi-Fi bidez egin nahi duzu?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Bai"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"Ez"</string>
-    <string name="pstn_connection_service_label" msgid="1743245930577325900">"SIM txartel barneratuak"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Internet bidezko dei bateratuak"</string>
+    <string name="pstn_connection_service_label" msgid="1743245930577325900">"SIM txartel integratuak"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Aktibatu bideo-deiak"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Bideo-deiak aktibatzeko, 4G LTE modu hobetua aktibatu behar duzu \"Sarearen ezarpenak\" atalean."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Sareko ezarpenak"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Itxi"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Larrialdi-deiak"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Larrialdi-deiak soilik"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM txartela, <xliff:g id="SLOT_ID">%s</xliff:g> erretena"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Erabilerraztasuna"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Sarrerako Wi-Fi deia"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi deia"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Irekitzeko, ukitu berriro"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"Errore bat gertatu mezua deskodetzean."</string>
 </resources>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
new file mode 100644
index 0000000..c02b706
--- /dev/null
+++ b/res/values-fa/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"سراسری"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"۱۰"</item>
+    <item msgid="6103348346295810336">"۸"</item>
+    <item msgid="3494519853214024879">"۹"</item>
+  </string-array>
+</resources>
diff --git a/res/values-fa/config.xml b/res/values-fa/config.xml
deleted file mode 100644
index ed45a3c..0000000
--- a/res/values-fa/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"نادرست"</string>
-</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index ce28570..6e2c40e 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -16,14 +16,14 @@
 
 <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="tablet" msgid="1107073389495104784">"داده سلولی"</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">"‏لیست FDN"</string>
     <string name="unknown" msgid="6878797917991465859">"ناشناس"</string>
     <string name="private_num" msgid="6713286113000232309">"شماره خصوصی"</string>
-    <string name="payphone" msgid="1931775086311769314">"تلفن سکه ای"</string>
+    <string name="payphone" msgid="4793877574636445118">"تلفن عمومی"</string>
     <string name="onHold" msgid="9035493194749959955">"در انتظار"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"‏کد MMI راه‌اندازی شد"</string>
     <string name="ussdRunning" msgid="485588686340541690">"‏در حال اجرای کد USSD..."</string>
@@ -52,18 +52,41 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"در حال درخواست بازگشایی قفل شبکه..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"درخواست قفل گشایی شبکه ناموفق بود."</string>
     <string name="unlock_success" msgid="6770085622238180152">"قفل گشایی شبکه با موفقیت انجام شد."</string>
-    <string name="mobile_network_settings_not_available" msgid="7355254462995117896">"تنظیمات شبکه دستگاه همراه برای این کاربر در دسترس نیست"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"تنظیمات شبکه تلفن همراه برای این کاربر در دسترس نیست"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"‏تنظیمات تماس GSM"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"‏تنظیمات تماس GSM (‏<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"‏تنظیمات تماس CDMA"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"‏تنظیمات تماس CDMA (‏<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"نام‌های نقاط دسترسی"</string>
     <string name="settings_label" msgid="3876743539816984008">"تنظیمات شبکه"</string>
-    <string name="connection_service" msgid="978745922583410219">"سرویس اتصال موردنظر برای استفاده"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"حساب‌های تماس"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"برقراری تماس‌ها با"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"‏برقراری تماس‌های SIP با"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"ابتدا سؤال شود"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"تنظیمات"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"انتخاب حساب‌ها"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"حساب‌های تلفن"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"‏افزودن حساب SIP"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"پیکربندی تنظیمات حساب"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"‏تماس از طریق Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"‏از تماس از طریق Wi-Fi استفاده نشود"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"از دستیار تماس استفاده نشود"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"هیچ‌کدام"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"دستیار تماس"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"استفاده از دستیار تماس"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"انتخاب دستیار تماس"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"مدیریت شبکه‌های مورد استفاده برای تماس‌ با"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"به برنامه‌ها یا سرویس‌ها اجازه داده شود شبکه‌های مورد استفاده برای تماس‌ها را مدیریت کنند"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"پیکربندی"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"سرویس اتصال داخلی"</string>
     <string name="voicemail" msgid="8693759337917898954">"پست صوتی"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"پست صوتی (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
     <string name="networks" msgid="8873030692174541976">"اپراتورهای شبکه"</string>
-    <string name="call_settings" msgid="1630474923393095156">"تنظیمات تماس"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"پخش هشدارهای اضطراری"</string>
+    <string name="call_settings" msgid="6112441768261754562">"تنظیمات تماس"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"تنظیمات دیگر"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"تنظیمات اضافی (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
@@ -77,29 +100,32 @@
     <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="call_forwarding_settings_with_label" msgid="8569489414006897127">"تنظیمات هدایت تماس (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="sum_cfu_disabled" msgid="8384177689501334080">"خاموش"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"هنگامی که مشغول است"</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="sum_cfb_disabled" msgid="4913145177320506827">"خاموش"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"اپراتور شمااز غیرفعال کردن هدایت تماس هنگامی که تلفن شما مشغول است، پشتیبانی نمی‌کند."</string>
-    <string name="labelCFNRy" msgid="3646316323834351390">"هدایت هنگام عدم پاسخگویی"</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"هنگامی که پاسخ داده نمی‌شود"</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="sum_cfnry_disabled" msgid="3884684060443538097">"خاموش"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"اپراتور شما از غیر فعال کردن هدایت تماس هنگامی که تلفن شما پاسخ نمی‌دهد، پشتیبانی نمی‌کند."</string>
-    <string name="labelCFNRc" msgid="47183615370850000">"هدایت هنگام عدم دسترسی"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"هنگامی که در دسترس نیست"</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="5646361343094064333">"شرکت مخابراتی شما از غیرفعال کردن هدایت تماس هنگامی که تلفن شما در دسترس نیست پشتیبانی نمی‌کند."</string>
     <string name="updating_title" msgid="6146755386174019046">"تنظیمات تماس"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"فقط کاربر اصلی می‌تواند تنظیمات تماس را تغییر دهد."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"تنظیمات تماس (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"خطای تنظیمات تماس"</string>
     <string name="reading_settings" msgid="1920291699287055284">"در حال خواندن تنظیمات..."</string>
     <string name="updating_settings" msgid="8171225533884883252">"در حال به‌روزرسانی تنظیمات..."</string>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"روشن کردن"</string>
+    <string name="disable" msgid="4678348128118573672">"خاموش کردن"</string>
     <string name="change_num" msgid="239476305819844391">"به‌روزرسانی"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"پیش‌فرض شبکه"</item>
@@ -123,8 +149,8 @@
     <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="voicemail_default" msgid="2001233554889016880">"شرکت مخابراتی شما"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"تنظیمات شبکه تلفن همراه"</string>
     <string name="label_available" msgid="1181658289009300430">"شبکه‌های موجود"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"در حال جستجو…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"شبکه‌ای یافت نشد."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"‏حالت شبکه برگزیده: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"حالت شبکه برگزیده: سراسری"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"‏حالت شبکه برگزیده: LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"‏حالت شبکه برگزیده: LTE / GSM / UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"‏حالت شبکه برگزیده: LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="7886739962255042385">"LTE / WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"‏فقط GSM"</item>
     <item msgid="3817924849415716259">"‏GSM/WCDMA برگزیده"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"‏حالت پیشرفته 4G LTE"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"‏استفاده از سرویس‌های LTE جهت بهبود ارتباطات صوتی و سایر ارتباطات (توصیه می‌شود)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"داده‌ها فعال شدند"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"فعال کردن دسترسی داده از طریق شبکهٔ تلفن همراه"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"اجازه استفاده از داده"</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="8913735676127858115">"اتصال داده خود را از دست داده‌اید، زیرا از شبکه اصلی خود خارج شدید و رومینگ داده خاموش است،"</string>
-    <string name="roaming_warning" msgid="7820963598559553967">"رومینگ داده مجاز است؟ ممکن است هزینه‌های رومینگ زیادی برای شما در بر داشته باشد!"</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"شاید هزینه زیادی برای شما داشته باشد."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"رومینگ داده مجاز است؟"</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>
@@ -190,7 +221,7 @@
     <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> کیلو بیت در ثانیه کاهش یافت"</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> کیلو بیت در ثانیه کاهش می‌یابد."</string>
-    <string name="throttle_help_subtext" msgid="5217706521499010816">"اطلاعات بیشتر درباره خط مشی استفاده از داده شبکهٔ تلفن همراه شرکت مخابراتی شما"</string>
+    <string name="throttle_help_subtext" msgid="3633091498168446044">"اطلاعات بیشتر درباره خط‌مشی استفاده از داده شبکه تلفن همراه شرکت مخابراتی شما"</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>
@@ -303,7 +334,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"راه‌اندازی سرویس داده"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"تنظیمات شرکت مخابراتی"</string>
     <string name="fdn" msgid="7878832555095183202">"شماره‌های شماره گیری ثابت"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"شماره‌های شماره‌گیری ثابت (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"‏لیست FDN"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"‏لیست FDN (‏<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"‏فعال کردن FDN"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"شماره‌های شماره گیری ثابت فعال هستند"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"شماره‌های شماره گیری ثابت غیر فعال هستند"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"‏تنظیم حالت TTY"</string>
     <string name="auto_retry_mode_title" msgid="4073265511427813322">"سعی مجدد خودکار"</string>
     <string name="auto_retry_mode_summary" msgid="4973886004067532288">"فعال کردن حالت سعی مجدد خودکار"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"‏تغییر حالت TTY در طول تماس ویدیویی مجاز نیست"</string>
     <string name="menu_add" msgid="1882023737425114762">"افزودن مخاطب"</string>
     <string name="menu_edit" msgid="7143003705504672374">"ویرایش مخاطب"</string>
     <string name="menu_delete" msgid="3977150783449642851">"حذف مخاطب"</string>
@@ -344,7 +378,7 @@
     <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="1846161429087789936">"برای وارد کردن مخاطبین از سیم کارت، ابتدا حالت هواپیما را خاموش کنید."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"برای وارد کردن مخاطبین از سیم کارت، حالت هواپیما را خاموش کنید."</string>
     <string name="enable_pin" msgid="5422767284133234860">"فعال کردن/غیر فعال کردن پین سیم"</string>
     <string name="change_pin" msgid="9174186126330785343">"تغییر پین سیم"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"پین سیم:"</string>
@@ -354,42 +388,40 @@
     <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="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="1796577128488773946">"‏گذرواژه نادرست است، پین مسدود شد! PUK مورد نیاز است."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"پاک کردن پین سیم‌کارت"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"تنظیم پین سیم‌کارت"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"در حال تنظیم پین..."</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"پین تنظیم شد"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"پین پاک شد"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"پین نادرست است"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"پین به‌روزرسانی شد"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"‏گذرواژه نادرست است. اکنون پین مسدود شده است. PUK درخواست شده است."</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="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="1639666438836544393">"پین 2 با موفقیت تغییر کرد."</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"‏تایپ کد PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"گذرواژه نادرست بود، پین ۲ مسدود شد. لطفاً پین ۲ را تغییر دهید و دوباره امتحان کنید!"</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"‏گذرواژه نادرست است، سیم کارت قفل شد. PUK2 مورد نیاز است."</string>
+    <string name="badPuk2" msgid="7910064009531541708">"‏PUK2 نادرست است. دوباره امتحان کنید."</string>
+    <string name="badPin2" msgid="6646896629970023109">"‏PIN2 قدیمی نادرست است. دوباره امتحان کنید."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"‏دو PIN2 وارد شده مطابقت ندارند. دوباره امتحان کنید."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"‏یک PIN2 وارد کنید که ۴ تا ۸ رقم دارد."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"‏یک PUK2 وارد کنید که ۸ رقم دارد."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"‏PIN2 به‌روزرسانی شد"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"‏کد PUK2 را وارد کنید"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"‏گذرواژه نادرست است. اکنون PIN2 مسدود شده است. برای امتحان مجدد، PIN 2 را تغییر دهید."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"‏گذرواژه نادرست است. اکنون سیم‌کارت قفل شده است. PUK2 را وارد کنید."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"‏PUK2 به صورت دائمی مسدود شده است."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"<xliff:g id="NUMBER">%d</xliff:g> بار دیگر می‌توانید تلاش کنید."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"قفل پین ۲ گشوده شد!"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"<xliff:g id="NUMBER">%d</xliff:g> تلاش باقی‌مانده دارید."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"‏PIN2 دیگر مسدود نیست"</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_redialing" msgid="8253487008234167266">"در حال شماره‌گیری مجدد"</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_dialing" msgid="2107666444937350731">"شماره‌گیری"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"تماس بی پاسخ"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"تماس‌های بی پاسخ"</string>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"برای برقراری تماس، حالت پرواز را خاموش کنید."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"برای برقرای تماس، حالت پرواز را خاموش کنید یا به شبکه بی‌سیم وصل شوید."</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_error_out_of_service" msgid="4100065333878929223">"شبکه تلفن همراه در دسترس نیست."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"شبکه همراه در دسترس نیست. برای برقراری تماس به یک شبکه بی‌سیم وصل شوید."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"برای برقراری تماس، یک شماره معتبر وارد کنید."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"نمی‌توانید تماس بگیرید."</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_unknown" msgid="655570339115407698">"سرویس پشتیبانی نمی‌شود"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"نمی‌توانید بین تماس‌ها جابجا شوید."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"نمی‌توانید تماس را جدا کنید."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"نمی‌توانید انتقال دهید."</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="incall_error_supp_service_reject" msgid="8998568661508655638">"نمی‌توانید تماس را رد کنید."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"نمی‌توانید تماس(ها) را آزاد کنید."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"برای برقراری تماس، به یک شبکه بی‌سیم وصل شوید"</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="7969515493359619960">"تماس ارسال نشد. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> یک شماره اضطراری نیست!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"تماس ارسال نشد، لطفاً یک شماره اضطراری را شماره‌گیری کنید!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"سرویسی در دسترس نیست. دوباره امتحان کنید..."</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"نمی‌توانید تماس بگیرید. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> یک شماره اضطراری نیست."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"نمی توانید تماس بگیرید. یک شماره اضطراری را شماره‌گیری کنید."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"استفاده از صفحه‌کلید برای شماره گیری"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"نگهداشت"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"پایان"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"معمولی"</item>
     <item msgid="2883365539347850535">"طولانی"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"پیام شبکه"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"پیام شبکه"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"پیام خطا"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"فعال کردن گوشی خود"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"برای فعال کردن سرویس گوشی خود، باید یک تماس ویژه برقرار کنید. \n\nبعد از فشردن \"فعال سازی\"، به دستورالعمل‌های ارائه شده جهت فعال کردن گوشی، گوش کنید."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"درحال فعال‌سازی…"</string>
@@ -469,8 +504,8 @@
     <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="3420314892609254729">"هنگام برنامه‌ریزی تلفن خود، منتظر بمانید."</string>
-    <string name="ota_failure" msgid="4311299546379674378">"برنامه‌ریزی ناموفق"</string>
+    <string name="ota_progress" msgid="460876637828044519">"در حال برنامه‌ریزی تلفن شما..."</string>
+    <string name="ota_failure" msgid="7713756181204620397">"تلفن شما برنامه‌ریزی نشد"</string>
     <string name="ota_successful" msgid="1880780692887077407">"گوشی شما در حال حاضر فعال است. راه‌اندازی سرویس ممکن است ۱۵ دقیقه طول بکشد."</string>
     <string name="ota_unsuccessful" msgid="8072141612635635357">"تلفن شما فعال نشد. \nممکن است لازم باشد منطقه‌ای با پوشش بهتر (در نزدیکی پنجره، یا خارج از ساختمان) پیدا کنید. \n\nدوباره امتحان کنید یا برای اطلاع از گزینه‌های بیشتر، با سرویس مشتری تماس بگیرید."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"‏خطاهای SPC بسیار زیاد"</string>
@@ -481,18 +516,18 @@
     <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="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="2585506997024726599">"عملکرد انتخاب شده در حالت پاسخ به تماس اضطراری در دسترس نیست. تلفن مدت <xliff:g id="COUNT">%s</xliff:g> دقیقه در این حالت است. آیا می‌خواهید اکنون خارج شوید؟"</item>
-    <item quantity="other" msgid="6115622137771382224">"عمل انتخاب شده در حالت پاسخ به تماس اضطراری در دسترس نیست. تلفن مدت <xliff:g id="COUNT">%s</xliff:g> دقیقه در این حالت باقی می‌ماند. آیا می‌خواهید اکنون خارج شوید؟"</item>
-  </plurals>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="one">هیچ اتصال داده‌ای برای <xliff:g id="COUNT_1">%s</xliff:g> دقیقه موجود نیست</item>
+      <item quantity="other">هیچ اتصال داده‌ای برای <xliff:g id="COUNT_1">%s</xliff:g> دقیقه موجود نیست</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="one">تلفن برای <xliff:g id="COUNT_1">%s</xliff:g> دقیقه در حالت تماس اضطراری خواهد بود. در این حالت برنامه‌ای که از اتصال داده استفاده می‌کند، نمی‌تواند استفاده شود. می‌خواهید اکنون خارج شوید؟</item>
+      <item quantity="other">تلفن برای <xliff:g id="COUNT_1">%s</xliff:g> دقیقه در حالت تماس اضطراری خواهد بود. در این حالت برنامه‌ای که از اتصال داده استفاده می‌کند، نمی‌تواند استفاده شود. می‌خواهید اکنون خارج شوید؟</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="one">اقدام انتخاب شده در حالت تماس اضطراری در دسترس نیست. این تلفن برای <xliff:g id="COUNT_1">%s</xliff:g> دقیقه در این حالت خواهد بود. می‌خواهید اکنون خارج شوید؟</item>
+      <item quantity="other">اقدام انتخاب شده در حالت تماس اضطراری در دسترس نیست. این تلفن برای <xliff:g id="COUNT_1">%s</xliff:g> دقیقه در این حالت خواهد بود. می‌خواهید اکنون خارج شوید؟</item>
+    </plurals>
     <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>
@@ -506,110 +541,23 @@
     <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="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="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="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_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="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="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>
-    <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">"‏&lt;تنظیم نشده&gt;"</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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"تماس صوتی پشتیبانی نمی‌شود"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"پاسخ‌های سریع"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></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="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 name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"صدا"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"صدای پیش‌فرض (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</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="dial_pad_autocomplete" msgid="494525952035761075">"تکمیل خودکار صفحه شماره‌گیری"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"آهنگ‌ زنگ و لرزش"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"‏از Wi-Fi برای برقراری تماس استفاده شود؟"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"بله"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"خیر"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"سیم‌کارت‌های داخلی"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"تماس اینترنتی داخلی"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"روشن کردن تماس ویدیویی"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"‏برای روشن کردن تماس ویدیویی، باید حالت پیشرفته 4G LTE را در تنظیمات شبکه فعال کنید."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"تنظیمات شبکه"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"بستن"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"تماس‌های اضطراری"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"فقط تماس‌های اضطراری"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"سیم‌کارت، شکاف: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"دسترس‌پذیری"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"‏تماس Wi-Fi ورودی"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"‏تماس Wi-Fi"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"لمس دوباره برای باز کردن"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"هنگام رمزگشایی پیام، خطایی روی داد."</string>
 </resources>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
new file mode 100644
index 0000000..3b1ce12
--- /dev/null
+++ b/res/values-fi/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Maailmanlaajuinen"</item>
+    <item msgid="6753774959494729275">"LTE/CDMA"</item>
+    <item msgid="8658695584186942227">"LTE/GSM/UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-fi/config.xml b/res/values-fi/config.xml
deleted file mode 100644
index 84902fa..0000000
--- a/res/values-fi/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"epätosi"</string>
-</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 019682d..c86a742 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -16,14 +16,14 @@
 
 <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">"Tiedonsiirto"</string>
+    <string name="phoneAppLabel" product="tablet" msgid="1107073389495104784">"Mobiilidata"</string>
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Puhelin"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Hätäpuhelut"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Puhelin"</string>
     <string name="fdnListLabel" msgid="8630418672279521003">"Sallittujen numeroiden luettelo"</string>
     <string name="unknown" msgid="6878797917991465859">"Tuntematon"</string>
     <string name="private_num" msgid="6713286113000232309">"Salainen numero"</string>
-    <string name="payphone" msgid="1931775086311769314">"Puhelinautomaatti"</string>
+    <string name="payphone" msgid="4793877574636445118">"Maksupuhelin"</string>
     <string name="onHold" msgid="9035493194749959955">"Pidossa"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI-koodi aloitettu"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD-koodi käytössä..."</string>
@@ -52,18 +52,41 @@
     <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="mobile_network_settings_not_available" msgid="7355254462995117896">"Mobiiliverkkoasetukset eivät ole käytettävissä tälle käyttäjälle"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Tämä käyttäjä ei saa muuttaa matkapuhelinverkon asetuksia"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM-puheluasetukset"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"GSM-puheluasetukset (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA-puheluasetukset"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"CDMA-puheluasetukset (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Tukiasemien nimet"</string>
     <string name="settings_label" msgid="3876743539816984008">"Verkkoasetukset"</string>
-    <string name="connection_service" msgid="978745922583410219">"Käytettävä yhteyspalvelu"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Puhelutilit"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Puheluiden soittaminen:"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"SIP-puheluiden soittaminen:"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Kysy ensin"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Asetukset"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Valitse tilit"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Puhelintilit"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Lisää SIP-tili"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Tiliasetusten määrittäminen"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi-puhelut"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Älä käytä puheluihin Wi-Fiä"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Älä käytä puheluapuria"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Ei mitään"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Puheluapuri"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Käytä puheluapuria"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Valitse puheluapuri"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Käytä puheluverkkojen hallinnointiin:"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Salli sovellusten tai palveluiden hallinnoida puheluihin käytettyjä verkkoja"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Asetukset"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Oletusyhteyspalvelu"</string>
     <string name="voicemail" msgid="8693759337917898954">"Vastaaja"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Puhelinvastaaja (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"Vast.:"</string>
     <string name="networks" msgid="8873030692174541976">"Verkko-operaattorit"</string>
-    <string name="call_settings" msgid="1630474923393095156">"Puheluasetukset"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Hätätilalähetykset"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Puheluasetukset"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Lisäasetukset"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Lisäasetukset (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Vain GSM -puhelujen lisäasetukset"</string>
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"CDMA-puhelujen lisäasetukset"</string>
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Vain CDMA -puhelujen lisäasetukset"</string>
@@ -77,29 +100,32 @@
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Ilmoita puhelun aikana saapuvista puheluista"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Ilmoita puhelun aikana saapuvista puheluista"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Soitonsiirtoasetukset"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Soitonsiirtoasetukset (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Soitonsiirto"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Siirrä aina"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Käytä aina tätä numeroa"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Kaikki puhelut siirretään"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Siirretään kaikki puhelut numeroon <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Numeroon ei saada yhteyttä"</string>
-    <string name="sum_cfu_disabled" msgid="3698472522160364904">"Pois käytöstä"</string>
-    <string name="labelCFB" msgid="218938523102207587">"Siirrä puhelu numeron ollessa varattu"</string>
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Ei käytössä"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Kun olen varattu"</string>
     <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="sum_cfb_disabled" msgid="4913145177320506827">"Ei käytössä"</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="labelCFNRy" msgid="1736067178393744351">"Kun en 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="sum_cfnry_disabled" msgid="3884684060443538097">"Ei käytössä"</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="labelCFNRc" msgid="2614827454402079766">"Kun en ole tavoitettavissa"</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="5646361343094064333">"Operaattorisi ei tue soitonsiirtojen poistamista käytöstä puhelimesi ollessa saavuttamattomissa."</string>
     <string name="updating_title" msgid="6146755386174019046">"Puheluasetukset"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"Vain ensisijainen käyttäjä voi muuttaa puheluasetuksia."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Puheluasetukset (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Virhe puheluasetuksissa"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Luetaan asetuksia…"</string>
     <string name="updating_settings" msgid="8171225533884883252">"Päivitetään asetuksia..."</string>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"Ota käyttöön"</string>
+    <string name="disable" msgid="4678348128118573672">"Poista käytöstä"</string>
     <string name="change_num" msgid="239476305819844391">"Päivitä"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Verkon oletus"</item>
@@ -123,8 +149,8 @@
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Nykyisten soitonsiirtonumeroasetuksien noutaminen ja tallentaminen epäonnistui.\nHaluatko 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>
-    <string name="voicemail_default" msgid="5902099213882352338">"Oma operaattori"</string>
-    <string name="mobile_networks" msgid="5540397602919106177">"Mobiiliverkkoasetukset"</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"Operaattorisi"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Matkapuhelinverkon asetukset"</string>
     <string name="label_available" msgid="1181658289009300430">"Käytettävissä olevat verkot"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Haetaan…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Ei verkkoja."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Ensisijainen verkkotila: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Ensisijainen verkkotila: Maailmanlaajuinen"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Ensisijainen verkkotila: LTE/WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Ensisijainen verkkotila: LTE/GSM/UMTS"</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="7886739962255042385">"LTE/WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,16 +199,19 @@
     <item msgid="1524224863879435516">"Vain GSM"</item>
     <item msgid="3817924849415716259">"Ensisijaisesti GSM/WCDMA"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Enhanced 4G LTE -tila"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Käytä LTE-palveluita puheviestinnän ja muiden viestintätapojen parantamiseen (suositeltu)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Datayhteys käytössä"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Ota mobiiliverkon tiedonsiirto käyttöön"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Salli tiedonsiirto"</string>
     <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="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="roaming_warning" msgid="1603164667540144353">"Siitä voi aiheutua huomattavia kuluja."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Sallitaanko tiedonsiirto roaming-tilassa?"</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_data_usage" msgid="3715677828160555808">"Datan käyttö"</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>
@@ -194,7 +225,7 @@
     <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"<xliff:g id="USED_0">%1$s</xliff:g> enimmäismäärä ylitetty\nTiedonsiirtonopeus vähennetty nopeuteen<xliff:g id="USED_1">%2$d</xliff:g> kt/s"</string>
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"<xliff:g id="USED_0">%1$d</xliff:g>٪ kierrosta valmis\nSeuraava 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="throttle_help_subtext" msgid="3633091498168446044">"Lisätietoja operaattorisi mobiilitiedonsiirtokäytännöstä"</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>
@@ -307,7 +338,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Määritä tiedonsiirtopalvelu"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Operaattorin asetukset"</string>
     <string name="fdn" msgid="7878832555095183202">"Sallitut numerot"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Sallitut numerot (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Sallittujen numeroiden luettelo"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"Sallittujen numeroiden luettelo (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Sallittujen numeroiden käyttöönotto"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Sallitut numerot ovat käytössä"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Sallitut numerot ovat pois käytöstä"</string>
@@ -325,6 +358,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Aseta TTY-tila"</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="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"TTY-tilan muutoksia ei sallita videopuhelun aikana."</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>
@@ -348,7 +382,7 @@
     <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="1846161429087789936">"Poista lentokonetila käytöstä, niin voit tuoda yhteystietoja SIM-kortilta."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Poista lentokonetila käytöstä, jos haluat 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>
@@ -358,42 +392,40 @@
     <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="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="1796577128488773946">"Virheellinen salasana, PIN-koodi estetty! Pyydetään PUK-koodia."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"Tyhjennä SIM-kortin PIN-koodi"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"Aseta SIM-kortin PIN-koodi"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"Asetetaan PIN-koodia…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN-koodi asetettiin"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN-koodi tyhjennetty"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"Virheellinen PIN-koodi"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN-koodi päivitetty"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Virheellinen salasana. PIN-koodi on estetty. PUK-koodi on pyydetty."</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="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="1639666438836544393">"PIN2-koodi vaihdettu."</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"Anna PUK2-koodi"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Virheellinen salasana, PIN2-koodi estetty. Vaihda PIN2-koodi ja yritä uudelleen."</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"Virheellinen salasana, SIM-kortti lukittu. PUK2-koodi tarvitaan."</string>
+    <string name="badPuk2" msgid="7910064009531541708">"Virheellinen PUK2-koodi. Yritä uudelleen."</string>
+    <string name="badPin2" msgid="6646896629970023109">"Virheellinen vanha PIN2-koodi. Yritä uudelleen."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2-koodit eivät täsmää. Yritä uudelleen."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Anna PIN2-koodi, joka on 4–8 numeroa."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Anna PUK2-koodi, joka on 8 numeroa."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2-koodi päivitetty"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Anna PUK2-koodi"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Virheellinen salasana. PIN2-koodi on nyt estetty. Yritä uudelleen vaihtamalla PIN2-koodi."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Virheellinen salasana. SIM-kortti on lukittu. Anna PUK2-koodi."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2-koodi on pysyvästi estetty."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Sinulla on <xliff:g id="NUMBER">%d</xliff:g> yritystä jäljellä."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2-koodin esto kumottu!"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"<xliff:g id="NUMBER">%d</xliff:g> yritystä jäljellä."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2-koodi ei ole enää estetty"</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="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_redialing" msgid="8253487008234167266">"Soitetaan 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_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>
     <string name="card_title_in_call" msgid="6346543933068225205">"Puhelun aikana"</string>
-    <string name="card_title_my_phone_number" msgid="112428362494434191">"Numeroni on <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Soitetaan"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Vastaamatta jäänyt puhelu"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Vastaamattomat puhelut"</string>
@@ -411,25 +443,27 @@
     <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_power_off" msgid="2947938060513306698">"Poista lentokonetila käytöstä, jos haluat soittaa puhelun."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Poista lentokonetila käytöstä tai yhdistä langattomaan verkkoon, jos haluat soittaa puhelun."</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_error_out_of_service" msgid="4100065333878929223">"Matkapuhelinverkko ei ole käytettävissä."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Matkapuhelinverkko ei ole käytettävissä. Yhdistä langattomaan verkkoon, jos haluat soittaa puhelun."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Soita antamalla kelvollinen numero."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Puhelua ei voi soittaa."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Aloitetaan MMI-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>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Puhelun siirtäminen epäonnistui."</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Palvelua ei tueta"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Puhelua ei voi vaihtaa."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Puhelua ei voi erottaa."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Puhelua ei voi siirtää."</string>
     <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Puhelujen yhdistäminen epäonnistui."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Puhelun hylkääminen epäonnistui."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Puhelujen suorittaminen epäonnistui."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Internetpuhelu"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Puhelua ei voi hylätä."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Puheluja ei voi vapauttaa."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Yhdistä langattomaan verkkoon, jos haluat soittaa puhelun."</string>
     <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="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="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Ei yhteyttä. Yritetään uudelleen…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Puhelua ei voi soittaa. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ei ole hätänumero."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Puhelua ei voi soittaa. Valitse hätänumero."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Valitse numero näppäimistöstä"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Pitoon"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Loppu"</string>
@@ -460,21 +494,22 @@
     <item msgid="899650777817315681">"Normaali"</item>
     <item msgid="2883365539347850535">"Pitkä"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Verkkoviesti"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Verkkoviesti"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Virheilmoitus"</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\nPaina Aktivoi ja aktivoi puhelimesi kuulemiesi ohjeiden avulla."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Aktivoidaan…"</string>
     <string name="ota_hfa_activation_dialog_message" msgid="8092479227918463415">"Puhelimen mobiilitiedonsiirtopalvelua aktivoidaan.\n\nAktivointi voi kestää viisi minuuttia."</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_message" msgid="2440770373498870550">"Jos ohitat aktivoinnin, et voi soittaa puheluita etkä muodostaa verkkoyhteyttä (voit tosin muodostaa yhteyden Wi-Fi-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_activate" msgid="1368528132525626264">"Aktivoi"</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_speaker" msgid="6904589278542719647">"Kaiutin"</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_progress" msgid="460876637828044519">"Ohjelmoidaan puhelintasi…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Puhelinta ei voi ohjelmoida"</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="8072141612635635357">"Puhelimesi aktivoiminen epäonnistui.\nSuosittelemme siirtymään alueelle, jolla signaali on vahvempi (ikkunan lähelle tai ulos).\n\nYritä uudelleen tai pyydä lisäohjeita asiakaspalvelusta."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"EXCESS SPC -VIRHEET"</string>
@@ -485,18 +520,18 @@
     <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>
     <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Verkkoyhteys pois käytöstä"</string>
-  <plurals name="phone_in_ecm_notification_time">
-    <item quantity="one" msgid="4866221796252472622">"Ei verkkoyhteyttä <xliff:g id="COUNT">%s</xliff:g> minuuttiin"</item>
-    <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="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="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>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other">Ei verkkoyhteyttä <xliff:g id="COUNT_1">%s</xliff:g> minuuttiin</item>
+      <item quantity="one">Ei verkkoyhteyttä <xliff:g id="COUNT_0">%s</xliff:g> minuuttiin</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other">Puhelin siirtyy hätäpuhelujen takaisinsoittotilaan <xliff:g id="COUNT_1">%s</xliff:g> minuutin ajaksi. Et voi käyttää verkkoyhteyttä hyödyntäviä sovelluksia tänä aikana. Haluatko poistua nyt?</item>
+      <item quantity="one">Puhelin siirtyy hätäpuhelujen takaisinsoittotilaan <xliff:g id="COUNT_0">%s</xliff:g> minuutin ajaksi. Et voi käyttää verkkoyhteyttä hyödyntäviä sovelluksia tänä aikana. Haluatko poistua nyt?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other">Valittua toimintoa ei voi käyttää, kun puhelin on hätäpuhelujen takaisinsoittotilassa. Puhelin on takaisinsoittotilassa <xliff:g id="COUNT_1">%s</xliff:g> minuutin ajan. Haluatko poistua nyt?</item>
+      <item quantity="one">Valittua toimintoa ei voi käyttää, kun puhelin on hätäpuhelujen takaisinsoittotilassa. Puhelin on takaisinsoittotilassa <xliff:g id="COUNT_0">%s</xliff:g> minuutin ajan. Haluatko poistua nyt?</item>
+    </plurals>
     <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>
@@ -510,110 +545,23 @@
     <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_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_title" msgid="27433718808839672">"Käytä internetpuheluita"</string>
-    <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Käytä internetpuheluita (vain Wi-Fi)"</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="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="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="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="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_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="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="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>
-    <string name="username_title" msgid="2479375923477682328">"Käyttäjänimi"</string>
-    <string name="password_title" msgid="3323555249068171531">"Salasana"</string>
-    <string name="display_name_title" msgid="2459768196312249937">"Näyttönimi"</string>
-    <string name="proxy_address_title" msgid="4828301345351614273">"Lähettävän välityspalvelimen osoite"</string>
-    <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="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>
-    <string name="auth_username_title" msgid="851473016307947120">"Vahvistuksen käyttäjänimi"</string>
-    <string name="auth_username_summary" msgid="6782012405225938629">"Käyttäjänimeä käytetään vahvistamiseen"</string>
-    <string name="default_preference_summary" msgid="868766740121667450">"&lt;Ei asetettu&gt;"</string>
-    <string name="display_name_summary" msgid="8636377460518225523">"&lt;Sama kuin käyttäjänimi&gt;"</string>
-    <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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"Äänipuheluita ei tueta"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Pikavastaukset"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"yksi"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"kaksi"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"kolme"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"neljä"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"viisi"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"kuusi"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"seitsemän"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"kahdeksan"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"yhdeksän"</string>
-    <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_dial_button" msgid="7459705245418435351">"soita"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"askelpalautin"</string>
-    <string name="description_target_answer" msgid="7205604197797472471">"Vastaa"</string>
-    <string name="description_target_send_sms" msgid="2098326025587950144">"Lähetä tekstiviesti"</string>
-    <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="2609519527849101590">"Ääni"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Oletusääni (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_title" msgid="6374978286202084684">"Puhelimen soittoääni"</string>
-    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Käytä värinää"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Valintanäppäimien näppäinäänet"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Näppäimistön automaattinen täydennys"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Soittoääni ja värinä"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Soitetaanko Wi-Fi-puhelu?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Kyllä"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"Ei"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Sisäiset SIM-kortit"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Internetpuheluiden SIP-yhteys"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Ota videopuhelut käyttöön"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Jos haluat ottaa videopuhelut käyttöön, sinun on otettava käyttöön Enhanced 4G LTE -tila verkkoasetuksissa."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Verkkoasetukset"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Sulje"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Hätäpuhelut"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Vain hätäpuhelut"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM-kortti, paikka: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Esteettömyys"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Saapuva Wi-Fi-puhelu"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi-puhelu"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Avaa koskettamalla uudelleen."</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"Virhe purettaessa viestiä."</string>
 </resources>
diff --git a/res/values-fr-rCA/arrays.xml b/res/values-fr-rCA/arrays.xml
new file mode 100644
index 0000000..ca760e8
--- /dev/null
+++ b/res/values-fr-rCA/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"International"</item>
+    <item msgid="6753774959494729275">"LTE/CDMA"</item>
+    <item msgid="8658695584186942227">"LTE/GSM/UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-fr-rCA/config.xml b/res/values-fr-rCA/config.xml
deleted file mode 100644
index 0750a67..0000000
--- a/res/values-fr-rCA/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"faux"</string>
-</resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 7f65449..ae16a04 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -16,14 +16,14 @@
 
 <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">"Données mobiles"</string>
+    <string name="phoneAppLabel" product="tablet" msgid="1107073389495104784">"Données cellulaires"</string>
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Téléphone"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Appels d\'urgence"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Téléphone"</string>
     <string name="fdnListLabel" msgid="8630418672279521003">"Liste de numéros autorisés"</string>
     <string name="unknown" msgid="6878797917991465859">"Inconnu"</string>
     <string name="private_num" msgid="6713286113000232309">"Numéro privé"</string>
-    <string name="payphone" msgid="1931775086311769314">"Cabine téléphonique"</string>
+    <string name="payphone" msgid="4793877574636445118">"Cabine téléphonique"</string>
     <string name="onHold" msgid="9035493194749959955">"En attente"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Le code IHM a été lancé."</string>
     <string name="ussdRunning" msgid="485588686340541690">"Exécution du code USSD..."</string>
@@ -52,18 +52,41 @@
     <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 été débloqué."</string>
-    <string name="mobile_network_settings_not_available" msgid="7355254462995117896">"Les paramètres de réseau cellulaire ne sont pas accessibles pour cet utilisateur"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Les paramètres de réseau cellulaire ne sont pas accessibles pour cet utilisateur"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Paramètres d\'appel GSM"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"Paramètres d\'appel GSM (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Paramètres d\'appel CDMA"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"Paramètres d\'appel CDMA (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="connection_service" msgid="978745922583410219">"Service de connexion à utiliser"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Comptes d\'appel"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Faire les appels avec"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Faire les appels SIP avec"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Demander d\'abord"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Paramètres"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Sélectionner des comptes"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Comptes du téléphone"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Ajouter un compte SIP"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Configurer les paramètres du compte"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Appels Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Ne pas utiliser les appels par Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Ne pas utiliser l\'assistant d\'appel"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Aucun"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Assistant d\'appel"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Utiliser un assistant d\'appel"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Sélectionner un assistant d\'appel"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Gérer les réseaux utilisés pour les appels avec"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Laisser les applications ou les services gérer les réseaux utilisés pour les appels"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Configurer"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Service de connexion intégré"</string>
     <string name="voicemail" msgid="8693759337917898954">"Messagerie vocale"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Messagerie vocale (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"MV :"</string>
     <string name="networks" msgid="8873030692174541976">"Opérateur de réseau"</string>
-    <string name="call_settings" msgid="1630474923393095156">"Paramètres d\'appel"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Diffusions d\'urgence"</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="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Paramètres supplémentaires (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Autres paramètres d\'appel \"GSM uniquement\""</string>
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Autres paramètres d\'appel CDMA"</string>
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Autres paramètres d\'appel \"CDMA uniquement\""</string>
@@ -77,29 +100,32 @@
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Me signaler les appels entrants lorsque je suis en communication"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Me signaler les appels entrants lorsque je suis en communication"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Paramètres de transfert d\'appel"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Paramètres du transfert d\'appel (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Transfert d\'appel"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Toujours transférer"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Toujours utiliser ce numéro"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Transfert de tous les appels"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Transfert de tous les appels vers <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Le numéro est indisponible."</string>
-    <string name="sum_cfu_disabled" msgid="3698472522160364904">"Désactivé"</string>
-    <string name="labelCFB" msgid="218938523102207587">"Transférer si ligne occupée"</string>
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Désactivé"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Si occupé"</string>
     <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="sum_cfb_disabled" msgid="4913145177320506827">"Désactivé"</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érer si sans réponse"</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"Si pas de 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="sum_cfnry_disabled" msgid="3884684060443538097">"Désactivé"</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="labelCFNRc" msgid="2614827454402079766">"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="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="call_settings_primary_user_only" msgid="5679923943740900965">"Seul l\'utilisateur principal peut modifier les paramètres d\'appel."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Paramètres d\'appel (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
     <string name="updating_settings" msgid="8171225533884883252">"Mise à jour des paramètres en cours…"</string>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"Activer"</string>
+    <string name="disable" msgid="4678348128118573672">"Désactiver"</string>
     <string name="change_num" msgid="239476305819844391">"Mettre à jour"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Réseau par défaut"</item>
@@ -123,8 +149,8 @@
     <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.\nVoulez-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>
-    <string name="voicemail_default" msgid="5902099213882352338">"Mon opérateur"</string>
-    <string name="mobile_networks" msgid="5540397602919106177">"Paramètres du réseau mobile"</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"Votre fournisseur de services"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Paramètres des réseaux cellulaires"</string>
     <string name="label_available" msgid="1181658289009300430">"Réseaux disponibles"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Recherche en cours…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Aucun réseau trouvé"</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Mode réseau préféré : CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Mode réseau préféré : général"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Mode réseau préféré : LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Modes réseaux préférés : LTE/GSM/UMTS"</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="7886739962255042385">"LTE/WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"GSM uniquement"</item>
     <item msgid="3817924849415716259">"GSM/WCDMA de préférence"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Mode LTE 4G avancé"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Utiliser services LTE pour améliorer communications vocales et autres (recommandé)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Données activées"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Activer l\'accès aux données sur le réseau mobile"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Autoriser l\'utilisation des données"</string>
     <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="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="roaming_warning" msgid="1603164667540144353">"Des frais importants peuvent s\'appliquer."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Autoriser les données en itinérance?"</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">"Utilisation des données"</string>
@@ -194,7 +225,7 @@
     <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"<xliff:g id="USED_0">%1$s</xliff:g> maximum dépassé\nTaux de transfert des données réduit à <xliff:g id="USED_1">%2$d</xliff:g> Ko/s"</string>
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"<xliff:g id="USED_0">%1$d</xliff:g> % du cycle écoulé.\nLa 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="throttle_help_subtext" msgid="3633091498168446044">"En savoir plus les politiques de votre fournisseur de services concernant l\'utilisation des données sur son réseau cellulaire"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"Diffusion cellulaire par SMS"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"Diffusion cellulaire par SMS"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"Option \"Diffusion cellulaire par SMS\" activée"</string>
@@ -307,7 +338,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Configurer le service de données"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Param. fourn. de services"</string>
     <string name="fdn" msgid="7878832555095183202">"Numéros autorisés"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Numéros autorisés (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Liste de numéros autorisés"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"Liste de numéros autorisés (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Activation des numéros autorisés"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"La liste de numéros autorisés est activée."</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"La liste des numéros autorisés est désactivée."</string>
@@ -325,6 +358,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Définir le mode TTY"</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="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"Le changement de mode ATS n\'est pas autorisé pendant les appels vidéo"</string>
     <string name="menu_add" msgid="1882023737425114762">"Ajouter un contact"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Modifier un contact"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Supprimer le contact"</string>
@@ -348,7 +382,7 @@
     <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="1846161429087789936">"Pour importer des contacts depuis la carte SIM, désactivez tout d\'abord le mode Avion."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Désactivez le mode Avion pour importer des contacts de la carte SIM."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Activer/désactiver le NIP de la carte SIM"</string>
     <string name="change_pin" msgid="9174186126330785343">"Modifier le NIP de la carte SIM"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"NIP de la carte SIM :"</string>
@@ -358,42 +392,40 @@
     <string name="badPin" msgid="8955102849303984935">"L\'ancien NIP saisi est incorrect. Veuillez réessayer."</string>
     <string name="mismatchPin" msgid="5923253370683071889">"Les NIP saisis ne correspondent pas. Veuillez réessayer."</string>
     <string name="invalidPin" msgid="5981171102258684792">"Veuillez saisir un NIP comprenant entre quatre et huit chiffres."</string>
-    <string name="disable_sim_pin" msgid="3992926931620188855">"Désactiver le NIP de la carte SIM"</string>
-    <string name="enable_sim_pin" msgid="5803702443844458831">"Activer le NIP de la carte SIM"</string>
-    <string name="enable_in_progress" msgid="3695303775100109650">"Veuillez patienter…"</string>
-    <string name="enable_pin_ok" msgid="9166061915030865848">"NIP de la carte SIM activé."</string>
-    <string name="disable_pin_ok" msgid="5596999379593924850">"NIP de la carte SIM désactivé."</string>
-    <string name="pin_failed" msgid="2298841192582192277">"Le NIP saisi est incorrect."</string>
-    <string name="pin_changed" msgid="4365538014588501049">"Modification du NIP de la carte SIM réussie."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Mot de passe incorrect. Le NIP est bloqué. Le code PUK est nécessaire."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"Effacer le NIP de la carte SIM"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"Définir le NIP de la carte SIM"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"Création du NIP en cours..."</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"NIP créé"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"Le NIP a été effacé"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"NIP incorrect"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"Le NIP a été mis à jour"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Le mot de passe est erroné. Le NIP a été verrouillé. Veuillez entrer le code PUK."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"NIP2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Ancien NIP2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Nouveau NIP2"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Confirmer le nouveau NIP2"</string>
-    <string name="badPuk2" msgid="4851734468010000418">"La clé PUK2 saisie est incorrecte. Veuillez réessayer."</string>
-    <string name="badPin2" msgid="1041576234483629991">"L\'ancien NIP2 saisi est incorrect. Veuillez réessayer."</string>
-    <string name="mismatchPin2" msgid="523029155918113440">"Les NIP2 saisis ne correspondent pas. Veuillez réessayer."</string>
-    <string name="invalidPin2" msgid="8237110107480395938">"Saisissez un NIP2 comprenant 4 à 8 chiffres."</string>
-    <string name="invalidPuk2" msgid="1290977391033057871">"Saisissez une clé PUK2 à 8 chiffres."</string>
-    <string name="pin2_changed" msgid="1639666438836544393">"Modification du NIP2 réussie."</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"Saisissez la clé PUK2."</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Le mot de passe est incorrect. Le NIP2 est bloqué. Veuillez modifier le NIP2, puis réessayer."</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"Mot de passe incorrect. Carte SIM verrouillée. Clé PUK2 requise."</string>
+    <string name="badPuk2" msgid="7910064009531541708">"Code PUK2 erroné. Veuillez réessayer."</string>
+    <string name="badPin2" msgid="6646896629970023109">"Ancien NIP2 erroné. Veuillez réessayer."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"Les NIP2 ne correspondent pas. Veuillez réessayer."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Entrez un NIP2 de 4 à 8 chiffres."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Entrez un code PUK2 de 8 chiffres."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"Le NIP2 a été mis à jour"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Entrez le code PUK2"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Mot de passe erroné. Le NIP2 est maintenant bloqué. Pour réessayer, veuillez changer le NIP2."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Le mot de passe est erroné. La carte SIM a été verrouillée. Entrez  le code PUK2."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"Le code PUK2 est bloqué définitivement."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Il vous reste <xliff:g id="NUMBER">%d</xliff:g> tentatives."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"NIP2 débloqué"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"Il vous reste <xliff:g id="NUMBER">%d</xliff:g> tentatives."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"Le NIP2 n\'est plus bloqué."</string>
     <string name="doneButton" msgid="2859593360997984240">"Terminé"</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="voicemail_settings_number_label" msgid="8524164258691887790">"N° messagerie vocale"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Numérotation en cours…"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Nouvelle tentative en cours…"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Recomposition en cours..."</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_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 d\'appel"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Appel en cours"</string>
-    <string name="card_title_my_phone_number" msgid="112428362494434191">"Mon numéro est le <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Numérotation en cours…"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Appel manqué"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Appels manqués"</string>
@@ -411,25 +443,27 @@
     <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ésactiver le mode Avion avant de passer un appel."</string>
+    <string name="incall_error_power_off" msgid="2947938060513306698">"Désactivez le mode Avion pour faire un appel."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Désactivez le mode Avion ou connectez-vous à un réseau Wi-Fi pour faire 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 pour 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_error_out_of_service" msgid="4100065333878929223">"Réseau cellulaire non disponible."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Le réseau cellulaire n\'est pas accessible. Connectez-vous à un réseau Wi-Fi pour faire un appel."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Pour faire un appel, entrez un numéro valide."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Impossible d\'appeler."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Lancement de la séquence IHM..."</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 basculer entre les appels."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Impossible de dissocier l\'appel."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Impossible de transférer l\'appel."</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Service non pris en charge"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Impossible de faire des appels."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Impossible de séparer les appels."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Impossible de transférer."</string>
     <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Impossible d\'effectuer des conférences téléphoniques."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Impossible de refuser l\'appel."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Impossible de raccrocher le ou les appel(s)."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Appel Internet"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Impossible de refuser l\'appel."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Impossible de libérer l\'appel ou les appels."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Connectez-vous à un réseau Wi-Fi pour faire un appel."</string>
     <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="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="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Aucun service. Nouvel essai en cours..."</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Appel impossible. <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="9130194953830414638">"Appel impossible. Composez un numéro d\'urgence."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Utilisez le clavier pour composer un numéro."</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Attente"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Terminé"</string>
@@ -460,7 +494,8 @@
     <item msgid="899650777817315681">"Normale"</item>
     <item msgid="2883365539347850535">"Longues"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Message réseau"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"message réseau"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Message d\'erreur"</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\nAprès avoir appuyé sur \"Activer\", écoutez les instructions qui vous permettront d\'activer votre téléphone."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Activation en cours…"</string>
@@ -473,8 +508,8 @@
     <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_speaker" msgid="6904589278542719647">"Haut-parleur"</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_progress" msgid="460876637828044519">"Programmation de votre téléphone en cours…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Impossible de programmer votre téléphone"</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 le démarrage du service."</string>
     <string name="ota_unsuccessful" msgid="8072141612635635357">"Votre téléphone n\'a pas pu être activé. \nIl 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\nVeuillez réessayer ou appeler le service à la clientèle pour plus d\'options."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"NOMBRE EXCESSIF D\'ÉCHECS SPC"</string>
@@ -485,18 +520,18 @@
     <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>
     <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Connexion des données désactivée"</string>
-  <plurals name="phone_in_ecm_notification_time">
-    <item quantity="one" msgid="4866221796252472622">"Aucune connexion à Internet pendant <xliff:g id="COUNT">%s</xliff:g> minute"</item>
-    <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="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="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>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="one">Aucune connexion de données pendant <xliff:g id="COUNT_1">%s</xliff:g> minute</item>
+      <item quantity="other">Aucune connexion de données pendant <xliff:g id="COUNT_1">%s</xliff:g> minutes</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="one">Le téléphone sera en mode de rappel d\'urgence pendant <xliff:g id="COUNT_1">%s</xliff:g> minute.  Lorsque ce mode est activé, vous ne pouvez pas utiliser d\'applications nécessitant une connexion à Internet. Voulez-vous quitter l\'écran maintenant?</item>
+      <item quantity="other"> Le téléphone sera en mode de rappel d\'urgence pendant <xliff:g id="COUNT_1">%s</xliff:g> minutes. Lorsque ce mode est activé, vous ne pouvez pas utiliser d\'applications nécessitant une connexion à Internet. Voulez-vous quitter l\'écran maintenant?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="one">L\'action sélectionnée n\'est pas disponible lorsque le mode de rappel d\'urgence est activé. Ce mode restera activé sur ce téléphone pendant <xliff:g id="COUNT_1">%s</xliff:g> minute. Voulez-vous quitter l\'écran maintenant?</item>
+      <item quantity="other">L\'action sélectionnée n\'est pas disponible lorsque le mode de rappel d\'urgence est activé. Ce mode restera activé sur ce téléphone pendant <xliff:g id="COUNT_1">%s</xliff:g> minutes. Voulez-vous quitter l\'écran maintenant?</item>
+    </plurals>
     <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>
@@ -510,110 +545,23 @@
     <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_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_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">"Uniquement 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="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="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 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="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="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">"Annuler"</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_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="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 plus tard."</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">"Détails 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>
-    <string name="username_title" msgid="2479375923477682328">"Nom d\'utilisateur"</string>
-    <string name="password_title" msgid="3323555249068171531">"Mot de passe"</string>
-    <string name="display_name_title" msgid="2459768196312249937">"Nom affiché"</string>
-    <string name="proxy_address_title" msgid="4828301345351614273">"Adresse de serveur mandataire sortant"</string>
-    <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="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>
-    <string name="auth_username_title" msgid="851473016307947120">"Nom d\'utilisateur d\'authentification"</string>
-    <string name="auth_username_summary" msgid="6782012405225938629">"Nom d\'utilisateur utilisé pour l\'authentification"</string>
-    <string name="default_preference_summary" msgid="868766740121667450">"&lt;Non défini&gt;"</string>
-    <string name="display_name_summary" msgid="8636377460518225523">"&lt;Identique au nom d\'utilisateur&gt;"</string>
-    <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="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">"Aucune connexion Internet"</string>
-    <string name="no_wifi_available_title" msgid="747881033089378758">"Aucune connexion Wi-Fi"</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>
     <string name="not_voice_capable" msgid="2739898841461577811">"Appels vocaux non pris en charge"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Réponses rapides"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"une"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"deux"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"trois"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"quatre"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"cinq"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"six"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"sept"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"huit"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"neuf"</string>
-    <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_dial_button" msgid="7459705245418435351">"composer"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"retour arrière"</string>
-    <string name="description_target_answer" msgid="7205604197797472471">"Répondre"</string>
-    <string name="description_target_send_sms" msgid="2098326025587950144">"Envoyer un message texte"</string>
-    <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="2609519527849101590">"Son"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Sonnerie par défaut (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <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. sonne"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Numérotation sonore"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Saisie semi-auto pour clavier numérique"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Sonnerie et vibreur"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Utiliser le Wi-Fi pour faire l\'appel?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Oui"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"Non"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Cartes SIM intégrées"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Fonctionnalité d\'appel par Internet intégrée"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Activer les appels vidéo"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Pour activer les appels vidéo, vous devez activer le mode LTE 4G avancé dans les paramètres réseau."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Paramètres des réseaux"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Fermer"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Appels d\'urgence"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Appels d\'urgence seulement"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"Carte SIM, fente : <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Accessibilité"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Appel Wi-Fi entrant"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Appel Wi-Fi"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Touchez à nouveau pour ouvrir"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"Une erreur s\'est produite lors du décodage du message."</string>
 </resources>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
new file mode 100644
index 0000000..ca760e8
--- /dev/null
+++ b/res/values-fr/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"International"</item>
+    <item msgid="6753774959494729275">"LTE/CDMA"</item>
+    <item msgid="8658695584186942227">"LTE/GSM/UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-fr/config.xml b/res/values-fr/config.xml
deleted file mode 100644
index 0750a67..0000000
--- a/res/values-fr/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"faux"</string>
-</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index c7a01c2..5ddde48 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -16,14 +16,14 @@
 
 <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">"Données mobiles"</string>
+    <string name="phoneAppLabel" product="tablet" msgid="1107073389495104784">"Données mobiles"</string>
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Téléphone"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Appels d\'urgence"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Téléphone"</string>
     <string name="fdnListLabel" msgid="8630418672279521003">"Liste de numéros autorisés"</string>
     <string name="unknown" msgid="6878797917991465859">"Inconnu"</string>
     <string name="private_num" msgid="6713286113000232309">"Numéro privé"</string>
-    <string name="payphone" msgid="1931775086311769314">"Cabine téléphonique"</string>
+    <string name="payphone" msgid="4793877574636445118">"Cabine téléphonique"</string>
     <string name="onHold" msgid="9035493194749959955">"En attente"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Le code IHM a été lancé."</string>
     <string name="ussdRunning" msgid="485588686340541690">"Exécution du code USSD..."</string>
@@ -52,18 +52,41 @@
     <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="mobile_network_settings_not_available" msgid="7355254462995117896">"Les paramètres des réseaux mobiles ne sont pas disponibles pour cet utilisateur."</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Les paramètres des réseaux mobiles ne sont pas disponibles pour cet utilisateur."</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Paramètres d\'appel GSM"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"Paramètres d\'appel GSM (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Paramètres d\'appel CDMA"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"Paramètres d\'appel CDMA (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="connection_service" msgid="978745922583410219">"Service de connexion à utiliser"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Comptes téléphoniques"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Passer les appels avec"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Passer les appels SIP avec"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Demander d\'abord"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Paramètres"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Sélectionner des comptes"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Comptes téléphone"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Ajouter un compte SIP"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Configurer les paramètres du compte"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Appels Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Ne pas utiliser les appels Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Ne pas utiliser l\'assistant d\'appel"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Aucun"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Assistant d\'appel"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Utiliser un assistant d\'appel"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Sélectionner un assistant d\'appel"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Gérer les réseaux utilisés pour les appels avec"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Laisser les applications ou les services gérer les réseaux utilisés pour les appels"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Configurer"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Service de connexion intégré"</string>
     <string name="voicemail" msgid="8693759337917898954">"Messagerie vocale"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Messagerie vocale (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"MV :"</string>
     <string name="networks" msgid="8873030692174541976">"Opérateurs de réseau"</string>
-    <string name="call_settings" msgid="1630474923393095156">"Paramètres d\'appel"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Messages d\'urgence"</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="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Paramètres supplémentaires (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Autres paramètres d\'appel \"GSM uniquement\""</string>
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Autres paramètres d\'appel CDMA"</string>
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Autres paramètres d\'appel \"CDMA uniquement\""</string>
@@ -77,29 +100,32 @@
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Me signaler les appels entrants lorsque je suis en communication"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Me signaler les appels entrants lorsque je suis en communication"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Paramètres de transfert d\'appel"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Paramètres du transfert d\'appel (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Transfert d\'appel"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Toujours transférer"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Toujours utiliser ce numéro"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Transfert de tous les appels"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Transfert de tous les appels vers <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Numéro indisponible"</string>
-    <string name="sum_cfu_disabled" msgid="3698472522160364904">"Désactivé"</string>
-    <string name="labelCFB" msgid="218938523102207587">"Transférer si ligne occupée"</string>
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Désactivé"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Si occupé"</string>
     <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="sum_cfb_disabled" msgid="4913145177320506827">"Désactivé"</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="labelCFNRy" msgid="1736067178393744351">"Si pas de 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="sum_cfnry_disabled" msgid="3884684060443538097">"Désactivé"</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="labelCFNRc" msgid="2614827454402079766">"Si non joignable"</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="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="call_settings_primary_user_only" msgid="5679923943740900965">"Seul l\'utilisateur principal peut modifier les paramètres d\'appel."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Paramètres d\'appel (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
     <string name="updating_settings" msgid="8171225533884883252">"Mise à jour des paramètres..."</string>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"Activer"</string>
+    <string name="disable" msgid="4678348128118573672">"Désactiver"</string>
     <string name="change_num" msgid="239476305819844391">"Mettre à jour"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Valeur par défaut"</item>
@@ -123,8 +149,8 @@
     <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.\nVoulez-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>
-    <string name="voicemail_default" msgid="5902099213882352338">"Mon opérateur"</string>
-    <string name="mobile_networks" msgid="5540397602919106177">"Paramètres du réseau mobile"</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"Votre opérateur"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Paramètres du réseau mobile"</string>
     <string name="label_available" msgid="1181658289009300430">"Réseaux disponibles"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Recherche..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Aucun réseau trouvé."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Mode réseau préféré : CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Mode réseau préféré : général"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Mode réseau préféré : LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Mode réseau préféré : LTE/GSM/UMTS"</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="7886739962255042385">"LTE/WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"GSM uniquement"</item>
     <item msgid="3817924849415716259">"GSM/WCDMA de préférence"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Mode LTE 4G avancé"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Utiliser services LTE pour améliorer communications vocales et autres (recommandé)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Données activées"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Activer l\'accès aux données sur le réseau mobile"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Autoriser la consommation des données"</string>
     <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="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="roaming_warning" msgid="1603164667540144353">"Des frais importants peuvent s\'appliquer."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Autoriser l\'itinérance des données ?"</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>
@@ -190,7 +221,7 @@
     <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"<xliff:g id="USED_0">%1$s</xliff:g> maximum dépassé\nTaux de transfert des données réduit à <xliff:g id="USED_1">%2$d</xliff:g> Ko/s"</string>
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"<xliff:g id="USED_0">%1$d</xliff:g> ٪ du cycle écoulé\nLa 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="throttle_help_subtext" msgid="3633091498168446044">"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="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>
@@ -303,7 +334,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Configurer service données"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Paramètres de l\'opérateur"</string>
     <string name="fdn" msgid="7878832555095183202">"Numéros autorisés"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Numéros autorisés (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Liste de numéros autorisés"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"Liste de numéros autorisés (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Activation des numéros autorisés"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"La liste de numéros autorisés est activée."</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Liste de numéros autorisés désactivée"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Définir le mode TTY"</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="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"Le changement de mode TTY n\'est pas autorisé durant un appel vidéo."</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>
@@ -344,7 +378,7 @@
     <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="1846161429087789936">"Pour importer des contacts depuis la carte SIM, désactivez tout d\'abord le mode Avion."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Désactivez le mode Avion pour importer des contacts depuis la carte SIM."</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>
@@ -354,42 +388,40 @@
     <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="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="1796577128488773946">"Mot de passe incorrect. Le code PIN est bloqué. Veuillez saisir la clé PUK."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"Effacer le code PIN de la carte SIM"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"Définir le code PIN de la carte SIM"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"Définition du code PIN en cours…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"Le code PIN a bien été défini."</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"Le code PIN a bien été effacé."</string>
+    <string name="pin_failed" msgid="5644377896213584760">"Le code PIN est erroné."</string>
+    <string name="pin_changed" msgid="4455736268023261662">"Le code PIN a bien été mis à jour."</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Le mot de passe est erroné. Le code PIN est désormais bloqué. Veuillez saisir le code PUK."</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="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="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="3674058967950559397">"Le mot de passe est incorrect. Le code PIN2 est bloqué. Veuillez le modifier, puis réessayer."</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"Mot de passe incorrect. Carte SIM verrouillée. Clé PUK2 requise."</string>
+    <string name="badPuk2" msgid="7910064009531541708">"Code PUK2 erroné. Veuillez réessayer."</string>
+    <string name="badPin2" msgid="6646896629970023109">"Ancien code PIN2 erroné. Veuillez réessayer."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"Les codes PIN2 ne correspondent pas. Veuillez réessayer."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Veuillez saisir un code PIN2 comportant entre quatre et huit chiffres."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Veuillez saisir un code PUK2 comportant huit chiffres."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"Le code PIN2 a bien été mis à jour."</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Saisissez le code PUK2."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Mot de passe erroné. Le code PIN2 est désormais bloqué. Pour réessayer, veuillez changer le code PIN2."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Le mot de passe est erroné. La carte SIM est désormais verrouillée. Veuillez saisir le code PUK2."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"La clé PUK2 est bloquée de manière définitive."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Il vous reste <xliff:g id="NUMBER">%d</xliff:g> tentatives."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"Code PIN2 débloqué."</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"Il vous reste <xliff:g id="NUMBER">%d</xliff:g> tentatives."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"Le code PIN2 n\'est plus bloqué."</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="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_redialing" msgid="8253487008234167266">"Rappel en cours..."</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_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>
     <string name="card_title_in_call" msgid="6346543933068225205">"Appel en cours"</string>
-    <string name="card_title_my_phone_number" msgid="112428362494434191">"Mon numéro est le <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Numérotation en cours…"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Appel manqué"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Appels manqués"</string>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"Désactivez le mode Avion pour passer un appel."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Désactivez le mode Avion ou connectez-vous à un réseau sans fil pour passer 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_error_out_of_service" msgid="4100065333878929223">"Réseau mobile non disponible."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Le réseau mobile n\'est pas disponible. Connectez-vous à un réseau sans fil pour passer un appel."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Pour émettre un appel, veuillez saisir un numéro valide."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Impossible d\'émettre l\'appel."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Lancement de la séquence IHM..."</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>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Impossible de transférer l\'appel."</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Service incompatible"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Impossible de changer d\'appel."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Impossible d\'isoler l\'appel."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Transfert impossible."</string>
     <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Impossible d\'effectuer des conférences téléphoniques."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Impossible de refuser l\'appel."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Impossible de libérer le(s) appel(s)."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Appel Internet"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Impossible de refuser l\'appel."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Impossible de lancer les appels."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Connectez-vous à un réseau sans fil pour passer un appel."</string>
     <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="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="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Aucun service disponible. Nouvelle tentative en cours…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Impossible d\'émettre l\'appel. <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="9130194953830414638">"Impossible d\'émettre l\'appel. Veuillez composer un numéro d\'urgence."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Utilisez le clavier pour composer un numéro."</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"En attente"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Raccrocher"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"Normales"</item>
     <item msgid="2883365539347850535">"Longues"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Message réseau"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Message réseau"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Message d\'erreur"</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\nAprès avoir appuyé sur \"Activer\", écoutez les instructions qui vous permettront d\'activer votre téléphone."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Activation en cours…"</string>
@@ -469,8 +504,8 @@
     <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_speaker" msgid="6904589278542719647">"Ht. parleur"</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_progress" msgid="460876637828044519">"Programmation de votre téléphone en cours…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Impossible de programmer votre téléphone."</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="8072141612635635357">"Votre téléphone n\'a pas pu être activé. \nIl 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\nVeuillez 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>
@@ -481,18 +516,18 @@
     <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>
     <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Connexion des données désactivée"</string>
-  <plurals name="phone_in_ecm_notification_time">
-    <item quantity="one" msgid="4866221796252472622">"Aucune connexion de données pendant <xliff:g id="COUNT">%s</xliff:g> minute"</item>
-    <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="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="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>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="one">Aucune connexion à Internet pendant <xliff:g id="COUNT_1">%s</xliff:g> minute</item>
+      <item quantity="other">Aucune connexion à Internet pendant <xliff:g id="COUNT_1">%s</xliff:g> minutes</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="one">Le téléphone sera en mode de rappel d\'urgence pendant <xliff:g id="COUNT_1">%s</xliff:g> minute. Lorsque ce mode est activé, vous ne pouvez pas utiliser d\'applications nécessitant une connexion à Internet. Voulez-vous quitter l\'écran maintenant ?</item>
+      <item quantity="other">Le téléphone sera en mode de rappel d\'urgence pendant <xliff:g id="COUNT_1">%s</xliff:g> minutes. Lorsque ce mode est activé, vous ne pouvez pas utiliser d\'applications nécessitant une connexion à Internet. Voulez-vous quitter l\'écran maintenant ?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="one">L\'action sélectionnée n\'est pas disponible lorsque le mode de rappel d\'urgence est activé. Ce mode restera activé sur ce téléphone pendant <xliff:g id="COUNT_1">%s</xliff:g> minute. Voulez-vous quitter l\'écran maintenant ?</item>
+      <item quantity="other">L\'action sélectionnée n\'est pas disponible lorsque le mode de rappel d\'urgence est activé. Ce mode restera activé sur ce téléphone pendant <xliff:g id="COUNT_1">%s</xliff:g> minute. Voulez-vous quitter l\'écran maintenant ?</item>
+    </plurals>
     <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>
@@ -506,110 +541,23 @@
     <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_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_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="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="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="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="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_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="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="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>
-    <string name="username_title" msgid="2479375923477682328">"Nom d\'utilisateur"</string>
-    <string name="password_title" msgid="3323555249068171531">"Mot de passe"</string>
-    <string name="display_name_title" msgid="2459768196312249937">"Nom à afficher"</string>
-    <string name="proxy_address_title" msgid="4828301345351614273">"Adresse de proxy sortant"</string>
-    <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="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>
-    <string name="auth_username_title" msgid="851473016307947120">"Nom d\'utilisateur d\'authentification"</string>
-    <string name="auth_username_summary" msgid="6782012405225938629">"Nom d\'utilisateur utilisé pour l\'authentification"</string>
-    <string name="default_preference_summary" msgid="868766740121667450">"&lt;Non défini&gt;"</string>
-    <string name="display_name_summary" msgid="8636377460518225523">"&lt;Identique au nom d\'utilisateur&gt;"</string>
-    <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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"Appels vocaux non pris en charge"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Réponses rapides"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"un"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"deux"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"trois"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"quatre"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"cinq"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"six"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"sept"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"huit"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"neuf"</string>
-    <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_dial_button" msgid="7459705245418435351">"composer"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"retour arrière"</string>
-    <string name="description_target_answer" msgid="7205604197797472471">"Réponse"</string>
-    <string name="description_target_send_sms" msgid="2098326025587950144">"Envoyer un SMS"</string>
-    <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="2609519527849101590">"Sonnerie"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Sonnerie par défaut (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <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. sonne"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Numérotation sonore"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Saisie semi-auto clavier num."</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Sonnerie et vibreur"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Utiliser le Wi-Fi pour passer l\'appel ?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Oui"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"Non"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Cartes SIM intégrées"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Fonctionnalité d\'appel via Internet intégrée"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Activer les appels vidéo"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Pour activer les appels vidéo, vous devez activer le mode LTE 4G avancé dans les paramètres réseau."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Paramètres du réseau"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Fermer"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Appels d\'urgence"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Appels d\'urgence seulement"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"Carte SIM, emplacement : <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Accessibilité"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Appel Wi-Fi entrant"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Appel Wi-Fi"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Appuyer à nouveau pour ouvrir"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"Une erreur s\'est produite lors du décodage du message."</string>
 </resources>
diff --git a/res/values-gl-rES/arrays.xml b/res/values-gl-rES/arrays.xml
new file mode 100644
index 0000000..773739b
--- /dev/null
+++ b/res/values-gl-rES/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Global"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-gl-rES/config.xml b/res/values-gl-rES/config.xml
deleted file mode 100644
index a842be4..0000000
--- a/res/values-gl-rES/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"falso"</string>
-</resources>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index b4fa555..70c70ab 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -16,14 +16,14 @@
 
 <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">"Datos móbiles"</string>
+    <string name="phoneAppLabel" product="tablet" msgid="1107073389495104784">"Datos móbiles"</string>
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Teléfono"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Marcador de emerxencia"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Teléfono"</string>
     <string name="fdnListLabel" msgid="8630418672279521003">"Lista de FDN"</string>
     <string name="unknown" msgid="6878797917991465859">"Descoñecido"</string>
     <string name="private_num" msgid="6713286113000232309">"Número privado"</string>
-    <string name="payphone" msgid="1931775086311769314">"Teléfono público"</string>
+    <string name="payphone" msgid="4793877574636445118">"Teléfono público"</string>
     <string name="onHold" msgid="9035493194749959955">"En espera"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Código MMI iniciado"</string>
     <string name="ussdRunning" msgid="485588686340541690">"Código USSD en execución..."</string>
@@ -52,18 +52,41 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Solicitando desbloqueo da rede..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Solicitude de desbloqueo da rede realizado correctamente."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Desbloqueo da rede realizado correctamente."</string>
-    <string name="mobile_network_settings_not_available" msgid="7355254462995117896">"A configuración de rede móbil non está dispoñible para este usuario"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"A configuración de rede móbil non está dispoñible para este usuario"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Configuración de chamadas GSM"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"Configuración da chamada de GSM (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Configuración de chamadas CDMA"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"Configuración da chamada de CDMA (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Nomes do punto de acceso"</string>
     <string name="settings_label" msgid="3876743539816984008">"Configuración de rede"</string>
-    <string name="connection_service" msgid="978745922583410219">"Servizo de conexión que se vai utilizar"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Contas de chamadas"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Facer chamadas con"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Facer chamadas SIP con"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Preguntar primeiro"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Configuración"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Seleccionar contas"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Contas do teléfono"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Engadir conta SIP"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Determinar configuración da conta"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Chamadas por wifi"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Non utilizar as chamadas wifi"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Non utilizar o asistente de chamadas"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Ningún"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Asistente de chamadas"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Utilizar o asistente de chamadas"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Seleccionar asistente de chamadas"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Xestionar as redes utilizadas para chamadas con"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Permitir que as aplicacións ou os servizos xestionen as redes que se utilizan para chamar"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Configurar"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Servizo de conexión integrado"</string>
     <string name="voicemail" msgid="8693759337917898954">"Correo de voz"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Correo de voz (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"CV:"</string>
     <string name="networks" msgid="8873030692174541976">"Operadores de rede"</string>
-    <string name="call_settings" msgid="1630474923393095156">"Configuración de chamadas"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Emisións de emerxencia"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Configuración de chamada"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Configuración adicional"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Configuración adicional (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Configuración de chamadas de só GSM adicionais"</string>
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Configuración adicional de chamadas CDMA"</string>
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Configuración de chamadas só CDMA adicionais"</string>
@@ -77,29 +100,32 @@
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Durante unha chamada, avisarme das chamadas entrantes"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Durante unha chamada, avisarme das chamadas entrantes"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Configuración de desvío de chamadas"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Configuración de desvío de chamadas (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Desvío de chamadas"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Desviar sempre"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Utilizar sempre este número"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Desvío de todas as chamadas"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Desvío de todas as chamadas ao <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"O número non está dispoñible"</string>
-    <string name="sum_cfu_disabled" msgid="3698472522160364904">"Desactivado"</string>
-    <string name="labelCFB" msgid="218938523102207587">"Desviar cando estea ocupado"</string>
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Desactivado"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Cando estea ocupado"</string>
     <string name="messageCFB" msgid="3711089705936187129">"Número cando está ocupado"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Desvío a <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
-    <string name="sum_cfb_disabled" msgid="227440009979537651">"Desactivado"</string>
+    <string name="sum_cfb_disabled" msgid="4913145177320506827">"Desactivado"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"O teu operador non admite a desactivación do desvío de chamadas cando o teléfono está ocupado."</string>
-    <string name="labelCFNRy" msgid="3646316323834351390">"Desviar cando non haxa resposta"</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"Cando non se responda"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Número cando non hai resposta"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Desvío ao <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
-    <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Desactivado"</string>
+    <string name="sum_cfnry_disabled" msgid="3884684060443538097">"Desactivado"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"O teu operador non admite a desactivación do desvío de chamadas cando o teléfono non responde."</string>
-    <string name="labelCFNRc" msgid="47183615370850000">"Desviar cando non se poida contactar"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"Cando non se poida contactar"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Número cando non se pode contactar"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Desvío ao <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Desactivado"</string>
     <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"O teu operador non admite a desactivación do desvío de chamadas cando non se pode acceder ao teléfono."</string>
     <string name="updating_title" msgid="6146755386174019046">"Configuración de chamada"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"Só o usuario principal pode cambiar a configuración de chamada."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Configuración de chamada (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Erro de configuración das chamadas"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Lendo a configuración..."</string>
     <string name="updating_settings" msgid="8171225533884883252">"Actualizando a configuración..."</string>
@@ -109,8 +135,8 @@
     <string name="fdn_check_failure" msgid="18200614306525434">"A configuración de números de marcación fixa da aplicación do teléfono está activada. Como resultado, hai algunhas funcións relacionadas coas chamadas que non funcionan."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Para ver esta configuración, tes que activar o sinal móbil."</string>
     <string name="close_dialog" msgid="2365884406356986917">"Aceptar"</string>
-    <string name="enable" msgid="1059008390636773574">"Activar"</string>
-    <string name="disable" msgid="7274240979164762320">"Desactivar"</string>
+    <string name="enable" msgid="7248657275000173526">"Activar"</string>
+    <string name="disable" msgid="4678348128118573672">"Desactivar"</string>
     <string name="change_num" msgid="239476305819844391">"Actualizar"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Configuración predeterminada da rede"</item>
@@ -123,8 +149,8 @@
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Non se puido recuperar e gardar a configuración do número de desvío actual.\nQueres cambiar ao novo provedor igualmente?"</string>
     <string name="no_change" msgid="3186040086622435212">"Non se fixeron cambios."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Escolle o servizo de correo de voz"</string>
-    <string name="voicemail_default" msgid="5902099213882352338">"O meu operador"</string>
-    <string name="mobile_networks" msgid="5540397602919106177">"Configuración de rede móbil"</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"O teu operador"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Configuración da rede móbil"</string>
     <string name="label_available" msgid="1181658289009300430">"Redes dispoñibles"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Buscando..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Non se atopou ningunha rede."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Modo de rede preferido: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Modo de rede preferido: global"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Modo de rede preferido: LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Modo de rede preferida: LTE / GSM / UMTS"</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="7886739962255042385">"LTE / WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"Só GSM"</item>
     <item msgid="3817924849415716259">"GSM/WCDMA preferido"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Modo LTE 4G mellorado"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Usa os servizos LTE para mellorar a comunicación por voz e outras (recomendado)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Datos activados"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Activa o acceso de datos a través da rede móbil"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Permitir o uso de datos"</string>
     <string name="roaming" msgid="8871412572928323707">"Itinerancia de datos"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Conecta cos servizos de datos durante a itinerancia"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Conecta cos servizos de datos durante a itinerancia"</string>
     <string name="roaming_reenable_message" msgid="8913735676127858115">"Perdiches a conectividade de datos debido a que abandonaches a túa rede doméstica coa itinerancia de datos desactivada."</string>
-    <string name="roaming_warning" msgid="7820963598559553967">"Permitir a itinerancia de datos? É posible que se apliquen custos de itinerancia importantes."</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"É posible que se apliquen custos elevados."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Permitir a itinerancia de datos?"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"Opcións de GSM/UMTS"</string>
     <string name="cdma_options" msgid="4016822858172249884">"Opcións de CDMA"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Uso de datos"</string>
@@ -190,12 +221,12 @@
     <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"<xliff:g id="USED_0">%1$s</xliff:g> máximo superado\nTaxa de datos reducida 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>٪ do ciclo transcorrido\nO seguinte período comeza dentro de <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">"A velocidade de datos redúcese a <xliff:g id="USED">%1$d</xliff:g> Kb/s se se supera o límite de uso de datos"</string>
-    <string name="throttle_help_subtext" msgid="5217706521499010816">"Máis información sobre a política de uso de datos da rede móbil do teu operador"</string>
-    <string name="cell_broadcast_sms" msgid="5584192824053625842">"SMS de difusión de cela"</string>
-    <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"SMS de difusión de cela"</string>
-    <string name="cell_bc_sms_enable" msgid="6441688565738921084">"SMS de difusión de cela activado"</string>
-    <string name="cell_bc_sms_disable" msgid="3398365088309408749">"SMS de difusión de cela desactivado"</string>
-    <string name="cb_sms_settings" msgid="651715019785107312">"Configuración de SMS da difusión de cela"</string>
+    <string name="throttle_help_subtext" msgid="3633091498168446044">"Máis información sobre a política de uso de datos da rede móbil do teu operador"</string>
+    <string name="cell_broadcast_sms" msgid="5584192824053625842">"SMS de difusión móbil"</string>
+    <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"SMS de difusión móbil"</string>
+    <string name="cell_bc_sms_enable" msgid="6441688565738921084">"SMS de difusión móbil activado"</string>
+    <string name="cell_bc_sms_disable" msgid="3398365088309408749">"SMS de difusión móbil desactivado"</string>
+    <string name="cb_sms_settings" msgid="651715019785107312">"Configuración de SMS da difusión móbil"</string>
     <string name="enable_disable_emergency_broadcast" msgid="2157014609041245335">"Difusión de emerxencia"</string>
     <string name="emergency_broadcast_enable" msgid="2645980025414010211">"Difusión de emerxencia activada"</string>
     <string name="emergency_broadcast_disable" msgid="3665199821267569426">"Difusión de emerxencia desactivada"</string>
@@ -303,7 +334,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Configurar servizo de datos"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Configuración do operador"</string>
     <string name="fdn" msgid="7878832555095183202">"Números de marcación fixa"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Números de marcación fixa (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Lista de FDN"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"Lista FDN (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Activación de FDN"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Os números de marcación fixa están activados"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Os números de marcación fixa están desactivados"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Definir modo TTY"</string>
     <string name="auto_retry_mode_title" msgid="4073265511427813322">"Reintento automático"</string>
     <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Activar o modo de reintento automático"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"Non se permite cambiar o modo TTY durante as videochamadas"</string>
     <string name="menu_add" msgid="1882023737425114762">"Engadir contacto"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Editar contacto"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Eliminar contacto"</string>
@@ -344,7 +378,7 @@
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Lendo da tarxeta SIM..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Non hai contactos na tarxeta SIM."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Seleccionar contactos para importar"</string>
-    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"Para importar contactos da tarxeta SIM, primeiro desactiva o modo avión."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Desactiva o modo avión para importar contactos da tarxeta SIM."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Activar/desactivar o PIN da SIM"</string>
     <string name="change_pin" msgid="9174186126330785343">"Cambiar PIN da SIM"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"PIN da SIM:"</string>
@@ -354,42 +388,40 @@
     <string name="badPin" msgid="8955102849303984935">"O PIN antigo que se inseriu non é correcto. Téntao de novo."</string>
     <string name="mismatchPin" msgid="5923253370683071889">"Os PIN que escribiches non coinciden. Téntao de novo."</string>
     <string name="invalidPin" msgid="5981171102258684792">"Escribe un PIN que teña entre 4 e 8 números."</string>
-    <string name="disable_sim_pin" msgid="3992926931620188855">"Desactivar PIN da SIM"</string>
-    <string name="enable_sim_pin" msgid="5803702443844458831">"Activar o PIN da SIM"</string>
-    <string name="enable_in_progress" msgid="3695303775100109650">"Agarda..."</string>
-    <string name="enable_pin_ok" msgid="9166061915030865848">"PIN da SIM activado"</string>
-    <string name="disable_pin_ok" msgid="5596999379593924850">"PIN da SIM desactivado."</string>
-    <string name="pin_failed" msgid="2298841192582192277">"O PIN que introduciches era incorrecto."</string>
-    <string name="pin_changed" msgid="4365538014588501049">"PIN da SIM cambiado correctamente."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Contrasinal incorrecto, PIN bloqueado. Solicitouse o PUK."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"Borrar o PIN da SIM"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"Establecer PIN da SIM"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"Establecendo PIN…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN establecido"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN borrado"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN incorrecto"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN actualizado"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Contrasinal incorrecto. O PIN está bloqueado agora. É necesario o PUK."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"PIN2 antigo"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"PIN2 novo"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Confirmar PIN2 novo"</string>
-    <string name="badPuk2" msgid="4851734468010000418">"O PUK2 que inseriches non é correcto. Téntao de novo."</string>
-    <string name="badPin2" msgid="1041576234483629991">"O PIN2 antigo que inseriches non é correcto. Téntao de novo."</string>
-    <string name="mismatchPin2" msgid="523029155918113440">"Os PIN2 que escribiches non coinciden. Téntao de novo."</string>
-    <string name="invalidPin2" msgid="8237110107480395938">"Escribe un PIN2 que teña entre 4 e 8 números."</string>
-    <string name="invalidPuk2" msgid="1290977391033057871">"Escribe un PUK2 que teña 8 números."</string>
-    <string name="pin2_changed" msgid="1639666438836544393">"PIN2 modificado correctamente."</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"Escribe o código PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Contrasinal incorrecto, PIN2 bloqueado. Cambia o PIN2 e téntao de novo."</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"Contrasinal incorrecto, a SIM está bloqueada. Solicitouse o PUK2."</string>
+    <string name="badPuk2" msgid="7910064009531541708">"PUK2 incorrecto. Téntao de novo."</string>
+    <string name="badPin2" msgid="6646896629970023109">"PIN2 antigo incorrecto. Téntao de novo."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"Os PIN2 non coinciden. Téntao de novo."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Introduce un código PIN2 de entre 4 e 8 números."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Introduce un código PUK2 de 8 números."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 actualizado"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Introducir código PUK2"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Contrasinal incorrecto. O PIN2 está bloqueado agora. Para tentalo de novo, cambia o PIN2."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Contrasinal incorrecto. A SIM está bloqueada agora. Introduce o PUK2."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"O PUK2 está permanentemente bloqueado."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Quedan <xliff:g id="NUMBER">%d</xliff:g> intentos."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 desbloqueado."</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"Quédanche <xliff:g id="NUMBER">%d</xliff:g> intentos."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"O PIN2 xa non está bloqueado"</string>
     <string name="doneButton" msgid="2859593360997984240">"Feito"</string>
-    <string name="caller_manage_header" msgid="3231519674734638786">"Conferencia telefónica ás <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Número de correo de voz"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Marcación"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Tentando de novo"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Marcando de novo"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Conferencia telefónica"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Chamada entrante"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Chamada finalizada"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"En espera"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Desconectando"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Chamada en curso"</string>
-    <string name="card_title_my_phone_number" msgid="112428362494434191">"O meu número é <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Marcación"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Chamada perdida"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Chamadas perdidas"</string>
@@ -407,25 +439,27 @@
     <string name="notification_action_end_call" msgid="6069460915123531620">"Colgar"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Devolver chamada"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Mensaxe"</string>
-    <string name="incall_error_power_off" msgid="6550191216405193368">"Para facer unha chamada, primeiro desactiva o modo avión."</string>
+    <string name="incall_error_power_off" msgid="2947938060513306698">"Desactiva o modo avión para facer unha chamada."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Desactiva o modo avión ou conéctate a unha rede sen fíos para facer unha chamada."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Sen rexistro na rede"</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"A rede móbil non está dispoñible."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Chamada non enviada; o número introducido non é válido."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Chamada non enviada"</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Rece móbil non dispoñible."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"A rede móbil non está dispoñible. Conéctate a unha rede sen fíos para facer unha chamada."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Para realizar unha chamada, introduce un número válido."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Non se pode chamar."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Iniciando secuencia MMI..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Servizo non compatible"</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Non se poden cambiar as chamadas."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Non se pode separar a chamada."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Non se pode transferir a chamada."</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Servizo non compatible"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Non se poden cambiar as chamadas."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Non se pode separar a chamada."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Non se pode transferir."</string>
     <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Non se poden efectuar conferencias."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Non se pode rexeitar a chamada."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Non se poden efectuar chamadas."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Chamada por Internet"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Non se pode rexeitar a chamada."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Non se poden desconectar as chamadas."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Conéctate a unha rede sen fíos para facer unha chamada."</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Chamada de emerxencia"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Activando radio..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Fóra da zona servizo; tentándo de novo..."</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"Chamada non efectuada. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> non é un número de emerxencia."</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Chamada non enviada. Marca un número de emerxencia."</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Sen servizo. Tentando de novo…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Non se pode chamar. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> non é un número de emerxencia."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Non se pode chamar. Marcar un número de emerxencia."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Utiliza o teclado para chamar"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Poñer en espera"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Finalizar"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"Normal"</item>
     <item msgid="2883365539347850535">"Longo"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Mensaxe de rede"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Mensaxe de rede"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Mensaxe de erro"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Activar o teléfono"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"É necesario facer unha chamada especial para activar o servizo do teléfono. \n\nDespois de pulsar “Activar”, escoita as instrucións fornecidas para activar o teléfono."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Activando..."</string>
@@ -469,8 +504,8 @@
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Hai un problema coa activación"</string>
     <string name="ota_listen" msgid="162923839877584937">"Sigue as instrucións de voz ata que escoites que se completou a activación."</string>
     <string name="ota_speaker" msgid="6904589278542719647">"Altofalante"</string>
-    <string name="ota_progress" msgid="3420314892609254729">"Agarda mentres se programa o teléfono."</string>
-    <string name="ota_failure" msgid="4311299546379674378">"Programación incorrecta"</string>
+    <string name="ota_progress" msgid="460876637828044519">"Programando o teu teléfono…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Non se puido programar o teu teléfono"</string>
     <string name="ota_successful" msgid="1880780692887077407">"O teléfono está agora activado. O servizo pode tardar ata 15 minutos en iniciarse."</string>
     <string name="ota_unsuccessful" msgid="8072141612635635357">"O teléfono non se activou. \nÉ posible que teñas que encontrar unha zona con mellor cobertura, preto dunha ventá ou fóra. \n\nTéntao de novo ou chama ao servizo de atención ao cliente para consultar máis opcións."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"FALLOS DE SPC EXCESIVOS"</string>
@@ -481,18 +516,18 @@
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Accedeuse ao modo de devolución de chamadas de emerxencia"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Modo de devolución de chamadas de emerxencia"</string>
     <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Conexión de datos desactivada"</string>
-  <plurals name="phone_in_ecm_notification_time">
-    <item quantity="one" msgid="4866221796252472622">"Non houbo conexión de datos durante <xliff:g id="COUNT">%s</xliff:g> minuto"</item>
-    <item quantity="other" msgid="3122217344579273583">"Non houbo 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="8060210887681426682">"O teléfono estará en modo de devolución de chamada de emerxencia durante <xliff:g id="COUNT">%s</xliff:g> minuto. Mentres está neste modo, non se poden utilizar aplicacións que usen conexión de datos. Queres saír agora?"</item>
-    <item quantity="other" msgid="8617116564023933114">"O teléfono estará en modo de devolución de chamada de emerxencia durante <xliff:g id="COUNT">%s</xliff:g> minutos. Mentres está neste modo, non se poden utilizar aplicacións que usen conexión de datos. Queres saír agora?"</item>
-  </plurals>
-  <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="2585506997024726599">"A acción seleccionada non está dispoñible durante o modo de devolución de chamada de emerxencia. O teléfono estará neste modo durante <xliff:g id="COUNT">%s</xliff:g> minuto. Queres saír agora?"</item>
-    <item quantity="other" msgid="6115622137771382224">"A acción seleccionada non está dispoñible durante o modo de devolución de chamada de emerxencia. O teléfono estará neste modo durante <xliff:g id="COUNT">%s</xliff:g> minutos. Queres saír agora?"</item>
-  </plurals>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other">Non houbo conexión de datos durante <xliff:g id="COUNT_1">%s</xliff:g> minutos</item>
+      <item quantity="one">Non houbo conexión de datos durante <xliff:g id="COUNT_0">%s</xliff:g> minuto</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other">O teléfono estará no modo de devolución de chamada de emerxencia durante <xliff:g id="COUNT_1">%s</xliff:g> minutos. Mentres se atope neste modo, non se poderá usar ningunha aplicación que utilice unha conexión de datos. Queres saír agora?</item>
+      <item quantity="one">O teléfono estará no modo de devolución de chamada de emerxencia durante <xliff:g id="COUNT_0">%s</xliff:g> minuto. Mentres se atope neste modo, non se poderá usar ningunha aplicación que utilice unha conexión de datos. Queres saír agora?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other">A acción seleccionada non está dispoñible durante o modo de devolución de chamadas de emerxencia. O teléfono estará neste modo durante <xliff:g id="COUNT_1">%s</xliff:g> minutos. Queres saír agora?</item>
+      <item quantity="one">A acción seleccionada non está dispoñible durante o modo de devolución de chamadas de emerxencia. O teléfono estará neste modo durante <xliff:g id="COUNT_0">%s</xliff:g> minuto. Queres saír agora?</item>
+    </plurals>
     <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"A acción seleccionada non está dispoñible durante as chamadas de emerxencia."</string>
     <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Saíndo do modo de devolución de chamadas de emerxencia"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Si"</string>
@@ -506,110 +541,23 @@
     <string name="contactPhoto" msgid="4713193418046639466">"foto do contacto"</string>
     <string name="goPrivate" msgid="865837794424530980">"activar o modo privado"</string>
     <string name="selectContact" msgid="781975788478987237">"seleccionar contacto"</string>
-    <string name="sip_settings" msgid="6699045718560859691">"Configuración 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_receive_calls" msgid="5635685570889971559">"Recibir chamadas entrantes"</string>
-    <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Reduce a duración da batería"</string>
-    <string name="sip_call_options_title" msgid="27433718808839672">"Usar chamadas por Internet"</string>
-    <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Utilizar chamadas por Internet (só Wi-Fi)"</string>
-    <string name="sip_call_options_entry_1" msgid="6556668894178520760">"Para todas as chamadas cando a rede de datos está dispoñible"</string>
-    <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Só para chamadas por Internet"</string>
-    <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Preguntar en cada chamada"</string>
-    <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"Para todas as chamadas"</string>
-    <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Facer chamada"</string>
-    <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"Utilizar conta para chamadas por Internet:"</string>
-    <string name="remember_my_choice" msgid="7058059586169290705">"Utilizar sempre para realizar chamadas por Internet"</string>
-    <string name="reset_my_choice_hint" msgid="5523030209803567922">"Podes cambiar a conta de chamadas por Internet que queres usar de forma predeterminada na pantalla Teléfono &gt; Configuración &gt; Configuración de chamadas por Internet &gt; Contas."</string>
-    <string name="pstn_phone" msgid="8782554491484326429">"Chamada de teléfono móbil"</string>
-    <string name="internet_phone" msgid="1147922660195095810">"Chamada por Internet"</string>
-    <string name="no_sip_account_found_title" msgid="6266249392379373628">"Ningunha conta de chamadas por Internet"</string>
-    <string name="no_sip_account_found" msgid="724325811961769997">"Non hai contas de chamadas por Internet neste teléfono. Queres engadir unha agora?"</string>
-    <string name="sip_menu_add" msgid="8757508498518881500">"Engadir"</string>
-    <string name="add_sip_account" msgid="5904858426290097611">"Engadir conta"</string>
-    <string name="remove_sip_account" msgid="7645900420385682570">"Eliminar conta"</string>
-    <string name="sip_account_list" msgid="5480058210652194306">"Contas SIP"</string>
-    <string name="saving_account" msgid="52903398217017954">"Gardando a conta..."</string>
-    <string name="removing_account" msgid="7183999896088628100">"Eliminando a conta..."</string>
-    <string name="sip_menu_save" msgid="5842531129356014943">"Gardar"</string>
-    <string name="sip_menu_discard" msgid="524075892158789701">"Descartar"</string>
-    <string name="alert_dialog_close" msgid="7759635137627626235">"Pechar o perfil"</string>
-    <string name="alert_dialog_ok" msgid="3580379406983564080">"Aceptar"</string>
-    <string name="close_profile" msgid="6886968271423155284">"Pechar"</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">"Comprobando o estado..."</string>
-    <string name="registration_status_registering" msgid="4288401139400232968">"Rexistrando..."</string>
-    <string name="registration_status_still_trying" msgid="3185581992666091911">"Aínda se está tentando..."</string>
-    <string name="registration_status_not_receiving" msgid="4185572774980557758">"Non se están recibindo chamadas."</string>
-    <string name="registration_status_no_data" msgid="4901476962360656611">"O rexistro da conta detívose debido a que non hai conexión a Internet."</string>
-    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"O rexistro da conta detívose debido a que non hai conexión wifi."</string>
-    <string name="registration_status_not_running" msgid="4824867184446232131">"Rexistro da conta incorrecto"</string>
-    <string name="registration_status_done" msgid="884630717456439280">"Recibindo chamadas"</string>
-    <string name="registration_status_failed_try_later" msgid="5214474354451220581">"O rexistro da conta non se realizou correctamente: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); tentarase máis tarde"</string>
-    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"O rexistro da conta non se completou correctamente: nome de usuario ou contrasinal incorrectos."</string>
-    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"Rexistro da conta incorrecto. Comproba o nome do servidor."</string>
-    <string name="third_party_account_summary" msgid="2532526738862533028">"Esta conta está sendo utilizada actualmente pola aplicación de <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
-    <string name="sip_edit_title" msgid="489288416435014385">"Detalles da conta SIP"</string>
-    <string name="sip_edit_new_title" msgid="3659149255856520385">"Detalles da conta SIP"</string>
-    <string name="domain_address_title" msgid="9071787581316160480">"Servidor"</string>
-    <string name="username_title" msgid="2479375923477682328">"Nome de usuario"</string>
-    <string name="password_title" msgid="3323555249068171531">"Contrasinal"</string>
-    <string name="display_name_title" msgid="2459768196312249937">"Nome de visualización"</string>
-    <string name="proxy_address_title" msgid="4828301345351614273">"Enderezo proxy saínte"</string>
-    <string name="port_title" msgid="5952939408078626657">"Número de porto"</string>
-    <string name="transport_title" msgid="8253139511847746640">"Tipo de transporte"</string>
-    <string name="send_keepalive_title" msgid="7533342573918645113">"Enviar sinal conexión"</string>
-    <string name="set_primary_title" msgid="5351892327447571451">"Establecer como conta principal"</string>
-    <string name="set_primary_summary" msgid="2219064654523258577">"Utilizado para chamadas saíntes"</string>
-    <string name="advanced_settings" msgid="8350631795335495338">"Configuración opcional"</string>
-    <string name="auth_username_title" msgid="851473016307947120">"Nome de usuario da autenticación"</string>
-    <string name="auth_username_summary" msgid="6782012405225938629">"Nome de usuario utilizado para a autenticación"</string>
-    <string name="default_preference_summary" msgid="868766740121667450">"&lt;Sen configurar&gt;"</string>
-    <string name="display_name_summary" msgid="8636377460518225523">"&lt;Igual que o nome de usuario&gt;"</string>
-    <string name="optional_summary" msgid="1464058793789832411">"&lt;Opcional&gt;"</string>
-    <string name="advanced_settings_show" msgid="4668880308290857597">"▷ Toca aquí para mostrar todo"</string>
-    <string name="advanced_settings_hide" msgid="217398292824758079">"▽ Toca aquí para ocultar todo"</string>
-    <string name="empty_alert" msgid="6839103946505432390">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> é obrigatorio e non se pode deixar en branco."</string>
-    <string name="not_a_valid_port" msgid="4796149266434630292">"O número do porto debe estar comprendido entre o 1000 e o 65534."</string>
-    <string name="no_internet_available_title" msgid="3327109242858406165">"Sen conexión a Internet"</string>
-    <string name="no_wifi_available_title" msgid="747881033089378758">"Sen conexión wifi"</string>
-    <string name="no_internet_available" msgid="7877142631803238549">"Para facer unha chamada por Internet, primeiro comproba a túa conexión a Internet."</string>
-    <string name="no_wifi_available" msgid="1225073547318465713">"Tes que estar conectado a unha rede wifi para facer chamadas por Internet (utiliza a configuración de Sen fíos e Rede)."</string>
-    <string name="no_voip" msgid="8901474054537199865">"Chamadas por Internet non compatibles"</string>
-    <string name="sip_system_decide" msgid="368030746310423471">"Automático"</string>
-    <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Enviar sempre"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Chamadas de voz non compatibles"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Respostas rápidas"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"un"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"dous"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"tres"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"catro"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"cinco"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"seis"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"sete"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"oito"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"nove"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"estrela"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"cero"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"libra"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"marcar"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"retroceso"</string>
-    <string name="description_target_answer" msgid="7205604197797472471">"Responder"</string>
-    <string name="description_target_send_sms" msgid="2098326025587950144">"Enviar SMS"</string>
-    <string name="description_target_decline" msgid="4789834364389731957">"Rexeitar"</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="2609519527849101590">"Son"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Son predeterminado (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_title" msgid="6374978286202084684">"Ton de chamada do teléfono"</string>
-    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrar ao soar"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Soar ao marcar número"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Autocompletar con teclado"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Ton de chamada e vibración"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Queres usar a wifi para efectuar a chamada?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Si"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"Non"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Tarxetas SIM integradas"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Chamadas por Internet integradas"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Activar videochamadas"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Para activar as videochamadas, necesitas activar o Modo LTE 4G mellorado na configuración do sistema."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Configuración de rede"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Pechar"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Chamadas de emerxencia"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Só chamadas de emerxencia"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"Tarxeta SIM, rañura: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Accesibilidade"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Chamada wifi entrante"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Chamada wifi"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Toca outra vez para abrir"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"Produciuse un erro durante a descodificación da mensaxe."</string>
 </resources>
diff --git a/res/values-gu-rIN/arrays.xml b/res/values-gu-rIN/arrays.xml
new file mode 100644
index 0000000..b6c7c38
--- /dev/null
+++ b/res/values-gu-rIN/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"વૈશ્વિક"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
new file mode 100644
index 0000000..2ed5350
--- /dev/null
+++ b/res/values-gu-rIN/strings.xml
@@ -0,0 +1,564 @@
+<?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="1107073389495104784">"સેલ્યુલર ડેટા"</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">"FDN સૂચિ"</string>
+    <string name="unknown" msgid="6878797917991465859">"અજાણ્યું"</string>
+    <string name="private_num" msgid="6713286113000232309">"ખાનગી નંબર"</string>
+    <string name="payphone" msgid="4793877574636445118">"પેફોન"</string>
+    <string name="onHold" msgid="9035493194749959955">"હોલ્ડ પર"</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="enter_input" msgid="1810529547726803893">"USSD સંદેશ <xliff:g id="MIN_LEN">%d</xliff:g> અને <xliff:g id="MAX_LEN">%d</xliff:g> વર્ણ વચ્ચેનો હોવો આવશ્યક છે. કૃપા કરીને ફરી પ્રયાસ કરો."</string>
+    <string name="manageConferenceLabel" msgid="4691922394301969053">"કોન્ફરન્સ કૉલ સંચાલિત કરો"</string>
+    <string name="ok" msgid="3811371167865772377">"ઑકે"</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">"Bluetooth"</string>
+    <string name="wait_prompt_str" msgid="7601815427707856238">"નીચે આપેલ ટોન્સ મોકલીએ?\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="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="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="mobile_network_settings_not_available" msgid="3831911315358856062">"સેલ્યુલર નેટવર્ક સેટિંગ્સ આ વપરાશકર્તા માટે ઉપલબ્ધ નથી"</string>
+    <string name="labelGSMMore" msgid="5930842194056092106">"GSM કૉલ સેટિંગ્સ"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"GSM કૉલ સેટિંગ્સ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA કૉલ સેટિંગ્સ"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"CDMA કૉલ સેટિંગ્સ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="apn_settings" msgid="9043423184895642077">"ઍક્સેસ પોઇન્ટનું નામ"</string>
+    <string name="settings_label" msgid="3876743539816984008">"નેટવર્ક સેટિંગ્સ"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"કૉલિંગ એકાઉન્ટ્સ"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"આના વડે કૉલ કરો"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"આના વડે SIP કૉલ્સ કરો"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"પહેલાં પૂછો"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"સેટિંગ્સ"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"એકાઉન્ટ્સ પસંદ કરો"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"ફોન એકાઉન્ટ્સ"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"SIP એકાઉન્ટ ઉમેરો"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"એકાઉન્ટ સેટિંગ્સ ગોઠવો"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi કૉલિંગ"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Wi-Fi કૉલિંગનો ઉપયોગ કરશો નહીં"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"કૉલ સહાયકનો ઉપયોગ કરશો નહીં"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"કોઈ નહીં"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"કૉલ સહાયક"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"કૉલ સહાયકનો ઉપયોગ કરો"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"કૉલ સહાયક પસંદ કરો"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"આની કૉલ્સ માટે ઉપયોગમાં લેવાયેલ નેટવર્ક્સને સંચાલિત કરો"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"એપ્લિકેશન્સ અથવા સેવાઓને કૉલ્સ માટે ઉપયોગમાં લેવાયેલ નેટવર્ક્સને સંચાલિત કરવા દો"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"ગોઠવો"</string>
+    <string name="connection_service_default_label" msgid="1498481943805913754">"બિલ્ટ-ઇન કનેક્શન સેવા"</string>
+    <string name="voicemail" msgid="8693759337917898954">"વૉઇસમેઇલ"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"વૉઇસમેઇલ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
+    <string name="networks" msgid="8873030692174541976">"નેટવર્ક ઓપરેટર્સ"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"કટોકટીના બ્રોડકાસ્ટ્સ"</string>
+    <string name="call_settings" msgid="6112441768261754562">"કૉલ સેટિંગ્સ"</string>
+    <string name="additional_gsm_call_settings" msgid="1391795981938800617">"વધારાની સેટિંગ્સ"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"વધારાની સેટિંગ્સ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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">"કૉલર 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>
+    <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="call_forwarding_settings_with_label" msgid="8569489414006897127">"કૉલ ફોરવર્ડિંગ સેટિંગ્સ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="8384177689501334080">"બંધ"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"જ્યારે વ્યસ્ત હોય ત્યારે"</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="4913145177320506827">"બંધ"</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"જ્યારે તમારો ફોન વ્યસ્ત હોય ત્યારે તમારા ઓપરેટર કૉલ ફોરવર્ડિંગને અક્ષમ કરવાને સમર્થન આપતા નથી."</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"જ્યારે જવાબ આપેલ ન હોય ત્યારે"</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="3884684060443538097">"બંધ"</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"જ્યારે તમારો ફોન જવાબ નહીં આપે ત્યારે તમારા ઓપરેટર કૉલ ફોરવર્ડિંગને અક્ષમ કરવાને સમર્થન આપતા નથી."</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"જ્યારે પહોંચયોગ્ય ન હોય ત્યારે"</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="5646361343094064333">"જ્યારે તમારો ફોન પહોંચયોગ્ય ન હોય ત્યારે તમારા કેરિઅર કૉલ ફોરવર્ડિંગને અક્ષમ કરવાને સમર્થન આપતા નથી."</string>
+    <string name="updating_title" msgid="6146755386174019046">"કૉલ સેટિંગ્સ"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"કૉલ સેટિંગ્સને ફક્ત પ્રાથમિક વપરાશકર્તા દ્વારા જ બદલી શકાય છે."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"કૉલ સેટિંગ્સ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="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="7248657275000173526">"ચાલુ કરો"</string>
+    <string name="disable" msgid="4678348128118573672">"બંધ કરો"</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="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="2001233554889016880">"તમારો કેરિઅર"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"સેલ્યુલર નેટવર્ક સેટિંગ્સ"</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="5613353860205691579">"તમારું SIM કાર્ડ આ નેટવર્કથી કનેક્શનને મંજૂરી આપતું નથી."</string>
+    <string name="connect_later" msgid="2308119155752343975">"હમણાં આ નેટવર્કથી કનેક્ટ કરી શકાતું નથી. પછીથી ફરી પ્રયાસ કરો."</string>
+    <string name="registration_done" msgid="495135664535876612">"નેટવર્ક પર નોંધણી કરી."</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="2336624679902659306">"પસંદગીનો નેટવર્ક પ્રકાર"</string>
+    <string name="preferred_network_mode_summary" msgid="1434820673166126609">"નેટવર્ક ઓપરેટિંગ મોડ બદલો"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"પસંદગીનો નેટવર્ક પ્રકાર"</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_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"પસંદગીનો નેટવર્ક મોડ: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"પસંદગીનો નેટવર્ક મોડ: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"પસંદગીનો નેટવર્ક મોડ: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"પસંદગીનો નેટવર્ક મોડ: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"પસંદગીનો નેટવર્ક મોડ: વૈશ્વિક"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"પસંદગીનો નેટવર્ક મોડ: LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"પસંદગીનો નેટવર્ક મોડ: LTE / GSM / UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"પસંદગીનો નેટવર્ક મોડ: LTE / CDMA"</string>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="7886739962255042385">"LTE / WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"વૈશ્વિક"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"ફક્ત EvDo"</item>
+    <item msgid="1508557726283094448">"CDMA w/o EvDo"</item>
+    <item msgid="4341433122263841224">"CDMA/EvDo સ્વતઃ"</item>
+    <item msgid="5958053792390386668">"GSM/WCDMA સ્વતઃ"</item>
+    <item msgid="7913148405605373434">"ફક્ત WCDMA"</item>
+    <item msgid="1524224863879435516">"ફક્ત GSM"</item>
+    <item msgid="3817924849415716259">"GSM/WCDMA પસંદ કરેલ છે"</item>
+  </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"વિસ્તૃત 4G LTE મોડ"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"વૉઇસ અને અન્ય સંચારોને બહેતર બનાવવા માટે LTE સેવાઓનો ઉપયોગ કરો (ભલામણ કરેલ)"</string>
+    <string name="data_enabled" msgid="5972538663568715366">"ડેટા સક્ષમ કરેલ છે"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"ડેટા વપરાશની મંજૂરી આપો"</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="8913735676127858115">"તમે ડેટા કનેક્ટિવિટી ગુમાવી છે કારણ કે તમે તમારા હોમ નેટવર્કને બંધ ડેટા રોમિંગ સાથે છોડ્યું છે."</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"તમારાથી આંશિક શુલ્ક લઈ શકાય છે."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"ડેટા રોમિંગને મંજૂરી આપીએ?"</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="3633091498168446044">"તમારા કેરિઅરની સેલ્યુલર નેટવર્ક ડેટા ઉપયોગ નીતિ વિશે વધુ માહિતી"</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>
+    <string name="cell_bc_sms_disable" msgid="3398365088309408749">"સેલ બ્રોડકાસ્ટ SMS અક્ષમ કરેલ છે"</string>
+    <string name="cb_sms_settings" msgid="651715019785107312">"સેલ બ્રોડકાસ્ટ SMS સેટિંગ્સ"</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">"૩"</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="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="network_lte" msgid="7702681952521375754">"LTE (ભલામણ કરેલ)"</string>
+    <string name="network_4G" msgid="2723512640529983138">"4G (ભલામણ કરેલ)"</string>
+    <string name="network_global" msgid="1323190488685355309">"વૈશ્વિક"</string>
+    <string name="cdma_system_select_title" msgid="5757657769327732833">"સિસ્ટમ પસંદગી"</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_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>
+    <string name="carrier_settings_title" msgid="9028166176523012300">"કેરિઅર સેટિંગ્સ"</string>
+    <string name="fdn" msgid="7878832555095183202">"ફિક્સ્ડ ડાયલિંગ નંબર્સ"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"ફિક્સ્ડ ડાયલિંગ નંબર્સ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="manage_fdn_list" msgid="8777755791892122369">"FDN સૂચિ"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"FDN સૂચિ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="fdn_activation" msgid="2156479741307463576">"FDN સક્રિયકરણ"</string>
+    <string name="fdn_enabled" msgid="5238109009915521240">"ફિક્સ્ડ ડાયલિંગ નંબર્સ સક્ષમ કરેલ છે."</string>
+    <string name="fdn_disabled" msgid="4700049736675368279">"ફિક્સ્ડ ડાયલિંગ નંબર્સ અક્ષમ કરેલ છે."</string>
+    <string name="enable_fdn" msgid="3740191529180493851">"FDN સક્ષમ કરો"</string>
+    <string name="disable_fdn" msgid="7944020890722540616">"FDN અક્ષમ કરો"</string>
+    <string name="change_pin2" msgid="2153563695382176676">"PIN2 બદલો"</string>
+    <string name="enable_fdn_ok" msgid="7215588870329688132">"FDN અક્ષમ કરો"</string>
+    <string name="disable_fdn_ok" msgid="5727046928930740173">"FDN સક્ષમ કરો"</string>
+    <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="3776841382844614716">"વૉઇસ ગોપનીયતા"</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="4073265511427813322">"સ્વતઃ-પુનઃપ્રયાસ કરો"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"સ્વતઃ-પુનઃપ્રયાસ કરો મોડ સક્ષમ કરો"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"વિડિઓ કૉલ દરમિયાન TTY મોડ ફેરફારની મંજૂરી નથી."</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="8204677063922225311">"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="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="fdn_failed" msgid="540018079008319747">"FDN ઓપરેશન નિષ્ફળ થયું."</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="5254946758982621072">"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="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="3419351358300716472">"SIM PIN સાફ કર્યો"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"SIM PIN સેટ કરો"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"PIN સેટ કરી રહ્યાં છે…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN સેટ કર્યો"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN સાફ કર્યો"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN ખોટો છે"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN અપડેટ કર્યો"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"પાસવર્ડ ખોટો છે, PIN હમણાં અવરોધિત છે. PUK ની વિનંતી કરી."</string>
+    <string name="enter_pin2_text" msgid="8339444124477720345">"પિન કરો"</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="7910064009531541708">"PUK2 ખોટી. ફરી પ્રયાસ કરો."</string>
+    <string name="badPin2" msgid="6646896629970023109">"જૂનો PIN2 ખોટો છે. ફરી પ્રયાસ કરો."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2 મેળ ખાતા નથી. ફરીથી પ્રયાસ કરો."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"4 થી 8 સંખ્યાનો તેવો એક PIN2 દાખલ કરો."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"8 સંખ્યાની હોય તેવી એક PUK2 દાખલ કરો."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 અપડેટ કર્યો"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"PUK2 કોડ દાખલ કરો"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"પાસવર્ડ ખોટો છે. PIN2 હમણાં અવરોધિત છે. ફરી પ્રયાસ કરવા માટે, PIN 2 બદલો."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"પાસવર્ડ ખોટો છે, SIM હમણાં અવરોધિત છે. PUK2 દાખલ કરો."</string>
+    <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 ને કાયમી રૂપે અવરોધિત કરેલ છે."</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"તમારી પાસે <xliff:g id="NUMBER">%d</xliff:g> પ્રયાસ બાકી છે."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 હવે અવરોધિત નથી"</string>
+    <string name="doneButton" msgid="2859593360997984240">"થઈ ગયું"</string>
+    <string name="voicemail_settings_number_label" msgid="8524164258691887790">"વૉઇસમેઇલ નંબર"</string>
+    <string name="card_title_dialing" msgid="5769417478498348054">"ડાયલ કરી રહ્યાં છે"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"ફરી ડાયલ કરી રહ્યાં છે"</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="notification_dialing" msgid="2107666444937350731">"ડાયલ કરી રહ્યાં છે"</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_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>
+    <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="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="2947938060513306698">"કૉલ કરવા માટે એરપ્લેન મોડ બંધ કરો."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"કૉલ કરવા માટે એરપ્લેન મોડ બંધ કરો અથવા વાયરલેસ નેટવર્કથી કનેક્ટ કરો."</string>
+    <string name="incall_error_emergency_only" msgid="4678640422710818317">"નેટવર્ક પર નોંધણી કરાયેલ નથી."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"સેલ્યુલર નેટવર્ક ઉપલબ્ધ નથી."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"સેલ્યુલર નેટવર્ક ઉપલબ્ધ નથી. કૉલ કરવા માટે વાયરલેસ નેટવર્કથી કનેક્ટ કરો."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"કૉલ કરવા માટે, માન્ય નંબર દાખલ કરો."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"કૉલ કરી શકાતો નથી."</string>
+    <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI અનુક્રમ પ્રારંભ કરી રહ્યાં છે…"</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"સેવા સમર્થિત નથી"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"કૉલ્સ સ્વિચ કરી શકાતા નથી."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"અલગ કૉલ કરી શકાતો નથી."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"સ્થાનાંતર કરી શકાતું નથી."</string>
+    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"કોન્ફરન્સ કૉલ કરવામાં અસમર્થ."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"કૉલ નકારી શકાતો નથી."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"કૉલ(લ્સ) રિલીઝ કરી શકતા નથી."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"કૉલ કરવા માટે વાયરલેસ નેટવર્કથી કનેક્ટ કરો."</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="5960061579996526883">"કોઈ સેવા નથી. ફરી પ્રયાસ કરી રહ્યાં છે…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"કૉલ કરી શકાતો નથી. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> એ કટોકટીનો નંબર નથી."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"કૉલ કરી શકાતો નથી. કટોકટીનો નંબર ડાયલ કરો!"</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="onscreenVideoCallText" msgid="4800924186056115442">"વિડિઓ કૉલ"</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="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_info_message" msgid="7738596060242881930">"નેટવર્ક સંદેશ"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"ભૂલ સંદેશ"</string>
+    <string name="ota_title_activate" msgid="8616918561356194398">"તમારા ફોનને સક્રિય કરો"</string>
+    <string name="ota_touch_activate" msgid="6553212803262586244">"તમારી ફોન સેવાને સક્રિય કરવા માટે એક વિશિષ્ટ કૉલની જરૂર છે. \n\n\"સક્રિય કરો\" દબાવ્યાં પછી, તમારા ફોનને સક્રિય કરવા માટે પ્રદાન કરવામાં આવેલ સૂચનાઓને અનુસરો."</string>
+    <string name="ota_hfa_activation_title" msgid="2234246934160473981">"સક્રિય કરી રહ્યું છે…"</string>
+    <string name="ota_hfa_activation_dialog_message" msgid="8092479227918463415">"ફોન તમારી મોબાઇલ ડેટા સેવાને સક્રિય કરી રહ્યું છે.\n\nઆમાં 5 મિનિટ સુધીનો સમય લાગી શકે છે."</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="6570240212263372046">"ફોન સક્રિય કરેલ છે."</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="460876637828044519">"તમારો ફોનનો પ્રોગ્રામ કરી રહ્યાં છે…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"તમારા ફોનનો પ્રોગ્રામ કરી શકાયો નથી"</string>
+    <string name="ota_successful" msgid="1880780692887077407">"તમારો ફોન હવે સક્રિય કરેલ છે. સેવા પ્રારંભ થવામાં 15 મિનિટ સુધી લાગી શકે છે."</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="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" formatted="false" msgid="8308381858502470919">
+      <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> મિનિટ માટે કોઈ ડેટા કનેક્શન નથી</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> મિનિટ માટે કોઈ ડેટા કનેક્શન નથી</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="one">ફોન <xliff:g id="COUNT_1">%s</xliff:g> મિનિટ સુધી કટોકટી કૉલબેક મોડમાં રહેશે. આ મોડમાં હોય ત્યારે ડેટા કનેક્શનનો ઉપયોગ કરતી કોઈપણ એપ્લિકેશન્સનો ઉપયોગ થઈ શકશે નહીં. શું તમે હમણાં બહાર નીકળવા માગો છો?</item>
+      <item quantity="other">ફોન <xliff:g id="COUNT_1">%s</xliff:g> મિનિટ સુધી કટોકટી કૉલબેક મોડમાં રહેશે. આ મોડમાં હોય ત્યારે ડેટા કનેક્શનનો ઉપયોગ કરતી કોઈપણ એપ્લિકેશન્સનો ઉપયોગ થઈ શકશે નહીં. શું તમે હમણાં બહાર નીકળવા માગો છો?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="one">કટોકટી કૉલબેક મોડમાં હોય ત્યારે પસંદ કરેલ ક્રિયા ઉપલબ્ધ રહેતી નથી. ફોન <xliff:g id="COUNT_1">%s</xliff:g> મિનિટ સુધી આ મોડમાં રહેશે. શું તમે હમણાં બહાર નીકળવા માગો છો?</item>
+      <item quantity="other">કટોકટી કૉલબેક મોડમાં હોય ત્યારે પસંદ કરેલ ક્રિયા ઉપલબ્ધ રહેતી નથી. ફોન <xliff:g id="COUNT_1">%s</xliff:g> મિનિટ સુધી આ મોડમાં રહેશે. શું તમે હમણાં બહાર નીકળવા માગો છો?</item>
+    </plurals>
+    <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_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="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="not_voice_capable" msgid="2739898841461577811">"વૉઇસ કૉલિંગ સમર્થિત નથી"</string>
+    <string name="description_dial_button" msgid="7459705245418435351">"ડાયલ કરો"</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="2609519527849101590">"ધ્વનિ"</string>
+    <string name="dial_pad_autocomplete" msgid="7683489952557536398">"ડાયલપેડ સ્વતઃપૂર્ણ"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"રિંગટોન અને વાઇબ્રેટ"</string>
+    <string name="pstn_connection_service_label" msgid="1743245930577325900">"બિલ્ટ-ઇન SIM કાર્ડ્સ"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"વિડિઓ કૉલિંગ ચાલુ કરો"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"વિડિઓ કૉલિંગ ચાલુ કરવા માટે, તમારે નેટવર્ક સેટિંગ્સમાં વધારેલ 4G LTE મોડને સક્ષમ કરવાની જરૂર છે."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"નેટવર્ક સેટિંગ્સ"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"બંધ કરો"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"કટોકટીના કૉલ્સ"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"ફક્ત કટોકટીની કૉલિંગ"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM કાર્ડ, સ્લોટ: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"ઍક્સેસિબિલિટી"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"આવનાર Wi-Fi કૉલ"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi કૉલ"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"ખોલવા માટે ફરી ટચ કરો"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"સંદેશ ડીકોડિંગ કરતી વખતે ભૂલ આવી હતી."</string>
+</resources>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
new file mode 100644
index 0000000..24f9c30
--- /dev/null
+++ b/res/values-hi/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"वैश्विक"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-hi/config.xml b/res/values-hi/config.xml
deleted file mode 100644
index 9e6e3e8..0000000
--- a/res/values-hi/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"असत्य"</string>
-</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 92bce33..d8cde4c 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -16,34 +16,34 @@
 
 <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="tablet" msgid="1107073389495104784">"सेल्युलर डेटा"</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">"FDN सूची"</string>
     <string name="unknown" msgid="6878797917991465859">"अज्ञात"</string>
     <string name="private_num" msgid="6713286113000232309">"निजी नंबर"</string>
-    <string name="payphone" msgid="1931775086311769314">"सशुल्क फ़ोन"</string>
+    <string name="payphone" msgid="4793877574636445118">"पे-फ़ोन"</string>
     <string name="onHold" msgid="9035493194749959955">"होल्ड पर"</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="cancel" msgid="5044513931633602634">"अभी नहीं"</string>
     <string name="enter_input" msgid="1810529547726803893">"USSD संदेश <xliff:g id="MIN_LEN">%d</xliff:g> और <xliff:g id="MAX_LEN">%d</xliff:g> वर्णों के बीच होना चाहिए. कृपया पुन: प्रयास करें."</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"कॉन्फ़्रेंस कॉल प्रबंधित करें"</string>
     <string name="ok" msgid="3811371167865772377">"ठीक है"</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">"Bluetooth"</string>
+    <string name="audio_mode_bluetooth" msgid="3047641300848211128">"ब्लूटूथ"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"निम्न टोन भेजें?\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="5543521676355533577">"वाइल्ड वर्ण को इससे बदलें:"</string>
-    <string name="no_vm_number" msgid="4164780423805688336">"गुम ध्वनिमेल नंबर"</string>
-    <string name="no_vm_number_msg" msgid="1300729501030053828">"सिम कार्ड पर कोई ध्वनिमेल नंबर संग्रहीत नहीं है."</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="puk_unlocked" msgid="2284912838477558454">"आपका सिम कार्ड अनब्लॉक कर दिया गया है. आपका फ़ोन अनलॉक किया जा रहा है..."</string>
     <string name="label_ndp" msgid="780479633159517250">"सिम नेटवर्क अनलॉक पिन"</string>
@@ -52,18 +52,41 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"नेटवर्क अनलॉक के लिए अनुरोध कर रहा है..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"नेटवर्क अनलॉक अनुरोध असफल."</string>
     <string name="unlock_success" msgid="6770085622238180152">"नेटवर्क अनलॉक सफल रहा."</string>
-    <string name="mobile_network_settings_not_available" msgid="7355254462995117896">"मोबाइल नेटवर्क सेटिंग इस उपयोगकर्ता के लिए उपलब्ध नहीं हैं"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"सेल्युलर नेटवर्क सेटिंग इस उपयोगकर्ता के लिए उपलब्ध नहीं हैं"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM कॉल सेटिंग"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"GSM कॉल सेटिंग (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA कॉल सेटिंग"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"CDMA कॉल सेटिंग (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"एक्सेस केन्द्र का नाम"</string>
     <string name="settings_label" msgid="3876743539816984008">"नेटवर्क सेटिंग"</string>
-    <string name="connection_service" msgid="978745922583410219">"उपयोग की जाने वाली कनेक्शन सेवा"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"कॉलिंग खाते"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"इससे कॉल करें"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"इससे SIP कॉल करें"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"पहले पूछें"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"सेटिंग"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"खाते चुनें"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"फ़ोन खाते"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"SIP खाता जोड़ें"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"खाता सेटिंग कॉन्‍फ़िगर करें"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"वाई-फ़ाई कॉलिंग"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"वाई-फ़ाई कॉलिंग का उपयोग न करें"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"कॉल सहायक का उपयोग न करें"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"कोई नहीं"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"कॉल सहायक"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"कॉल सहायक का उपयोग करें"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"कॉल सहायक चुनें"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"इससे कॉल करने हेतु उपयोग किए जाने वाले नेटवर्क प्रबंधित करें:"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"ऐप्‍स या सेवाओं को कॉल हेतु उपयाेग किए जाने वाले नेटवर्क प्रबंधित करने दें"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"कॉन्फ़िगर करें"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"अंतर्निहित कनेक्शन सेवा"</string>
-    <string name="voicemail" msgid="8693759337917898954">"ध्वनिमेल"</string>
+    <string name="voicemail" msgid="8693759337917898954">"वॉयस मेल"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"वॉइसमेल (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
     <string name="networks" msgid="8873030692174541976">"नेटवर्क ऑपरेटर"</string>
-    <string name="call_settings" msgid="1630474923393095156">"कॉल सेटिंग"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"आपातकालीन प्रसारण"</string>
+    <string name="call_settings" msgid="6112441768261754562">"कॉल सेटिंग"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"अतिरिक्त सेटिंग"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"अतिरिक्‍त सेटिंग (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
@@ -74,32 +97,35 @@
     <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="sum_cw_enabled" msgid="8083061901633671397">"कॉल के दौरान, मुझे इनकमिंग कॉल की नोटिफिकेशन दें"</string>
+    <string name="sum_cw_disabled" msgid="3648693907300104575">"कॉल के दौरान, मुझे इनकमिंग कॉल की नोटिफिकेशन दें"</string>
+    <string name="call_forwarding_settings" msgid="3378927671091537173">"कॉल आगे भेजने की सेटिंग"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"कॉल आगे भेजने की सेटिंग (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="sum_cfu_disabled" msgid="8384177689501334080">"बंद"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"व्‍यस्‍त होने पर"</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="sum_cfb_disabled" msgid="4913145177320506827">"बंद"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"जब आपका फ़ोन व्यस्त हो, तो आपका ऑपरेटर कॉल अग्रेषण अक्षम करने का समर्थन नहीं करता."</string>
-    <string name="labelCFNRy" msgid="3646316323834351390">"अनुत्तरित होने पर इसको भेजें"</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"उत्‍तर न मिलने पर"</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="sum_cfnry_disabled" msgid="3884684060443538097">"बंद"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"जब आपका फ़ोन उत्तर न दे, तो आपका ऑपरेटर कॉल अग्रेषण अक्षम करने का समर्थन नहीं करता."</string>
-    <string name="labelCFNRc" msgid="47183615370850000">"पहुंच योग्य न होने पर इसको भेजें"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"पहुंच से बाहर होने पर"</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="5646361343094064333">"जब आपका फ़ोन पहुंच योग्य न हो, तो आपका कैरियर कॉल अग्रेषण अक्षम करने का समर्थन नहीं करता."</string>
     <string name="updating_title" msgid="6146755386174019046">"कॉल सेटिंग"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"कॉल सेटिंग केवल प्राथमिक उपयोगकर्ता द्वारा ही बदली जा सकती हैं."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"कॉल सेटिंग (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"कॉल सेटिंग त्रुटि"</string>
     <string name="reading_settings" msgid="1920291699287055284">"सेटिंग पढ़ रहा है..."</string>
     <string name="updating_settings" msgid="8171225533884883252">"सेटिंग के लिए नई जानकारी मिल रही है..."</string>
@@ -109,22 +135,22 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"चालू करें"</string>
+    <string name="disable" msgid="4678348128118573672">"बंद करें"</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="3352934863246208918">"ध्वनिमेल नंबर बदला नहीं जा सका.\nयदि यह समस्या बनी रहती है, तो अपने कैरियर से संपर्क करें."</string>
+    <string name="vm_changed" msgid="380744030726254139">"वॉयस मेल नंबर बदला गया."</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="sum_voicemail_choose_provider" msgid="59911196126278922">"वॉयस मेल सेवा चुनें"</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"आपका वाहक"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"सेल्युलर नेटवर्क सेटिंग"</string>
     <string name="label_available" msgid="1181658289009300430">"उपलब्ध नेटवर्क"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"खोज रहा है..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"कोई नेटवर्क नहीं मिला."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"पसंदीदा नेटवर्क मोड: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"पसंदीदा नेटवर्क मोड: वैश्विक"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"पसंदीदा नेटवर्क मोड: LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"पसंदीदा नेटवर्क मोड: LTE / GSM / UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"पसंदीदा नेटवर्क मोड: LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="7886739962255042385">"LTE / WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"केवल GSM"</item>
     <item msgid="3817924849415716259">"GSM/WCDMA पसंदीदा"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"उन्नत 4G LTE मोड"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"ध्‍वनि और अन्‍य संचारों को बेहतर बनाने हेतु LTE सेवाओं का उपयोग करें (अनुशंसित)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"डेटा सक्षम किया गया"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"मोबाइल नेटवर्क पर डेटा पहुंच सक्षम करें"</string>
-    <string name="roaming" msgid="8871412572928323707">"डेटा रोमिंग"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"डेटा उपयोग करने दें"</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="8913735676127858115">"आपकी डेटा कनेक्टिविटी खो गई है क्योंकि आप डेटा रोमिंग बंद करके अपने होम नेटवर्क से बाहर आ गए हैं."</string>
-    <string name="roaming_warning" msgid="7820963598559553967">"डेटा रोमिंग की अनुमति दें? आपको रोमिंग शुल्‍क लग सकते हैं!"</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"आपको बहुत अधिक शुल्‍क देना पड़ सकता है."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"डेटा रोमिंग की अनुमति दें?"</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>
@@ -190,7 +221,7 @@
     <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="throttle_help_subtext" msgid="3633091498168446044">"आपके वाहक की सेल्युलर नेटवर्क डेटा उपयोग नीति के बारे में अधिक जानकारी"</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>
@@ -299,11 +330,13 @@
     <item msgid="7494167883478914080">"0"</item>
     <item msgid="6043847456049107742">"1"</item>
   </string-array>
-    <string name="cdma_activate_device" msgid="3793805892364814518">"उपकरण सक्रिय करें"</string>
+    <string name="cdma_activate_device" msgid="3793805892364814518">"डिवाइस सक्रिय करें"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"डेटा सेवा सेट करें"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"वाहक सेटिंग"</string>
     <string name="fdn" msgid="7878832555095183202">"फ़िक्स्ड डायलिंग नंबर"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"नियत डायलिंग नंबर (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FDN सूची"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"FDN सूची (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FDN सक्रियण"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"फ़िक्स्ड डायलिंग नंबर सक्षम किए गए"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"फ़िक्स्ड डायलिंग नंबर अक्षम किए गए हैं"</string>
@@ -321,13 +354,14 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"TTY मोड सेट करें"</string>
     <string name="auto_retry_mode_title" msgid="4073265511427813322">"स्वतः पुन: प्रयास"</string>
     <string name="auto_retry_mode_summary" msgid="4973886004067532288">"स्वतः पुन: प्रयास मोड सक्षम करें"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"वीडियो कॉल के दौरान TTY मोड में बदलाव की अनुमति नहीं है"</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="8204677063922225311">"पिन2 लिखें"</string>
     <string name="name" msgid="7329028332786872378">"नाम"</string>
     <string name="number" msgid="7905950798349903858">"नंबर"</string>
-    <string name="save" msgid="4094274636321939086">"सहेजें"</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>
@@ -344,52 +378,50 @@
     <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="1846161429087789936">"सिम कार्ड से संपर्क आयात करने के लिए, पहले हवाई जहाज़ मोड बंद करें."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"SIM कार्ड से संपर्क आयात करने के लिए हवाई जहाज़ मोड बंद करें."</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="8955102849303984935">"आपके द्वारा लिखा गया पुराना पिन सही नहीं है. पुनः प्रयास करें."</string>
-    <string name="mismatchPin" msgid="5923253370683071889">"आपके द्वारा लिखे गए पिन का मिलान नहीं होता. पुनः प्रयास करें."</string>
+    <string name="confirmPinLabel" msgid="257597715098070206">"नए पिन की दुबारा पूछें"</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="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="1796577128488773946">"पासवर्ड गलत है, PIN अवरोधित किया गया! PUK का अनुरोध किया गया."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"सिम पिन साफ़ करें"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"सिम पिन सेट करें"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"पिन सेट किया जा रहा है…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"पिन सेट हो गया"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"पिन साफ़ किया गया"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN गलत है"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN अपडेट किया गया"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"पासवर्ड गलत है. पिन अब अवरोधित है. PUK का अनुरोध किया गया."</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="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="1639666438836544393">"पिन2 सफलतापूर्वक बदला गया"</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"PUK2 कोड टाइप करें"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"पासवर्ड गलत है, PIN2 अवरोधित किया गया. कृपया PIN2 को बदलें और पुन: प्रयास करें!"</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"पासवर्ड गलत है, सिम लॉक हो गया है. PUK2 का अनुरोध किया गया."</string>
+    <string name="confirmPin2Label" msgid="8100319484454787708">"नए पिन2 की दुबारा पूछें"</string>
+    <string name="badPuk2" msgid="7910064009531541708">"PUK2 गलत है. पुन: प्रयास करें."</string>
+    <string name="badPin2" msgid="6646896629970023109">"पुराना PIN2  गलत है. पुन: प्रयास करें."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2 का मिलान नहीं हो रहा. पुन: प्रयास करें."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"4 से 8 संख्‍याओं वाला PIN2 डालें."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"8 संख्‍याओं वाला PUK2 डालें."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 अपडेट किया गया"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"PUK2 कोड डालें"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"पासवर्ड गलत है. PIN2 अब अवरोधित है. पुन: प्रयास करने के लिए, PIN 2 को बदलें."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"पासवर्ड गलत है. सिम अब लॉक हो गई है. PUK2 डालें."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 स्थायी रूप से अवरोधित है."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"<xliff:g id="NUMBER">%d</xliff:g> प्रयास शेष हैं."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 अनब्लॉक किया गया!"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"आपके पास <xliff:g id="NUMBER">%d</xliff:g> प्रयास शेष हैं."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 अब अवरोधित नहीं है"</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_redialing" msgid="8253487008234167266">"पुन: डायल हो रहा है"</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_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_dialing" msgid="2107666444937350731">"डायल हो रहा है"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"छूटी कॉल"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"छूटी कॉल"</string>
@@ -398,34 +430,36 @@
     <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>
-    <string name="notification_voicemail_title_count" msgid="4366360747660929916">"नई ध्वनिमेल (<xliff:g id="COUNT">%d</xliff:g>)"</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_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_power_off" msgid="2947938060513306698">"कॉल करने के लिए हवाई जहाज़ मोड बंद करें."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"कॉल करने के लिए हवाई जहाज़ मोड बंद करें या किसी वायरलेस नेटवर्क से कनेक्‍ट करें."</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_error_out_of_service" msgid="4100065333878929223">"सेल्युलर नेटवर्क उपलब्ध नहीं."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"सेल्‍युलर नेटवर्क उपलब्‍ध नहीं है. कॉल करने के लिए किसी वायरलेस नेटवर्क से कनेक्‍ट करें."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"कॉल करने के लिए, मान्‍य नंबर डालें."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"कॉल नहीं किया जा सकता."</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_unknown" msgid="655570339115407698">"सेवा समर्थित नहीं है"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"कॉल स्‍विच नहीं किए जा सकते."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"कॉल अलग नहीं किया जा सकता."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"ट्रांसफर नहीं किया जा सकता."</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="incall_error_supp_service_reject" msgid="8998568661508655638">"कॉल अस्‍वीकार नहीं किया जा सकता."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"कॉल रिलीज़ नहीं किया जा सकता (किए जा सकते)."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"कॉल करने के लिए किसी वायरलेस नेटवर्क से कनेक्‍ट करें."</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="7969515493359619960">"कॉल नहीं भेजा गया, <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> कोई आपातकालीन नंबर नहीं है!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"कॉल नहीं भेजा गया. कोई आपातकालीन नंबर डायल करें!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"कोई सेवा नहीं. पुन: प्रयास किया जा रहा है…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"कॉल नहीं किया जा सकता. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> एक आपातकालीन नंबर नहीं है."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"कॉल नहीं किया जा सकता. आपातकालीन नबर डायल करें."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"डायल करने के लिए कीबोर्ड का उपयोग करें"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"होल्ड करें"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"समाप्त"</string>
@@ -456,43 +490,44 @@
     <item msgid="899650777817315681">"सामान्य"</item>
     <item msgid="2883365539347850535">"लंबा"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"नेटवर्क संदेश"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"नेटवर्क संदेश"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"त्रुटि संदेश"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"अपना फ़ोन सक्रिय करें"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"आपकी फ़ोन सेवा को सक्रिय करने के लिए एक विशेष कॉल करने की आवश्यकता है. \n\n\"सक्रिय करें\" दबाने के बाद, अपने फ़ोन को सक्रिय करने के लिए दिए जाने वाले निर्देश सुनें."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"सक्रिय हो रहा है..."</string>
     <string name="ota_hfa_activation_dialog_message" msgid="8092479227918463415">"फ़ोन आपकी मोबाइल डेटा सेवा सक्रिय कर रहा है.\n\nइसमें 5 मिनट तक लग सकते हैं."</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_message" msgid="2440770373498870550">"यदि आप सक्रियण छोड़ देते हैं, तो आप कॉल नहीं कर सकते या मोबाइल डेटा नेटवर्क से कनेक्ट (हालांकि आप वाई-फ़ाई  नेटवर्क से कनेक्ट हो सकते हैं) नहीं हो सकते हैं. जब तक आप अपने फ़ोन को सक्रिय नहीं करते, आपको प्रत्येक बार उसे चालू करने पर उसे सक्रिय करने के लिए कहा जाएगा."</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="6570240212263372046">"फ़ोन सक्रिय हो गया."</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="3420314892609254729">"जब तक आपका फ़ोन प्रोग्राम हो, प्रतीक्षा करें."</string>
-    <string name="ota_failure" msgid="4311299546379674378">"प्रोग्रामिंग विफल"</string>
+    <string name="ota_progress" msgid="460876637828044519">"आपका फ़ोन प्रोग्राम किया जा रहा है…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"आपके फ़ोन को प्रोग्राम नहीं किया जा सका"</string>
     <string name="ota_successful" msgid="1880780692887077407">"आपका फ़ोन अब सक्रिय कर दिया गया है. सेवा को आरंभ होने में 15 मिनट तक लग सकते हैं."</string>
-    <string name="ota_unsuccessful" msgid="8072141612635635357">"आपका फ़ोन सक्रिय नहीं हुआ. \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_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="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="2585506997024726599">"आपातकालीन कॉलबैक मोड के समय चयनित क्रिया उपलब्ध नहीं है. फ़ोन <xliff:g id="COUNT">%s</xliff:g> मिनट तक इस मोड में रहेगा. क्या आप अभी बाहर निकलना चाहते हैं?"</item>
-    <item quantity="other" msgid="6115622137771382224">"आपातकालीन कॉलबैक मोड के समय चयनित क्रिया उपलब्ध नहीं है. फ़ोन <xliff:g id="COUNT">%s</xliff:g> मिनट तक इस मोड में रहेगा. क्या आप अभी बाहर निकलना चाहते हैं?"</item>
-  </plurals>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> मिनट तक कोई डेटा कनेक्‍शन नहीं</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> मिनट तक कोई डेटा कनेक्‍शन नहीं</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="one">फ़ोन <xliff:g id="COUNT_1">%s</xliff:g> मिनट तक आपातकालीन कॉलबैक मोड में रहेगा. इस मोड में रहने पर डेटा कनेक्‍शन का उपयोग करने वाले किसी भी ऐप्‍लिकेशन का उपयोग नहीं किया जा सकता. क्‍या आप अभी बाहर निकलना चाहते हैं?</item>
+      <item quantity="other">फ़ोन <xliff:g id="COUNT_1">%s</xliff:g> मिनट तक आपातकालीन कॉलबैक मोड में रहेगा. इस मोड में रहने पर डेटा कनेक्‍शन का उपयोग करने वाले किसी भी ऐप्‍लिकेशन का उपयोग नहीं किया जा सकता. क्‍या आप अभी बाहर निकलना चाहते हैं?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="one">आपातकालीन कॉलबैक मोड में रहने पर चयनित कार्रवाई उपलब्‍ध नहीं होती. फ़ोन <xliff:g id="COUNT_1">%s</xliff:g> मिनट तक इस मोड में रहेगा. क्‍या आप अभी बाहर निकलना चाहते हैं?</item>
+      <item quantity="other">आपातकालीन कॉलबैक मोड में रहने पर चयनित कार्रवाई उपलब्‍ध नहीं होती. फ़ोन <xliff:g id="COUNT_1">%s</xliff:g> मिनट तक इस मोड में रहेगा. क्‍या आप अभी बाहर निकलना चाहते हैं?</item>
+    </plurals>
     <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>
@@ -506,110 +541,23 @@
     <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="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="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="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_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="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="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>
-    <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">"&lt;सेट नहीं है&gt;"</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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"ध्वनि कॉल करना समर्थित नहीं है"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"त्वरित प्रतिसाद"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></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">"बैकस्पेस"</string>
-    <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_ringtone_title" msgid="2609519527849101590">"ध्वनि"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"डिफ़ॉल्ट ध्वनि (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</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="dial_pad_autocomplete" msgid="494525952035761075">"डायलपैड स्वत: पूर्ण"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"रिंगटोन और कंपन"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"कॉल करने के लिए Wi-Fi का उपयोग करें?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"हां"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"नहीं"</string>
-    <string name="pstn_connection_service_label" msgid="1743245930577325900">"अंतर्निहित SIM कार्ड"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"अंतर्निहित इंटरनेट कॉल सुविधा"</string>
+    <string name="pstn_connection_service_label" msgid="1743245930577325900">"अंतर्निहित सिम कार्ड"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"वीडियो कॉलिंग चालू करें"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"वीडियो कॉलिंग चालू करने के लिए, आपको नेटवर्क सेटिंग में उन्‍नत 4G LTE मोड सक्षम करना होगा."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"नेटवर्क सेटिंग"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"बंद करें"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"आपातकालीन कॉल"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"केवल आपातकालीन कॉल"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"सिम कार्ड, स्‍लॉट: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"सरल उपयोग"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"इनकमिंग वाई-फ़ाई कॉल"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"वाई-फ़ाई कॉल"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"खोलने के लिए पुन: स्पर्श करें"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"संदेश डीकोड करते समय कोई त्रुटि हुई थी."</string>
 </resources>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
new file mode 100644
index 0000000..ff6cd57
--- /dev/null
+++ b/res/values-hr/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Globalno"</item>
+    <item msgid="6753774959494729275">"LTE/CDMA"</item>
+    <item msgid="8658695584186942227">"LTE/GSM/UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-hr/config.xml b/res/values-hr/config.xml
deleted file mode 100644
index cb5707b..0000000
--- a/res/values-hr/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"netočno"</string>
-</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index e6228a2..bcc58c4 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -16,14 +16,14 @@
 
 <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">"Mobilni podaci"</string>
+    <string name="phoneAppLabel" product="tablet" msgid="1107073389495104784">"Mobilni podaci"</string>
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Telefon"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Birač hitnih poziva"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Telefon"</string>
     <string name="fdnListLabel" msgid="8630418672279521003">"Popis FDN-a"</string>
     <string name="unknown" msgid="6878797917991465859">"Nepoznato"</string>
     <string name="private_num" msgid="6713286113000232309">"Privatni broj"</string>
-    <string name="payphone" msgid="1931775086311769314">"Telefonska govornica"</string>
+    <string name="payphone" msgid="4793877574636445118">"Javna telefonska govornica"</string>
     <string name="onHold" msgid="9035493194749959955">"Na čekanju"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Pokrenut je MMI kôd"</string>
     <string name="ussdRunning" msgid="485588686340541690">"Pokrenut je USSD kôd…"</string>
@@ -52,18 +52,41 @@
     <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="mobile_network_settings_not_available" msgid="7355254462995117896">"Postavke mobilne mreže nisu dostupne za tog korisnika"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Postavke mobilne mreže nisu dostupne za tog korisnika"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Postavke GSM poziva"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"Postavke GSM poziva (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Postavke CDMA poziva"</string>
-    <string name="apn_settings" msgid="9043423184895642077">"Nazivi pristupnih točaka"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"Postavke CDMA poziva (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="apn_settings" msgid="9043423184895642077">"Pristupne točke"</string>
     <string name="settings_label" msgid="3876743539816984008">"Postavke mreže"</string>
-    <string name="connection_service" msgid="978745922583410219">"Usluga povezivanja koja će se upotrijebiti"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Računi za pozivanje"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Nazovite putem računa"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Uputite SIP poziv putem računa"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Najprije pitaj"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Postavke"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Odaberite račune"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Telefonski računi"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Dodaj SIP račun"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Konfiguriranje postavki računa"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi pozivi"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Ne upotrebljavaj Wi-Fi pozive"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Ne upotrebljavaj pomoćnik za pozive"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Ništa"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Pomoćnik za pozive"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Upotrebljavaj pomoćnik za pozive"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Odabir pomoćnika za pozive"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Upravljanje mrežama koje se upotrebljavaju za pozive putem"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Neka aplikacije ili usluge upravljaju mrežama koje se upotrebljavaju za pozive"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Konfiguriraj"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Ugrađena usluga povezivanja"</string>
     <string name="voicemail" msgid="8693759337917898954">"Govorna pošta"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Govorna pošta (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
     <string name="networks" msgid="8873030692174541976">"Mrežni operateri"</string>
-    <string name="call_settings" msgid="1630474923393095156">"Postavke poziva"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Hitna emitiranja"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Postavke poziva"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Dodatne postavke"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Dodatne postavke (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Dodatne postavke samo za GSM poziv"</string>
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Dodatne postavke za CDMA poziv"</string>
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Dodatne postavke samo za CDMA poziv"</string>
@@ -77,29 +100,32 @@
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Obavijesti me tijekom poziva o dolaznim pozivima"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Obavijesti me tijekom poziva o dolaznim pozivima"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Postavke preusmjeravanja poziva"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Postavke prosljeđivanja poziva (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Preusmjeravanje poziva"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Uvijek preusmjeri"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Uvijek koristi ovaj broj"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Preusmjeravanje svih poziva"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Preusmjeravanje poziva na <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Broj je nedostupan"</string>
-    <string name="sum_cfu_disabled" msgid="3698472522160364904">"Onemogućeno"</string>
-    <string name="labelCFB" msgid="218938523102207587">"Preusmjeri ako je zauzeto"</string>
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Isključeno"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Kad je zauzeto"</string>
     <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="sum_cfb_disabled" msgid="4913145177320506827">"Isključeno"</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="labelCFNRy" msgid="1736067178393744351">"Kad 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="sum_cfnry_disabled" msgid="3884684060443538097">"Isključeno"</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="labelCFNRc" msgid="2614827454402079766">"Kad je nedostupno"</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="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="call_settings_primary_user_only" msgid="5679923943740900965">"Postavke može mijenjati samo primarni korisnik."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Postavke poziva (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Pogreška postavki poziva"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Postavke čitanja..."</string>
     <string name="updating_settings" msgid="8171225533884883252">"Ažuriranje postavki..."</string>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"Uključi"</string>
+    <string name="disable" msgid="4678348128118573672">"Isključi"</string>
     <string name="change_num" msgid="239476305819844391">"Ažuriraj"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Zdana postavka mreže"</item>
@@ -123,8 +149,8 @@
     <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>
-    <string name="voicemail_default" msgid="5902099213882352338">"Moj mobilni operater"</string>
-    <string name="mobile_networks" msgid="5540397602919106177">"Postavke mobilne mreže"</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"Vaš mobilni operater"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Postavke mobilne mreže"</string>
     <string name="label_available" msgid="1181658289009300430">"Dostupne mreže"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Pretraživanje…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Nije pronađena mreža."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Preferirani mrežni način: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Preferirani mrežni način: globalni"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Preferirani mrežni način: LTE/WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Preferirani način mreže: LTE/GSM/UMTS"</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="7886739962255042385">"LTE/WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"Samo GSM"</item>
     <item msgid="3817924849415716259">"Preferirano GSM/WCDMA"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Poboljšan 4G LTE način"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Upotreba LTE usluga za poboljšanje glasovne i drugih komunikacija (preporučeno)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Podaci su omogućeni"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Omogući podatkovni pristup preko mobilne mreže"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Dopusti upotrebu podataka"</string>
     <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="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="roaming_warning" msgid="1603164667540144353">"To se može skupo naplaćivati."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Želite li dopustiti roaming podataka?"</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>
@@ -190,7 +221,7 @@
     <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"<xliff:g id="USED_0">%1$s</xliff:g> maksimum je prekoračen\nBrzina prijenosa podataka smanjena je na <xliff:g id="USED_1">%2$d</xliff:g> Kb/s"</string>
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"Proteklo je <xliff:g id="USED_0">%1$d</xliff:g>٪ ciklusa\nSljedeć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="throttle_help_subtext" msgid="3633091498168446044">"Više informacija o pravilima upotrebe mobilne podatkovne mreže vašeg davatelja mobilne usluge"</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>
@@ -303,7 +334,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Postavljanje podatkovne usluge"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Postavke mobil. operatera"</string>
     <string name="fdn" msgid="7878832555095183202">"Brojevi za fiksno biranje"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Brojevi fiksnog biranja (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Popis FDN-a"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"FDN popis (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Aktivacija FDN-a"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Brojevi za fiksno biranje su omogućeni"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Brojevi za fiksno biranje su onemogućeni"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Postavi način TTY"</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="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"Promjena TTY načina nije dopuštena tijekom videopoziva"</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>
@@ -344,7 +378,7 @@
     <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="1846161429087789936">"Za uvoz kontakata sa SIM kartice prvo isključite način rada u zrakoplovu."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Isključite način rada u zrakoplovu da biste uvezli kontakte sa SIM kartice."</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>
@@ -354,42 +388,40 @@
     <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="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="1796577128488773946">"Zaporka nije točna, PIN je blokiran! Potreban je PUK."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"Brisanje PIN-a za SIM"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"Postavljanje PIN-a za SIM"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"Postavljanje PIN-a..."</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN je postavljen"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN je izbrisan"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN nije točan"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN ažuriran"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Zaporka nije točna. PIN je sada blokiran. Unesite PUK."</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="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="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="3674058967950559397">"Zaporka nije točna, PIN2 je blokiran. 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="badPuk2" msgid="7910064009531541708">"PUK2 nije točan. Pokušajte ponovo."</string>
+    <string name="badPin2" msgid="6646896629970023109">"Stari PIN2 nije točan. Pokušajte ponovo."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN-ovi 2 nisu podudarni. Pokušajte ponovo."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Unesite PIN2 koji ima od 4 do 8 brojeva."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Unesite PUK2 koji ima 8 brojeva."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 ažuriran"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Unesite PUK2 kôd"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Zaporka nije točna. PIN2 sada je blokiran. Da biste pokušali ponovo, promijenite PIN 2."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Zaporka nije točna. SIM je sada zaključan. Unesite PUK2."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 je trajno blokiran."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Imate još ovoliko preostalih pokušaja: <xliff:g id="NUMBER">%d</xliff:g>."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 je deblokiran!"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"Imate još <xliff:g id="NUMBER">%d</xliff:g> pokušaja."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 više nije blokiran"</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="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_redialing" msgid="8253487008234167266">"Ponovno biranje"</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_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>
     <string name="card_title_in_call" msgid="6346543933068225205">"Poziv u tijeku"</string>
-    <string name="card_title_my_phone_number" msgid="112428362494434191">"Moj broj je <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Biranje broja"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Propušteni poziv"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Propušteni pozivi"</string>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"Isključite način rada u zrakoplovu da biste uputili poziv."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Isključite način rada u zrakoplovu ili se povežite s bežičnom mrežom da biste uputili poziv."</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_error_out_of_service" msgid="4100065333878929223">"Mobilna mreža nije dostupna."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Mobilna mreža nije dostupna. Povežite se s bežičnom mrežom da biste uputili poziv."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Unesite važeći broj da biste uspostavili poziv."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Pozivanje nije moguće."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Pokretanje MMI sekvence…"</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>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Nije moguće prenijeti poziv."</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Usluga nije podržana"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Prebacivanje poziva nije moguće."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Odvajanje poziva nije moguće."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Prijenos nije moguć."</string>
     <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Nije moguće uspostaviti konferencijske pozive."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Nije moguće odbiti poziv."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Nije moguće ostvariti pozi(e)."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Internetski poziv"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Odbijanje poziva nije moguće."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Prekidanje poziva nije moguće."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Povežite se s bežičnom mrežom da biste uputili poziv."</string>
     <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="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="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Nema usluge. Pokušavamo ponovo…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Pozivanje nije moguće. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nije broj hitne službe."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Pozivanje nije moguće. Nazovite broj hitne službe."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Birajte pomoću tipkovnice"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Na čekanju"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Kraj"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"Normalni"</item>
     <item msgid="2883365539347850535">"Dugo"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Mrežna poruka"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Mrežna poruka"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Poruka pogreške"</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\nNakon što pritisnete “Aktiviraj”, poslušajte upute za aktiviranje telefona."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Aktivacija..."</string>
@@ -469,8 +504,8 @@
     <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_speaker" msgid="6904589278542719647">"Zvučnik"</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_progress" msgid="460876637828044519">"Programiranje telefona..."</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Programiranje telefona nije uspjelo"</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="8072141612635635357">"Vaš se telefon nije aktivirao. \nMožda biste trebali potražiti područje s boljom pokrivenošću (pored prozora ili vani). \n\nPokuš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>
@@ -481,18 +516,21 @@
     <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>
     <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Onemogućena je podatkovna mreža"</string>
-  <plurals name="phone_in_ecm_notification_time">
-    <item quantity="one" msgid="4866221796252472622">"Nema podatkovne veze <xliff:g id="COUNT">%s</xliff:g> min"</item>
-    <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="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="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>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="one">Podatkovne veze neće biti <xliff:g id="COUNT_1">%s</xliff:g> minutu</item>
+      <item quantity="few">Podatkovne veze neće biti <xliff:g id="COUNT_1">%s</xliff:g> minute</item>
+      <item quantity="other">Podatkovne veze neće biti <xliff:g id="COUNT_1">%s</xliff:g> minuta</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="one">Telefon će biti u načinu hitnog povratnog poziva <xliff:g id="COUNT_1">%s</xliff:g> minutu. U tom se načinu ne mogu upotrebljavati aplikacije koje upotrebljavaju podatkovnu vezu. Želite li odmah zatvoriti taj način?</item>
+      <item quantity="few">Telefon će biti u načinu hitnog povratnog poziva <xliff:g id="COUNT_1">%s</xliff:g> minute. U tom se načinu ne mogu upotrebljavati aplikacije koje upotrebljavaju podatkovnu vezu. Želite li odmah zatvoriti taj način?</item>
+      <item quantity="other">Telefon će biti u načinu hitnog povratnog poziva <xliff:g id="COUNT_1">%s</xliff:g> minuta. U tom se načinu ne mogu upotrebljavati aplikacije koje upotrebljavaju podatkovnu vezu. Želite li odmah zatvoriti taj način?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="one">Odabrana radnja nije dostupna u načinu hitnog povratnog poziva. Telefon će u tom načinu biti <xliff:g id="COUNT_1">%s</xliff:g> minutu. Želite li odmah zatvoriti taj način?</item>
+      <item quantity="few">Odabrana radnja nije dostupna u načinu hitnog povratnog poziva. Telefon će u tom načinu biti <xliff:g id="COUNT_1">%s</xliff:g> minute. Želite li odmah zatvoriti taj način?</item>
+      <item quantity="other">Odabrana radnja nije dostupna u načinu hitnog povratnog poziva. Telefon će u tom načinu biti <xliff:g id="COUNT_1">%s</xliff:g> minuta. Želite li odmah zatvoriti taj način?</item>
+    </plurals>
     <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>
@@ -506,110 +544,23 @@
     <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_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_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="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="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="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="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_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="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 Wi-Fi 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="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>
-    <string name="username_title" msgid="2479375923477682328">"Korisničko ime"</string>
-    <string name="password_title" msgid="3323555249068171531">"Zaporka"</string>
-    <string name="display_name_title" msgid="2459768196312249937">"Ime za prikaz"</string>
-    <string name="proxy_address_title" msgid="4828301345351614273">"Odlazna proxy adresa"</string>
-    <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="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>
-    <string name="auth_username_title" msgid="851473016307947120">"Korisničko ime za provjeru autentičnosti"</string>
-    <string name="auth_username_summary" msgid="6782012405225938629">"Korisničko ime za provjeru autentičnosti"</string>
-    <string name="default_preference_summary" msgid="868766740121667450">"&lt;Nije postavljeno&gt;"</string>
-    <string name="display_name_summary" msgid="8636377460518225523">"&lt;Isto kao korisničko ime&gt;"</string>
-    <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="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="7877142631803238549">"Za uspostavu internetskog poziva prvo provjerite internetsku vezu."</string>
-    <string name="no_wifi_available" msgid="1225073547318465713">"Morate se povezati s Wi-Fi 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>
     <string name="not_voice_capable" msgid="2739898841461577811">"Glasovni pozivi nisu podržani"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Brzi odgovori"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"jedan"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"dva"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"tri"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"četiri"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"pet"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"šest"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"sedam"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"osam"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"devet"</string>
-    <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_dial_button" msgid="7459705245418435351">"biraj"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="description_target_answer" msgid="7205604197797472471">"Odgovori"</string>
-    <string name="description_target_send_sms" msgid="2098326025587950144">"Pošalji SMS"</string>
-    <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="2609519527849101590">"Zvuk"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Zadani zvuk (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <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="dial_pad_autocomplete" msgid="494525952035761075">"Samodovršavanje biranja brojeva"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Melodija zvona i vibracija"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Želite li uputiti poziv putem Wi-Fi-ja?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Da"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"Ne"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Ugrađene SIM kartice"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Ugrađeni internetski pozivi"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Uključivanje videopoziva"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Da biste uključili videopozive, morate omogućiti Poboljšan 4G LTE način u postavkama mreže."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Postavke mreže"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Zatvori"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Hitni pozivi"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Samo hitni pozivi"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM kartica, utor: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Pristupačnost"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Dolazni Wi-Fi poziv"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi poziv"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Dodirnite ponovo da biste otvorili"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"Došlo je do pogreške prilikom dekodiranja poruke."</string>
 </resources>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
new file mode 100644
index 0000000..0961f84
--- /dev/null
+++ b/res/values-hu/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Globális"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-hu/config.xml b/res/values-hu/config.xml
deleted file mode 100644
index e886969..0000000
--- a/res/values-hu/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"hamis"</string>
-</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index f5cc45b..c328b68 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -16,14 +16,14 @@
 
 <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">"Mobiladatok"</string>
+    <string name="phoneAppLabel" product="tablet" msgid="1107073389495104784">"Mobiladatok"</string>
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Telefon"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Segélyhívó tárcsázó"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Telefon"</string>
-    <string name="fdnListLabel" msgid="8630418672279521003">"FDN lista"</string>
+    <string name="fdnListLabel" msgid="8630418672279521003">"Fix hívószámok listája"</string>
     <string name="unknown" msgid="6878797917991465859">"Ismeretlen"</string>
     <string name="private_num" msgid="6713286113000232309">"Magántelefonszám"</string>
-    <string name="payphone" msgid="1931775086311769314">"Nyilvános telefon"</string>
+    <string name="payphone" msgid="4793877574636445118">"Nyilvános telefon"</string>
     <string name="onHold" msgid="9035493194749959955">"Tartásban"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI-kód elindítva"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD-kód futtatása..."</string>
@@ -43,27 +43,50 @@
     <string name="pause_prompt_no" msgid="6686238803236884877">"Nem"</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="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="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="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>
     <string name="sim_ndp_dismiss_text" msgid="1604823375752456947">"Elvetés"</string>
     <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="mobile_network_settings_not_available" msgid="7355254462995117896">"Mobilhálózati beállítások nem érhetők el ennél a felhasználónál"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Mobilhálózati beállítások nem érhetők el ennél a felhasználónál"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM-hívásbeállítások"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"GSM-hívásbeállítások (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA-hívásbeállítások"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"CDMA-hívásbeállítások (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="connection_service" msgid="978745922583410219">"Használandó kapcsolati szolgáltatás"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Telefonos fiókok"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Hívásindítás a következővel:"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"SIP-hívások indítása a következővel:"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Először kérdezze meg"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Beállítások"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Fiókok kiválasztása"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Telefonos fiókok"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"SIP-fiók hozzáadása"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Fiókbeállítások konfigurálása"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi-hívás"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Ne használja a Wi-Fi-hívást"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Ne használja a hívássegédet"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Nincs"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Hívássegéd"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Hívássegéd használata"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Hívássegéd kiválasztása"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"A híváshoz használt hálózatok kezelése a következővel:"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Alkalmazások vagy szolgáltatások kezelhetik a hívásokra használt hálózatokat"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Konfigurálás"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Beépített kapcsolati szolgáltatás"</string>
     <string name="voicemail" msgid="8693759337917898954">"Hangposta"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Hangposta (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"HP:"</string>
     <string name="networks" msgid="8873030692174541976">"Mobilszolgáltatók"</string>
-    <string name="call_settings" msgid="1630474923393095156">"Hívásbeállítások"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Sürgősségi adások"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Hívásbeállítások"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"További beállítások"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"További  beállítások (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="sum_gsm_call_settings" msgid="4076647190996778012">"További csak GSM hívásbeállítások"</string>
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"További CDMA-hívásbeállítások"</string>
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"További csak CDMA-hívásbeállítások"</string>
@@ -77,40 +100,43 @@
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Hívás közben értesítést kérek a beérkező hívásokról"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Hívás közben értesítést kérek a beérkező hívásokról"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Hívásátirányítás beállításai"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Hívásátirányítási beállítások (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Hívásátirányítás"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Mindig legyen átirányítás"</string>
-    <string name="messageCFU" msgid="3560082430662923687">"Mindig a következő szám használata"</string>
+    <string name="messageCFU" msgid="3560082430662923687">"Mindig a következő számot használja"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Minden hívás átirányítása"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Minden hívás átirányítása ide: <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"A szám nem érhető el"</string>
-    <string name="sum_cfu_disabled" msgid="3698472522160364904">"Letiltva"</string>
-    <string name="labelCFB" msgid="218938523102207587">"Átirányítás, ha foglalt"</string>
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Ki"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Amikor foglalt"</string>
     <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="sum_cfb_disabled" msgid="4913145177320506827">"Ki"</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="labelCFNRy" msgid="1736067178393744351">"Amikor 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="sum_cfnry_disabled" msgid="3884684060443538097">"Ki"</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="labelCFNRc" msgid="2614827454402079766">"Amikor ki van kapcsolva"</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="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="call_settings_primary_user_only" msgid="5679923943740900965">"A hívásbeállításokat csak az elsődleges felhasználó módosíthatja."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Hívásbeállítások (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
     <string name="updating_settings" msgid="8171225533884883252">"Beállítások frissítése..."</string>
     <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="exception_error" msgid="7027667130619518211">"Hiba a hálózatban vagy a SIM kártyánál."</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>
+    <string name="enable" msgid="7248657275000173526">"Bekapcsolás"</string>
+    <string name="disable" msgid="4678348128118573672">"Kikapcsolás"</string>
     <string name="change_num" msgid="239476305819844391">"Frissítés"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Hálózati alapértelmezés"</item>
@@ -123,8 +149,8 @@
     <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.\nMé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>
-    <string name="voicemail_default" msgid="5902099213882352338">"Saját szolgáltatóm"</string>
-    <string name="mobile_networks" msgid="5540397602919106177">"Mobilhálózati beállítások"</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"Saját mobilszolgáltató"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Mobilhálózati beállítások"</string>
     <string name="label_available" msgid="1181658289009300430">"Elérhető hálózatok"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Keresés…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Nem található hálózat."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Preferált hálózati mód: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Preferált hálózati mód: globális"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Preferált hálózati mód: LTE/WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Előnyben részesített hálózati mód: LTE / GSM / UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Preferált hálózati mód: LTE/CDMA"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="7886739962255042385">"LTE/WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"Csak GSM"</item>
     <item msgid="3817924849415716259">"GSM/WCDMA a preferált"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Javított 4G LTE mód"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"LTE-szolgáltatások használata hang- és egyéb kommunikáció javításához (ajánlott)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Adatok engedélyezése"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Adathozzáférés engedélyezése mobilhálózatokon"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Adatforgalom engedélyezése"</string>
     <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="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="roaming_warning" msgid="1603164667540144353">"Lehet, hogy jelentős összeget számítanak fel érte."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Engedélyezi az adatbarangolást?"</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>
@@ -190,7 +221,7 @@
     <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"Elérte a felső korlátot: <xliff:g id="USED_0">%1$s</xliff:g>\nAz adatsebesség lecsökken <xliff:g id="USED_1">%2$d</xliff:g> kb/s-ra"</string>
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"A ciklus <xliff:g id="USED_0">%1$d</xliff:g>٪ -a letelt\nA 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="throttle_help_subtext" msgid="3633091498168446044">"További információk mobilszolgáltatója hálózatának adatfelhasználási irányelveiről"</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>
@@ -303,17 +334,19 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Adatszolgáltatás beállítása"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Szolgáltatói beállítások"</string>
     <string name="fdn" msgid="7878832555095183202">"Fix hívószámok"</string>
-    <string name="manage_fdn_list" msgid="8777755791892122369">"FDN lista"</string>
-    <string name="fdn_activation" msgid="2156479741307463576">"FDN aktiválása"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Fix hívószámok (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="manage_fdn_list" msgid="8777755791892122369">"Fix hívószámok listája"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"Fix hívószámok listája (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="fdn_activation" msgid="2156479741307463576">"Fix hívószám aktiválása"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"A fix hívószámok engedélyezve"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"A fix hívószámok letiltva"</string>
-    <string name="enable_fdn" msgid="3740191529180493851">"FDN engedélyezése"</string>
-    <string name="disable_fdn" msgid="7944020890722540616">"FDN letiltása"</string>
-    <string name="change_pin2" msgid="2153563695382176676">"PIN2-kód módosítása"</string>
-    <string name="enable_fdn_ok" msgid="7215588870329688132">"FDN letiltása"</string>
-    <string name="disable_fdn_ok" msgid="5727046928930740173">"FDN engedélyezése"</string>
+    <string name="enable_fdn" msgid="3740191529180493851">"Fix hívószám engedélyezése"</string>
+    <string name="disable_fdn" msgid="7944020890722540616">"Fix hívószám letiltása"</string>
+    <string name="change_pin2" msgid="2153563695382176676">"PIN2 kód módosítása"</string>
+    <string name="enable_fdn_ok" msgid="7215588870329688132">"Fix hívószám letiltása"</string>
+    <string name="disable_fdn_ok" msgid="5727046928930740173">"Fix hívószám engedélyezése"</string>
     <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_change_pin" msgid="6666549734792827932">"PIN kód módosítása a fix hívószámok 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="3776841382844614716">"Adatvédelem"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Fokozott adatvédelmi mód engedélyezése"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"TTY-mód beállítá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="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"A TTY mód nem módosítható videohívás közben"</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>
@@ -337,59 +371,57 @@
     <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="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="fdn_failed" msgid="540018079008319747">"Az FDN-művelet sikertelen."</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="pin2_invalid" msgid="5470854099230755944">"A fix hívószám nincs frissítve, mert hibás PIN kódot írt be."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"A fix hívószám nem lett frissítve, mert a szám nem haladhatja meg a 20 számjegyet."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"A fix hívószám nem lett frissítve. Hibás a PIN2 kód, vagy a telefonszámot elutasították."</string>
+    <string name="fdn_failed" msgid="540018079008319747">"Sikertelen a fix hívószámmal végzett művelet."</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="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="simContacts_airplaneMode" msgid="5254946758982621072">"A repülős üzemmód kikapcsolása a névjegyek SIM kártyáról történő importálásához."</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="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="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="1796577128488773946">"A jelszó helytelen, a PIN kód letiltva. Adja meg a PUK kódot."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"SIM kártya PIN kódjának törlése"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"SIM kártya PIN kódjának beállítása"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"PIN kód beállítása…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN kód beállítva"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN kód törölve"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"A PIN kód helytelen"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN kód frissítve"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"A jelszó helytelen. PIN kód letiltva. Adja meg a PUK 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="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="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="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="3674058967950559397">"A jelszó helytelen, a PIN2 letiltva. 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="badPuk2" msgid="7910064009531541708">"A PUK2 kód helytelen. Próbálja újra."</string>
+    <string name="badPin2" msgid="6646896629970023109">"A régi PIN2 kód helytelen. Próbálja újra."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"A PIN2 kódok nem egyeznek. Próbálja újra."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"4–8 számjegyből álló PIN2 kódot adjon meg."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"8 számjegyből álló PUK2 kódot adjon meg."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 kód frissítve"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Adja meg a PUK2 kódot"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"A jelszó helytelen. A PIN2 kód le van tiltva. Az újrapróbálkozáshoz módosítsa a PIN2 kódot."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"A jelszó helytelen. SIM kártya zárolva. Adja meg a PUK2 kódot."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"A PUK2 végleg letiltva."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Még <xliff:g id="NUMBER">%d</xliff:g> próbálkozás maradt."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"A PIN2 letiltása feloldva."</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"<xliff:g id="NUMBER">%d</xliff:g> próbálkozási lehetősége maradt."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 kód letiltása feloldva"</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="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_redialing" msgid="8253487008234167266">"Újratárcsázá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_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>
     <string name="card_title_in_call" msgid="6346543933068225205">"Hívásban"</string>
-    <string name="card_title_my_phone_number" msgid="112428362494434191">"A számom: <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Tárcsázás"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Nem fogadott hívás"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Nem fogadott hívások"</string>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"Repülős üzemmód kikapcsolása hívás indításához."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Hívás indításához kapcsolja ki a repülős üzemmódot, illetve csatlakozzon egy vezeték nélküli hálózathoz."</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_error_out_of_service" msgid="4100065333878929223">"A mobilhálózat nem érhető el."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"A mobilhálózat nem érhető el. Hívás indításához csatlakozzon egy vezeték nélküli hálózathoz."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Hívásindításhoz adjon meg egy érvényes számot."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"A hívás sikertelen."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI-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>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Nem lehet továbbítani a hívást."</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"A szolgáltatás nem támogatott"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"A hívások közötti váltás sikertelen."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"A híváselkülönítés sikertelen."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Az átirányítás sikertelen."</string>
     <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Nem lehet konferenciahívást folytatni."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Nem lehet elutasítani a hívást."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Nem lehet befejezni a hívás(oka)t."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Internetes hívás"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"A híváselutasítás sikertelen."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"A tartásban lévő hívás(ok) folytatása sikertelen."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Hívás indításához csatlakozzon egy vezeték nélküli hálózathoz."</string>
     <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="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="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Nincs szolgáltatás. Újrapróbálkozás folyamatban…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"A hívás sikertelen. A(z) <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> szám nem vészhívószám."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"A hívás sikertelen. Tárcsázzon vészhívószámot."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"A tárcsázáshoz használja a billentyűzetet"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Tartás"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Befejezés"</string>
@@ -440,7 +474,7 @@
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Videohívás"</string>
     <string name="importSimEntry" msgid="6614358325359736031">"Importálás"</string>
     <string name="importAllSimEntries" msgid="1503181169636198673">"Összes importálása"</string>
-    <string name="importingSimContacts" msgid="7374056215462575769">"SIM-kártya névjegyeinek importálása"</string>
+    <string name="importingSimContacts" msgid="7374056215462575769">"SIM kártya névjegyeinek importálása"</string>
     <string name="importToFDNfromContacts" msgid="2130620207013368580">"Importálás a Címtárból"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Hallókészülékek"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Hallókészülék-kompatibilitás bekapcsolása"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"Normál"</item>
     <item msgid="2883365539347850535">"Hosszú"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Hálózati üzenet"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Hálózati üzenet"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Hibaü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\nAz \"Aktiválás\" megnyomása után kövesse az utasításokat."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Aktiválás..."</string>
@@ -469,8 +504,8 @@
     <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_speaker" msgid="6904589278542719647">"Hangszóró"</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_progress" msgid="460876637828044519">"Telefon programozása folyamatban…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"A telefon programozása sikertelen"</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="8072141612635635357">"Nem aktiválta a telefont. \nLehet, hogy keresnie kell egy jobb lefedettségű területet (egy ablak közelében vagy a szabadban). \n\nPró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>
@@ -481,18 +516,18 @@
     <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>
     <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Adatkapcsolat letiltva"</string>
-  <plurals name="phone_in_ecm_notification_time">
-    <item quantity="one" msgid="4866221796252472622">"<xliff:g id="COUNT">%s</xliff:g> perce nincs adatkapcsolat"</item>
-    <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="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="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>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> perce nincs adatkapcsolat</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> perce nincs adatkapcsolat</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other">A telefon <xliff:g id="COUNT_1">%s</xliff:g> percig lesz Segélykérő visszahívása módban. Ebben az üzemmódban nem használhatók olyan alkalmazások, amelyeknél adatkapcsolatra van szükség. Szeretne kilépni most?</item>
+      <item quantity="one">A telefon <xliff:g id="COUNT_0">%s</xliff:g> percig lesz Segélykérő visszahívása módban. Ebben az üzemmódban nem használhatók olyan alkalmazások, amelyeknél adatkapcsolatra van szükség. Szeretne kilépni most?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other">A választott művelet nem érhető el Segélykérő visszahívása módban. A telefon <xliff:g id="COUNT_1">%s</xliff:g> percig lesz ebben a módban. Szeretne kilépni most?</item>
+      <item quantity="one">A választott művelet nem érhető el Segélykérő visszahívása módban. A telefon <xliff:g id="COUNT_0">%s</xliff:g> percig lesz ebben a módban. Szeretne kilépni most?</item>
+    </plurals>
     <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>
@@ -506,110 +541,23 @@
     <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_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_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="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="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="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="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_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="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="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>
-    <string name="username_title" msgid="2479375923477682328">"Felhasználónév"</string>
-    <string name="password_title" msgid="3323555249068171531">"Jelszó"</string>
-    <string name="display_name_title" msgid="2459768196312249937">"Megjelenített név"</string>
-    <string name="proxy_address_title" msgid="4828301345351614273">"Kimenő proxy címe"</string>
-    <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="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>
-    <string name="auth_username_title" msgid="851473016307947120">"Azonosításhoz használt felhasználónév"</string>
-    <string name="auth_username_summary" msgid="6782012405225938629">"Azonosításhoz használt felhasználónév"</string>
-    <string name="default_preference_summary" msgid="868766740121667450">"&lt;Nincs megadva&gt;"</string>
-    <string name="display_name_summary" msgid="8636377460518225523">"&lt;Ugyanaz, mint a felhasználónév&gt;"</string>
-    <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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"A hanghívás nem támogatott"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Gyors válaszok"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"egy"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"kettő"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"három"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"négy"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"öt"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"hat"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"hét"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"nyolc"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"kilenc"</string>
-    <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_dial_button" msgid="7459705245418435351">"tárcsázás"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"Backspace"</string>
-    <string name="description_target_answer" msgid="7205604197797472471">"Fogadás"</string>
-    <string name="description_target_send_sms" msgid="2098326025587950144">"SMS küldése"</string>
-    <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="2609519527849101590">"Hang"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Alapértelmezett hang (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <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="dial_pad_autocomplete" msgid="494525952035761075">"Tárcsázó automatikus kiegészítés"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Csengőhang és rezgés"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Wi-Fit szeretne használni a hívásindításhoz?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Igen"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"Nem"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Beépített SIM kártyák"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Beépített internetes hívás"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Videohívás bekapcsolása"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"A videohívás bekapcsolásához engedélyeznie kell a Javított 4G LTE üzemmódot a hálózati beállításokban."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Hálózati beállítások"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Bezárás"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Segélyhívások"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Csak segélyhívás"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM kártya, bővítőhely: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Kisegítő lehetőségek"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Beérkező Wi-Fi-hívás"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi-hívás"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Érintse meg ismét a megnyitáshoz"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"Hiba történt az üzenet dekódolása közben."</string>
 </resources>
diff --git a/res/values-hy-rAM/arrays.xml b/res/values-hy-rAM/arrays.xml
new file mode 100644
index 0000000..e97f6e5
--- /dev/null
+++ b/res/values-hy-rAM/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Համընդհանուր"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-hy-rAM/config.xml b/res/values-hy-rAM/config.xml
deleted file mode 100644
index c0292c3..0000000
--- a/res/values-hy-rAM/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"սխալ"</string>
-</resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 536c244..a9da284 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -16,14 +16,14 @@
 
 <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="tablet" msgid="1107073389495104784">"Բջջային տվյալներ"</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">"FDN ցուցակ"</string>
     <string name="unknown" msgid="6878797917991465859">"Անհայտ"</string>
     <string name="private_num" msgid="6713286113000232309">"Գաղտնի համար"</string>
-    <string name="payphone" msgid="1931775086311769314">"Վճարել հեռախոսի համար"</string>
+    <string name="payphone" msgid="4793877574636445118">"Բջջային տերմինալ"</string>
     <string name="onHold" msgid="9035493194749959955">"Սպասում"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI կոդը մեկնարկել է"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD կոդը գործարկվում է..."</string>
@@ -52,18 +52,41 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Հայցվում է ցանցի ապակողպում..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Ցանցի ապակողպման հարցումը խափանվեց:"</string>
     <string name="unlock_success" msgid="6770085622238180152">"Ցանցի ապակողպումը խափանվեց"</string>
-    <string name="mobile_network_settings_not_available" msgid="7355254462995117896">"Բջջային ցանցի կարգավորումներն անհասանելի են այս օգտվողի համար"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Բջջային ցանցի կարգավորումներն անհասանելի են այս օգտվողի համար"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM զանգերի կարգավորումներ"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"GSM զանգի կարգավորումներ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA զանգերի կարգավորումներ"</string>
-    <string name="apn_settings" msgid="9043423184895642077">"Մատչման կետերի Անունները"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"CDMA զանգի կարգավորումներ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="apn_settings" msgid="9043423184895642077">"Մատչման կետերի անունները"</string>
     <string name="settings_label" msgid="3876743539816984008">"Ցանցային կարգավորումներ"</string>
-    <string name="connection_service" msgid="978745922583410219">"Օգտագործվող կապի ծառայությունը"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Հաշիվներ զանգերի համար"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Ընտրել հաշիվ զանգերի համար"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Ընտրել հաշիվ SIP-ի միջոցով զանգերի համար"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Նախ հարցնել"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Կարգավորումներ"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Ընտրել հաշիվներ"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Հաշիվներ զանգերի համար"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Ավելացնել SIP հաշիվ"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Կազմաձևել հաշվի կարգավորումները"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Զանգեր Wi-Fi-ի միջոցով"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Չօգտագործել Wi-Fi-ը զանգերի համար"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Չօգտագործել զանգերի օգնականը"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Ոչ մեկը"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Զանգերի օգնական"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Օգտագործել զանգերի օգնականը"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Ընտրել զանգերի օգնական"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Կառավարել զանգերի համար օգտագործվող ցանցերը"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Թույլատրել հավելվածներին կամ ծառայություններին կառավարել զանգերի համար օգտագործվող ցանցերը"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Կազմաձևել"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Ներկառուցված կապի ծառայություն"</string>
     <string name="voicemail" msgid="8693759337917898954">"Ձայնային փոստ"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Ձայնային փոստ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"ՁՓ՝"</string>
-    <string name="networks" msgid="8873030692174541976">"Ցանցային օպերատորներ"</string>
-    <string name="call_settings" msgid="1630474923393095156">"Զանգերի կարգավորումներ"</string>
+    <string name="networks" msgid="8873030692174541976">"Կապի օպերատորներ"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Ծանուցումներ արտակարգ իրավիճակների մասին"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Զանգի կարգավորումներ"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Լրացուցիչ կարգավորումներ"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Լրացուցիչ կարգավորումներ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
@@ -77,29 +100,32 @@
     <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="call_forwarding_settings_with_label" msgid="8569489414006897127">"Զանգի փոխանցման կարգավորումներ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="sum_cfu_disabled" msgid="8384177689501334080">"Անջատված է"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Երբ զբաղված է"</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="sum_cfb_disabled" msgid="4913145177320506827">"Անջատված է"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Ձեր օպերատորը չի աջակցում զանգի վերահասցեավորման կասեցում, երբ ձեր հեռախոսը զբաղված է:"</string>
-    <string name="labelCFNRy" msgid="3646316323834351390">"Վերահասցեավորել, երբ անպատասխան է"</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"Երբ անպատասխան է"</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="sum_cfnry_disabled" msgid="3884684060443538097">"Անջատված է"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Ձեր օպերատորը չի աջակցում զանգի վերահասցեավորման կասեցում, երբ ձեր հեռախոսը չի պատասխանում:"</string>
-    <string name="labelCFNRc" msgid="47183615370850000">"Փոխանցել, երբ անհասանելի է"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"Երբ անհասանելի է"</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="5646361343094064333">"Ձեր սպասարկողը չի աջակցում զանգի վերահասցեավորման կասեցում, երբ ձեր հեռախոսն անհասանելի է:"</string>
     <string name="updating_title" msgid="6146755386174019046">"Զանգի կարգավորումներ"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"Զանգի կարգավորումները կարող է փոխել միայն հիմնական օգտագործողը:"</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Զանգի կարգավորումներ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Զանգի կարգավորումների սխալ"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Ընթերցման կարգավորումներ..."</string>
     <string name="updating_settings" msgid="8171225533884883252">"Թարմացվում են կարգավորումները..."</string>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"Միացնել"</string>
+    <string name="disable" msgid="4678348128118573672">"Անջատել"</string>
     <string name="change_num" msgid="239476305819844391">"Նորացնել"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Լռելյայն ցանց"</item>
@@ -123,8 +149,8 @@
     <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="voicemail_default" msgid="2001233554889016880">"Ձեր օպերատորը"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Բջջային ցանցի կարգավորումները"</string>
     <string name="label_available" msgid="1181658289009300430">"Հասանելի ցանցեր"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Որոնում..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Ոչ մի ցանց չի գտնվել:"</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Նախընտրելի ցանցի ռեժիմը՝ CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Նախընտրելի ցանցի ռեժիմը՝ Global"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Նախընտրելի ցանցի ռեժիմը՝ LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Ցանցի նախընտրելի ռեժիմը՝ LTE / GSM / UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Նախընտրելի ցանցի ռեժիմը՝ LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="7886739962255042385">"LTE / WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -166,18 +194,21 @@
     <item msgid="545430093607698090">"Միայն EvDo"</item>
     <item msgid="1508557726283094448">"CDMA առանց EvDo"</item>
     <item msgid="4341433122263841224">"CDMA/EvDo ավտոմատ"</item>
-    <item msgid="5958053792390386668">"GSM/WCDMA ինքնուրույն"</item>
+    <item msgid="5958053792390386668">"GSM/WCDMA ինքնաշխատ"</item>
     <item msgid="7913148405605373434">"Միայն WCDMA"</item>
     <item msgid="1524224863879435516">"Միայն GSM"</item>
     <item msgid="3817924849415716259">"GSM/WCDMA նախընտրելի"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Ընդլայնված 4G LTE ռեժիմ"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Ձայնի և կապի որակը բարելավելու համար օգտվեք LTE ծառայություններից (հանձնարարելի)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Տվյալները միացված են"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Միացնել բջջային ցանցում տվյալների ծառայությունը"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Թույլատրել տվյալների օգտագործումը"</string>
     <string name="roaming" msgid="8871412572928323707">"Տվյալների ռոումինգ"</string>
-    <string name="roaming_enable" msgid="7331106985174381987">"Միանալ տվյալների ծառայություններին ռոումինգում"</string>
-    <string name="roaming_disable" msgid="1843417228755568110">"Միանալ տվյալների ծառայություններին ռոումինգում"</string>
+    <string name="roaming_enable" msgid="7331106985174381987">"Միանալ տվյալների փոխանցման ծառայություններին ռոումինգում գտնվելիս"</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="roaming_warning" msgid="1603164667540144353">"Դրա համար ձեզանից կարող են զգալի վճարներ գանձվել:"</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Թույլատրե՞լ տվյալների ռոումինգը:"</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>
@@ -191,12 +222,12 @@
     <!-- String.format failed for translation -->
     <!-- no translation found for throttle_data_usage_subtext (6029276011123694701) -->
     <skip />
-    <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> Կբ/վ"</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> ԿԲ/վ"</string>
     <!-- String.format failed for translation -->
     <!-- no translation found for throttle_time_frame_subtext (7732763021560399960) -->
     <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="throttle_rate_subtext" msgid="2149102656120726855">"Տվյալների ծավալը կնվազի մինչև <xliff:g id="USED">%1$d</xliff:g> ԿԲ/վ, եթե տվյալների օգտագործման սահմանաչափը գերազանցվի"</string>
+    <string name="throttle_help_subtext" msgid="3633091498168446044">"Լրացուցիչ տեղեկություններ ձեր օպերատորի բջջային ցանցի տվյալների օգտագործման քաղաքականության մասին"</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>
@@ -309,7 +340,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Կարգավորել տվյալների ծառայությունը"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Օպերատորի կարգավորումներ"</string>
     <string name="fdn" msgid="7878832555095183202">"Ամրակայված հեռախոսահամարներ"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Ֆիքսված համարներ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FDN ցուցակ"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"FDN ցանկ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FDN ակտիվացում"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Ամրակայված հեռախոսահամարները միացված են"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Ամրակայված հեռախոսահամարներն անջատված են"</string>
@@ -327,6 +360,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Սահմանել TTY ռեժիմը"</string>
     <string name="auto_retry_mode_title" msgid="4073265511427813322">"Ավտոմատ կրկնում"</string>
     <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Միացնել ավտոմատ կրկնման ռեժիմը"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"Հնարավոր չէ փոխել TTY ռեժիմը տեսազանգի ընթացքում"</string>
     <string name="menu_add" msgid="1882023737425114762">"Ավելացնել կոնտակտ"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Խմբագրել կոնտակտը"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Ջնջել կոնտակտը"</string>
@@ -350,7 +384,7 @@
     <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="1846161429087789936">"SIM քարտից կոնտակտների ներմուծման համար նախ անջատեք թռիչքային ռեժիմը:"</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Կոնտակտները 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>
@@ -360,42 +394,40 @@
     <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="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="1796577128488773946">"Գաղտնաբառը սխալ է, PIN2-ը՝ արգելափակված: PUK-ն է պահանջվում:"</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"Ջնջել SIM քարտի PIN կոդը"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"SIM քարտի PIN կոդի կարգավորում"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"PIN կոդի կարգավորում…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN կոդը կարգավորվեց"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN կոդը ջնջվեց"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN կոդը սխալ է"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN կոդը թարմացվեց"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Գաղտնաբառը սխալ է: PIN կոդն այժմ կողպված է: Պահանջվում է PUK կոդը:"</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="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="1639666438836544393">"PIN2-ը հաջողությամբ փոխվել է:"</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"Մուտքագրել PUK2 կոդը"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Գաղտնաբառը սխալ է, PIN2-ը՝ արգելափակված: Խնդրում ենք փոխել PIN2-ն ու կրկին փորձել:"</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"Գաղտնաբառը սխալ ՝, SIM-ը կողպված է: Պահանջվում է PUK2-ը:"</string>
+    <string name="badPuk2" msgid="7910064009531541708">"PUK2 կոդը սխալ է: Փորձեք կրկին:"</string>
+    <string name="badPin2" msgid="6646896629970023109">"Հին PIN2 կոդը սխալ է: Փորձեք կրկին:"</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2 կոդերը չեն համընկնում: Փորձեք կրկին:"</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Մուտքագրեք 4-8 թիվ պարունակող PIN2 կոդ:"</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Մուտքագրեք 8 թիվ պարունակող PUK2 կոդ:"</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 կոդը թարմացվեց"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Մուտքագրեք PUK2 կոդը"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Գաղտնաբառը սխալ է: PIN2 կոդն այժմ արգելափակվել է: Կրկին փորձելու համար փոխեք PIN 2 կոդը:"</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Գաղտնաբառը սխալ է: SIM քարտն այժմ կողպված է: Մուտքագրեք PUK2 կոդը:"</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2-ն ընդմիշտ արգելափակված է:"</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Մնաց <xliff:g id="NUMBER">%d</xliff:g> փորձ:"</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2-ն արգելաբացվեց:"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"Ձեզ մնացել է <xliff:g id="NUMBER">%d</xliff:g> փորձ:"</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 կոդն այլևս արգելափակված չէ"</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_redialing" msgid="8253487008234167266">"Վերահամարարկում"</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_dialing" msgid="2107666444937350731">"Համարարկում է"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Բաց թողնված զանգ"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Բաց թողնված զանգեր"</string>
@@ -413,25 +445,27 @@
     <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_power_off" msgid="2947938060513306698">"Զանգ կատարելու համար անջատեք ինքնաթիռային ռեժիմը:"</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Զանգ կատարելու համար անջատեք ինքնաթիռային ռեժիմը կամ միացեք անլար ցանցին:"</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_error_out_of_service" msgid="4100065333878929223">"Բջջային ցանցն անհասանելի է:"</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Բջջային ցանցն անհասանելի է: Զանգ կատարելու համար միացեք անլար ցանցին:"</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Զանգ կատարելու համար մուտքագրեք ճիշտ համար:"</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Հնարավոր չէ զանգել:"</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_unknown" msgid="655570339115407698">"Ծառայությունը չի աջակցվում"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Հնարավոր չէ փոխանջատել զանգը:"</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Հնարավոր չէ առանձնացնել զանգը:"</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Հնարավոր չէ փոխանցել:"</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="incall_error_supp_service_reject" msgid="8998568661508655638">"Հնարավոր չէ մերժել զանգը:"</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Հնարավոր չէ անջատել զանգ(եր)ը:"</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Զանգ կատարելու համար միացեք անլար ցանցին:"</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="7969515493359619960">"Զանգը չի առաքվել: <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g>-ն արտակարգ իրավիճակների հեռախոսահամար չէ:"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Զանգը չի առաքվել: Համարարկեք արտակարգ իրավիճակների հեռախոսահամար:"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Ծառայությունը մատչելի չէ: Նորից փորձեք…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Հնարավոր չէ զանգել: <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> համարը արտակարգ իրավիճակի համար չէ:"</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Հնարավոր չէ զանգել: Հավաքեք արտակարգ իրավիճակի որևէ համար:"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Օգտագործեք ստեղնաշարը՝ համարհավաքման համար"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Պահել"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Ավարտել"</string>
@@ -462,7 +496,8 @@
     <item msgid="899650777817315681">"Սովորական"</item>
     <item msgid="2883365539347850535">"Երկար"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Ցանցային հաղորդագրություն"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Ցանցի հաղորդագրություն"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Սխալի հաղորդագրություն"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Ակտիվացրեք ձեր հեռախոսը"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Հատուկ զանգ է հարկավոր կատարել՝ ձեր հեռախոսի ծառայությունն ակտիվացնելու համար: \n\n«Ակտիվացնել» կոճակը սեղմելուց հետո լսեք հրահանգները, որոնք տրվում են ձեր հեռախոսն ակտիվացնելու համար:"</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Ակտիվացվում է..."</string>
@@ -475,8 +510,8 @@
     <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="3420314892609254729">"Սպասեք մինչև ձեր հեռախոսը կծրագրավորվի:"</string>
-    <string name="ota_failure" msgid="4311299546379674378">"Ծրագրավորումը չի հաջողվել"</string>
+    <string name="ota_progress" msgid="460876637828044519">"Ձեր հեռախոսը ծրագրավորվում է…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Չհաջողվեց ծրագրավորել ձեր հեռախոսը"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Ձեր հեռախոսն այժմ ակտիվացված է: սՍա կարող է տևել մինչեւ 15 րոպե՝ ծառայության մեկնարկի համար:"</string>
     <string name="ota_unsuccessful" msgid="8072141612635635357">"Ձեր հեռախոսը չի ակտիվացնել: \nՁեզ հարկավոր է գտնել ավելի լավ ծածկույթով տարածք (պատուհանի մոտ կամ դրսում): \n\nԿրկին փորձեք կամ զանգահարեք հաճախորդների սպասարկման ծառայություն՝ այլ ընտրանքների համար:"</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"SPC գերազանցման ձախողումներ"</string>
@@ -487,18 +522,18 @@
     <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="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="2585506997024726599">"Ընտրված գործողությունը մատչելի չէ արտակարգ հետզանգի ռեժիմում գտնվելիս: Հեռախոսն այս ռեժիմում կլինի <xliff:g id="COUNT">%s</xliff:g> րոպե: Ցանկանու՞մ եք դուրս գալ հիմա:"</item>
-    <item quantity="other" msgid="6115622137771382224">"Ընտրված գործողությունը մատչելի չէ արտակարգ հետզանգի ռեժիմում գտնվելիս: Հեռախոսն այս ռեժիմում կլինի <xliff:g id="COUNT">%s</xliff:g> րոպե: Ցանկանու՞մ եք դուրս գալ հիմա:"</item>
-  </plurals>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> րոպե տվյալների միացում չկա</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> րոպե տվյալների միացում չկա</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="one">Հեռախոսը գտնվելու է Արտակարգ իրավիճակների հետզանգի ռեժիմում <xliff:g id="COUNT_1">%s</xliff:g> րոպե: Այդ ռեժիմում տվյալների միացում պահանջող հավելվածները չեն կարող օգտագործվել: Ցանկանո՞ւմ եք դուրս գալ հիմա:</item>
+      <item quantity="other">Հեռախոսը գտնվելու է Արտակարգ իրավիճակների հետզանգի ռեժիմում <xliff:g id="COUNT_1">%s</xliff:g> րոպե: Այդ ռեժիմում տվյալների միացում պահանջող հավելվածները չեն կարող օգտագործվել: Ցանկանո՞ւմ եք դուրս գալ հիմա:</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="one">Նշված գործողությունն Արտակարգ իրավիճակների հետզանգի ռեժիմում հասանելի չէ: Հեռախոսը գտնվելու է այս ռեժիմում <xliff:g id="COUNT_1">%s</xliff:g> րոպե: Ցանկանո՞ւմ եք դուրս գալ հիմա:</item>
+      <item quantity="other">Նշված գործողությունն Արտակարգ իրավիճակների հետզանգի ռեժիմում հասանելի չէ: Հեռախոսը գտնվելու է այս ռեժիմում <xliff:g id="COUNT_1">%s</xliff:g> րոպե: Ցանկանո՞ւմ եք դուրս գալ հիմա:</item>
+    </plurals>
     <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>
@@ -512,110 +547,23 @@
     <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="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="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="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_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="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="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>
-    <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">"Ներքին proxy հասցե"</string>
-    <string name="port_title" msgid="5952939408078626657">"Port-ի համարը"</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">"&lt;Նշված չէ&gt;"</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="6839103946505432390">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g>-ը պարտադիր է և չի կարող լինել դատարկ:"</string>
-    <string name="not_a_valid_port" msgid="4796149266434630292">"Port համարը պետք է լինի 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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"Ձայնային զանգերը չեն սպասարկվում"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Արագ պատասխաններ"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></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">"հետշարժ"</string>
-    <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_ringtone_title" msgid="2609519527849101590">"Ձայն"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Լռելյայն ձայներանգը (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</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="dial_pad_autocomplete" msgid="494525952035761075">"Թվաշարի ինքնալրացում"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Ձայներանգ &amp; Թրթռոց"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Օգտագործե՞լ Wi-Fi-ը զանգահարելու համար:"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Այո"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"Ոչ"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Ներկառուցված SIM քարտեր"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Ներկառուցված Ինտերնետ զանգ"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Միացնել տեսազանգի գործառույթը"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Տեսազանգերը միացնելու համար ձեզ անհրաժեշտ է ցանցի կարգավորումներում թույլատրել Ընդլայնված 4G LTE ռեժիմը:"</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Ցանցային կարգավորումներ"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Փակել"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Արտակարգ իրավիճակների զանգեր"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Միայն արտակարգ իրավիճակների զանգեր"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM քարտ, բնիկը՝ <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Մատչելիություն"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Մուտքային Wi-Fi զանգ"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Զանգ Wi-Fi-ի միջոցով"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Կրկին հպեք՝ բացելու համար"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"Հաղորդագրությունն ապակոդավորելիս սխալ առաջացավ:"</string>
 </resources>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
new file mode 100644
index 0000000..773739b
--- /dev/null
+++ b/res/values-in/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Global"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-in/config.xml b/res/values-in/config.xml
deleted file mode 100644
index 4222c68..0000000
--- a/res/values-in/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"salah"</string>
-</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index c1773bd..68bdea0 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -16,14 +16,14 @@
 
 <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">"Data Seluler"</string>
+    <string name="phoneAppLabel" product="tablet" msgid="1107073389495104784">"Data Seluler"</string>
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Ponsel"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Aplikasi Telepon Darurat"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Telepon"</string>
     <string name="fdnListLabel" msgid="8630418672279521003">"Daftar FDN"</string>
     <string name="unknown" msgid="6878797917991465859">"Tidak diketahui"</string>
     <string name="private_num" msgid="6713286113000232309">"Nomor pribadi"</string>
-    <string name="payphone" msgid="1931775086311769314">"Telepon umum"</string>
+    <string name="payphone" msgid="4793877574636445118">"Telepon Umum"</string>
     <string name="onHold" msgid="9035493194749959955">"Ditangguhkan"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Kode MMI dimulai"</string>
     <string name="ussdRunning" msgid="485588686340541690">"Kode USSD sedang berjalan…"</string>
@@ -32,7 +32,7 @@
     <string name="enter_input" msgid="1810529547726803893">"Pesan USSD harus antara <xliff:g id="MIN_LEN">%d</xliff:g> dan <xliff:g id="MAX_LEN">%d</xliff:g> karakter. Coba lagi."</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Kelola penggilan telewicara"</string>
     <string name="ok" msgid="3811371167865772377">"Oke"</string>
-    <string name="audio_mode_speaker" msgid="27649582100085266">"Pelantang"</string>
+    <string name="audio_mode_speaker" msgid="27649582100085266">"Speaker"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Earpiece handset"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Headset berkabel"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
@@ -52,18 +52,41 @@
     <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="mobile_network_settings_not_available" msgid="7355254462995117896">"Setelan jaringan seluler tidak tersedia bagi pengguna ini"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Setelan jaringan seluler tidak tersedia bagi pengguna ini"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Setelan panggilan GSM"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"Setelan panggilan telepon GSM (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Setelan panggilan CDMA"</string>
-    <string name="apn_settings" msgid="9043423184895642077">"Access Point Names (Nama Titik Akses)"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"Setelan panggilan telepon CDMA (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="apn_settings" msgid="9043423184895642077">"Nama Titik Akses"</string>
     <string name="settings_label" msgid="3876743539816984008">"Setelan jaringan"</string>
-    <string name="connection_service" msgid="978745922583410219">"Layanan sambungan untuk digunakan"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Akun panggilan"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Lakukan panggilan dengan"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Lakukan panggilan SIP dengan"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Tanyakan terlebih dahulu"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Setelan"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Pilih akun"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Akun ponsel"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Tambahkan akun SIP"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Mengonfigurasi setelan akun"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Panggilan Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Jangan gunakan panggilan Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Jangan gunakan asisten panggilan telepon"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Tidak ada"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Asisten panggilan telepon"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Gunakan asisten panggilan telepon"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Pilih asisten panggilan telepon"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Kelola jaringan yang digunakan untuk panggilan telepon"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Izinkan aplikasi atau layanan mengelola jaringan yang digunakan untuk panggilan telepon"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Konfigurasi"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Layanan sambungan di dalamnya"</string>
     <string name="voicemail" msgid="8693759337917898954">"Kotak Pesan"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Kotak pesan (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
     <string name="networks" msgid="8873030692174541976">"Operator jaringan"</string>
-    <string name="call_settings" msgid="1630474923393095156">"Setelan Panggilan Telepon"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Siaran darurat"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Setelan panggilan"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Setelan tambahan"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Setelan tambahan (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Setelan panggilan khusus GSM tambahan"</string>
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Setelan panggilan CDMA tambahan"</string>
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Setelan panggilan khusus CDMA tambahan"</string>
@@ -77,29 +100,32 @@
     <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>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Setelan penerusan panggilan"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Setelan penerusan panggilan (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Penerusan panggilan"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Selalu teruskan"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Selalu gunakan nomor ini"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Meneruskan semua panggilan"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Meneruskan semua panggilan ke <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Nomor tidak tersedia"</string>
-    <string name="sum_cfu_disabled" msgid="3698472522160364904">"Dinonaktifkan"</string>
-    <string name="labelCFB" msgid="218938523102207587">"Teruskan ketika sibuk"</string>
-    <string name="messageCFB" msgid="3711089705936187129">"Nomor ketika sibuk"</string>
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Nonaktif"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Saat sibuk"</string>
+    <string name="messageCFB" msgid="3711089705936187129">"Nomor saat 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="sum_cfb_disabled" msgid="4913145177320506827">"Nonaktif"</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="labelCFNRy" msgid="1736067178393744351">"Jika tidak dijawab"</string>
+    <string name="messageCFNRy" msgid="672317899884380374">"Nomor jika tidak dijawab"</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="sum_cfnry_disabled" msgid="3884684060443538097">"Nonaktif"</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="labelCFNRc" msgid="2614827454402079766">"Saat tidak dapat dijangkau"</string>
+    <string name="messageCFNRc" msgid="6380695421020295119">"Nomor jika 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="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="call_settings_primary_user_only" msgid="5679923943740900965">"Setelan panggilan hanya dapat diubah oleh pengguna utama."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Setelan panggilan (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
@@ -109,8 +135,8 @@
     <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="enable" msgid="7248657275000173526">"Aktifkan"</string>
+    <string name="disable" msgid="4678348128118573672">"Nonaktifkan"</string>
     <string name="change_num" msgid="239476305819844391">"Perbarui"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Setelan default jaringan"</item>
@@ -123,8 +149,8 @@
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Tidak dapat mengambil dan menyimpan setelan nomor telepon penerusan saat ini.\nTetap 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>
-    <string name="voicemail_default" msgid="5902099213882352338">"Operator Anda"</string>
-    <string name="mobile_networks" msgid="5540397602919106177">"Setelan jaringan seluler"</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"Operator Anda"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Setelan jaringan seluler"</string>
     <string name="label_available" msgid="1181658289009300430">"Jaringan yang tersedia"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Menelusuri…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Jaringan tidak ditemukan."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Mode jaringan yang disukai: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Mode jaringan yang disukai: Global"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Mode jaringan yang disukai: LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Mode jaringan pilihan: LTE / GSM / UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Mode jaringan pilihan: LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="7886739962255042385">"LTE / WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"GSM saja"</item>
     <item msgid="3817924849415716259">"GSM/WCDMA lebih disukai"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Mode LTE 4G yang Ditingkatkan"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Gunakan layanan LTE untuk menyempurnakan suara dan komunikasi lainnya (disarankan)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Data diaktifkan"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Aktifkan akses data pada jaringan Seluler"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Izinkan penggunaan data"</string>
     <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="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="roaming_warning" msgid="1603164667540144353">"Anda dapat dikenakan biaya yang cukup besar."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Izinkan roaming data?"</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>
@@ -190,7 +221,7 @@
     <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"Melebihi batas maksimum <xliff:g id="USED_0">%1$s</xliff:g>\nKecepatan data dikurangi hingga <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>٪ dari siklus yang berlalu\nPeriode 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="throttle_help_subtext" msgid="3633091498168446044">"Informasi selengkapnya tentang kebijakan penggunaan data jaringan seluler operator Anda"</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>
@@ -303,7 +334,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Siapkan layanan data"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Setelan operator"</string>
     <string name="fdn" msgid="7878832555095183202">"Nomor Panggilan Tetap"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Nomor Panggilan Tetap (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Daftar FDN"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"Daftar NPT (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Aktivasi FDN"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Nomor Panggilan Tetap diaktifkan"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Nomor Panggilan Tetap dinonaktifkan"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Setel Mode TTY"</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="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"Perubahan Mode TTY tidak diizinkan selama video call"</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>
@@ -344,7 +378,7 @@
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Membaca dari kartu SIM…"</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="simContacts_airplaneMode" msgid="5254946758982621072">"Nonaktifkan mode pesawat untuk mengimpor kontak dari kartu SIM."</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>
@@ -354,42 +388,40 @@
     <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="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="1796577128488773946">"Sandi salah, PIN Diblokir! PUK diminta."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"Hapus PIN SIM"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"Setel PIN SIM"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"Menyetel PIN…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN disetel"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN dihapus"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN salah"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN diperbarui"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Sandi salah. PIN kini diblokir. PUK diperlukan."</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="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="1639666438836544393">"PIN2 berhasil diubah."</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"Ketikkan kode PUK2."</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Sandi salah, PIN2 Diblokir. Ubah PIN2 dan coba lagi!"</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"Sandi salah, SIM terkunci. Masukkan PUK2."</string>
+    <string name="badPuk2" msgid="7910064009531541708">"PUK2 salah. Coba lagi."</string>
+    <string name="badPin2" msgid="6646896629970023109">"PIN2 lama salah. Coba lagi."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2 tidak cocok. Coba lagi."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Masukkan PIN2 berisi 4 hingga 8 angka."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Masukkan PUK2 berisi 8 angka."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 diperbarui"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Masukkan kode PUK2"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Sandi salah. PIN2 kini Diblokir. Untuk mencoba lagi, ubah PIN 2."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Sandi salah. SIM kini dikunci. Masukkan PUK2."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 diblokir selamanya."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Sisa <xliff:g id="NUMBER">%d</xliff:g> percobaan."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"Blokir PIN2 Terbuka!"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"Tersisa <xliff:g id="NUMBER">%d</xliff:g> upaya lagi."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 tidak lagi diblokir"</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="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_redialing" msgid="8253487008234167266">"Memanggil 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_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>
     <string name="card_title_in_call" msgid="6346543933068225205">"Sedang dalam panggilan"</string>
-    <string name="card_title_my_phone_number" msgid="112428362494434191">"Nomor saya <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Memanggil"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Panggilan tak terjawab"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Panggilan tak terjawab"</string>
@@ -400,37 +432,39 @@
     <string name="notification_incoming_call" msgid="2820429205043529642">"Panggilan masuk"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Kotak pesan baru"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Kotak pesan baru (<xliff:g id="COUNT">%d</xliff:g>)"</string>
-    <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Panggil <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
+    <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Telepon <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <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_power_off" msgid="2947938060513306698">"Nonaktifkan mode pesawat untuk melakukan panggilan"</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Nonaktifkan mode pesawat atau sambungkan ke jaringan nirkabel untuk melakukan panggilan"</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_error_out_of_service" msgid="4100065333878929223">"Jaringan seluler tidak tersedia."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Jaringan selular tidak tersedia. Sambungkan ke jaringan nirkabel untuk melakukan panggilan."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Untuk melakukan panggilan telepon, masukkan nomor yang valid."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Tidak dapat menelepon."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Memulai urutan MMI..."</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>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Tidak dapat mentransfer panggilan."</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Layanan tidak didukung"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Tidak dapat berganti panggilan telepon."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Tidak dapat memisahkan panggilan telepon."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Tidak dapat mentransfer."</string>
     <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Tidak dapat melakukan telewicara."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Tidak dapat menolak panggilan."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Tidak dapat melepaskan panggilan."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Panggilan internet"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Tidak dapat menolak panggilan telepon."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Tidak dapat melepas panggilan telepon."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Sambungkan ke jaringan nirkabel untuk melakukan panggilan"</string>
     <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="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="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Tidak ada layanan. Mencoba lagi…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Tidak dapat menelepon. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> bukan nomor darurat."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Tidak dapat menelepon. Panggil nomor darurat."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Gunakan keyboard untuk memanggil"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Tahan"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Akhiri"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Dialpad"</string>
-    <string name="onscreenMuteText" msgid="5011369181754261374">"Bungkam"</string>
+    <string name="onscreenMuteText" msgid="5011369181754261374">"Bisukan"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"Tambahkan panggilan"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Gabungkan panggilan"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Tukar"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"Normal"</item>
     <item msgid="2883365539347850535">"Jauh"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Pesan jaringan"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Pesan jaringan"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Pesan kesalahan"</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\nSetelah menekan “Aktifkan”, dengarkan instruksi yang diberikan untuk mengaktifkan ponsel."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Mengaktifkan..."</string>
@@ -469,8 +504,8 @@
     <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_speaker" msgid="6904589278542719647">"Pengeras Suara"</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_progress" msgid="460876637828044519">"Memprogram ponsel…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Tidak dapat memprogram ponsel"</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="8072141612635635357">"Ponsel Anda tidak aktif. \nAnda mungkin perlu menemukan area dengan cakupan yang lebih baik (di dekat jendela atau di luar). \n\nCoba lagi atau hubungi layanan pelanggan untuk opsi lainnya."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"KEGAGALAN SPC BERLEBIH"</string>
@@ -478,23 +513,23 @@
     <string name="ota_try_again" msgid="7685477206465902290">"Coba lagi"</string>
     <string name="ota_next" msgid="3904945374358235910">"Berikutnya"</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_entered_ecm_text" msgid="6266424252578731203">"Masukkan Mode Telepon Balik Darurat"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Mode Panggilan Balik Darurat"</string>
     <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Sambungan data dinonaktifkan"</string>
-  <plurals name="phone_in_ecm_notification_time">
-    <item quantity="one" msgid="4866221796252472622">"Tidak ada sambungan data selama <xliff:g id="COUNT">%s</xliff:g> menit"</item>
-    <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="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="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>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other">Tidak ada sambungan data selama <xliff:g id="COUNT_1">%s</xliff:g> menit</item>
+      <item quantity="one">Tidak ada sambungan data selama <xliff:g id="COUNT_0">%s</xliff:g> menit</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other">Ponsel ini akan berada dalam mode Panggilan Balik Darurat selama <xliff:g id="COUNT_1">%s</xliff:g> menit. Saat dalam mode ini, aplikasi yang menggunakan sambungan data tidak dapat digunakan. Ingin keluar sekarang?</item>
+      <item quantity="one">Ponsel ini akan berada dalam mode Panggilan Balik Darurat selama <xliff:g id="COUNT_0">%s</xliff:g> menit. Saat dalam mode ini, aplikasi yang menggunakan sambungan data tidak dapat digunakan. Ingin keluar sekarang?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other">Tindakan yang dipilih tidak tersedia saat dalam mode Panggilan Balik Darurat. Ponsel ini akan berada dalam mode ini selama <xliff:g id="COUNT_1">%s</xliff:g> menit. Ingin keluar sekarang?</item>
+      <item quantity="one">Tindakan yang dipilih tidak tersedia saat dalam mode Panggilan Balik Darurat. Ponsel ini akan berada dalam mode ini selama <xliff:g id="COUNT_0">%s</xliff:g> menit. Ingin keluar sekarang?</item>
+    </plurals>
     <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="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Keluar dari mode Telepon 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">"Tutup"</string>
@@ -506,110 +541,23 @@
     <string name="contactPhoto" msgid="4713193418046639466">"foto kontak"</string>
     <string name="goPrivate" msgid="865837794424530980">"aktifkan pribadi"</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_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_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="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="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="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="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">"Oke"</string>
-    <string name="close_profile" msgid="6886968271423155284">"Tutup"</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="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="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>
-    <string name="username_title" msgid="2479375923477682328">"Nama Pengguna"</string>
-    <string name="password_title" msgid="3323555249068171531">"Sandi"</string>
-    <string name="display_name_title" msgid="2459768196312249937">"Nama tampilan"</string>
-    <string name="proxy_address_title" msgid="4828301345351614273">"Alamat proxy di luar"</string>
-    <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="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>
-    <string name="auth_username_title" msgid="851473016307947120">"Nama pengguna autentikasi"</string>
-    <string name="auth_username_summary" msgid="6782012405225938629">"Nama pengguna yang digunakan untuk autentikasi"</string>
-    <string name="default_preference_summary" msgid="868766740121667450">"&lt;Tidak disetel&gt;"</string>
-    <string name="display_name_summary" msgid="8636377460518225523">"&lt;Sama dengan nama pengguna&gt;"</string>
-    <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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"Panggilan suara tidak didukung"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Tanggapan cepat"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"satu"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"dua"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"tiga"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"empat"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"lima"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"enam"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"tujuh"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"delapan"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"sembilan"</string>
-    <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_dial_button" msgid="7459705245418435351">"panggil"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="description_target_answer" msgid="7205604197797472471">"Menjawab"</string>
-    <string name="description_target_send_sms" msgid="2098326025587950144">"Mengirim SMS"</string>
-    <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="2609519527849101590">"Suara"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Suara default (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <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="dial_pad_autocomplete" msgid="494525952035761075">"Lengkapi otomatis tombol nomor"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Nada dering &amp; Getar"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Gunakan Wi-Fi untuk melakukan panggilan?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Ya"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"Tidak"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Kartu SIM internal"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Panggilan internet yang terpasang di dalamnya"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Aktifkan video call"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Untuk mengaktifkan video call, Anda perlu mengaktifkan Mode LTE 4G yang Ditingkatkan di setelan jaringan."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Setelan jaringan"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Tutup"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Panggilan darurat"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Hanya untuk panggilan darurat"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Aksesibilitas"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Panggilan Wi-Fi masuk"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Panggilan Wi-Fi"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Sentuh lagi untuk membuka"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"Terjadi kesalahan saat mendekode pesan."</string>
 </resources>
diff --git a/res/values-is-rIS/arrays.xml b/res/values-is-rIS/arrays.xml
new file mode 100644
index 0000000..3e8c846
--- /dev/null
+++ b/res/values-is-rIS/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Alþjóðlegt"</item>
+    <item msgid="6753774959494729275">"LTE/CDMA"</item>
+    <item msgid="8658695584186942227">"LTE/GSM/UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-is-rIS/config.xml b/res/values-is-rIS/config.xml
deleted file mode 100644
index b39fbe6..0000000
--- a/res/values-is-rIS/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"slökkt"</string>
-</resources>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index 59288ac..27fd3b2 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -16,14 +16,14 @@
 
 <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">"Farsímagögn"</string>
+    <string name="phoneAppLabel" product="tablet" msgid="1107073389495104784">"Farsímagögn"</string>
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Sími"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Neyðarnúmeraval"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Sími"</string>
     <string name="fdnListLabel" msgid="8630418672279521003">"Listi yfir fast númeraval"</string>
     <string name="unknown" msgid="6878797917991465859">"Óþekkt"</string>
     <string name="private_num" msgid="6713286113000232309">"Leyninúmer"</string>
-    <string name="payphone" msgid="1931775086311769314">"Almenningssími"</string>
+    <string name="payphone" msgid="4793877574636445118">"Símasjálfsali"</string>
     <string name="onHold" msgid="9035493194749959955">"Í bið"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI-kóðaskipun ræst"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD-kóðaskipun í gangi…"</string>
@@ -52,18 +52,41 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Biður um að símkerfi sé opnað…"</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Ekki tókst að opna fyrir símkerfið."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Opnað var fyrir símkerfið."</string>
-    <string name="mobile_network_settings_not_available" msgid="7355254462995117896">"Farsímakerfisstillingar eru ekki í boði fyrir þennan notanda"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Farsímakerfisstillingar eru ekki í boði fyrir þennan notanda"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM-símtalsstillingar"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"GSM-símtalsstillingar (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA-símtalsstillingar"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"CDMA-símtalsstillingar (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Heiti aðgangsstaða"</string>
     <string name="settings_label" msgid="3876743539816984008">"Stillingar símkerfis"</string>
-    <string name="connection_service" msgid="978745922583410219">"Tengingarþjónusta sem nota á"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Símtalareikningar"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Hringja með"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Hringja SIP-símtöl með"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Spyrja fyrst"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Stillingar"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Velja reikninga"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Símareikningar"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Bæta við SIP-reikningi"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Velja reikningsstillingar"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi símtöl"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Ekki nota Wi-Fi símtöl"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Ekki nota símtalaaðstoð"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Engin"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Símtalaaðstoð"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Nota símtalaaðstoð"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Velja símtalaaðstoð"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Stjórna símkerfum til að nota fyrir símtöl með"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Láta forrit eða þjónustu stjórna símkerfum sem notuð eru fyrir símtöl"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Stilla"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Innbyggð tengingarþjónusta"</string>
     <string name="voicemail" msgid="8693759337917898954">"Talhólf"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Talhólf (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"Talhólf:"</string>
     <string name="networks" msgid="8873030692174541976">"Símafyrirtæki"</string>
-    <string name="call_settings" msgid="1630474923393095156">"Símtalastillingar"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Neyðarútsendingar"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Símtalsstillingar"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Viðbótarstillingar"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Viðbótarstillingar (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Viðbótarstillingar fyrir GSM-símtöl eingöngu"</string>
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Viðbótarstillingar CDMA-símtala"</string>
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Viðbótarstillingar CDMA-símtala eingöngu"</string>
@@ -77,29 +100,32 @@
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Láta mig vita af símtölum sem berast meðan símtal er í gangi"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Láta mig vita af símtölum sem berast meðan símtal er í gangi"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Stillingar símtalsflutnings"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Stillingar símtalsflutnings (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Símtalsflutningur"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Áframsenda alltaf"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Nota alltaf þetta númer"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Áframsendir öll símtöl"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Áframsendir öll símtöl í <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Ekki næst í númerið"</string>
-    <string name="sum_cfu_disabled" msgid="3698472522160364904">"Slökkt"</string>
-    <string name="labelCFB" msgid="218938523102207587">"Áframsenda þegar síminn er á tali"</string>
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Slökkt"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Þegar er á tali"</string>
     <string name="messageCFB" msgid="3711089705936187129">"Númeraval þegar síminn er á tali"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Áframsendir í <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
-    <string name="sum_cfb_disabled" msgid="227440009979537651">"Slökkt"</string>
+    <string name="sum_cfb_disabled" msgid="4913145177320506827">"Slökkt"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Símafyrirtækið leyfir ekki að slökkt sé á símtalsflutningi þegar síminn er á tali."</string>
-    <string name="labelCFNRy" msgid="3646316323834351390">"Áframsenda þegar ekki er svarað í símann"</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"Þegar ekki er svarað"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Númeraval þegar ekki er svarað í símann"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Áframsendir í <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
-    <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Slökkt"</string>
+    <string name="sum_cfnry_disabled" msgid="3884684060443538097">"Slökkt"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Símafyrirtækið leyfir ekki að slökkt sé á símtalsflutningi þegar ekki er svarað í símann."</string>
-    <string name="labelCFNRc" msgid="47183615370850000">"Áframsenda þegar ekki næst í símann"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"Þegar ekki næst í þig"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Númeraval þegar ekki næst í símann"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Áframsendir í <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Slökkt"</string>
     <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Símafyrirtækið leyfir ekki að slökkt sé á símtalsflutningi þegar ekki næst í símann."</string>
     <string name="updating_title" msgid="6146755386174019046">"Símtalsstillingar"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"Aðeins aðalnotandinn má breyta símtalsstillingum."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Símtalsstillingar (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Villa í símtalsstillingum"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Les stillingar…"</string>
     <string name="updating_settings" msgid="8171225533884883252">"Uppfærir stillingar…"</string>
@@ -109,8 +135,8 @@
     <string name="fdn_check_failure" msgid="18200614306525434">"Kveikt er á föstu númeravali í símaforritinu. Þetta veldur því að sumir símtalseiginleikar virka ekki."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Kveiktu á loftnetinu áður en þú skoðar þessar stillingar."</string>
     <string name="close_dialog" msgid="2365884406356986917">"Í lagi"</string>
-    <string name="enable" msgid="1059008390636773574">"Kveikja"</string>
-    <string name="disable" msgid="7274240979164762320">"Slökkva"</string>
+    <string name="enable" msgid="7248657275000173526">"Kveikja"</string>
+    <string name="disable" msgid="4678348128118573672">"Slökkva"</string>
     <string name="change_num" msgid="239476305819844391">"Uppfæra"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Sjálfgildi símkerfis"</item>
@@ -123,8 +149,8 @@
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Ekki tókst að sækja og vista núverandi stillingar fasts númeravals.\nViltu samt skipta yfir í nýja símafyrirtækið?"</string>
     <string name="no_change" msgid="3186040086622435212">"Engu var breytt."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Velja talhólfsþjónustu"</string>
-    <string name="voicemail_default" msgid="5902099213882352338">"Símafyrirtækið mitt"</string>
-    <string name="mobile_networks" msgid="5540397602919106177">"Stillingar farsímakerfis"</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"Símafyrirtækið þitt"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Farsímakerfisstillingar"</string>
     <string name="label_available" msgid="1181658289009300430">"Símkerfi í boði"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Leitar…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Engin símkerfi fundust."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Valin símkerfisstilling: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Valin símkerfisstilling: Alþjóðleg"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Valin símkerfisstilling: LTE/WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Valið símkerfi: LTE/GSM/UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Valin símkerfisstilling: LTE/CDMA"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="7886739962255042385">"LTE/WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"GSM eingöngu"</item>
     <item msgid="3817924849415716259">"GSM/WCDMA fyrsta val"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"endurbætt 4G LTE-stilling"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Nota LTE-þjónustu til að bæta talsamband og önnur samskipti (ráðlagt)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Kveikt á gagnaaðgangi"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Kveikja á gagnaaðgangi um farsímakerfi"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Leyfa gagnanotkun"</string>
     <string name="roaming" msgid="8871412572928323707">"Gagnareiki"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Tengjast gagnaþjónustu í reiki"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Tengjast gagnaþjónustu í reiki"</string>
     <string name="roaming_reenable_message" msgid="8913735676127858115">"Gagnatengingin rofnaði vegna þess að þú ert utan heimakerfis með slökkt á gagnareiki."</string>
-    <string name="roaming_warning" msgid="7820963598559553967">"Leyfa gagnareiki? Þetta getur leitt til umtalsverðs kostnaðar!"</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"Þetta getur haft mikinn kostnað í för með sér."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Leyfa gagnareiki?"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"Valkostir GSM/UMTS"</string>
     <string name="cdma_options" msgid="4016822858172249884">"CDMA-valkostir"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Gagnanotkun"</string>
@@ -190,7 +221,7 @@
     <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"<xliff:g id="USED_0">%1$s</xliff:g> hámarki náð\nGagnahraði minnkaður í <xliff:g id="USED_1">%2$d</xliff:g> kB/sek."</string>
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"<xliff:g id="USED_0">%1$d</xliff:g>٪ af tímabili lokið\nNæsta tímabil hefst eftir <xliff:g id="USED_1">%2$d</xliff:g> daga (<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"Gagnahraði minnkaður í <xliff:g id="USED">%1$d</xliff:g> kB/sek. ef farið er yfir gagnanotkunarmörk"</string>
-    <string name="throttle_help_subtext" msgid="5217706521499010816">"Frekari upplýsingar um reglur símafyrirtækisins um gagnanotkun"</string>
+    <string name="throttle_help_subtext" msgid="3633091498168446044">"Frekari upplýsingar um gagnanotkunarreglur símafyrirtækisins"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"SMS-skilaboð frá endurvarpa"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"SMS-skilaboð frá endurvarpa"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"Kveikt á SMS-skilaboðum frá endurvarpa"</string>
@@ -303,7 +334,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Setja upp gagnaþjónustu"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Stillingar símafyrirtækis"</string>
     <string name="fdn" msgid="7878832555095183202">"Fast númeraval"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Fast númeraval (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Listi yfir fast númeraval"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"Listi yfir fast númeraval (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Virkjun fasts númeravals"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Kveikt er á föstu númeravali"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Slökkt er á föstu númeravali"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Velja TTY-stillingu"</string>
     <string name="auto_retry_mode_title" msgid="4073265511427813322">"Reyna sjálfkrafa aftur"</string>
     <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Kveikja á stillingunni Reyna sjálfkrafa aftur"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"Ekki er heimilt að breyta fjarritastillingu meðan á myndsímtali stendur"</string>
     <string name="menu_add" msgid="1882023737425114762">"Bæta tengilið við"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Breyta tengilið"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Eyða tengilið"</string>
@@ -344,7 +378,7 @@
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Les af SIM-korti…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Engir tengiliðir á SIM-kortinu."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Veldu tengiliði til að flytja inn"</string>
-    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"Til að flytja inn tengiliði af SIM-kortinu þarf að slökkva á flugstillingu."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Slökktu á flugstillingu til að flytja inn tengiliði af SIM-kortinu."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Gera PIN-númer SIM-korts virkt eða óvirkt"</string>
     <string name="change_pin" msgid="9174186126330785343">"Breyta PIN-númeri SIM-korts"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"PIN-númer SIM-korts:"</string>
@@ -354,42 +388,40 @@
     <string name="badPin" msgid="8955102849303984935">"Gamla PIN-númerið sem þú slóst inn er ekki rétt. Reyndu aftur."</string>
     <string name="mismatchPin" msgid="5923253370683071889">"PIN-númerin sem þú slóst inn eru ekki eins. Reyndu aftur."</string>
     <string name="invalidPin" msgid="5981171102258684792">"Sláðu in PIN-númer sem er 4 til 8 tölustafir."</string>
-    <string name="disable_sim_pin" msgid="3992926931620188855">"Gera PIN-númer SIM-korts óvirkt"</string>
-    <string name="enable_sim_pin" msgid="5803702443844458831">"Gera PIN-númer SIM-korts virkt"</string>
-    <string name="enable_in_progress" msgid="3695303775100109650">"Augnablik…"</string>
-    <string name="enable_pin_ok" msgid="9166061915030865848">"PIN-númer SIM-korts virkt."</string>
-    <string name="disable_pin_ok" msgid="5596999379593924850">"PIN-númer SIM-korts óvirkt."</string>
-    <string name="pin_failed" msgid="2298841192582192277">"Þú slóst inn rangt PIN-númer."</string>
-    <string name="pin_changed" msgid="4365538014588501049">"PIN-númeri SIM-korts breytt."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Rangt aðgangsorð; PIN-númerið er læst. Beðið um PUK-númer."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"Hreinsa PIN-númer SIM-korts"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"Stilla PIN-númer SIM-korts"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"Stillir PIN-númer…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN-númer stillt"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN-númer hreinsað"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"Rangt PIN-númer"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN-númer uppfært"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Rangt aðgangsorð. PIN-númerinu var læst. Sláðu inn PUK-númerið."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2-númer"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Gamla PIN2-númerið"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Nýtt PIN2-númer"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Staðfestu nýja PIN2-númerið"</string>
-    <string name="badPuk2" msgid="4851734468010000418">"PUK2-númerið sem þú slóst inn er ekki rétt. Reyndu aftur."</string>
-    <string name="badPin2" msgid="1041576234483629991">"Gamla PIN2-númerið sem þú slóst inn er ekki rétt. Reyndu aftur."</string>
-    <string name="mismatchPin2" msgid="523029155918113440">"PIN2-númerin sem þú slóst inn eru ekki eins. Reyndu aftur."</string>
-    <string name="invalidPin2" msgid="8237110107480395938">"Sláðu in PIN2-númer sem er 4 til 8 tölustafir."</string>
-    <string name="invalidPuk2" msgid="1290977391033057871">"Sláðu in PUK2-númer sem er 8 tölustafir."</string>
-    <string name="pin2_changed" msgid="1639666438836544393">"PIN2-númeri breytt."</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"Sláðu inn PUK2-númer"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Rangt aðgangsorð; búið er að læsa PIN2-númerinu. Breyttu PIN2-númerinu og reyndu aftur!"</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"Rangt aðgangsorð; SIM-kortið er læst. Beðið um PUK2-númer."</string>
+    <string name="badPuk2" msgid="7910064009531541708">"Rangt PUK2-númer. Reyndu aftur."</string>
+    <string name="badPin2" msgid="6646896629970023109">"Gamla PIN2-númerið er rangt. Reyndu aftur."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2-númerin stemma ekki. Reyndu aftur."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Sláðu inn PIN2-númer sem er 4 til 8 tölur."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Sláðu inn PUK2-númer sem er 8 tölur."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2-númer uppfært"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Sláðu inn PUK2-númer"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Rangt aðgangsorð. PIN2-númerið er nú læst. Breyttu PIN2-númerinu til að reyna aftur."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Rangt aðgangsorð. SIM-kortinu var læst. Sláðu inn PUK2-númerið."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 er læst fyrir fullt og allt."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"<xliff:g id="NUMBER">%d</xliff:g> tilraunir eru eftir."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"Opnað fyrir PIN2-númer!"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"<xliff:g id="NUMBER">%d</xliff:g> tilraunir eru eftir."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2-númer ekki lengur læst"</string>
     <string name="doneButton" msgid="2859593360997984240">"Lokið"</string>
-    <string name="caller_manage_header" msgid="3231519674734638786">"Símafundur <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Talhólfsnúmer"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Hringir"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Reynir aftur"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Hringir aftur"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Símafundur"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Símtal berst"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Lagt á"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"Í bið"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Leggur á"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Í símtali"</string>
-    <string name="card_title_my_phone_number" msgid="112428362494434191">"Númerið mitt er <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Hringir"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Ósvarað símtal"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Ósvöruð símtöl"</string>
@@ -407,25 +439,27 @@
     <string name="notification_action_end_call" msgid="6069460915123531620">"Leggja á"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Hringja til baka"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Skilaboð"</string>
-    <string name="incall_error_power_off" msgid="6550191216405193368">"Til að hringja símtal þarftu fyrst að slökkva á flugstillingu."</string>
+    <string name="incall_error_power_off" msgid="2947938060513306698">"Slökktu á flugstillingu til að hringja."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Slökktu á flugstillingu eða tengstu þráðlausu neti til að hringja."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Ekki skráð á símkerfi."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Farsímakerfi ekki tiltækt."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Símtalið var ekki sent, gilt símanúmer var ekki slegið inn."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Símtalið var ekki sent."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Farsímakerfi ekki til staðar."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Farsímakerfi er ekki í boði. Tengstu þráðlausu neti til að hringja."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Sláðu inn gilt númer til að hringja símtal."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Ekki hægt að hringja."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Ræsir MMI-runu…"</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Óstudd þjónusta."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Ekki hægt að skipta milli símtala."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Ekki hægt að aðskilja símtal."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Ekki hægt að flytja símtal."</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Þjónusta ekki studd"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Ekki hægt að skipta milli símtala."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Ekki hægt að aðskilja símtal."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Ekki hægt að flytja."</string>
     <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Ekki hægt að halda símafund."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Ekki hægt að hafna símtali."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Ekki hægt að hringja."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Netsímtal"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Ekki hægt að hafna símtali."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Ekki hægt að leggja á."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Tengstu þráðlausu neti til að hringja."</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Neyðarsímtal"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Kveikir á loftneti…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Utan þjónustusvæðis. Reynir aftur…"</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"Símtalið var ekki sent. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> er ekki neyðarnúmer."</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Símtalið var ekki sent. Sláðu inn neyðarnúmer."</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Ekkert samband. Reynir aftur…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Ekki hægt að hringja. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> er ekki neyðarnúmer."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Ekki hægt að hringja. Hringdu í neyðarnúmer."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Notaðu lyklaborðið til að hringja"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Setja í bið"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Ljúka"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"Venjulegir"</item>
     <item msgid="2883365539347850535">"Langir"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Símkerfisskilaboð"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Símkerfisskilaboð"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Villuboð"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Virkjaðu símann"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Hringja þarf sérstakt símtal til að virkja símaþjónustuna. \n\nÞeagr þú hefur ýtt á „Virkja“ skaltu hlusta á leiðbeiningarnar til að virkja símann."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Virkjar..."</string>
@@ -469,8 +504,8 @@
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Vandamál við virkjun"</string>
     <string name="ota_listen" msgid="162923839877584937">"Fylgdu lesnu leiðbeiningunum þar til þú heyrir tilkynnt að virkjun sé lokið."</string>
     <string name="ota_speaker" msgid="6904589278542719647">"Hátalari"</string>
-    <string name="ota_progress" msgid="3420314892609254729">"Bíddu á meðan verið er að uppfæra símann."</string>
-    <string name="ota_failure" msgid="4311299546379674378">"Ekki tókst að uppfæra"</string>
+    <string name="ota_progress" msgid="460876637828044519">"Forritar símann…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Ekki tókst að forrita símann"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Síminn hefur verið virkjaður. Allt að fimmtán mínútur kunna að líða þar til samband næst."</string>
     <string name="ota_unsuccessful" msgid="8072141612635635357">"Ekki tókst að virkja símann. \nÞú gætir þurft að færa þig á stað þar sem er betra samband (við glugga eða utandyra). \n\nReyndu aftur eða hringdu í þjónustuver til að frekari upplýsingar."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"SPC-VILLUR YFIR MÖRKUM"</string>
@@ -481,18 +516,18 @@
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Stilling fyrir svarhringingu neyðarsímtala virk"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Stilling fyrir svarhringingu neyðarsímtala"</string>
     <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Slökkt á gagnatengingu"</string>
-  <plurals name="phone_in_ecm_notification_time">
-    <item quantity="one" msgid="4866221796252472622">"Engin gagnatenging í <xliff:g id="COUNT">%s</xliff:g> mínútu"</item>
-    <item quantity="other" msgid="3122217344579273583">"Engin gagnatenging í <xliff:g id="COUNT">%s</xliff:g> mínútur"</item>
-  </plurals>
-  <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="8060210887681426682">"Síminn verður í stillingu fyrir svarhringingu neyðarsímtala í <xliff:g id="COUNT">%s</xliff:g> mínútu. Á meðan stillingin er virk er ekki hægt að nota nein forrit sem þurfa gagnatengingu. Viltu hætta núna?"</item>
-    <item quantity="other" msgid="8617116564023933114">"Síminn verður í stillingu fyrir svarhringingu neyðarsímtala í <xliff:g id="COUNT">%s</xliff:g> mínútur. Á meðan stillingin er virk er ekki hægt að nota nein forrit sem þurfa gagnatengingu. Viltu hætta núna?"</item>
-  </plurals>
-  <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="2585506997024726599">"Þessi aðgerð er ekki í boði á meðan stilling fyrir svarhringingu neyðarsímtala er virk. Síminn verður í þessari stillingu í <xliff:g id="COUNT">%s</xliff:g> mínútu. Viltu hætta núna?"</item>
-    <item quantity="other" msgid="6115622137771382224">"Þessi aðgerð er ekki í boði á meðan stilling fyrir svarhringingu neyðarsímtala er virk. Síminn verður í þessari stillingu í <xliff:g id="COUNT">%s</xliff:g> mínútur. Viltu hætta núna?"</item>
-  </plurals>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="one">Engin gagnatenging í <xliff:g id="COUNT_1">%s</xliff:g> mínútu</item>
+      <item quantity="other">Engin gagnatenging í <xliff:g id="COUNT_1">%s</xliff:g> mínútur</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="one">Síminn verður í stillingu fyrir svarhringingu neyðarsímtala í <xliff:g id="COUNT_1">%s</xliff:g> mínútu. Þegar hann er í þessari stillingu er ekki hægt að nota nein forrit sem krefjast gagnatengingar. Viltu hætta núna?</item>
+      <item quantity="other">Síminn verður í stillingu fyrir svarhringingu neyðarsímtala í <xliff:g id="COUNT_1">%s</xliff:g> mínútur. Þegar hann er í þessari stillingu er ekki hægt að nota nein forrit sem krefjast gagnatengingar. Viltu hætta núna?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="one">Þessi aðgerð er ekki í boði þegar síminn er í stillingu fyrir svarhringingu neyðarsímtala. Síminn verður í þessari stillingu í <xliff:g id="COUNT_1">%s</xliff:g> mínútu. Viltu hætta núna?</item>
+      <item quantity="other">Þessi aðgerð er ekki í boði þegar síminn er í stillingu fyrir svarhringingu neyðarsímtala. Síminn verður í þessari stillingu í <xliff:g id="COUNT_1">%s</xliff:g> mínútur. Viltu hætta núna?</item>
+    </plurals>
     <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"Þessi aðgerð er ekki í boði í neyðarsímtali."</string>
     <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Fer úr stillingu fyrir svarhringingu neyðarsímtala"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Já"</string>
@@ -506,110 +541,23 @@
     <string name="contactPhoto" msgid="4713193418046639466">"mynd tengiliðar"</string>
     <string name="goPrivate" msgid="865837794424530980">"tala í einrúmi"</string>
     <string name="selectContact" msgid="781975788478987237">"velja tengilið"</string>
-    <string name="sip_settings" msgid="6699045718560859691">"Stillingar netsímtala"</string>
-    <string name="sip_accounts" msgid="2097054001288457163">"Netsímtalareikningar (SIP)"</string>
-    <string name="sip_accounts_title" msgid="1212889069281054570">"Reikningar"</string>
-    <string name="sip_receive_calls" msgid="5635685570889971559">"Svara símtölum"</string>
-    <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Dregur úr endingartíma rafhlöðu"</string>
-    <string name="sip_call_options_title" msgid="27433718808839672">"Nota netsímtal"</string>
-    <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Nota netsímtal (Wi-Fi eingöngu)"</string>
-    <string name="sip_call_options_entry_1" msgid="6556668894178520760">"Fyrir öll símtöl þegar gagnanet er tiltækt"</string>
-    <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Aðeins fyrir netsímtöl"</string>
-    <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Spyrja við hvert símtal"</string>
-    <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"Fyrir öll símtöl"</string>
-    <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Hringja símtal"</string>
-    <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"Nota netsímareikning:"</string>
-    <string name="remember_my_choice" msgid="7058059586169290705">"Nota alltaf fyrir netsímtöl"</string>
-    <string name="reset_my_choice_hint" msgid="5523030209803567922">"Þú getur breytt því hvaða netsímareikningur er notaður sjálfgefið á skjámyndinni Sími &gt; Stillingar &gt; Netsímastillingar &gt; Reikningar."</string>
-    <string name="pstn_phone" msgid="8782554491484326429">"Símtal í farsíma"</string>
-    <string name="internet_phone" msgid="1147922660195095810">"Netsímtal"</string>
-    <string name="no_sip_account_found_title" msgid="6266249392379373628">"Enginn netsímareikningur"</string>
-    <string name="no_sip_account_found" msgid="724325811961769997">"Engir netsímareikningar í þessum síma. Viltu bæta reikningi við núna?"</string>
-    <string name="sip_menu_add" msgid="8757508498518881500">"Bæta við"</string>
-    <string name="add_sip_account" msgid="5904858426290097611">"Bæta reikningi við"</string>
-    <string name="remove_sip_account" msgid="7645900420385682570">"Fjarlægja reikning"</string>
-    <string name="sip_account_list" msgid="5480058210652194306">"SIP-reikningar"</string>
-    <string name="saving_account" msgid="52903398217017954">"Vistar reikninginn…"</string>
-    <string name="removing_account" msgid="7183999896088628100">"Fjarlægir reikninginn…"</string>
-    <string name="sip_menu_save" msgid="5842531129356014943">"Vista"</string>
-    <string name="sip_menu_discard" msgid="524075892158789701">"Fleygja"</string>
-    <string name="alert_dialog_close" msgid="7759635137627626235">"Loka sniðinu"</string>
-    <string name="alert_dialog_ok" msgid="3580379406983564080">"Í lagi"</string>
-    <string name="close_profile" msgid="6886968271423155284">"Loka"</string>
-    <string name="primary_account_summary_with" msgid="1633960536212343187">"Aðalreikningur. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
-    <string name="registration_status_checking_status" msgid="3381868307694056727">"Athugar stöðu..."</string>
-    <string name="registration_status_registering" msgid="4288401139400232968">"Skráir…"</string>
-    <string name="registration_status_still_trying" msgid="3185581992666091911">"Enn að reyna…"</string>
-    <string name="registration_status_not_receiving" msgid="4185572774980557758">"Tekur ekki við símtölum."</string>
-    <string name="registration_status_no_data" msgid="4901476962360656611">"Reikningsskráning var stöðvuð því engin nettenging er til staðar."</string>
-    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"Reikningsskráning var stöðvuð því engin Wi-Fi tenging er til staðar."</string>
-    <string name="registration_status_not_running" msgid="4824867184446232131">"Reikningsskráning mistókst."</string>
-    <string name="registration_status_done" msgid="884630717456439280">"Tekur við símtölum."</string>
-    <string name="registration_status_failed_try_later" msgid="5214474354451220581">"Ekki tókst að skrá reikninginn (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); reynt verður aftur síðar"</string>
-    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"Reikningsskráning tókst ekki. Rangt notandanafn eða aðgangsorð."</string>
-    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"Reikningsskráning mistókst. Athugaðu þjónsheitið."</string>
-    <string name="third_party_account_summary" msgid="2532526738862533028">"Forritið <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> er að nota þennan reikning eins og er."</string>
-    <string name="sip_edit_title" msgid="489288416435014385">"SIP-reikningsupplýsingar"</string>
-    <string name="sip_edit_new_title" msgid="3659149255856520385">"SIP-reikningsupplýsingar"</string>
-    <string name="domain_address_title" msgid="9071787581316160480">"Netþjónn"</string>
-    <string name="username_title" msgid="2479375923477682328">"Notandanafn"</string>
-    <string name="password_title" msgid="3323555249068171531">"Aðgangsorð"</string>
-    <string name="display_name_title" msgid="2459768196312249937">"Skjánafn"</string>
-    <string name="proxy_address_title" msgid="4828301345351614273">"Vistfang proxy-þjóns á útleið"</string>
-    <string name="port_title" msgid="5952939408078626657">"Númer gáttar"</string>
-    <string name="transport_title" msgid="8253139511847746640">"Flutningstegund"</string>
-    <string name="send_keepalive_title" msgid="7533342573918645113">"Halda tengingu opinni"</string>
-    <string name="set_primary_title" msgid="5351892327447571451">"Nota sem aðalreikning"</string>
-    <string name="set_primary_summary" msgid="2219064654523258577">"Notað fyrir hringd símtöl"</string>
-    <string name="advanced_settings" msgid="8350631795335495338">"Valfrjálsar stillingar"</string>
-    <string name="auth_username_title" msgid="851473016307947120">"Notandanafn til auðkenningar"</string>
-    <string name="auth_username_summary" msgid="6782012405225938629">"Notandanafn notað til auðkenningar"</string>
-    <string name="default_preference_summary" msgid="868766740121667450">"&lt;Ekki stillt&gt;"</string>
-    <string name="display_name_summary" msgid="8636377460518225523">"&lt;Sama og notandanafnið&gt;"</string>
-    <string name="optional_summary" msgid="1464058793789832411">"&lt;Valfrjálst&gt;"</string>
-    <string name="advanced_settings_show" msgid="4668880308290857597">"▷ Snertu til að sýna allt"</string>
-    <string name="advanced_settings_hide" msgid="217398292824758079">"▽ Snertu til að fela allt"</string>
-    <string name="empty_alert" msgid="6839103946505432390">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> er áskilið og má ekki vera autt."</string>
-    <string name="not_a_valid_port" msgid="4796149266434630292">"Númer gáttar á að vera milli 1000 og 65534."</string>
-    <string name="no_internet_available_title" msgid="3327109242858406165">"Engin nettenging"</string>
-    <string name="no_wifi_available_title" msgid="747881033089378758">"Engin Wi-Fi tenging"</string>
-    <string name="no_internet_available" msgid="7877142631803238549">"Til að hringja netsímtal skaltu fyrst athuga nettenginguna."</string>
-    <string name="no_wifi_available" msgid="1225073547318465713">"Nettenging þarf að vera til staðar til að hægt sé að hringja netsímtöl (notaðu stillingarnar undir Þráðlaust net og símkerfi)."</string>
-    <string name="no_voip" msgid="8901474054537199865">"Netsímtöl eru ekki studd"</string>
-    <string name="sip_system_decide" msgid="368030746310423471">"Sjálfvirkt"</string>
-    <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Senda alltaf"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Símtöl eru ekki studd"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Snarsvör"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"einn"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"tveir"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"þrír"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"fjórir"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"fimm"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"sex"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"sjö"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"átta"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"níu"</string>
-    <string name="description_image_button_star" msgid="1976280813017254462">"stjarna"</string>
-    <string name="description_image_button_zero" msgid="4211255756866893605">"núll"</string>
-    <string name="description_image_button_pound" msgid="1716041284529917866">"kassi"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"hringja"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"bakklykill"</string>
-    <string name="description_target_answer" msgid="7205604197797472471">"Svara"</string>
-    <string name="description_target_send_sms" msgid="2098326025587950144">"Senda SMS"</string>
-    <string name="description_target_decline" msgid="4789834364389731957">"Hafna"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Titringur"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Titringur"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Hljóð"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Sjálfgefið hljóð (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_title" msgid="6374978286202084684">"Hringitónn síma"</string>
-    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Titra við hringingu"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Snertitónar takkaborðs"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Sjálfvirk útfylling á takkaborði"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Hringitónn og titringur"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Nota Wi-Fi til að hringja símtal?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Já"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"Nei"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Innbyggð SIM-kort"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Innbyggð netsímtöl"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Kveikja á myndsímtölum"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Til að kveikja á myndsímtölum þarftu að virkja endurbætta 4G LTE stillingu í símkerfisstillingum."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Símkerfisstillingar"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Loka"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Neyðarsímtöl"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Eingöngu neyðarsímtöl"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM-kort, rauf: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Aðgengi"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Wi-Fi símtal berst"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi símtal"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Snertu aftur til að opna"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"Villa kom upp við að afkóða skeytið."</string>
 </resources>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
new file mode 100644
index 0000000..16bdfca
--- /dev/null
+++ b/res/values-it/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Generali"</item>
+    <item msgid="6753774959494729275">"LTE/CDMA"</item>
+    <item msgid="8658695584186942227">"LTE/GSM/UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-it/config.xml b/res/values-it/config.xml
deleted file mode 100644
index 0605cd7..0000000
--- a/res/values-it/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"false"</string>
-</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index a784a4e..c023c2d 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -16,14 +16,14 @@
 
 <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">"Dati cellulare"</string>
+    <string name="phoneAppLabel" product="tablet" msgid="1107073389495104784">"Dati mobili"</string>
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Telefono"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Chiamata di emergenza"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Telefono"</string>
     <string name="fdnListLabel" msgid="8630418672279521003">"Elenco FDN"</string>
     <string name="unknown" msgid="6878797917991465859">"Sconosciuto"</string>
     <string name="private_num" msgid="6713286113000232309">"Numero privato"</string>
-    <string name="payphone" msgid="1931775086311769314">"Telefono a monete"</string>
+    <string name="payphone" msgid="4793877574636445118">"Cabina telefonica"</string>
     <string name="onHold" msgid="9035493194749959955">"In attesa"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Codice MMI avviato"</string>
     <string name="ussdRunning" msgid="485588686340541690">"Esecuzione codice USSD..."</string>
@@ -52,18 +52,41 @@
     <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="mobile_network_settings_not_available" msgid="7355254462995117896">"Le impostazioni per dispositivi mobili non sono disponibili per questo utente"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Le impostazioni per reti cellulari non sono disponibili per questo utente"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Imp. chiamate GSM"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"Impostazioni di chiamata GSM (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Impostazioni di chiamata CDMA"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"Impostazioni di chiamata CDMA (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Nomi punti di accesso"</string>
     <string name="settings_label" msgid="3876743539816984008">"Impostazioni di rete"</string>
-    <string name="connection_service" msgid="978745922583410219">"Servizio di connessione da utilizzare"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Account chiamata"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Effettua chiamate con"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Effettua chiamate SIP con"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Chiedi prima"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Impostazioni"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Seleziona account"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Account telefono"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Aggiungi account SIP"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Configurazione delle impostazioni dell\'account"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Chiamate Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Non utilizzare chiamate Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Non utilizzare assistente chiamate"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Nessuno"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Assistente chiamate"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Utilizza assistente chiamate"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Seleziona assistente chiamate"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Gestisci le reti utilizzate per le chiamate con"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Consenti ad app o servizi di gestire le reti utilizzate per le chiamate"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Configura"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Servizio di connessione integrato"</string>
     <string name="voicemail" msgid="8693759337917898954">"Segreteria"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Segreteria (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"ST:"</string>
     <string name="networks" msgid="8873030692174541976">"Operatori di rete"</string>
-    <string name="call_settings" msgid="1630474923393095156">"Impostazioni chiamate"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Trasmissioni di emergenza"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Impostazioni chiamate"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Altre impostazioni"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Impostazioni aggiuntive (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Altre impostazioni chiamata solo GSM"</string>
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Altre impostazioni chiamata CDMA"</string>
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Altre impostazioni chiamata solo CDMA"</string>
@@ -77,29 +100,32 @@
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Notifica chiamate in entrata durante telefonata"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Notifica chiamate in entrata durante telefonata"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Deviazione chiamate"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Impostazioni deviazione chiamate (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Deviazione chiamate"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Devia sempre"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Usa sempre questo numero"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Deviazione di tutte le chiamate"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Deviazione di tutte le chiamate al numero <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Numero non disponibile"</string>
-    <string name="sum_cfu_disabled" msgid="3698472522160364904">"Disattivato"</string>
-    <string name="labelCFB" msgid="218938523102207587">"Devia se occupato"</string>
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Non attiva"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Quando occupato"</string>
     <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="sum_cfb_disabled" msgid="4913145177320506827">"Non attiva"</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="labelCFNRy" msgid="1736067178393744351">"Quando senza risposta"</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="sum_cfnry_disabled" msgid="3884684060443538097">"Non attiva"</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="labelCFNRc" msgid="2614827454402079766">"Quando 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="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="call_settings_primary_user_only" msgid="5679923943740900965">"Le impostazioni delle chiamate possono essere modificate solo dall\'utente principale."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Impostazioni chiamate (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Errore durante aggiornam. impostaz. chiamate"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Lettura impostazioni..."</string>
     <string name="updating_settings" msgid="8171225533884883252">"Aggiornamento impostazioni..."</string>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"Attiva"</string>
+    <string name="disable" msgid="4678348128118573672">"Disattiva"</string>
     <string name="change_num" msgid="239476305819844391">"Aggiorna"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Rete predefinita"</item>
@@ -123,8 +149,8 @@
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Recupero e salvataggio delle impostazioni correnti dei numeri di deviazione non riusciti. \nPassare 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>
-    <string name="voicemail_default" msgid="5902099213882352338">"Il mio gestore"</string>
-    <string name="mobile_networks" msgid="5540397602919106177">"Impostazioni reti mobili"</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"Operatore"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Impostazioni rete cellulare"</string>
     <string name="label_available" msgid="1181658289009300430">"Reti disponibili"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Ricerca..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Nessuna rete trovata."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Modalità di rete preferita: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Modalità di rete preferita: globale"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Modalità di rete preferita: LTE/WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Modalità di rete preferita: LTE/GSM/UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Modalità di rete preferita: LTE/CDMA"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="7886739962255042385">"LTE/WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"Solo GSM"</item>
     <item msgid="3817924849415716259">"GSM/WCDMA preferito"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Modalità 4G LTE avanzata"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Usa i servizi LTE per migliorare la voce e le altre comunicazioni (consigliato)"</string>
     <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="data_enable_summary" msgid="2382798156640007971">"Consenti l\'utilizzo dei dati"</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="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="roaming_warning" msgid="1603164667540144353">"I costi potrebbero essere elevati."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Consentire il roaming dei dati?"</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>
@@ -194,7 +225,7 @@
     <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"<xliff:g id="USED_0">%1$s</xliff:g> max superato\nVelocità 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\nIl 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="throttle_help_subtext" msgid="3633091498168446044">"Informazioni su norme di utilizzo dati della rete cellulare dell\'operatore"</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>
@@ -307,7 +338,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Imposta servizio dati"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Impostazioni operatore"</string>
     <string name="fdn" msgid="7878832555095183202">"Numeri selezione fissa (FDN)"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Numeri consentiti (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Elenco FDN"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"Elenco numeri consentiti (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Attivazione FDN"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Numeri di selezione fissa attivi"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Numeri di selezione fissa non attivi"</string>
@@ -325,6 +358,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Imposta modalità TTY"</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="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"Durante le videochiamate non è possibile cambiare modalità TTY"</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>
@@ -348,7 +382,7 @@
     <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="1846161429087789936">"Per importare i contatti dalla scheda SIM, prima disattiva la modalità aereo."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Disattiva la modalità aereo per importare i contatti dalla scheda SIM."</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>
@@ -358,42 +392,40 @@
     <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="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="1796577128488773946">"Password errata, PIN bloccato. Occorre il PUK."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"Cancella PIN scheda SIM"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"Imposta PIN scheda SIM"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"Impostazione PIN…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN impostato"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN cancellato"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN errato"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN aggiornato"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Password errata. PIN bloccato. Codice PUK richiesto."</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="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="1639666438836544393">"PIN2 modificato."</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"Digita il codice PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Password errata, PIN2 bloccato. Modifica il PIN2 e riprova."</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"Password errata. La SIM è bloccata. Inserisci il codice PUK2."</string>
+    <string name="badPuk2" msgid="7910064009531541708">"PUK2 errato. Riprova."</string>
+    <string name="badPin2" msgid="6646896629970023109">"PIN2 precedente errato. Riprova."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"I codici PIN2 non corrispondono. Riprova."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Inserisci un codice PIN2 di 4-8 numeri."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Inserisci un codice PUK2 di 8 numeri."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 aggiornato"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Inserisci codice PUK2"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Password errata. PIN2 bloccato. Per riprovare, modifica il codice PIN2."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Password errata. SIM bloccata. Inserisci codice PUK2."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 bloccato definitivamente."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Ancora <xliff:g id="NUMBER">%d</xliff:g> tentativi a disposizione."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 sbloccato."</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"Hai a disposizione ancora <xliff:g id="NUMBER">%d</xliff:g> tentativi."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 sbloccato"</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="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_redialing" msgid="8253487008234167266">"Ricomposizione"</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_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>
     <string name="card_title_in_call" msgid="6346543933068225205">"Chiamata"</string>
-    <string name="card_title_my_phone_number" msgid="112428362494434191">"Il mio numero è <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Chiamata in corso"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Chiamata senza risposta"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Chiamate senza risposta"</string>
@@ -411,25 +443,27 @@
     <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_power_off" msgid="2947938060513306698">"Disattiva la modalità aereo per effettuare una chiamata."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Disattiva la modalità aereo o connettiti a una rete wireless per effettuare una chiamata."</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_error_out_of_service" msgid="4100065333878929223">"Rete cellulare non disponibile."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"La rete cellulare non è disponibile. Connettiti a una rete wireless per effettuare una chiamata."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Per effettuare una chiamata, inserisci un numero valido."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Impossibile chiamare."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Inizio sequenza MMI..."</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>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Impossibile trasferire la chiamata."</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Servizio non supportato"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Impossibile cambiare chiamata."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Impossibile separare la chiamata."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Impossibile trasferire."</string>
     <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Audioconferenze non disponibili"</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Impossibile rifiutare la chiamata."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Impossibile riprendere le chiamate."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Chiamata Internet"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Impossibile rifiutare la chiamata."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Impossibile riagganciare."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Connettiti a una rete wireless per effettuare una chiamata."</string>
     <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="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="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Nessun servizio. Nuovo tentativo…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Impossibile chiamare. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> non è un numero di emergenza."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Impossibile chiamare. Componi un numero di emergenza."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Usa tastiera"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"In attesa"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Chiudi"</string>
@@ -460,7 +494,8 @@
     <item msgid="899650777817315681">"Normali"</item>
     <item msgid="2883365539347850535">"Lunghi"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Messaggio di rete"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Messaggio di rete"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Messaggio di errore"</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\nDopo avere premuto \"Attiva\", ascolta le istruzioni fornite per attivare il telefono."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Attivazione..."</string>
@@ -473,8 +508,8 @@
     <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_speaker" msgid="6904589278542719647">"Vivavoce"</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_progress" msgid="460876637828044519">"Programmazione telefono…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Impossibile programmare il telefono"</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="8072141612635635357">"Il telefono non è stato attivato. \nPotrebbe essere necessario trovare una zona con copertura migliore (vicino a una finestra o all\'esterno). \n\nRiprova o contatta l\'assistenza clienti per conoscere altre soluzioni."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"TROPPI ERRORI SPC"</string>
@@ -485,18 +520,18 @@
     <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>
     <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Connessione dati disabilitata"</string>
-  <plurals name="phone_in_ecm_notification_time">
-    <item quantity="one" msgid="4866221796252472622">"Nessuna connessione dati per <xliff:g id="COUNT">%s</xliff:g> minuto"</item>
-    <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="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="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>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other">Nessuna connessione dati per <xliff:g id="COUNT_1">%s</xliff:g> minuti</item>
+      <item quantity="one">Nessuna connessione dati per <xliff:g id="COUNT_0">%s</xliff:g> minuto</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other">Il telefono sarà in modalità Richiamata di emergenza per <xliff:g id="COUNT_1">%s</xliff:g> minuti. In questa modalità non è possibile utilizzare applicazioni che impiegano una connessione dati. Vuoi uscire ora?</item>
+      <item quantity="one">Il telefono sarà in modalità Richiamata di emergenza per <xliff:g id="COUNT_0">%s</xliff:g> minuto. In questa modalità non è possibile utilizzare app che impiegano una connessione dati. Vuoi uscire ora?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other">L\'azione selezionata non è disponibile in modalità Richiamata di emergenza. Il telefono sarà in questa modalità per <xliff:g id="COUNT_1">%s</xliff:g> minuti. Vuoi uscire ora?</item>
+      <item quantity="one">L\'azione selezionata non è disponibile in modalità Richiamata di emergenza. Il telefono sarà in questa modalità per <xliff:g id="COUNT_0">%s</xliff:g> minuto. Vuoi uscire ora?</item>
+    </plurals>
     <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>
@@ -510,110 +545,23 @@
     <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_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_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="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="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="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="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_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="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="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>
-    <string name="username_title" msgid="2479375923477682328">"Nome utente"</string>
-    <string name="password_title" msgid="3323555249068171531">"Password"</string>
-    <string name="display_name_title" msgid="2459768196312249937">"Nome visualizzato"</string>
-    <string name="proxy_address_title" msgid="4828301345351614273">"Indirizzo proxy in uscita"</string>
-    <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="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>
-    <string name="auth_username_title" msgid="851473016307947120">"Nome utente per autenticazione"</string>
-    <string name="auth_username_summary" msgid="6782012405225938629">"Nome utente utilizzato per l\'autenticazione"</string>
-    <string name="default_preference_summary" msgid="868766740121667450">"&lt;Non impostato&gt;"</string>
-    <string name="display_name_summary" msgid="8636377460518225523">"&lt;Uguale al nome utente&gt;"</string>
-    <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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"Chiamate vocali non supportate"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Risposte rapide"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"uno"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"due"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"tre"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"quattro"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"cinque"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"sei"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"sette"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"otto"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"nove"</string>
-    <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_dial_button" msgid="7459705245418435351">"componi"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="description_target_answer" msgid="7205604197797472471">"Rispondi"</string>
-    <string name="description_target_send_sms" msgid="2098326025587950144">"Invia SMS"</string>
-    <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="2609519527849101590">"Suono"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Suono predefinito (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <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"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Completam. autom. tastierino"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Suoneria e vibrazione"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Utilizzare il Wi-Fi per effettuare la chiamata?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Sì"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"No"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Schede SIM integrate"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Chiamate Internet integrate"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Attiva videochiamata"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Per attivare le videochiamate, devi abilitare la modalità 4G LTE avanzata nelle impostazioni della rete."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Impostazioni di rete"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Chiudi"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Chiamate di emergenza"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Solo chiamate di emergenza"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"Scheda SIM, slot: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Accessibilità"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Chiamata Wi-Fi in arrivo"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Chiamata Wi-Fi"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Tocca di nuovo per aprire"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"Si è verificato un errore durante la decodifica del messaggio."</string>
 </resources>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
new file mode 100644
index 0000000..4e66e70
--- /dev/null
+++ b/res/values-iw/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"גלובלי"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-iw/config.xml b/res/values-iw/config.xml
deleted file mode 100644
index 0605cd7..0000000
--- a/res/values-iw/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"false"</string>
-</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 8fad7e0..d08f516 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -16,14 +16,14 @@
 
 <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="tablet" msgid="1107073389495104784">"נתונים סלולריים"</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">"‏רשימת FDN"</string>
     <string name="unknown" msgid="6878797917991465859">"לא ידוע"</string>
     <string name="private_num" msgid="6713286113000232309">"מספר פרטי"</string>
-    <string name="payphone" msgid="1931775086311769314">"טלפון ציבורי"</string>
+    <string name="payphone" msgid="4793877574636445118">"טלפון ציבורי"</string>
     <string name="onHold" msgid="9035493194749959955">"בהמתנה"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"‏קוד MMI הופעל"</string>
     <string name="ussdRunning" msgid="485588686340541690">"‏קוד USSD פועל…"</string>
@@ -52,18 +52,41 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"מבקש ביטול נעילת רשת..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"הבקשה לביטול נעילת הרשת נכשלה."</string>
     <string name="unlock_success" msgid="6770085622238180152">"ביטול נעילת הרשת התבצע בהצלחה."</string>
-    <string name="mobile_network_settings_not_available" msgid="7355254462995117896">"הגדרות של רשת לנייד אינן זמינות עבור המשתמש הזה"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"הגדרות רשת סלולרית אינן זמינות עבור המשתמש הזה"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"‏הגדרות שיחה של GSM"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"‏הגדרות שיחת GSM ‏(<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"‏הגדרות שיחה של CDMA"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"‏הגדרות שיחת CDMA ‏(<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"שמות של נקודות גישה"</string>
     <string name="settings_label" msgid="3876743539816984008">"הגדרות רשת"</string>
-    <string name="connection_service" msgid="978745922583410219">"שירות חיבור שבו יש להשתמש"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"חשבונות להתקשרות"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"בצע שיחות באמצעות"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"‏בצע שיחות SIP באמצעות"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"שאל לפני ביצוע"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"הגדרות"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"בחר חשבונות"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"חשבונות טלפון"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"‏הוסף חשבון SIP"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"קבע את הגדרות החשבון"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"‏שיחות ב-Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"‏אל תשתמש בשיחות Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"אל תשתמש באסיסטנט שיחות"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"ללא"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"אסיסטנט שיחות"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"השתמש באסיסטנט שיחות"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"בחר אסיסטנט שיחות"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"נהל את הרשתות שבהן נעשה שימוש לשיחות עם"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"אפשר לאפליקציות או לשירותים לנהל רשתות המשמשות לשיחות"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"הגדר"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"שירות חיבור מובנה"</string>
     <string name="voicemail" msgid="8693759337917898954">"דואר קולי"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"דואר קולי (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"דואר קולי:"</string>
     <string name="networks" msgid="8873030692174541976">"מפעילי רשת"</string>
-    <string name="call_settings" msgid="1630474923393095156">"הגדרות שיחה"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"שידורי חירום"</string>
+    <string name="call_settings" msgid="6112441768261754562">"הגדרות שיחה"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"הגדרות נוספות"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"הגדרות נוספות (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
@@ -77,29 +100,32 @@
     <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="call_forwarding_settings_with_label" msgid="8569489414006897127">"הגדרות העברת שיחות (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="sum_cfu_disabled" msgid="8384177689501334080">"כבוי"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"כאשר לא פנוי"</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="sum_cfb_disabled" msgid="4913145177320506827">"כבוי"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"הספק שלך אינו תומך בהשבתה של העברת שיחות כאשר הטלפון תפוס."</string>
-    <string name="labelCFNRy" msgid="3646316323834351390">"העבר כשאין מענה"</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"כאשר אין מענה"</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="sum_cfnry_disabled" msgid="3884684060443538097">"כבוי"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"הספק אינו תומך בהשבתה של העברת שיחות כאשר אין מענה בטלפון."</string>
-    <string name="labelCFNRc" msgid="47183615370850000">"העבר כשלא ניתן להשיג"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"כאשר לא נגיש"</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="5646361343094064333">"הספק שלך לא תומך בהשבתה של העברת שיחות כאשר הטלפון כבוי."</string>
     <string name="updating_title" msgid="6146755386174019046">"הגדרות שיחה"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"רק המשתמש הראשי יכול לשנות הגדרות שיחה."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"הגדרות שיחה (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"שגיאה בהגדרות שיחה"</string>
     <string name="reading_settings" msgid="1920291699287055284">"קורא הגדרות…"</string>
     <string name="updating_settings" msgid="8171225533884883252">"מעדכן הגדרות..."</string>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"הפעל"</string>
+    <string name="disable" msgid="4678348128118573672">"כבה"</string>
     <string name="change_num" msgid="239476305819844391">"עדכן"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"רשת ברירת מחדל"</item>
@@ -123,8 +149,8 @@
     <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="voicemail_default" msgid="2001233554889016880">"הספק שלך"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"הגדרות רשת סלולרית"</string>
     <string name="label_available" msgid="1181658289009300430">"רשתות זמינות"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"מחפש..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"לא נמצאו רשתות."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"‏מצב רשת מועדף: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"מצב רשת מועדף: גלובלי"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"‏מצב רשת מועדף: LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"‏מצב רשת מועדף: LTE / GSM / UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"‏מצב רשת מועדפת: LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="7886739962255042385">"LTE / WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"‏GSM בלבד"</item>
     <item msgid="3817924849415716259">"‏GSM/WCDMA מועדף"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"‏מצב 4G LTE משופר"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"‏השתמש בשירותי LTE כדי לשפר את הקול ודרכי תקשורת אחרות (מומלץ)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"נתונים מופעלים"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"אפשר גישת נתונים ברשת לנייד"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"התר שימוש בנתונים"</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="8913735676127858115">"איבדת את קישוריות הנתונים כיוון שעזבת את הרשת הביתית כשהנדידה כבויה."</string>
-    <string name="roaming_warning" msgid="7820963598559553967">"לאפשר נדידת נתונים? אתה עלול לצבור חיובי נדידה משמעותיים!"</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"ייתכנו שיעורי חיוב גבוהים."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"האם לאפשר נדידה?"</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>
@@ -190,7 +221,7 @@
     <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 לשנייה"</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 לשנייה במקרה של חריגה ממגבלת השימוש בנתונים"</string>
-    <string name="throttle_help_subtext" msgid="5217706521499010816">"למידע נוסף על מדיניות השימוש בנתונים ברשת הסלולרית של הספק שלך"</string>
+    <string name="throttle_help_subtext" msgid="3633091498168446044">"מידע נוסף על מדיניות השימוש בנתונים ברשת הסלולרית של הספק שלך"</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>
@@ -303,7 +334,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"הגדר שירות נתונים"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"הגדרות ספק"</string>
     <string name="fdn" msgid="7878832555095183202">"מספרי חיוג קבועים"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"מספרי חיוג קבועים (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"‏רשימת FDN"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"‏רשימת FDN ‏(<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"‏הפעלת FDN"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"מספרי חיוג קבועים מופעלים"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"מספרי חיוג קבועים מושבתים"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"‏הגדר מצב TTY"</string>
     <string name="auto_retry_mode_title" msgid="4073265511427813322">"ניסיון חוזר אוטומטי"</string>
     <string name="auto_retry_mode_summary" msgid="4973886004067532288">"אפשר מצב \'ניסיון חוזר\'."</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"‏שינוי מצב TTY אינו מותר במהלך שיחת וידאו"</string>
     <string name="menu_add" msgid="1882023737425114762">"הוסף איש קשר"</string>
     <string name="menu_edit" msgid="7143003705504672374">"ערוך איש קשר"</string>
     <string name="menu_delete" msgid="3977150783449642851">"מחק איש קשר"</string>
@@ -344,7 +378,7 @@
     <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="1846161429087789936">"‏כדי לייבא אנשי קשר מכרטיס ה-SIM, כבה תחילה את מצב טיסה."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"‏בטל את מצב טיסה כדי לייבא אנשי קשר מכרטיס ה-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>
@@ -354,42 +388,40 @@
     <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="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="1796577128488773946">"‏הסיסמה שגויה. מספר ה-PIN חסום. נשלחה בקשה לקוד PUK."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"‏ניקוי PIN עבור SIM"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"‏הגדרת PIN עבור SIM"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"‏מגדיר PIN…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"‏PIN הוגדר"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"‏ה-PIN נוקה"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"‏PIN2 שגוי"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"‏PIN עודכן"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"‏סיסמה שגויה. PIN נעול כעת. יש להזין PUK."</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="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="1639666438836544393">"‏ה-PIN2 שונה בהצלחה."</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"‏הקלד קוד PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"‏הסיסמה שגויה. PIN2 חסום. שנה את קוד PIN2 ונסה שוב!"</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"‏הסיסמה שגויה, ה-SIM נעול. נדרש PUK2‎."</string>
+    <string name="badPuk2" msgid="7910064009531541708">"‏PUK2 שגוי. נסה שוב."</string>
+    <string name="badPin2" msgid="6646896629970023109">"‏PIN2 הישן שגוי. נסה שוב."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"‏קודי PIN2 לא תואמים. נסה שוב."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"‏הזן PIN2 שאורכו בין 4 ל-8 ספרות."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"‏הזן PUK2 שאורכו 8 ספרות."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"‏PIN2 עודכן"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"‏הזן קוד PUK2"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"‏סיסמה שגויה. PIN2 חסום כעת. כדי לנסות שוב, שנה את PIN 2."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"‏סיסמה שגויה. ה-SIM נעול כעת. הזן PUK2."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"‏PUK2 נחסם לצמיתות."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"נותרו <xliff:g id="NUMBER">%d</xliff:g> ניסיונות."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"‏נעילת PIN2 בוטלה!"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"נותרו לך עוד <xliff:g id="NUMBER">%d</xliff:g> ניסיונות."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"‏PIN2 אינו חסום עוד"</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_redialing" msgid="8253487008234167266">"מחייג שוב"</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_dialing" msgid="2107666444937350731">"מחייג"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"שיחה שלא נענתה"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"שיחות שלא נענו"</string>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"בטל את מצב טיסה כדי לבצע שיחה."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"בטל את מצב טיסה או התחבר לרשת אלחוטית כדי לבצע שיחה."</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_error_out_of_service" msgid="4100065333878929223">"רשת סלולרית אינה זמינה."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"רשת סלולרית אינה זמינה. התחבר לרשת אלחוטית כדי לבצע שיחה."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"כדי להתקשר, הזן מספר טלפון חוקי."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"לא ניתן להתקשר."</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_unknown" msgid="655570339115407698">"שירות לא נתמך"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"לא ניתן לעבור בין שיחות."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"לא ניתן להפריד שיחה."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"לא ניתן להעביר."</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="incall_error_supp_service_reject" msgid="8998568661508655638">"לא ניתן לדחות שיחה."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"לא ניתן לשחרר שיחות."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"התחבר לרשת אלחוטית כדי לבצע שיחה."</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="7969515493359619960">"השיחה לא נשלחה. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> אינו מספר חירום!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"השיחה לא נשלחה. חייג מספר חירום!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"אין שירות. מנסה שוב..."</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"לא ניתן להתקשר. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> אינו מספר חירום."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"לא ניתן להתקשר. חייג למספר חירום."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"השתמש במקלדת כדי לחייג"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"השהה"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"סיום"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"רגיל"</item>
     <item msgid="2883365539347850535">"ארוך"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"הודעת רשת"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"הודעת רשת"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"הודעת שגיאה"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"הפעל את הטלפון"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"יש לבצע שיחה מיוחדת כדי להפעיל את השירות לטלפון. \n\nלאחר הלחיצה על \'הפעל\', הקשב להוראות להפעלת הטלפון."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"מפעיל..."</string>
@@ -469,8 +504,8 @@
     <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="3420314892609254729">"מתבצע תכנות של הטלפון. אנא המתן."</string>
-    <string name="ota_failure" msgid="4311299546379674378">"התכנות נכשל"</string>
+    <string name="ota_progress" msgid="460876637828044519">"מתכנת את הטלפון שלך…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"לא ניתן היה לתכנת את הטלפון שלך"</string>
     <string name="ota_successful" msgid="1880780692887077407">"הטלפון שלך מופעל כעת. ייתכן שתמתין עד 15 דקות להפעלת השירות."</string>
     <string name="ota_unsuccessful" msgid="8072141612635635357">"הטלפון שלך לא הופעל. \nייתכן שעליך למצוא מקום שהקליטה בו טובה יותר (ליד חלון או בחוץ). \n\nנסה שוב או התקשר לשירות לקוחות לקבלת אפשרויות נוספות."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"‏כשלים מרובים של SPC"</string>
@@ -481,18 +516,24 @@
     <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="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="2585506997024726599">"הפעולה שנבחרה אינה זמינה במצב התקשרות חזרה בחירום. הטלפון יהיה במצב זה במשך <xliff:g id="COUNT">%s</xliff:g> דקות. האם אתה רוצה לצאת כעת?"</item>
-    <item quantity="other" msgid="6115622137771382224">"הפעולה שנבחרה אינה זמינה במצב התקשרות חזרה בחירום. הטלפון יהיה במצב זה במשך <xliff:g id="COUNT">%s</xliff:g> דקות. אתה רוצה לצאת כעת?"</item>
-  </plurals>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="two">ללא חיבור נתונים למשך <xliff:g id="COUNT_1">%s</xliff:g> דקות</item>
+      <item quantity="many">ללא חיבור נתונים למשך <xliff:g id="COUNT_1">%s</xliff:g> דקות</item>
+      <item quantity="other">ללא חיבור נתונים למשך <xliff:g id="COUNT_1">%s</xliff:g> דקות</item>
+      <item quantity="one">ללא חיבור נתונים למשך דקה <xliff:g id="COUNT_0">%s</xliff:g></item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="two">הטלפון יהיה במצב חירום של התקשרות חזרה למשך <xliff:g id="COUNT_1">%s</xliff:g> דקות. בזמן שהטלפון במצב הזה, לא ניתן להשתמש באפליקציות הזקוקות לחיבור נתונים. האם ברצונך לצאת כעת?</item>
+      <item quantity="many">הטלפון יהיה במצב חירום של התקשרות חזרה למשך <xliff:g id="COUNT_1">%s</xliff:g> דקות. בזמן שהטלפון במצב הזה, לא ניתן להשתמש באפליקציות הזקוקות לחיבור נתונים. האם ברצונך לצאת כעת?</item>
+      <item quantity="other">הטלפון יהיה במצב חירום של התקשרות חזרה למשך <xliff:g id="COUNT_1">%s</xliff:g> דקות. בזמן שהטלפון במצב הזה, לא ניתן להשתמש באפליקציות הזקוקות לחיבור נתונים. האם ברצונך לצאת כעת?</item>
+      <item quantity="one">הטלפון יהיה במצב חירום של התקשרות חזרה למשך דקה <xliff:g id="COUNT_0">%s</xliff:g>. בזמן שהטלפון במצב הזה, לא ניתן להשתמש באפליקציות הזקוקות לחיבור נתונים. האם ברצונך לצאת כעת?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="two">הפעולה הנבחרת אינה זמינה במצב חירום של התקשרות חזרה. הטלפון יהיה במצב זה למשך <xliff:g id="COUNT_1">%s</xliff:g> דקות. האם ברצונך לצאת כעת?</item>
+      <item quantity="many">הפעולה הנבחרת אינה זמינה במצב חירום של התקשרות חזרה. הטלפון יהיה במצב זה למשך <xliff:g id="COUNT_1">%s</xliff:g> דקות. האם ברצונך לצאת כעת?</item>
+      <item quantity="other">הפעולה הנבחרת אינה זמינה במצב חירום של התקשרות חזרה. הטלפון יהיה במצב זה למשך <xliff:g id="COUNT_1">%s</xliff:g> דקות. האם ברצונך לצאת כעת?</item>
+      <item quantity="one">הפעולה הנבחרת אינה זמינה במצב חירום של התקשרות חזרה. הטלפון יהיה במצב זה למשך דקה <xliff:g id="COUNT_0">%s</xliff:g>. האם ברצונך לצאת כעת?</item>
+    </plurals>
     <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>
@@ -506,110 +547,23 @@
     <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="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="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="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_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="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="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>
-    <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">"‏כתובת שרת Proxy יוצא"</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">"‏&lt;לא הוגדר&gt;"</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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"חיוג קולי אינו נתמך"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"תגובות מהירות"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></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="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_ringtone_title" msgid="2609519527849101590">"צליל"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"צליל ברירת מחדל (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</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="dial_pad_autocomplete" msgid="494525952035761075">"השלמה אוטומטית בלוח חיוג"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"רינגטון ורטט"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"‏האם להשתמש ב-Wi-Fi לביצוע השיחה?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"כן"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"לא"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"‏כרטיסי SIM מובנים"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"שיחות אינטרנט מובנות"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"הפעל שיחות וידאו"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"‏כדי להפעיל שיחת וידאו, עליך להפעיל את \'מצב 4G LTE משופר\' ב\'הגדרות רשת\'."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"הגדרות רשת"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"סגור"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"שיחות חירום"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"שיחות חירום בלבד"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"‏כרטיס SIM, חריץ: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"נגישות"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"‏שיחת Wi-Fi נכנסת"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"‏שיחת Wi-Fi"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"גע שוב כדי לפתוח"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"אירעה שגיאה בעת פענוח ההודעה."</string>
 </resources>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
new file mode 100644
index 0000000..a6e2682
--- /dev/null
+++ b/res/values-ja/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"グローバル"</item>
+    <item msgid="6753774959494729275">"LTE/CDMA"</item>
+    <item msgid="8658695584186942227">"LTE/GSM/UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-ja/config.xml b/res/values-ja/config.xml
deleted file mode 100644
index 0605cd7..0000000
--- a/res/values-ja/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"false"</string>
-</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 3154867..790c356 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -16,14 +16,14 @@
 
 <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="tablet" msgid="1107073389495104784">"モバイルデータ"</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="payphone" msgid="4793877574636445118">"公衆電話"</string>
     <string name="onHold" msgid="9035493194749959955">"保留中"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMIコードの開始"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSDコードを実行中..."</string>
@@ -52,18 +52,41 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"ネットワークのロック解除をリクエスト中..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"ネットワークロックを解除できませんでした。"</string>
     <string name="unlock_success" msgid="6770085622238180152">"ネットワークロックを解除しました。"</string>
-    <string name="mobile_network_settings_not_available" msgid="7355254462995117896">"このユーザーはモバイルネットワーク設定を利用できません。"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"このユーザーはモバイルネットワーク設定を利用できません。"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM通話設定"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"GSM通話設定（<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>）"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA通話設定"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"CDMA通話設定（<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>）"</string>
     <string name="apn_settings" msgid="9043423184895642077">"アクセスポイント名"</string>
     <string name="settings_label" msgid="3876743539816984008">"ネットワーク設定"</string>
-    <string name="connection_service" msgid="978745922583410219">"使用する接続サービス"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"通話アカウント"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"発信先"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"SIP通話の発信先"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"最初に確認する"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"設定"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"アカウントを選択"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"携帯端末アカウント"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"SIPアカウントを追加"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"アカウントを設定"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi通話"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Wi-Fi発信を使用しない"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"発信アシスタントを使用しない"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"使用しない"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"発信アシスタント"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"発信アシスタントを使用"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"発信アシスタントを選択"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"通話用ネットワークを管理する"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"通話用ネットワークの管理をアプリやサービスに許可する"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"設定"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"組み込みの接続サービス"</string>
     <string name="voicemail" msgid="8693759337917898954">"ボイスメール"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"ボイスメール（<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>）"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
     <string name="networks" msgid="8873030692174541976">"通信事業者"</string>
-    <string name="call_settings" msgid="1630474923393095156">"通話設定"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"緊急警報"</string>
+    <string name="call_settings" msgid="6112441768261754562">"通話設定"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"その他の設定"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"その他の設定（<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>）"</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>
@@ -77,29 +100,32 @@
     <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="call_forwarding_settings_with_label" msgid="8569489414006897127">"電話の転送の設定（<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>）"</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="sum_cfu_disabled" msgid="8384177689501334080">"OFF"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"通話中の着信時"</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="sum_cfb_disabled" msgid="4913145177320506827">"OFF"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"ご利用の携帯通信会社は通話中の転送の無効化をサポートしていません。"</string>
-    <string name="labelCFNRy" msgid="3646316323834351390">"不在着信時に転送"</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"不在着信時"</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="sum_cfnry_disabled" msgid="3884684060443538097">"OFF"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"ご利用の携帯通信会社は不在着信時の転送の無効化をサポートしていません。"</string>
-    <string name="labelCFNRc" msgid="47183615370850000">"着信不能時に転送"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"着信不能時"</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="5646361343094064333">"ご利用の携帯通信会社は着信不能時の転送の無効化をサポートしていません。"</string>
     <string name="updating_title" msgid="6146755386174019046">"通話設定"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"通話設定はメインユーザーのみが変更できます。"</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"通話設定（<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>）"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"通話設定エラー"</string>
     <string name="reading_settings" msgid="1920291699287055284">"設定を読み取り中..."</string>
     <string name="updating_settings" msgid="8171225533884883252">"設定を更新中..."</string>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"ONにする"</string>
+    <string name="disable" msgid="4678348128118573672">"OFFにする"</string>
     <string name="change_num" msgid="239476305819844391">"更新"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"ネットワーク既定"</item>
@@ -123,8 +149,8 @@
     <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="voicemail_default" msgid="2001233554889016880">"携帯通信会社"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"モバイルネットワーク設定"</string>
     <string name="label_available" msgid="1181658289009300430">"利用可能なネットワーク"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"検索中..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"ネットワークが見つかりません。"</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"優先ネットワークモード: CDMA+LTE/EV-DO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"優先ネットワークモード: グローバル"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"優先ネットワークモード: LTE/WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"推奨ネットワークモード: LTE/GSM/UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"優先ネットワークモード: LTE/CDMA"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="7886739962255042385">"LTE/WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"GSMのみ"</item>
     <item msgid="3817924849415716259">"GSM/WCDMAを優先"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"4G LTE拡張モード"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"LTEサービスを使用して音声などの通信を改善する（推奨）"</string>
     <string name="data_enabled" msgid="5972538663568715366">"データ通信を有効にする"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"モバイルネットワーク経由のデータアクセスを有効にする"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"データ使用を許可"</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="8913735676127858115">"データローミングをOFFにしてホームネットワークを離れたため、データ接続が切断されました。"</string>
-    <string name="roaming_warning" msgid="7820963598559553967">"データローミングを許可すると、ローミング料金が発生する場合があります。"</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"高額な通信料が発生することがあります。"</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"データローミングを許可しますか？"</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>
@@ -190,7 +221,7 @@
     <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/秒に低下"</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/秒まで低下します"</string>
-    <string name="throttle_help_subtext" msgid="5217706521499010816">"携帯通信会社のモバイルネットワークデータ利用ポリシーの詳細"</string>
+    <string name="throttle_help_subtext" msgid="3633091498168446044">"携帯通信会社のモバイルネットワークデータ利用ポリシーの詳細"</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>
@@ -303,7 +334,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"データサービスの設定"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"携帯通信会社の設定"</string>
     <string name="fdn" msgid="7878832555095183202">"発信番号制限"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"発信番号制限（<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>）"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"発信番号制限リスト"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"発信番号制限リスト（<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>）"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"発信番号制限の有効化"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"発信番号制限はONになっています"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"発信番号制限はOFFになっています"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"TTYモードの設定"</string>
     <string name="auto_retry_mode_title" msgid="4073265511427813322">"自動再試行"</string>
     <string name="auto_retry_mode_summary" msgid="4973886004067532288">"自動再試行モードを有効にする"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"TTYモードの変更はビデオハングアウト中には行えません"</string>
     <string name="menu_add" msgid="1882023737425114762">"連絡先を追加"</string>
     <string name="menu_edit" msgid="7143003705504672374">"連絡先を編集"</string>
     <string name="menu_delete" msgid="3977150783449642851">"連絡先を削除"</string>
@@ -344,7 +378,7 @@
     <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="1846161429087789936">"連絡先をSIMカードからインポートするには、まず機内モードをOFFにしてください。"</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"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>
@@ -354,42 +388,40 @@
     <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="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="1796577128488773946">"パスワードが正しくありません。PINはブロックされています。PUKがリクエストされました。"</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"SIM PINの消去"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"SIM PINの設定"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"PINを設定しています…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PINを設定しました"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PINを消去しました"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PINが正しくありません"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PINを更新しました"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"パスワードが正しくありません。PINはロックされました。PUKを入力してください。"</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="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="1639666438836544393">"PIN2を変更しました。"</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"PUK2コードを入力"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"パスワードが正しくありません。PIN2はブロックされています。PIN2を変更して再入力してください。"</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"パスワードが正しくありません。SIMはロックされています。PUK2を入力してください。"</string>
+    <string name="badPuk2" msgid="7910064009531541708">"PUK2が正しくありません。もう一度お試しください。"</string>
+    <string name="badPin2" msgid="6646896629970023109">"これまでのPIN2が正しくありません。もう一度お試しください。"</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2が一致しません。もう一度お試しください。"</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"4～8桁の数字でPIN2を入力してください。"</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"8桁の数字でPUK2を入力してください。"</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2を更新しました"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"PUK2コードを入力"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"パスワードが正しくありません。PIN2はブロックされました。もう一度お試しになるには、PIN2を変更してください。"</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"パスワードが正しくありません。SIMはロックされました。PUK2を入力してください。"</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2は完全にブロックされています。"</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"入力できるのはあと<xliff:g id="NUMBER">%d</xliff:g>回です。"</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2のブロックが解除されました。"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"入力できるのはあと<xliff:g id="NUMBER">%d</xliff:g>回です。"</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2はブロックされなくなりました"</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_redialing" msgid="8253487008234167266">"リダイヤル中"</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_dialing" msgid="2107666444937350731">"発信中"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"不在着信"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"不在着信"</string>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"電話をかけるには機内モードをオフにしてください。"</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"電話をかけるには、機内モードをオフにするか無線ネットワークに接続してください。"</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_error_out_of_service" msgid="4100065333878929223">"モバイルネットワークが利用できません。"</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"モバイルネットワークが利用できません。電話をかけるには無線ネットワークに接続してください。"</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"発信するには、有効な番号を入力してください。"</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"発信できません。"</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_unknown" msgid="655570339115407698">"サービスはサポートされていません"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"通話を切り替えられません。"</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"通話を分割できません。"</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"転送できません。"</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="incall_error_supp_service_reject" msgid="8998568661508655638">"着信を拒否できません。"</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"通話を解放できません。"</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"電話をかけるには無線ネットワークに接続してください。"</string>
     <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="7969515493359619960">"発信できません。<xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g>は緊急通報番号ではありません。"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"発信できません。緊急通報番号におかけください。"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"通信サービスはありません。もう一度お試しください…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"発信できません。<xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g>は緊急通報番号ではありません。"</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"発信できません。緊急通報番号におかけください。"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"キーボードで番号を入力してください"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"保留"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"終了"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"標準"</item>
     <item msgid="2883365539347850535">"長め"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"ネットワークメッセージ"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"ネットワークメッセージ"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"エラーメッセージ"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"携帯電話を有効にする"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"通話サービスを有効にするには特別な通話が必要です。\n\n[有効にする]を押してから、流れてくる音声に従って電話を有効にしてください。"</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"有効にしています..."</string>
@@ -469,8 +504,8 @@
     <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="3420314892609254729">"携帯端末のプログラムを設定しています。お待ちください。"</string>
-    <string name="ota_failure" msgid="4311299546379674378">"プログラムの設定に失敗しました"</string>
+    <string name="ota_progress" msgid="460876637828044519">"プログラムを設定しています…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"プログラムを設定できませんでした"</string>
     <string name="ota_successful" msgid="1880780692887077407">"携帯が有効に設定されました。サービスが開始されるまで最大で15分ほどかかることがあります。"</string>
     <string name="ota_unsuccessful" msgid="8072141612635635357">"携帯端末を有効にできませんでした。\n電波状態が悪い可能性があります。\n\n電波の良い場所（窓のそばや屋外）に移動してもう一度お試しいただくか、カスタマーサービスに他の方法をお問い合わせください。"</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"超過SPCによる失敗"</string>
@@ -481,18 +516,18 @@
     <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="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="2585506997024726599">"選択した操作は緊急通報待機モードでは実行できません。端末はあと<xliff:g id="COUNT">%s</xliff:g>分間このモードです。今すぐこのモードを終了しますか？"</item>
-    <item quantity="other" msgid="6115622137771382224">"選択した操作は緊急通報待機モードでは実行できません。端末はあと<xliff:g id="COUNT">%s</xliff:g>分間このモードです。今すぐこのモードを終了しますか？"</item>
-  </plurals>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g>分間データ接続できません</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g>分間データ接続できません</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other">スマートフォンはあと<xliff:g id="COUNT_1">%s</xliff:g>分間、緊急通報待機モードです。このモードではデータ通信を行うアプリは使用できません。今すぐこのモードを終了しますか？</item>
+      <item quantity="one">スマートフォンはあと<xliff:g id="COUNT_0">%s</xliff:g>分間、緊急通報待機モードです。このモードではデータ通信を行うアプリは使用できません。今すぐこのモードを終了しますか？</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other">選択した操作は緊急通報待機モードでは実行できません。スマートフォンはあと<xliff:g id="COUNT_1">%s</xliff:g>分間このモードです。今すぐこのモードを終了しますか？</item>
+      <item quantity="one">選択した操作は緊急通報待機モードでは実行できません。スマートフォンはあと<xliff:g id="COUNT_0">%s</xliff:g>分間このモードです。今すぐこのモードを終了しますか？</item>
+    </plurals>
     <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>
@@ -506,110 +541,23 @@
     <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="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="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="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_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="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="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>
-    <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">"&lt;未設定&gt;"</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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"音声通話はサポートされていません"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"クイック返信"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"1"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"2"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"3"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"4"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"5"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"6"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"7"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"8"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"9"</string>
-    <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_dial_button" msgid="7459705245418435351">"発信"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"バックスペース"</string>
-    <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_ringtone_title" msgid="2609519527849101590">"通知音"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"デフォルトの通知音（<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>）"</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="dial_pad_autocomplete" msgid="494525952035761075">"ダイヤルのオートコンプリート"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"着信音とバイブレーション"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Wi-Fiを使用して発信しますか？"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"はい"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"いいえ"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"内蔵のSIMカード"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"内蔵のインターネット通話機能"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"ビデオハングアウトを有効にする"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"ビデオハングアウトをONにするには、ネットワーク設定で4G LTE拡張モードを有効にする必要があります。"</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"ネットワーク設定"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"閉じる"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"緊急通報"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"緊急通報のみ"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIMカード、スロット: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"ユーザー補助機能"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Wi-Fi通話が着信中"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi通話"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"開くにはもう一度タップしてください"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"メッセージのデコード中にエラーが発生しました。"</string>
 </resources>
diff --git a/res/values-ka-rGE/arrays.xml b/res/values-ka-rGE/arrays.xml
new file mode 100644
index 0000000..64ab679
--- /dev/null
+++ b/res/values-ka-rGE/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"გლობალური"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-ka-rGE/config.xml b/res/values-ka-rGE/config.xml
deleted file mode 100644
index 3ab0b09..0000000
--- a/res/values-ka-rGE/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"მცდარია"</string>
-</resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index bfb01ce..b74e7f2 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -16,14 +16,14 @@
 
 <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="tablet" msgid="1107073389495104784">"ფიჭური მონაცემები"</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">"FDN სია"</string>
     <string name="unknown" msgid="6878797917991465859">"უცნობი"</string>
     <string name="private_num" msgid="6713286113000232309">"დაფარული ნომერი"</string>
-    <string name="payphone" msgid="1931775086311769314">"საზოგადოებრივი ტელეფონი"</string>
+    <string name="payphone" msgid="4793877574636445118">"გადახდის ტელეფონი"</string>
     <string name="onHold" msgid="9035493194749959955">"შეყოვნების რეჟიმში"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI კოდი დაიწყო"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD კოდი გაშვებულია…"</string>
@@ -52,18 +52,41 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"ქსელის განბლოკვის მოთხოვნა…"</string>
     <string name="unlock_failed" msgid="6490531697031504225">"ქსელის განბლოკვის მოთხოვნა წარუმატებლად დასრულდა."</string>
     <string name="unlock_success" msgid="6770085622238180152">"ქსელის განბლოკვის მოთხოვნა წარმატებით დასრულდა."</string>
-    <string name="mobile_network_settings_not_available" msgid="7355254462995117896">"მობილური ქსელის პარამეტრები ამ მომხმარებლისათვის მიუწვდომელია"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"ფიჭური ქსელის პარამეტრები ამ მომხმარებლისათვის მიუწვდომელია"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM ზარის პარამეტრები"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"GSM ზარის პარამეტრები (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA ზარის პარამეტრები"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"CDMA ზარის პარამეტრები (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"წვდომის წერტილის სახელები"</string>
     <string name="settings_label" msgid="3876743539816984008">"ქსელის პარამეტრები"</string>
-    <string name="connection_service" msgid="978745922583410219">"გამოსაყენებელი კავშირის სერვისი"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"დარეკვის ანგარიშები"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"ზარის განხორციელება"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"SIP ზარების მიღება"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"წინასწარი შეკითხვა"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"პარამეტრები"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"აირჩიეთ ანგარიშები"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"ტელეფონის ანგარიშები"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"SIP ანგარიშის დამატება"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"ანგარიშის პარამეტრების კონფიგურაცია"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"დარეკვა Wi-Fi-ს მეშვეობით"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"არ გამოიყენოს Wi-Fi დარეკვა"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"არ გამოიყენოს ზარის თანაშემწე"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"არცერთი"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"ზარის თანაშემწე"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"ზარის თანაშემწეს გამოყენება"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"ზარის თანაშემწეს არჩევა"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"ზარებისათვის გამოყენებული ქსელების მართვა შემდეგით"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"დართეთ ნება აპლიკაციას ან მომსახურებას, მართოს დარეკვისათვის გამოყენებული ქსელები"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"კონფიგურაცია"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"კავშირის ჩაშენებული სერვისი"</string>
     <string name="voicemail" msgid="8693759337917898954">"ხმოვანი ფოსტა"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"ხმოვანი ფოსტა (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
     <string name="networks" msgid="8873030692174541976">"ქსელის ოპერატორები"</string>
-    <string name="call_settings" msgid="1630474923393095156">"ზარის პარამეტრები"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"სასწრაფო გადაცემები"</string>
+    <string name="call_settings" msgid="6112441768261754562">"ზარის პარამეტრები"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"დამატებითი პარამეტრები"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"დამატებითი პარამეტრები ( <xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g> )"</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>
@@ -77,29 +100,32 @@
     <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="call_forwarding_settings_with_label" msgid="8569489414006897127">"ზარის გადამისამართება პარამეტრები (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="sum_cfu_disabled" msgid="8384177689501334080">"გამორთული"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"როდესაც დაკავებულია"</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="sum_cfb_disabled" msgid="4913145177320506827">"გამორთული"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"თქვენს ოპერატორს ტელეფონის დაკავებისას ზარის გადამისამართების გაუქმების მხარდაჭერა არ გააჩნია."</string>
-    <string name="labelCFNRy" msgid="3646316323834351390">"პასუხგაუცემელი ზარის გადამისამართება"</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"როდესაც პასუხგაუცემელია"</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="sum_cfnry_disabled" msgid="3884684060443538097">"გამორთული"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"თქვენს ოპერატორს ზარის გადამისამართების გაუქმების მხარდაჭერა არ გააჩნია, როდესაც ტელეფონი არ პასუხობს."</string>
-    <string name="labelCFNRc" msgid="47183615370850000">"გადამისამართება, როდესაც მიუწვდომელია"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"როდესაც მიუწვდომელია"</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="5646361343094064333">"თქვენს ოპერატორს ტელეფონის მიუწვდომელობის დროს ზარის გადამისამართების გაუქმების მხარდაჭერა არ გააჩნია."</string>
     <string name="updating_title" msgid="6146755386174019046">"ზარის პარამეტრები"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"ზარის პარამეტრების ცვლილება შესაძლებელია მხოლოდ პირველადი მომხმარებლის მიერ."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"ზარის პარამეტრები (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"ზარის პარამეტრების შეცდომა"</string>
     <string name="reading_settings" msgid="1920291699287055284">"პარამეტრების წაკითხვა…"</string>
     <string name="updating_settings" msgid="8171225533884883252">"პარამეტრების განახლება…"</string>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"ჩართვა"</string>
+    <string name="disable" msgid="4678348128118573672">"გამორთვა"</string>
     <string name="change_num" msgid="239476305819844391">"განახლება"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"ქსელის ნაგულისხმევი"</item>
@@ -123,8 +149,8 @@
     <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="voicemail_default" msgid="2001233554889016880">"თქვენი მომწოდებელი"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"ფიჭური ქსელის პარამეტრებიჶ"</string>
     <string name="label_available" msgid="1181658289009300430">"ხელმისაწვდომი ქსელები"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"ძიება..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"ქსელები ვერ მოიძებნა."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"ქსელის სასურველი რეჟიმი: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"ქსელის სასურველი რეჟიმი: გლობალური"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"ქსელის სასურველი რეჟიმი: LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"სასურველი ქსელის რეჟიმი: LTE / GSM / UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"ქსელის სასურველი რეჟიმი: LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="7886739962255042385">"LTE / WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"მხოლოდ GSM"</item>
     <item msgid="3817924849415716259">"GSM/WCDMA უპირატესობით"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"გაუმჯობესებული 4G LTE რეჟიმი"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"ხმოვანი და სხვა სახის კომუნიკაციებიგამოიყენეთ LTE მომსახურება გაუმჯობესება ხმა და სხვა კომუნიკაციები (რეკომენდირებულია)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"მონაცემთა გადაცემა ჩართულია჻"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"მობილურ ქსელზე მონაცემთა გადაცემის ჩართვა"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"მონაცემების გამოყენება"</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="8913735676127858115">"ინტერნეტთან კავშირი გაწყდა, რადგან საშინაო ქსელში აღარ ხართ ჩართული, ხოლო მობილური ინტერნეტის როუმინგი გამორთული გაქვთ."</string>
-    <string name="roaming_warning" msgid="7820963598559553967">"გსურთ მობილური ინტერნეტის როუმინგის ჩართვა? ამით შესაძლოა მონაცემთა როუმინგის მაღალი ხარჯები დაგეკისროთ!"</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"თქვენ შეიძლება წარმოგეშვათ მნიშვნელოვანი ხარჯები."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"გსურთ, ჩაირთოს ინტერნეტის როუმინგი?"</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>
@@ -190,7 +221,7 @@
     <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> კბიტი/წმ-ზე"</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> კბიტი/წმ-ზე"</string>
-    <string name="throttle_help_subtext" msgid="5217706521499010816">"დამატებითი ინფორმაცია თქვენი ოპერატორის მობილური ინტერნეტის გამოყენების წესების შესახებ"</string>
+    <string name="throttle_help_subtext" msgid="3633091498168446044">"დამატებითი ინფორმაცია თქვენი ოპერატორის ფიჭური ინტერნეტის გამოყენების წესების შესახებ"</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>
@@ -303,7 +334,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"მობილური ინტერნეტის სერვისის დაყენება"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"ოპერატორის პარამეტრები"</string>
     <string name="fdn" msgid="7878832555095183202">"დაშვებული ნომრები"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"ფიქსირებული სატელეფონო ნომრები (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FDN სია"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"FDN სია (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FDN აქტივაცია"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"დაშვებულ ნომრებზე დარეკვა გააქტიურებულია"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"დაშვებული ნომრები გაუქმებულია"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"TTY რეჟიმის დაყენება"</string>
     <string name="auto_retry_mode_title" msgid="4073265511427813322">"ავტო-გამეორება"</string>
     <string name="auto_retry_mode_summary" msgid="4973886004067532288">"ავტო გამეორების რეჟიმის ჩართვა"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"ვიდეოზარის დროს TTY რეჟიმის შეცვლა დაუშვებელია"</string>
     <string name="menu_add" msgid="1882023737425114762">"კონტაქტის დამატება"</string>
     <string name="menu_edit" msgid="7143003705504672374">"კონტაქტის რედაქტირება"</string>
     <string name="menu_delete" msgid="3977150783449642851">"კონტაქტის წაშლა"</string>
@@ -344,7 +378,7 @@
     <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="1846161429087789936">"კონტაქტების SIM ბარათიდან იმპორტისათვის, ჯერ გამორთეთ თვითმფრინავის რეჟიმი."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"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>
@@ -354,42 +388,40 @@
     <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="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="1796577128488773946">"პაროლი არასწორია, PIN დაიბლოკა! მოთხოვნილია PUK."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"SIM ბარათPIN"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"SIM ბარათის PIN-ის დაყენება"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"მიმდინარეობს PIN-ის დაყენება ..."</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN-ის დაყენება"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN წაშლილია"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN არასწორია"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN განახლებულია"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"პაროლი არასწორია. PIN ახლა დაბლოკილია. მოთხოვნილია PUK."</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="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="1639666438836544393">"PIN2 წარმატებით შეიცვალა."</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"შეიყვანეთ PUK2 კოდი"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"პაროლი არასწორია, PIN2 დაიბლოკა. გთხოვთ, შეცვალოთ PIN2 და სცადოთ ისევ!"</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"პაროლი არასწორია, SIM ჩაკეტილია. მოთხოვნილია PUK2."</string>
+    <string name="badPuk2" msgid="7910064009531541708">"PUK2 არასწორია. სცადეთ ხელახლა."</string>
+    <string name="badPin2" msgid="6646896629970023109">"ძველი PIN2 არასწორია. სცადეთ ხელახლა."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2-ები არ ემთხვევა. სცადეთ ხელახლა."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"შეიყვანეთ 4 დან 8 ციფრამდე შემცველობის PIN2."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"შეიყვანეთ 8 ციფრიანი PUK2."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 განახლებულია"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"შეიყვანეთ PUK2 კოდი"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"პაროლი არასწორია. PIN2 ახლა დაბლოკილია. ხელახალი მცდელობისათვის, შეცვალეთ PIN 2."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"პაროლი არასწორია. SIM ახლა დაბლოკილია. შეიყვანეთ PUK2."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 სამუდამოდ დაიბლოკა."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"დარჩენილია <xliff:g id="NUMBER">%d</xliff:g> მცდელობა."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 განიბლოკა!"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n" თქვენ გაქვთ <xliff:g id="NUMBER">%d</xliff:g> დარჩენილი მცდელობა."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 აღარ არის დაბლოკილი"</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_redialing" msgid="8253487008234167266">"განმეორება"</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_dialing" msgid="2107666444937350731">"აკრეფვა"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"გამოტოვებული ზარი"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"გამოტოვებული ზარები"</string>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"ზარის განსახორციელებლად, გამორთეთ თვითმფრინავის რეჟიმი."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"ზარის განსახორციელებლად, გამორთეთ თვითმფრინავის რეჟიმი ან დაუკავშირდით უსადენო ქსელს."</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_error_out_of_service" msgid="4100065333878929223">"ფიჭური ქსელი მიუწვდომელია"</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"ფიჭური ქსელი მიუწვდომელია. ზარის განსახორციელებლად, დაუკავშირდით უსადენო ქსელს."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"ზარის განხორციელებისათვის, შეიყვანეთ მოქმედი ნომერი."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"არ ირეკება."</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_unknown" msgid="655570339115407698">"მომსახურება არ არის მხარდაჭერილი"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"ვერ ხორციელდება ზარების გადართვა."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"ვერ ხორციელდება ზარის გამოყოფა."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"გადაცემა ვერ ხორციელდება."</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="incall_error_supp_service_reject" msgid="8998568661508655638">"ზარის უარყოფა ვერ ხორციელდება."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"ვერ ხერხდება ზარ(ებ)ის გაშვება."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"ზარის განსახორციელებლად, დაუკავშირდით უსადენო ქსელს."</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="7969515493359619960">"ზარი ვერ გაიგზავნა. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> გადაუდებელი ზარის ნომერი არ არის!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"ზარი ვერ გაიგზავნა. აკრიფეთ გადაუდებელი ზარის ნომერი!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"მომხსახურება არ არის. სცადეთ ხელხლა..."</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"არ ირეკება. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> არ არის საგანგებო ნომერი."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"დარეკვა ვერ ხორციელდება. აკრიფეთ საგანგებო ნომერი."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"კლავიატურის გამოყენება დასარეკად"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"შეყოვნება"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"დასრულება"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"ჩვეულებრივი"</item>
     <item msgid="2883365539347850535">"გრძელი"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"ქსელის შეტყობინება"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"ქსელის შეტყობინება"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"ხარვეზის შეტყობინება"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"თქვენი ტელეფონის აქტივაცია"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"თქვენი ტელეფონის სერვისის გასააქტიურებლად აუცილებელია საგანგებო ზარის განხორციელება. \n\nტექსტზე „აქტივაცია“ დაჭერის შემდეგ, მოუსმინეთ ინსტრუქციებს თქვენი ტელეფონის აქტივაციისათვის."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"მიმდინარეობს გააქტიურება..."</string>
@@ -469,8 +504,8 @@
     <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="3420314892609254729">"მოითმინეთ, სანამ ტელეფონის პროგრამირება დასრულდებოდეს."</string>
-    <string name="ota_failure" msgid="4311299546379674378">"პროგრამირება წარუმატებლად დასრულდა"</string>
+    <string name="ota_progress" msgid="460876637828044519">"მიმდინარეობს თქვენი ტელეფონს პროგრამირება..."</string>
+    <string name="ota_failure" msgid="7713756181204620397">"ვერ ხორციელდება თქვენი ტელეფონის პროგრამირება"</string>
     <string name="ota_successful" msgid="1880780692887077407">"თქვენი ტელეფონი გააქტიურდა. სერვისის დაწყებას შესაძლოა 15 წუთი დაჭრდეს."</string>
     <string name="ota_unsuccessful" msgid="8072141612635635357">"თქვენი ტელეფონი ვერ გააქტიურდა. \nშესაძლოა მოგიწიოთ იხილოთ არეალი, სადაც უკეთ ვრცელდება დაფარვის სიგნალი (ფანჯარასთან ახლოს ან გარეთ). \n\nსცადეთ ისევ ან დაურეკეთ კლიენტთან მხარდაჭერას დამატებითი ვარიანტებისათვის."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"EXCESS SPC FAILURES"</string>
@@ -481,18 +516,18 @@
     <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="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="2585506997024726599">"არჩეული ქმედება მიუწვდომელია გადაუდებელი ზარის გადმორეკვის რეჟიმში. ტელეფონი ამ რეჟიმში დარჩება <xliff:g id="COUNT">%s</xliff:g> წუთის განმავლობაში. გსურთ გასვლა?"</item>
-    <item quantity="other" msgid="6115622137771382224">"არჩეული ქმედება მიუწვდომელია გადაუდებელი ზარის გადმორეკვის რეჟიმში. ტელეფონი ამ რეჟიმში დარჩება <xliff:g id="COUNT">%s</xliff:g> წუთის განმავლობაში. გსურთ გასვლა?"</item>
-  </plurals>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other"> არ არის დაკავშირების მონაცემები <xliff:g id="COUNT_1">%s</xliff:g> წუთისათვის</item>
+      <item quantity="one"> არ არის დაკავშირების მონაცემები <xliff:g id="COUNT_0">%s</xliff:g> წუთისათვის</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other"> ტელეფონი იქნება საგანგებო დარეკვის რეჟიმი <xliff:g id="COUNT_1">%s</xliff:g> წუთით. ამ რეჟიმის მანძილზე ვერ მოხერხდება მონაცემთა დაკავშირების გმაოყენებით აპლიკაციების გამოყენება. გსურთ ახლა გამოსვლა?</item>
+      <item quantity="one"> ტელეფონი იქნება საგანგებო დარეკვის რეჟიმი <xliff:g id="COUNT_0">%s</xliff:g> წუთით. ამ რეჟიმის მანძილზე ვერ მოხერხდება მონაცემთა დაკავშირების გმაოყენებით აპლიკაციების გამოყენება. გსურთ ახლა გამოსვლა?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other"> შერჩეული აქცია არ არის ხელმისაწვდომი გადაუდებელი დარეკვის რეჟიმში. ტელეფონი იქნება ამ რეჟიმი <xliff:g id="COUNT_1">%s</xliff:g> წუთი. გსურთ ახლა გამოსვლა?</item>
+      <item quantity="one"> შერჩეული აქცია არ არის ხელმისაწვდომი გადაუდებელი დარეკვის რეჟიმში. ტელეფონი იქნება ამ რეჟიმი <xliff:g id="COUNT_0">%s</xliff:g> წუთი. გსურთ ახლა გამოსვლა?</item>
+    </plurals>
     <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>
@@ -506,110 +541,23 @@
     <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="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="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="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_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="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="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>
-    <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">"keep-alive-ის გაგზავნა"</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">"&lt;არ არის დაყენებული&gt;"</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="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="7877142631803238549">"ინტერნეტ-ზარის განსახორციელებლად, ჯერ გადაამოწმეთ ინტერნეტთან კავშირი."</string>
-    <string name="no_wifi_available" msgid="1225073547318465713">"ინტერნეტით დარეკვისათვის დაკავშირებული უნდა იყოთ Wi-Fi ქსელთან (გამოიყენეთ უსადენო &amp; ქსელის პარამეტრები)."</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_setting_title" msgid="3754000371039709383">"სწრაფი პასუხი"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></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">"უკუშლა"</string>
-    <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_ringtone_title" msgid="2609519527849101590">"ხმა"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"ნაგულისხმები ხმა (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</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="dial_pad_autocomplete" msgid="494525952035761075">"ციფერბლატის თვითშევსება"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"ზარის მელოდია &amp; ვიბრაცია"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"გსურთ დასარეკად Wi-Fi-ს გამოყენება?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"დიახ"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"არა"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"ჩაშენებული SIM ბარათები"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"ჩაშენებული ინტერნეტ-ზარი"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"ვიდეოზარის ჩართვა"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"ვიდეო დარეკვის ჩასართავად, ქსელის პარამეტრებიდან უნდა ჩართოთ გაძლიერებული 4G LTE რეჟიმი."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"ქსელის პარამეტრები"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"დახურვა"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"გადაუდებელი ზარები"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"მხოლოდ საგანგებო ნომრებზე დარეკვა"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM ბარათი, სლოტი: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"მარტივი წვდომა"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"შემომავალი Wi-Fi ზარი"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi ზარი"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"შეეხეთ ისევ გასახსნელად"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"შეტყობინების გაშიფრვისას წარმოიშვა შეცდომა."</string>
 </resources>
diff --git a/res/values-kk-rKZ/arrays.xml b/res/values-kk-rKZ/arrays.xml
new file mode 100644
index 0000000..b0cd872
--- /dev/null
+++ b/res/values-kk-rKZ/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Ғаламдық"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-kk-rKZ/config.xml b/res/values-kk-rKZ/config.xml
deleted file mode 100644
index 86bdd7c..0000000
--- a/res/values-kk-rKZ/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"жалған"</string>
-</resources>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
new file mode 100644
index 0000000..5a3c701
--- /dev/null
+++ b/res/values-kk-rKZ/strings.xml
@@ -0,0 +1,563 @@
+<?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="1107073389495104784">"Ұялы деректер"</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="4793877574636445118">"Автомат-телефон"</string>
+    <string name="onHold" msgid="9035493194749959955">"Күтуде"</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="enter_input" msgid="1810529547726803893">"USSD хабары <xliff:g id="MIN_LEN">%d</xliff:g> және <xliff:g id="MAX_LEN">%d</xliff:g> аралығындағы таңбалардан тұруы тиіс. Қайта әрекеттеніп көріңіз"</string>
+    <string name="manageConferenceLabel" msgid="4691922394301969053">"Мәжіліс қоңырауын басқару"</string>
+    <string name="ok" msgid="3811371167865772377">"Жарайды"</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">"Bluetooth"</string>
+    <string name="wait_prompt_str" msgid="7601815427707856238">"Келесі әуендер жіберілсін бе?\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="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="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="mobile_network_settings_not_available" msgid="3831911315358856062">"Ұялы желі параметрлері бұл пайдаланушы үшін қол жетімді емес"</string>
+    <string name="labelGSMMore" msgid="5930842194056092106">"GSM қоңырауының параметрлері"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"GSM қоңырау параметрлері (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA қоңырауының параметрлері"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"CDMA қоңырау параметрлері (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="apn_settings" msgid="9043423184895642077">"Қол жетімділік нүктесінің атаулары"</string>
+    <string name="settings_label" msgid="3876743539816984008">"Желі параметрлері"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Есептік жазбаларға қоңыр. шалу"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Келесінің көмегімен қоңыраулар шалу"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Келесінің көмегімен SIP қоңырауларын шалу"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Алдымен сұрау"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Параметрлер"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Есептік жазбаларды таңдау"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Телефон есептік жазбалары"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"SIP есептік жазбасын қосу"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Есептік жазба параметрлерін конфигурациялау"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi қоңыраулары"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Wi-Fi қоңырауларын пайдаланбау"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Қоңыраулар көмекшісін пайдаланбау"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Ешқандай"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Қоңыраулар көмекшісі"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Қоңыраулар көмекшісін пайдалану"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Қоңыраулар көмекшісін таңдау"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Келесі арқылы қоңыраулар үшін пайдаланылатын желілерді басқару"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Қолданбаларға немесе қызметтерге қоңыраулар үшін пайдаланылатын желілерді басқаруға мүмкіндік береді"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Конфигурациялау"</string>
+    <string name="connection_service_default_label" msgid="1498481943805913754">"Кірістірілген байланыс қызметі"</string>
+    <string name="voicemail" msgid="8693759337917898954">"Дауыс-хабар"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Дауыстық пошта (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="voicemail_abbreviated" msgid="2215592488517217448">"ДХ:"</string>
+    <string name="networks" msgid="8873030692174541976">"Желі операторлары"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Жедел таратылымдар"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Қоңырау параметрлері"</string>
+    <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Қосымша параметрлер"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Қосымша параметрлер (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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_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>
+    <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="call_forwarding_settings_with_label" msgid="8569489414006897127">"Қоңырауды басқа нөмірге бағыттау параметрлері (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="8384177689501334080">"Өшірулі"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Бос емес болғанда"</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="4913145177320506827">"Өшірулі"</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Телефоныңыз қолданыста болғанда операторыңыз қоңырауды басқа нөмірге бағыттауды өшіруді қолдамайды."</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"Жауап берілмегенде"</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="3884684060443538097">"Өшірулі"</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Телефоныңыз жауап бермегенде операторыңыз қоңырауды басқа нөмірге бағыттауды өшіруді қолдамайды."</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"Хабарласу мүмкін болмағанда"</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="5646361343094064333">"Телефоныңыз қол жетімсіз болғанда жабдықтаушы қоңырауды басқа нөмірге бағыттауды өшіруді қолдамайды."</string>
+    <string name="updating_title" msgid="6146755386174019046">"Қоңырау параметрлері"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"Қоңырау параметрлерін тек негізгі пайдаланушы өзгерте алады."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Қоңырау параметрлері (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="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="7248657275000173526">"Қосу"</string>
+    <string name="disable" msgid="4678348128118573672">"Өшіру"</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="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="2001233554889016880">"Операторыңыз"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Ұялы желі параметрлері"</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="5613353860205691579">"SIM картаңыз бұл желіге жалғануға рұқсат бермейді."</string>
+    <string name="connect_later" msgid="2308119155752343975">"Дәл қазір бұл желіге жалғана алмайды. Кейінірек қайта әрекеттеніп көріңіз."</string>
+    <string name="registration_done" msgid="495135664535876612">"Желіге тіркелді."</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">"Aвтоматты тіркелу…"</string>
+    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Қалаулы желі түрі"</string>
+    <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Желі жұмысының режимін өзгерту"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Қалаулы желі түрі"</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_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Қалаулы желі режимі: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Қалаулы желі режимі: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Қалаулы желі режимі: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Қалаулы желі режимі: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Қалаулы желі режимі: Жаһандық"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Қалаулы желі режимі: LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Таңдаулы желі режимі: LTE / GSM / UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Таңдаулы желі режимі: LTE / CDMA"</string>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="7886739962255042385">"LTE / WCDMA"</item>
+    <item msgid="577652050447385699">"LTE (ұзақ мерзімді дамыту)"</item>
+    <item msgid="6813597571293773656">"Жаһандық"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"EvDo ғана"</item>
+    <item msgid="1508557726283094448">"EvDo-сыз CDMA"</item>
+    <item msgid="4341433122263841224">"CDMA/EvDo aвто"</item>
+    <item msgid="5958053792390386668">"GSM/WCDMA aвто"</item>
+    <item msgid="7913148405605373434">"WCDMA (кең жолақты әр түрлі кодты бірнеше қол жетімділік) ғана"</item>
+    <item msgid="1524224863879435516">"GSM (ұялы байланыстың жаһандық жүйесі) ғана"</item>
+    <item msgid="3817924849415716259">"GSM/WCDMA қалаулы"</item>
+  </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Жақсартылған 4G LTE режимі"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Дауыстық және басқа байланыстарды жақсарту үшін LTE қызметтерін пайдалану (ұсынылады)"</string>
+    <string name="data_enabled" msgid="5972538663568715366">"Дерекқор қосылған"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Деректерді пайдалануға рұқсат ету"</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="8913735676127858115">"Дерекқор байланысын жоғалтып алдыңыз, себебі үйдегі желінің дерекқор роумингін өшірілген күйінде қалдырғансыз."</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"Сізден елеулі ақылар алынуы мүмкін."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Деректер роумингіне рұқсат берілсін бе?"</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_0">%1$s</xliff:g> (<xliff:g id="USED_1">%2$d</xliff:g>٪), барлық ең көп мерзім <xliff:g id="USED_2">%3$s</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_0">%1$s</xliff:g> (<xliff:g id="USED_1">%2$d</xliff:g>٪), барлық ең көп мерзім <xliff:g id="USED_2">%3$s</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> Kб/с шамасына азайтылды"</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> Kб/с шамасына азайтылады."</string>
+    <string name="throttle_help_subtext" msgid="3633091498168446044">"Оператордың ұялы желі деректерін пайдалану саясаты туралы қосымша ақпарат"</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>
+    <string name="cell_bc_sms_disable" msgid="3398365088309408749">"Ұялы таратылымды SMS өшірілген"</string>
+    <string name="cb_sms_settings" msgid="651715019785107312">"Ұялы таратылымды SMS параметрлері"</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="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="network_lte" msgid="7702681952521375754">"LTE (ұсынылған)"</string>
+    <string name="network_4G" msgid="2723512640529983138">"4Г (ұсынылған)"</string>
+    <string name="network_global" msgid="1323190488685355309">"Жаһандық"</string>
+    <string name="cdma_system_select_title" msgid="5757657769327732833">"Жүйе таңдау"</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">"Hегізгі ғана"</item>
+    <item msgid="1205664026446156265">"Aвтоматты"</item>
+  </string-array>
+    <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>
+    <string name="carrier_settings_title" msgid="9028166176523012300">"Жабдықтаушы параметрлері"</string>
+    <string name="fdn" msgid="7878832555095183202">"Тұрақты теру нөмірлері"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Бекітілген теру нөмірлері (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="manage_fdn_list" msgid="8777755791892122369">"ТТН тізімі"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"Бекітілген теру нөмірлерінің тізімі (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="3776841382844614716">"Дауыс құпиялығы"</string>
+    <string name="voice_privacy_summary" msgid="3159383389833516214">"Жетілдірілген құпиялық режимін қосу"</string>
+    <string name="tty_mode_option_title" msgid="9033098925144434669">"Tелетайп режимі"</string>
+    <string name="tty_mode_option_summary" msgid="1073835131534808732">"Телетайп режиміне реттеу"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"Қайта авто әрекеттену"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Қайта авто әрекеттену режимін қосу"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"Бейне қоңырау барысында Телетайп режимін өзгертуге рұқсат етілмеген"</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="8204677063922225311">"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="5470854099230755944">"ТТН жаңартылмады, себебі қате PIN код терілді."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"ТТН жаңартылмады, себебі нөмір 20 бірліктен аспауы тиіс."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"ТТН жаңартылмады. PIN2 қате болды немесе телефон нөмірі қабылданбады."</string>
+    <string name="fdn_failed" msgid="540018079008319747">"Тұрақты теру нөмірлерінің жұмысы орындалмады."</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="5254946758982621072">"Контактілерді 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="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="3419351358300716472">"SIM PIN кодын тазалау"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"SIM PIN кодын орнату"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"PIN орнатылуда…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN орнатылды"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN тазаланды"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN дұрыс емес"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN коды жаңартылды"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Құпия сөз дұрыс емес. PIN қазір бөгелген. PUK коды сұралды."</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="7910064009531541708">"PUK2 коды дұрыс емес. Әрекетті қайталаңыз."</string>
+    <string name="badPin2" msgid="6646896629970023109">"Ескі PIN2 коды дұрыс емес. Әрекетті қайталаңыз."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2 кодтары сәйкес емес. Әрекетті қайталаңыз."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"4-8 саннан тұратын PIN2 кодын енгізіңіз."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"8 саннан тұратын PUK2 кодын енгізіңіз."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 коды жаңартылды"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"PUK2 кодын енгізіңіз"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Құпия сөз дұрыс емес. PIN2 енді бөгелді. Әрекетті қайталау үшін PIN 2 кодын өзгертіңіз."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Құпия сөз дұрыс емес. SIM қазір бекітілген. PUK2 кодын енгізіңіз."</string>
+    <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 уақытша бөгелген."</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"<xliff:g id="NUMBER">%d</xliff:g> әрекет қалды."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 енді бөгелмеген"</string>
+    <string name="doneButton" msgid="2859593360997984240">"Орындалды"</string>
+    <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Дауыс хабарының нөмірі"</string>
+    <string name="card_title_dialing" msgid="5769417478498348054">"Теруде"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Қайта терілуде"</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="notification_dialing" msgid="2107666444937350731">"Теру"</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_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>
+    <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="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="2947938060513306698">"Қоңырау шалу үшін ұшақ режимін өшіріңіз."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Қоңырау шалу үшін ұшақ режимін өшіріңіз не сымсыз желіге қосылыңыз."</string>
+    <string name="incall_error_emergency_only" msgid="4678640422710818317">"Желіде тіркелмеген."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Ұялы желі қол жетімді емес."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Ұялы желі қол жетімді емес. Қоңырау шалу үшін сымсыз желіге қосылыңыз."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Қоңырау шалу үшін жарамды нөмірді енгізіңіз."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Қоңырау шалу мүмкін емес."</string>
+    <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI қатарын бастау…"</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Қызметке қолдау көрсетілмейді"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Қоңырауларды ауыстыру мүмкін емес."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Қоңырауды бөлу мүмкін емес."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Тасымалдау мүмкін емес."</string>
+    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Мәжіліс қоңырауларын өшіру."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Қоңырауды қабылдамау мүмкін емес."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Қоңырау(лар)ды босату мүмкін емес."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Қоңырау шалу үшін сымсыз желіге қосылыңыз."</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="5960061579996526883">"Қызмет жоқ. Әрекет қайталануда…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Қоңырау шалу мүмкін емес. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> жедел нөмір емес."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Қоңырау шалу мүмкін емес. Жедел нөмірді теріңіз."</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">"Mәжілісті басқару"</string>
+    <string name="onscreenAudioText" msgid="1710087112800041743">"Aудио"</string>
+    <string name="onscreenVideoCallText" msgid="4800924186056115442">"Видео қоңырау"</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">"Tеле тайп өшірулі"</item>
+    <item msgid="3971695875449640648">"Tелетайп Толық"</item>
+    <item msgid="1937509904407445684">"Tелетайп HCO (есту арқылы тасымалдау)"</item>
+    <item msgid="5644925873488772224">"Tелетайп VCO (дауыс арқылы тасымалдау)"</item>
+  </string-array>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"Әуенді сигнал әуендері"</string>
+    <string name="dtmf_tones_summary" msgid="3351820372864020331">"Әуенді сигнал ұзақтығын реттеу"</string>
+  <string-array name="dtmf_tone_entries">
+    <item msgid="899650777817315681">"Орташа"</item>
+    <item msgid="2883365539347850535">"Ұзақ"</item>
+  </string-array>
+    <string name="network_info_message" msgid="7738596060242881930">"Желі хабары"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Қате туралы хабар"</string>
+    <string name="ota_title_activate" msgid="8616918561356194398">"Телефоныңызды іске қосыңыз."</string>
+    <string name="ota_touch_activate" msgid="6553212803262586244">"Телефон қызметін іске қосу үшін бөлек қоңырау шалу қажет. \n\n\"Іске қосу\" пәрменін басқан соң, телефонды іске қосу үшін берілген нұсқауларды тыңдаңыз."</string>
+    <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Іске қосуда..."</string>
+    <string name="ota_hfa_activation_dialog_message" msgid="8092479227918463415">"Телефон ұялы дерекқор қызметін қосуда.\n\nБұған 5 минуттай қажет болуы мүмкін."</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="6570240212263372046">"Телефон іске қосылды."</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="460876637828044519">"Телефон бағдарламалануда…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Телефонды бағдарламалау мүмкін болмады"</string>
+    <string name="ota_successful" msgid="1880780692887077407">"Телефоныңыз іске қосылды. Қызмет көрсету басталғанша 15 минут қажет болуы мүмкін."</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="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>
+    <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Дерекқор байланысы өшірілген"</string>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> минут бойы деректер байланысы жоқ</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> минут бойы деректер байланысы жоқ</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other">Телефон <xliff:g id="COUNT_1">%s</xliff:g> минут бойы жедел кері қоңырау шалу режимінде болады. Бұл режимде деректер байланысын пайдаланатын қолданбаларды пайдалану мүмкін емес. Қазір шығу керек пе?</item>
+      <item quantity="one">Телефон <xliff:g id="COUNT_0">%s</xliff:g> минут бойы жедел кері қоңырау шалу режимінде болады. Бұл режимде деректер байланысын пайдаланатын қолданбаларды пайдалану мүмкін емес. Қазір шығу керек пе?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other">Таңдалған әрекет жедел кері қоңырау шалу режимінде қол жетімді емес. Телефон осы режимде <xliff:g id="COUNT_1">%s</xliff:g> минут бойы болады. Қазір шығу керек пе?</item>
+      <item quantity="one">Таңдалған әрекет жедел кері қоңырау шалу режимінде қол жетімді емес. Телефон осы режимде <xliff:g id="COUNT_0">%s</xliff:g> минут бойы болады. Қазір шығу керек пе?</item>
+    </plurals>
+    <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_provider" msgid="5135942703327136909">"Қызмет"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Орнату"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Реттелген жоқt&gt;"</string>
+    <string name="other_settings" msgid="3672912580359716394">"Басқа қоңырау параметрлері"</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="not_voice_capable" msgid="2739898841461577811">"Дауыс арқылы қоңырау шалу қолдауы жоқ"</string>
+    <string name="description_dial_button" msgid="7459705245418435351">"теру"</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="2609519527849101590">"Дыбыс"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Рингтон&amp; Тербеліс"</string>
+    <string name="pstn_connection_service_label" msgid="1743245930577325900">"Кірістірілген SIM карталары"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Бейне қоңырауларды қосу"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Бейне қоңырауларды қосу үшін желі параметрлерінде жақсартылған 4G LTE режимін қосу керек."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Желі параметрлері"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Жабу"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Жедел қоңыраулар"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Тек жедел қоңыраулар"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM картасы, ұяшық: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Арнайы мүмкіндіктер"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Кіріс Wi-Fi қоңырауы"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi қоңырауы"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Ашу үшін қайтадан түртіңіз"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"Хабарды кодтан шығару кезінде қате пайда болды."</string>
+</resources>
diff --git a/res/values-km-rKH/arrays.xml b/res/values-km-rKH/arrays.xml
new file mode 100644
index 0000000..5dc9c1d
--- /dev/null
+++ b/res/values-km-rKH/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"សកល"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-km-rKH/config.xml b/res/values-km-rKH/config.xml
deleted file mode 100644
index d6890be..0000000
--- a/res/values-km-rKH/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"មិនពិត"</string>
-</resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 22bf1fd..af84169 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -16,14 +16,14 @@
 
 <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="tablet" msgid="1107073389495104784">"ទិន្នន័យប្រព័ន្ធទូរស័ព្ទ"</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">"បញ្ជី FDN"</string>
     <string name="unknown" msgid="6878797917991465859">"មិន​ស្គាល់"</string>
     <string name="private_num" msgid="6713286113000232309">"លេខ​ឯកជន"</string>
-    <string name="payphone" msgid="1931775086311769314">"ទូរស័ព្ទ​ប្រើ​កាក់"</string>
+    <string name="payphone" msgid="4793877574636445118">"ទូរស័ព្ទសាធារណៈ"</string>
     <string name="onHold" msgid="9035493194749959955">"រង់ចាំ"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"បាន​ចាប់ផ្ដើម​កូដ MMI"</string>
     <string name="ussdRunning" msgid="485588686340541690">"កូដ USSD កំពុង​ដំណើរការ…"</string>
@@ -52,18 +52,41 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"កំពុង​ស្នើ​​ដោះ​សោ​បណ្ដាញ…"</string>
     <string name="unlock_failed" msgid="6490531697031504225">"បាន​បរាជ័យ​ក្នុង​ការ​ស្នើ​ដោះ​សោ​បណ្ដាញ។"</string>
     <string name="unlock_success" msgid="6770085622238180152">"ដោះ​សោ​បណ្ដាញ​បាន​ជោគជ័យ។"</string>
-    <string name="mobile_network_settings_not_available" msgid="7355254462995117896">"ការ​កំណត់​បណ្ដាញ​ចល័ត​មិន​អាច​ប្រើ​បាន​​សម្រាប់​អ្នក​ប្រើ​នេះ"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"ការ​កំណត់​បណ្ដាញ​ចល័ត​គឺ​មិន​មាន​​សម្រាប់​អ្នក​ប្រើ​នេះ"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"កំណត់​ការ​ហៅ GSM"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"ការកំណត់ការហៅ GSM (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"កំណត់​ការ​ហៅ CDMA"</string>
-    <string name="apn_settings" msgid="9043423184895642077">"ចូល​ដំណើរ​ការ​ឈ្មោះ​ចំណុច"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"ការកំណត់ការហៅ CDMA (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="apn_settings" msgid="9043423184895642077">"ឈ្មោះ​ចំណុច​ចូលដំណើរការ"</string>
     <string name="settings_label" msgid="3876743539816984008">"ការកំណត់​បណ្ដាញ"</string>
-    <string name="connection_service" msgid="978745922583410219">"សេវាកម្ម​ភ្ជាប់​ត្រូវ​ប្រើ"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"គណនីហៅទូរស័ព្ទ"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"ធ្វើការហៅជាមួយ"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"ធ្វើការហៅ SIP ជាមួយ"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"សួរជាមុនសិន"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"ការកំណត់"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"ជ្រើសរើសគណនី"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"គណនីទូរស័ព្ទ"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"បន្ថែមគណនី SIP"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"កំណត់ការកំណត់គណនី"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"ការហៅតាម Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"កុំប្រើការហៅតាម Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"កុំប្រើជំនួយការហៅ"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"គ្មាន"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"ជំនួយការហៅ"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"ប្រើជំនួយការហៅ"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"ជ្រើសរើសជំនួយការហៅ"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"គ្រប់គ្រងបណ្តាញដែលបានប្រើសម្រាប់ហៅជាមួយ"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"អនុញ្ញាតឲ្យកម្មវិធី ឬសេវាកម្មគ្រប់គ្រងបណ្តាញដែលត្រូវបានប្រើសម្រាប់ហៅ"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"កំណត់"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"សេវាកម្ម​ភ្ជាប់​ដែល​ជាប់​ជា​មួយ"</string>
     <string name="voicemail" msgid="8693759337917898954">"សារ​ជា​សំឡេង"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"សារជាសម្លេង (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
     <string name="networks" msgid="8873030692174541976">"ប្រតិបត្តិ​ករ​​​បណ្ដាញ"</string>
-    <string name="call_settings" msgid="1630474923393095156">"កំណត់​ការ​ហៅ"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"ការ​ផ្សាយ​ពេល​មាន​អាសន្ន"</string>
+    <string name="call_settings" msgid="6112441768261754562">"កំណត់​ការ​ហៅ"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"ការ​កំណត់​បន្ថែម"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"ការកំណត់បន្ថែម (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
@@ -77,29 +100,32 @@
     <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="call_forwarding_settings_with_label" msgid="8569489414006897127">"ការកំណត់ការបញ្ជូនការហៅបន្ត (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="sum_cfu_disabled" msgid="8384177689501334080">"បិទ"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"នៅពេលជាប់រវល់"</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="sum_cfb_disabled" msgid="4913145177320506827">"បិទ"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"ប្រតិបត្តិ​ករ​របស់​អ្នក​មិន​គាំទ្រ​ការ​បិទ​ការ​ហៅ​បញ្ជូន​​បន្ត នៅ​ពេល​ទូរស័ព្ទ​របស់​អ្នក​ជាប់​រវល់។"</string>
-    <string name="labelCFNRy" msgid="3646316323834351390">"បញ្ជូន​បន្ត​នៅ​ពេល​ដែល​មិន​បាន​ឆ្លើយតប"</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"នៅពេលមិនមានការឆ្លើយតប"</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="sum_cfnry_disabled" msgid="3884684060443538097">"បិទ"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"ប្រតិបត្តិការ​របស់​អ្នក​មិន​គាំទ្រ​ការ​បិទ​ការ​បញ្ជូន​បន្ត​ហៅ​នៅ​ពេល​ដែល​ទូរស័ព្ទ​របស់​អ្នក​មិន​ឆ្លើយតប​។"</string>
-    <string name="labelCFNRc" msgid="47183615370850000">"បញ្ជូន​បន្ត​នៅ​ពេល​ដែល​មិន​អាច​ហៅ​ចូល"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"នៅពេលមិនអាចទាក់ទងបាន"</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="5646361343094064333">"ក្រុមហ៊ុន​បញ្ជូន​របស់​អ្នក​​មិន​គាំទ្រ​ការ​បិទ​ការ​ហៅ​​បញ្ជូន​បន្ត នៅ​ពេល​ទូរស័ព្ទ​របស់​អ្នក​មិន​អាច​ហៅ​ចូល។"</string>
     <string name="updating_title" msgid="6146755386174019046">"កំណត់​ការ​ហៅ"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"ការកំណត់ការហៅអាចផ្លាស់ប្តូរបានដោយអ្នកប្រើបឋមតែប៉ុណ្ណោះ។"</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"ការកំណត់ការហៅ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"កំហុស​ការ​កំណត់​ការ​ហៅ"</string>
     <string name="reading_settings" msgid="1920291699287055284">"កំពុង​អាន​ការ​កំណត់…"</string>
     <string name="updating_settings" msgid="8171225533884883252">"កំណត់​ការ​ធ្វើ​បច្ចុប្បន្ន​ភាព…"</string>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"បើក"</string>
+    <string name="disable" msgid="4678348128118573672">"បិទ"</string>
     <string name="change_num" msgid="239476305819844391">"ធ្វើ​បច្ចុប្បន្នភាព"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"លំនាំដើម​បណ្ដាញ"</item>
@@ -123,8 +149,8 @@
     <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="voicemail_default" msgid="2001233554889016880">"អ្នកផ្តល់សេវាកម្មរបស់អ្នក"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"ការ​កំណត់​បណ្ដាញ​ចល័ត"</string>
     <string name="label_available" msgid="1181658289009300430">"បណ្ដាញ​ដែល​មាន"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"កំពុង​ស្វែងរក..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"រក​មិន​ឃើញ​បណ្ដាញ។"</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"របៀប​បណ្ដាញ​ដែល​ចូលចិត្ត៖ CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"របៀប​បណ្ដាញ​ដែល​ចូលចិត្ត៖ សកល"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"របៀប​បណ្ដាញ​ដែល​ចូលចិត្ត៖ LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"ប្រភេទបណ្តាញដែលពេញចិត្ត៖ LTE / GSM / UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"របៀប​បណ្ដាញ​ដែល​ចូលចិត្ត៖ LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="7886739962255042385">"LTE / WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"តែ GSM ប៉ុណ្ណោះ"</item>
     <item msgid="3817924849415716259">"GSM/WCDMA ដែល​ចូលចិត្ត​"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"​របៀប 4G LTE ធ្វើឲ្យ​ប្រសើរ​ឡើង"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"ប្រើសេវាកម្ម LTE ដើម្បីធ្វើឲ្យសម្លេង និងការទំនាក់ទំនងផ្សេងទៀតប្រសើរឡើង (បានណែនាំ)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"បាន​បើក​ទិន្នន័យ"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"បើក​ចូល​ដំណើរការ​ទិន្នន័យ​លើ​​បណ្ដាញ​ឧបករណ៍​ចល័ត"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"អនុញ្ញាត​​ឲ្យ​​ប្រើ​ប្រាស់​ទិន្នន័យ"</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="8913735676127858115">"អ្នក​បាន​បាត់បង់​ការ​តភ្ជាប់​ទិន្នន័យ ពីព្រោះ​អ្នក​បាន​ចាកចេញ​ពី​បណ្ដាញ​ដើម​របស់​អ្នក​ជាមួយ​រ៉ូមីង​ទិន្នន័យ​បាន​បិទ។"</string>
-    <string name="roaming_warning" msgid="7820963598559553967">"អនុញ្ញាត​ឲ្យ​រ៉ូមីង​ទិន្នន័យ? អ្នក​អាច​ទទួល​រង​ការ​ចោទ​ប្រកាន់​រ៉ូមីង​!"</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"អាចនាំឲ្យមានការគិតប្រាក់របស់អ្នកច្រើន។"</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"អនុញ្ញាតឲ្យរ៉ូមីងទិន្នន័យ?"</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>
@@ -190,7 +221,7 @@
     <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="throttle_help_subtext" msgid="3633091498168446044">"ព័ត៌មាន​បន្ថែម​អំពី​​គោលនយោបាយ​ក្នុង​ការ​ប្រើប្រាស់​ទិន្នន័យ​បណ្ដាញ​ចល័ត​របស់​ក្រុមហ៊ុន​បញ្ជូន។"</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>
@@ -303,7 +334,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"រៀបចំ​សេវា​​កម្ម​ទិន្នន័យ"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"ការ​កំណត់​ក្រុមហ៊ុន​បញ្ជូន"</string>
     <string name="fdn" msgid="7878832555095183202">"លេខ​ហៅ​ថេរ"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"លេខចុចហៅថេរ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"បញ្ជី FDN"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"បញ្ជី FDN (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"ការ​ធ្វើ​ឲ្យ​សកម្ម FDN"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"បាន​បើក​លេខ​ហៅ​ថេរ"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"បាន​បិទ​លេខ​ហៅ​ថេរ"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"កំណត់​របៀប TTY"</string>
     <string name="auto_retry_mode_title" msgid="4073265511427813322">"ព្យាយាម​ម្ដងទៀត​ស្វ័យប្រវត្តិ"</string>
     <string name="auto_retry_mode_summary" msgid="4973886004067532288">"បើក​របៀប​ព្យាយាម​ម្ដងទៀត​ស្វ័យប្រវត្តិ"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"ការផ្លាស់ប្តូររបៀប TTY មិនត្រូវបានអនុញ្ញាតអំឡុងពេលធ្វើការហៅជាវីដេអូទេ។"</string>
     <string name="menu_add" msgid="1882023737425114762">"បន្ថែម​ទំនាក់ទំនង"</string>
     <string name="menu_edit" msgid="7143003705504672374">"កែ​ទំនាក់ទំនង"</string>
     <string name="menu_delete" msgid="3977150783449642851">"លុប​ទំនាក់ទំនង"</string>
@@ -344,7 +378,7 @@
     <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="1846161429087789936">"ដើម្បី​នាំចូល​ទំនាក់ទំនង​ពី​ស៊ី​ម​កាត​ ដំបូង​ត្រូវបិទ​របៀប​ពេល​ជិះ​​យន្តហោះ​។"</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"បិទរបៀបយន្តហោះដើម្បីនាំចូលទំនាក់ទំនងចេញពីស៊ីមកាត។"</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>
@@ -354,42 +388,40 @@
     <string name="badPin" msgid="8955102849303984935">"អ្នក​បាន​វាយ​បញ្ចូល​កូដ PIN ចាស់​មិន​ត្រឹមត្រូវ។ សូម​ព្យាយាម​ម្ដងទៀត។"</string>
     <string name="mismatchPin" msgid="5923253370683071889">"អ្នក​បាន​វាយ​បញ្ចូល​កូដ PINs មិន​ផ្គូផ្គង។ ព្យាយាម​ម្ដងទៀត។"</string>
     <string name="invalidPin" msgid="5981171102258684792">"វាយ​បញ្ចូល​កូដ PIN ដែល​មាន​​ពី​​​លេខ ៤ ដល់​លេខ ៨ ។"</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="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="1796577128488773946">"ពាក្យ​សម្ងាត់​មិន​ត្រឹមត្រូវ​, បាន​ទប់ស្កាត់​​លេខ​កូដ PIN​! បាន​ស្នើ​លេខ​កូដ PUK ​។"</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"ជម្រះលេខសម្ងាត់ស៊ីម"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"កំណត់លេខសម្ងាត់ស៊ីម"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"កំពុងកំណត់លេខសម្ងាត់…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"លេខសម្ងាត់ត្រូវបានកំណត់"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"លេខសម្ងាត់ត្រូវបានជម្រះ"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"លេខសម្ងាត់មិនត្រឹមត្រូវ"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"លេខសម្ងាត់ត្រូវបានធ្វើបច្ចុប្បន្នភាព"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"ពាក្យសម្ងាត់មិនត្រឹមត្រូវ។ ឥឡូវនេះពាក្យសម្ងាត់ត្រូវបានរារាំង។ PUK ត្រូវបានស្នើ។"</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="4851734468010000418">"អ្នក​បាន​វាយ​បញ្ចូល​កូដ PUK2 មិន​ត្រឹមត្រូវ។ សូម​ព្យាយាម​ម្ដងទៀត។"</string>
-    <string name="badPin2" msgid="1041576234483629991">"អ្នក​បាន​វាយ​បញ្ចូល​កូដ PIN2 មិន​ត្រឹមត្រូវ។ ព្យាយាម​ម្ដងទៀត។"</string>
-    <string name="mismatchPin2" msgid="523029155918113440">"អ្នក​បាន​វាយ​បញ្ចូល​កូដ PIN2s មិន​ផ្គូផ្គង។ ព្យាយាម​ម្ដងទៀត។"</string>
-    <string name="invalidPin2" msgid="8237110107480395938">"​វាយ​បញ្ចូល​កូដ PIN2 ដែល​មាន​ពី​លេខ ៤ ដល់​លេខ ៨ ។"</string>
-    <string name="invalidPuk2" msgid="1290977391033057871">"​វាយ​បញ្ចូល​កូដ PUK2 ដែល​មាន​ចំនួន ៨ ខ្ទង់ ​។"</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="3674058967950559397">"ពាក្យ​សម្ងាត់​មិន​ត្រឹមត្រូវ​,​បាន​ទប់ស្កាត់​លេខ​កូដ PIN2 ​។ សូម​​ប្ដូរ​​លេខ​កូដ PIN2 ហើយ​​ព្យាយាម​ម្ដង​ទៀត​!"</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"ពាក្យ​សម្ងាត់​មិន​ត្រឹមត្រូវ​  បាន​ចាក់សោ​ស៊ីមកាត។ បាន​ស្នើ​កូដ PUK2 ​។"</string>
+    <string name="badPuk2" msgid="7910064009531541708">"PUK2 មិនត្រឹមត្រូវទេ។ ព្យាយាមម្តងទៀត។"</string>
+    <string name="badPin2" msgid="6646896629970023109">"លេខសម្ងាត់ PIN2 ចាស់មិនត្រឹមត្រូវទេ។ ព្យាយាមម្តងទៀត។"</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"លេខសម្ងាត់ PIN2s មិនត្រូវគ្នាទេ។ ព្យាយាមម្តងទៀត។"</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"បញ្ចូលលេខសម្ងាត់ PIN2 ដែលមានពី 4 ទៅ 8 លេខ។"</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"បញ្ចូល PUK2 ដែលមាន 8 លេខ។"</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"លេខសម្ងាត់ PIN2 ត្រូវបានធ្វើបច្ចុប្បន្នភាព"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"បញ្ចូលលេខកូដ PUK2"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"ពាក្យសម្ងាត់មិនត្រឹមត្រូវទេ។ ឥឡូវនេះលេខសម្ងាត់ PIN2 របស់អ្នកត្រូវបានរារាំង។ ប្តូរលេខសម្ងាត់ PIN2។"</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"ពាក្យសម្ងាត់មិនត្រឹមត្រូវ។ ឥឡូវនេះស៊ីមកាតត្រូវបានចាក់សោ។ បញ្ចូល PUK2។"</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"លេខ​កូដ PUK2 ត្រូវ​បាន​​ទប់ស្កាត់​ជា​អចិន្ត្រៃយ៍។"</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n" មាន <xliff:g id="NUMBER">%d</xliff:g> ការ​ព្យាយាម​ដែល​នៅ​សល់​។"</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"មិន​បាន​​ទប់ស្កាត់​​លេខ​កូដ​ PIN2 !"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"អ្នកនៅសល់ការព្យាយាមបញ្ចូល <xliff:g id="NUMBER">%d</xliff:g> ដងទៀត។"</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"លេខសម្ងាត់ PIN2 មិនត្រូវបានរារាំងទៀតទេ"</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_redialing" msgid="8253487008234167266">"ការចុចហៅឡើងវិញ"</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_dialing" msgid="2107666444937350731">"ហៅ"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"ខកខាន​ទទួល"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"ខកខាន​ទទួល"</string>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"បិទរបៀបយន្តហោះដើម្បីធ្វើការហៅ។"</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"បិទរបៀបយន្តហោះ ឬភ្ជាប់ទៅបណ្តាញឥតខ្សែដើម្បីធ្វើការហៅ។"</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_error_out_of_service" msgid="4100065333878929223">"បណ្ដាញ​ចល័ត​មិន​អាច​ប្រើ​បាន។"</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"មិនមានបណ្តាញទូរស័ព្ទទេ។ ភ្ជាប់ទៅបណ្តាញឥតខ្សែដើម្បីធ្វើការហៅ។"</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"ដើម្បីធ្វើការហៅ បញ្ចូលលេខដែលមានសុពលភាព។"</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"មិនអាចហៅបានទេ។"</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_unknown" msgid="655570339115407698">"សេវាកម្មមិនត្រូវបានគាំទ្រទេ។"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"មិនអាចឆ្លាស់ការហៅបានទេ។"</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"មិនអាចបំបែកការហៅបានទេ។"</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"មិនអាចផ្ទេរបានទេ។"</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="incall_error_supp_service_reject" msgid="8998568661508655638">"មិនអាចបដិសេធការហៅបានទេ។"</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"មិនអាចបញ្ចេញការហៅបានទេ។"</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"ភ្ជាប់ទៅបណ្តាញឥតខ្សែដើម្បីធ្វើការហៅ។"</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="7969515493359619960">"មិន​បាន​ផ្ញើ​ការ​ហៅ។ <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> គឺ​មិន​មែន​ជា​លេខ​ហៅ​ពេល​មាន​អាសន្ន!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"មិន​បាន​ផ្ញើ​​​ការ​​​ហៅ​។ ហៅ​បាន​តែ​លេខ​ពេល​មាន​​​អាសន្ន!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"គ្មានសេវាទេ។ ព្យាយាមម្តង…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"មិនអាចហៅបានទេ។ <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> មិនមានជាលេខអាសន្នទេ។"</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"មិនអាចហៅបានទេ។ ចុចហៅលេខអាសន្ន។"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"ប្រើ​​ក្ដារចុច​ដើម្បី​ចុច​លេខ"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"រង់ចាំ"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"បញ្ចប់"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"ធម្មតា"</item>
     <item msgid="2883365539347850535">"វែង"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"សារ​បណ្ដាញ"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"សារ​បណ្ដាញ"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"សារកំហុស"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"បាន​ធ្វើ​ឲ្យ​ទូរស័ព្ទ​របស់​អ្នក​សកម្ម"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"ការ​ហៅ​ពិសេស​ចាំបាច់​ធ្វើ​ឲ្យ​សេវា​ទូរស័ព្ទ​របស់​អ្នក​សកម្ម។ \n\n បន្ទាប់​ពី​ចុច​ “ធ្វើ​ឲ្យ​សកម្ម”  ស្ដាប់​សេចក្ដី​ណែនាំ​ដែល​បាន​ផ្ដល់​​ដើម្បី​ធ្វើ​ឲ្យ​ទូរស័ព្ទ​របស់​អ្នក​សកម្ម។"</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"កំពុង​ធ្វើ​ឲ្យ​សកម្ម..."</string>
@@ -469,8 +504,8 @@
     <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="3420314892609254729">"រង់ចាំ​ខណៈ​ពេល​ដែល​ទូរស័ព្ទ​របស់​អ្នក​កំពុង​​បញ្ចូល​កម្មវិធី​។"</string>
-    <string name="ota_failure" msgid="4311299546379674378">"ការរៀបចំ​កម្មវិធី​មិន​ជោគជ័យ"</string>
+    <string name="ota_progress" msgid="460876637828044519">"កំពុងសរសេរកម្មវិធីទូរស័ព្ទររបស់អ្នក…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"មិនអាចសរសេរកម្មវិធីទូរស័ព្ទរបស់អ្នកទេ"</string>
     <string name="ota_successful" msgid="1880780692887077407">"បាន​ធ្វើ​ឲ្យ​​​​ទូរស័ព្ទ​របស់​អ្នក​សកម្ម​​ឥឡូវ​នេះ វា​អាច​ចំណាយ​ពេល​ ១៥ នាទី ដើម្បី​ចាប់ផ្ដើម​សេវា។"</string>
     <string name="ota_unsuccessful" msgid="8072141612635635357">"មិន​បាន​ធ្វើ​ឲ្យ​ទូរស័ព្ទ​របស់​អ្នក​​សកម្ម។ \n អ្នក​ត្រូវ​ស្វែងរក​តំបន់​សេវា​​ដែល​ល្អ​ជាង​នេះ (ជិត​បង្អួច ឬ​ខាងក្រៅ)។ \n\n ព្យាយាម​ម្ដងទៀត ឬ​ហៅ​ទៅ​កាន់​សេវា​បម្រើ​អតិថិជន​សម្រាប់​ជម្រើស​ជា​ច្រើន​ទៀត។"</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"ការ​បរាជ័យ SPC លើស"</string>
@@ -481,18 +516,18 @@
     <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="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="2585506997024726599">"សកម្មភាព​ដែល​បាន​ជ្រើស​គឺ​មិន​អាច​ធ្វើ​បាន​ខណៈ​ពេល​ដែល​នៅ​ក្នុង​របៀប​ហៅ​ទៅ​វិញ​សម្រាប់​ពេល​មាន​អាសន្ន។ ទូរស័ព្ទ​នឹង​នៅ​ក្នុង​របៀប <xliff:g id="COUNT">%s</xliff:g> នាទី។ តើ​អ្នក​ចង់​ចាកចេញ​ឥឡូវ​នេះ​ឬ?"</item>
-    <item quantity="other" msgid="6115622137771382224">"សកម្មភាព​ដែល​បាន​ជ្រើស​គឺ​មិន​អាច​ធ្វើ​បាន​ខណៈ​ពេល​ដែល​នៅ​ក្នុង​របៀប​ហៅ​ទៅ​វិញ​សម្រាប់​​ពេល​មាន​អាសន្ន។ ទូរស័ព្ទ​នឹង​នៅ​ក្នុង​របៀប​នេះ <xliff:g id="COUNT">%s</xliff:g> នាទី។ តើ​អ្នក​ចង់​ចាកចេញ​ឥឡូវ​នេះ​ឬ?"</item>
-  </plurals>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other">គ្មានការភ្ជាប់ទិន្នន័យរយៈពេល <xliff:g id="COUNT_1">%s</xliff:g> នាទី</item>
+      <item quantity="one">គ្មានការភ្ជាប់ទិន្នន័យរយៈពេល <xliff:g id="COUNT_0">%s</xliff:g> នាទី</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other">ទូរស័ព្ទនេះនឹងស្ថិតក្នុងរបៀប ហៅត្រលប់ពេលអាសន្ន រយៈពេល <xliff:g id="COUNT_1">%s</xliff:g> នាទី។ ខណៈពេលស្ថិតក្នុងរបៀបនេះ មិនមានកម្មវិធីដែលប្រើការភ្ជាប់ទិន្នន័យណា អាចប្រើបានបានឡើយ។ តើអ្នកចង់ចាកចេញឥឡូវនេះទេ?</item>
+      <item quantity="one">ទូរស័ព្ទនេះនឹងស្ថិតក្នុងរបៀប ហៅត្រលប់ពេលអាសន្ន រយៈពេល <xliff:g id="COUNT_0">%s</xliff:g> នាទី។ ខណៈពេលស្ថិតក្នុងរបៀបនេះ មិនមានកម្មវិធីដែលប្រើការភ្ជាប់ទិន្នន័យណា អាចប្រើបានបានឡើយ។ តើអ្នកចង់ចាកចេញឥឡូវនេះទេ?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other">សកម្មភាពដែលបានជ្រើសមិនមានទេ ខណៈពេលដែលស្ថិតក្នុងរបៀប ហៅត្រលប់ពេលអាសន្ន។ ទូរស័ព្ទនេះនឹងស្ថិតក្នុងរបៀបនេះរយៈពេល <xliff:g id="COUNT_1">%s</xliff:g> នាទី។ តើអ្នកចង់ចាកចេញឥឡូវនេះទេ?</item>
+      <item quantity="one">សកម្មភាពដែលបានជ្រើសមិនមានទេ ខណៈពេលដែលស្ថិតក្នុងរបៀប ហៅត្រលប់ពេលអាសន្ន។ ទូរស័ព្ទនេះនឹងស្ថិតក្នុងរបៀបនេះរយៈពេល <xliff:g id="COUNT_0">%s</xliff:g> នាទី។ តើអ្នកចង់ចាកចេញឥឡូវនេះទេ?</item>
+    </plurals>
     <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>
@@ -506,110 +541,23 @@
     <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">"ប្រើ​ការ​ហៅ​តាម​អ៊ីនធឺណិត (តែ​​វ៉ាយហ្វាយ​ប៉ុណ្ណោះ)"</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="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="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="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_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="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">"បាន​បញ្ឈប់​ការ​ចុះឈ្មោះ​គណនី ពី​ព្រោះ​គ្មាន​ការ​តភ្ជាប់​វ៉ាយហ្វាយ។"</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="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>
-    <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">"&lt; មិន​កំណត់ &gt;"</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="6839103946505432390">"មិន​​អាច​ទុក​ឲ្យ​នៅ​ទទេ និង​បាន​ទាមទារ <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> ។"</string>
-    <string name="not_a_valid_port" msgid="4796149266434630292">"លេខ​ច្រក​គួរតែ​នៅ​ចន្លោះ ១០០០ និង ៦៥៥៣៤។"</string>
-    <string name="no_internet_available_title" msgid="3327109242858406165">"គ្មាន​ការ​តភ្ជាប់​អ៊ីនធឺណិត​"</string>
-    <string name="no_wifi_available_title" msgid="747881033089378758">"គ្មាន​ការ​តភ្ជាប់​តាម​​វ៉ាយហ្វាយ​"</string>
-    <string name="no_internet_available" msgid="7877142631803238549">"ដើម្បី​កំណត់​ការ​ហៅ​តាម​អ៊ីនធឺណិត ពិនិត្យមើល​ការ​តភ្ជាប់​អ៊ីនធឺណិត​របស់​អ្នក​ដំបូង។"</string>
-    <string name="no_wifi_available" msgid="1225073547318465713">"អ្នក​ត្រូវ​តភ្ជាប់​តាម​បណ្ដាញ​​វ៉ាយហ្វាយ​សម្រាប់​​ហៅ​តាម​អ៊ីនធឺណិត (ប្រើ​ការ​កំណត់​បណ្ដាញ​ឥត​ខ្សែ &amp; )។"</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_setting_title" msgid="3754000371039709383">"ការ​ឆ្លើយតប​រហ័ស"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></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">"លុប​ថយក្រោយ"</string>
-    <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_ringtone_title" msgid="2609519527849101590">"សំឡេង"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"សំឡេង​លំនាំដើម (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</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="dial_pad_autocomplete" msgid="494525952035761075">"បន្ទះ​លេខ​បំពេញ​ស្វ័យប្រវត្តិ"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"សំឡេង​រោទ៍ &amp; ញ័រ"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"ប្រើ​វ៉ាយហ្វាយ​ដើម្បី​ហៅ?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"បាទ/ចាស"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"ទេ"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"ស៊ីមកាត​ជាប់​ជា​មួយ"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"ការ​ហៅ​តាម​អ៊ីនធឺណិត​ជាប់​ជា​មួយ​ស្រាប់"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"បើក​ការ​ហៅ​ជា​វីដេអូ"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"ដើម្បីបើកការហៅវីដេអូ អ្នកត្រូវបើកដំណើរការរបៀប 4G LTE នៅក្នុងការកំណត់បណ្តាញ។"</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"ការកំណត់​បណ្ដាញ"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"បិទ"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"ការហៅពេលអាសន្ន"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"សម្រាប់ការហៅពេលអាសន្នប៉ុណ្ណោះ"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"ស៊ីមកាត រន្ធ៖ <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"លទ្ធភាពប្រើប្រាស់"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"មានការហៅចូលមកតាម Wi-Fi"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"ហៅតាម Wi-Fi"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"ប៉ះ​ម្ដង​ទៀត​ដើម្បី​បើក"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"មានកំហុសខណៈពេលឌិកូដសារ។"</string>
 </resources>
diff --git a/res/values-kn-rIN/arrays.xml b/res/values-kn-rIN/arrays.xml
new file mode 100644
index 0000000..8da8aa2
--- /dev/null
+++ b/res/values-kn-rIN/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"ಜಾಗತಿಕ"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-kn-rIN/config.xml b/res/values-kn-rIN/config.xml
deleted file mode 100644
index 637f5db..0000000
--- a/res/values-kn-rIN/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"ತಪ್ಪು"</string>
-</resources>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 28055df..dc673d8 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -16,14 +16,14 @@
 
 <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="tablet" msgid="1107073389495104784">"ಸೆಲ್ಯುಲಾರ್ ಡೇಟಾ"</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">"FDN ಪಟ್ಟಿ"</string>
     <string name="unknown" msgid="6878797917991465859">"ಅಜ್ಞಾತ"</string>
     <string name="private_num" msgid="6713286113000232309">"ಖಾಸಗಿ ಸಂಖ್ಯೆ"</string>
-    <string name="payphone" msgid="1931775086311769314">"ಪಾವತಿಯ ಫೋನ್‌"</string>
+    <string name="payphone" msgid="4793877574636445118">"ಪೇಫೋನ್"</string>
     <string name="onHold" msgid="9035493194749959955">"ತಡೆಹಿಡಿಯಲಾಗಿದೆ"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI ಕೋಡ್‌ ಪ್ರಾರಂಭಿಸಲಾಗಿದೆ"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD ಕೋಡ್‌ ಚಾಲನೆಯಲ್ಲಿದೆ…"</string>
@@ -43,27 +43,50 @@
     <string name="pause_prompt_no" msgid="6686238803236884877">"ಇಲ್ಲ"</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="no_vm_number_msg" msgid="1300729501030053828">"ಸಿಮ್‌ ಕಾರ್ಡ್‌ನಲ್ಲಿ ಯಾವುದೇ ಧ್ವನಿಮೇಲ್‌ ಸಂಖ್ಯೆಯನ್ನು ಸಂಗ್ರಹಿಸಿಲ್ಲ."</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="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="requesting_unlock" msgid="6412629401033249351">"ನೆಟ್‌ವರ್ಕ್‌ ಅನ್ನು ಅನ್‌ಲಾಕ್‌ ಮಾಡಲು ವಿನಂತಿಸಲಾಗುತ್ತಿದೆ…"</string>
     <string name="unlock_failed" msgid="6490531697031504225">"ನೆಟ್‌ವರ್ಕ್‌ ಅನ್‌ಲಾಕ್‌ ವಿನಂತಿಯು ಯಶಸ್ವಿಯಾಗಲಿಲ್ಲ."</string>
     <string name="unlock_success" msgid="6770085622238180152">"ನೆಟ್‌ವರ್ಕ್‌ ಅನ್‌ಲಾಕ್‌ ಯಶಸ್ವಿಯಾಗಿದೆ."</string>
-    <string name="mobile_network_settings_not_available" msgid="7355254462995117896">"ಮೊಬೈಲ್ ನೆಟ್‌ವರ್ಕ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು ಈ ಬಳಕೆದಾರರಿಗೆ ಲಭ್ಯವಿಲ್ಲ"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"ಸೆಲ್ಯುಲಾರ್‌ ನೆಟ್‌ವರ್ಕ್‌ ಸೆಟ್ಟಿಂಗ್‌ಗಳು ಈ ಬಳಕೆದಾರರಿಗೆ ಲಭ್ಯವಿಲ್ಲ"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM ಕರೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"GSM ಕರೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA ಕರೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"CDMA ಕರೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"ಪ್ರವೇಶಿಸುವಿಕೆ ಕೇಂದ್ರದ ಹೆಸರುಗಳು"</string>
     <string name="settings_label" msgid="3876743539816984008">"ನೆಟ್‌ವರ್ಕ್‌ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
-    <string name="connection_service" msgid="978745922583410219">"ಬಳಸಲು ಸಂಪರ್ಕ ಸೇವೆ"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"ಕರೆ ಮಾಡುವ ಖಾತೆಗಳು"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"ಇದರೊಂದಿಗೆ ಕರೆಗಳನ್ನು ಮಾಡಿ"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"SIP ಕರೆಗಳನ್ನು ಇದರೊಂದಿಗೆ ಮಾಡಿ"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"ಮೊದಲು ಕೇಳಿ"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"ಖಾತೆಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"ಫೋನ್ ಖಾತೆಗಳು"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"SIP ಖಾತೆಯನ್ನು ಸೇರಿಸಿ"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"ಖಾತೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಕಾನ್ಫಿಗರ್ ಮಾಡಿ"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"ವೈ-ಫೈ ಕರೆ ಮಾಡುವಿಕೆ"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Wi-Fi ಕರೆ ಮಾಡುವಿಕೆಯನ್ನು ಬಳಸಬೇಡಿ"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"ಕರೆ ಸಹಾಯಕವನ್ನು ಬಳಸಬೇಡಿ"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"ಯಾವುದೂ ಇಲ್ಲ"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"ಸಹಾಯಕಕ್ಕೆ ಕರೆ ಮಾಡಿ"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"ಕರೆ ಸಹಾಯಕ ಬಳಸಿ"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"ಕರೆ ಸಹಾಯಕವನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"ಇದರ ಜೊತೆಗೆ ಕರೆಗಳನ್ನು ಮಾಡಲು ಬಳಸಲಾದ ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ನಿರ್ವಹಿಸಿ"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"ಕರೆಗಳಿಗಾಗಿ ಬಳಸಲಾಗುವ ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ನಿರ್ವಹಿಸಲು ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಅಥವಾ ಸೇವೆಗಳನ್ನು ಅನುಮತಿಸಿ"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"ಕಾನ್ಫಿಗರ್ ಮಾಡು"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"ಅಂತರ್ನಿರ್ಮಿತ ಸಂಪರ್ಕ ಸೇವೆ"</string>
     <string name="voicemail" msgid="8693759337917898954">"ಧ್ವನಿಮೇಲ್"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"ಧ್ವನಿಮೇಲ್ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
     <string name="networks" msgid="8873030692174541976">"ನೆಟ್‌ವರ್ಕ್‌ ಆಪರೇಟರ್‌ಗಳು"</string>
-    <string name="call_settings" msgid="1630474923393095156">"ಕರೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"ತುರ್ತು ಪ್ರಸಾರಗಳು"</string>
+    <string name="call_settings" msgid="6112441768261754562">"ಕರೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"ಹೆಚ್ಚುವರಿ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"ಹೆಚ್ಚುವರಿ ಸೆಟ್ಟಿಂಗ್‌ಗಳು (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
@@ -77,40 +100,43 @@
     <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="call_forwarding_settings_with_label" msgid="8569489414006897127">"ಕರೆ ಫಾರ್ವರ್ಡ್ ಮಾಡುವಿಕೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="sum_cfu_disabled" msgid="8384177689501334080">"ಆಫ್ ಆಗಿದೆ"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"ಕಾರ್ಯನಿರತವಾಗಿರುವಾಗ"</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="sum_cfb_disabled" msgid="4913145177320506827">"ಆಫ್ ಆಗಿದೆ"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"ನಿಮ್ಮ ಫೋನ್‌ ಕಾರ್ಯನಿರತವಾಗಿರುವಾಗ ಕರೆಯ ಫಾರ್ವರ್ಡ್‌ ಮಾಡುವಿಕೆಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ನಿಮ್ಮ ಆಪರೇಟರ್ ಬೆಂಬಲಿಸುವುದಿಲ್ಲ."</string>
-    <string name="labelCFNRy" msgid="3646316323834351390">"ಉತ್ತರಿಸಲಾಗದಿದ್ದಾಗ ಫಾರ್ವರ್ಡ್‌ ಮಾಡು"</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"ಉತ್ತರಿಸದಿದ್ದಾಗ"</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="sum_cfnry_disabled" msgid="3884684060443538097">"ಆಫ್ ಆಗಿದೆ"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"ನಿಮ್ಮ ಫೋನ್‌ ಉತ್ತರಿಸದಿರುವಾಗ ಕರೆಯ ಫಾರ್ವರ್ಡ್‌ ಮಾಡುವಿಕೆ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುವುದನ್ನು ನಿಮ್ಮ ಆಪರೇಟರ್ ಬೆಂಬಲಿಸುವುದಿಲ್ಲ."</string>
-    <string name="labelCFNRc" msgid="47183615370850000">"ತಲುಪಲಾಗದಿದ್ದಾಗ ಫಾರ್ವರ್ಡ್‌ ಮಾಡು"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"ಅಲಭ್ಯವಿರುವಾಗ"</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="5646361343094064333">"ನಿಮ್ಮ ಫೋನ್‌ ಅನ್ನು ತಲುಪಲಾಗದಿದ್ದಾಗ ನಿಮ್ಮ ವಾಹಕ ಕರೆಯ ಫಾರ್ವರ್ಡ್‌ ಮಾಡುವಿಕೆ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ಬೆಂಬಲಿಸುವುದಿಲ್ಲ."</string>
     <string name="updating_title" msgid="6146755386174019046">"ಕರೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"ಕರೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಕೇವಲ ಪ್ರಾಥಮಿಕ ಬಳಕೆದಾರರು ಮಾತ್ರ ಬದಲಾಯಿಸಬಹುದು."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"ಕರೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="exception_error" msgid="7027667130619518211">"ನೆಟ್‌ವರ್ಕ್‌ ಅಥವಾ ಸಿಮ್‌ ಕಾರ್ಡ್‌ ದೋಷ."</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>
+    <string name="enable" msgid="7248657275000173526">"ಆನ್ ಮಾಡು"</string>
+    <string name="disable" msgid="4678348128118573672">"ಆಫ್ ಮಾಡು"</string>
     <string name="change_num" msgid="239476305819844391">"ನವೀಕರಿಸು"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"ನೆಟ್‌ವರ್ಕ್ ಡೀಫಾಲ್ಟ್"</item>
@@ -123,15 +149,15 @@
     <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="voicemail_default" msgid="2001233554889016880">"ನಿಮ್ಮ ವಾಹಕ"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"ಸೆಲ್ಯುಲಾರ್‌ ನೆಟ್‌ವರ್ಕ್‌ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</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="5613353860205691579">"ಈ ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಂಪರ್ಕವನ್ನು ನಿಮ್ಮ SIM ಕಾರ್ಡ್‌ ಅನುಮತಿಸುವುದಿಲ್ಲ."</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="3494252551249882718">"ನೆಟ್‌ವರ್ಕ್‌ ಆಪರೇಟರ್‌ ಅನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"ಬಯಸಿದ ನೆಟ್‌ವರ್ಕ್‌ ಮೋಡ್‌: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"ಬಯಸಿದ ನೆಟ್‌ವರ್ಕ್‌ ಮೋಡ್‌: ಜಾಗತಿಕ"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"ಬಯಸಿದ ನೆಟ್‌ವರ್ಕ್‌ ಮೋಡ್‌‌: LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"ಆದ್ಯತೆಯ ನೆಟ್‌ವರ್ಕ್ ಮೋಡ್: LTE / GSM / UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"ಪ್ರಾಶಸ್ತ್ಯದ ನೆಟ್‌ವರ್ಕ್‌ ಮೋಡ್‌‌: LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="7886739962255042385">"LTE / WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"GSM ಮಾತ್ರ"</item>
     <item msgid="3817924849415716259">"GSM/WCDMA ಗೆ ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಲಾಗಿದೆ"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"ವರ್ಧಿಸಲಾದ 4G LTE ಮೋಡ್"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"ಧ್ವನಿ ಮತ್ತು ಇತರ ಸಂವಹನಗಳನ್ನು ಸುಧಾರಿಸಲು LTE ಸೇವೆಗಳನ್ನು ಬಳಸಿ (ಶಿಫಾರಸು ಮಾಡಲಾಗಿದೆ)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"ಡೇಟಾ ಸಕ್ರಿಯಗೊಂಡಿದೆ"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"ಮೊಬೈಲ್‌ ನೆಟ್‌ವರ್ಕ್‌ ಮೂಲಕ ಡೇಟಾ ಪ್ರವೇಶ ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"ಡೇಟಾ ಬಳಕೆಯನ್ನು ಅನುಮತಿಸಿ"</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="8913735676127858115">"ಡೇಟಾ ರೋಮಿಂಗ್ ಅನ್ನು ಆಫ್‌ ಮಾಡಿರುವ ಸ್ಥಿತಿಯಲ್ಲಿ ನಿಮ್ಮ ಹೋಮ್‌ ನೆಟ್‌ವರ್ಕ್‌ ಅನ್ನು ನೀವು ಇರಿಸಿರುವ ಕಾರಣ ನೀವು ಡೇಟಾ ಸಂಪರ್ಕವನ್ನು ಕಳೆದುಕೊಂಡಿರುವಿರಿ."</string>
-    <string name="roaming_warning" msgid="7820963598559553967">"ಡೇಟಾ ರೋಮಿಂಗ್‌ಗೆ ಅನುಮತಿ ನೀಡುವುದೇ? ಸ್ವಲ್ಪ ಹೆಚ್ಚು ರೋಮಿಂಗ್ ಮೊತ್ತವನ್ನು ನೀವು ತೆರಬೇಕಾಗಬಹುದು!"</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"ನೀವು ಗಣನೀಯವಾಗಿ ಶುಲ್ಕಗಳನ್ನು ತೆರಬೇಕಾಗಬಹುದು."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"ಡೇಟಾ ರೋಮಿಂಗ್ ಅನುಮತಿಸುವುದೇ?"</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>
@@ -190,7 +221,7 @@
     <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="throttle_help_subtext" msgid="3633091498168446044">"ನಿಮ್ಮ ವಾಹಕದ ಸೆಲ್ಯುಲಾರ್‌ ನೆಟ್‌ವರ್ಕ್ ಡೇಟಾ ಬಳಕೆ ನೀತಿ ಕುರಿತು ಇನ್ನಷ್ಟು ಮಾಹಿತಿ"</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>
@@ -289,10 +320,10 @@
     <item msgid="1205664026446156265">"ಸ್ವಯಂಚಾಲಿತ"</item>
   </string-array>
     <string name="cdma_subscription_title" msgid="1162564010076763284">"CDMA ಚಂದಾದಾರಿಕೆ"</string>
-    <string name="cdma_subscription_summary" msgid="2530890766115781140">"RUIM/SIM ಮತ್ತು NV ರ ನಡುವೆ ಬದಲಾಯಿಸಿ"</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/SIM"</item>
+    <item msgid="2258014151300708431">"RUIM/ಸಿಮ್‌"</item>
     <item msgid="5127722015571873880">"NV"</item>
   </string-array>
   <string-array name="cdma_subscription_values">
@@ -303,7 +334,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"ಡೇಟಾ ಸೇವೆಯನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"ವಾಹಕ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="fdn" msgid="7878832555095183202">"ಸ್ಥಿರ ಡಯಲಿಂಗ್‌‌ ಸಂಖ್ಯೆಗಳು"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"ಸ್ಥಿರ ಡಯಲ್ ಸಂಖ್ಯೆಗಳು (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FDN ಪಟ್ಟಿ"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"FDN ಪಟ್ಟಿ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FDN ಸಕ್ರಿಯಗೊಳಿಸುವಿಕೆ"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"ಸ್ಥಿರ ಡಯಲಿಂಗ್ ಸಂಖ್ಯೆಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"ಸ್ಥಿರ ಡಯಲಿಂಗ್ ಸಂಖ್ಯೆಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
@@ -313,7 +346,7 @@
     <string name="enable_fdn_ok" msgid="7215588870329688132">"FDN ನಿಷ್ಕ್ರಿಯಗೊಳಿಸು"</string>
     <string name="disable_fdn_ok" msgid="5727046928930740173">"FDN ಸಕ್ರಿಯಗೊಳಿಸು"</string>
     <string name="sum_fdn" msgid="1959399454900272878">"ಸ್ಥಿರ ಡಯಲಿಂಗ್ ಸಂಖ್ಯೆಗಳನ್ನು ನಿರ್ವಹಿಸಿ"</string>
-    <string name="sum_fdn_change_pin" msgid="6666549734792827932">"FDN ಪ್ರವೇಶಕ್ಕಾಗಿ PIN ಬದಲಾಯಿಸಿ"</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="3776841382844614716">"ಧ್ವನಿ ಗೌಪ್ಯತೆ"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"ಗೌಪ್ಯತೆ ವರ್ಧಿತ ಮೋಡ್ ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸು"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"TTY ಮೋಡ್‌ ಹೊಂದಿಸಿ"</string>
     <string name="auto_retry_mode_title" msgid="4073265511427813322">"ಸ್ವಯಂ-ಮರುಪ್ರಯತ್ನಿಸುವಿಕೆ"</string>
     <string name="auto_retry_mode_summary" msgid="4973886004067532288">"ಸ್ವಯಂ ಮರುಪ್ರಯತ್ನಿಸುವಿಕೆ ಮೋಡ್‌‌ ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"TTY ಮೋಡ್ ವೀಡಿಯೊ ಕರೆಯ ಸಂದರ್ಭದಲ್ಲಿ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ"</string>
     <string name="menu_add" msgid="1882023737425114762">"ಸಂಪರ್ಕ ಸೇರಿಸಿ"</string>
     <string name="menu_edit" msgid="7143003705504672374">"ಸಂಪರ್ಕವನ್ನು ಸಂಪಾದಿಸಿ"</string>
     <string name="menu_delete" msgid="3977150783449642851">"ಸಂಪರ್ಕವನ್ನು ಅಳಿಸಿ"</string>
@@ -337,64 +371,62 @@
     <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="5470854099230755944">"ನೀವು ತಪ್ಪಾದ PIN ಟೈಪ್‌ ಮಾಡಿರುವ ಕಾರಣ FDN ಅನ್ನು ನವೀಕರಿಸಲಾಗಲಿಲ್ಲ."</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 ಅನ್ನು ನವೀಕರಿಸಲಾಗಲಿಲ್ಲ. PIN2 ತಪ್ಪಾಗಿದೆ ಅಥವಾ ಫೋನ್ ಸಂಖ್ಯೆಯನ್ನು ತಿರಸ್ಕರಿಸಲಾಗಿದೆ."</string>
     <string name="fdn_failed" msgid="540018079008319747">"FDN ಕಾರ್ಯಾಚರಣೆ ವಿಫಲವಾಗಿದೆ."</string>
-    <string name="simContacts_emptyLoading" msgid="2203331234764498011">"SIM ಕಾರ್ಡ್‌ನಿಂದ ಓದಲಾಗುತ್ತಿದೆ…"</string>
-    <string name="simContacts_empty" msgid="5270660846489561932">"ನಿಮ್ಮ SIM ಕಾರ್ಡ್‌ನಲ್ಲಿ ಯಾವುದೇ ಸಂಪರ್ಕಗಳಿಲ್ಲ."</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="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="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="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="1796577128488773946">"ಪಾಸ್‌ವರ್ಡ್‌ ತಪ್ಪಾಗಿರುವುದರಿಂದ, PIN ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ! PUK ಅನ್ನು ವಿನಂತಿಸಲಾಗಿದೆ."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"ಸಿಮ್ ಕಾರ್ಡ್‌ನಿಂದ ಸಂಪರ್ಕಗಳನ್ನು ಆಮದು ಮಾಡಲು ಏರ್‌ಪ್ಲೇನ್ ಮೋಡ್ ಆಫ್ ಮಾಡಿ."</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="8955102849303984935">"ನೀವು ಟೈಪ್‌‌ ಮಾಡಿದ ಹಳೆಯ ಪಿನ್‌ ಸರಿಯಾಗಿಲ್ಲ. ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"ನೀವು ಟೈಪ್‌ ಮಾಡಿದ ಪಿನ್‌ ಗಳು ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ. ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
+    <string name="invalidPin" msgid="5981171102258684792">"4 ರಿಂದ 8 ಸಂಖ್ಯೆಗಳಿರುವ ಪಿನ್‌ ಟೈಪ್ ಮಾಡಿ."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"SIM PIN ತೆರವುಗೊಳಿಸಿ"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"SIM PIN ಹೊಂದಿಸಿ"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"PIN ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN ಹೊಂದಿಸಲಾಗಿದೆ"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN ತೆರವುಗೊಳಿಸಲಾಗಿದೆ"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN ತಪ್ಪಾಗಿದೆ"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN ನವೀಕರಿಸಲಾಗಿದೆ"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"ಪಾಸ್‌ವರ್ಡ್ ತಪ್ಪಾಗಿದೆ. PIN ಇದೀಗ ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ. PUK ವಿನಂತಿಸಲಾಗಿದೆ."</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="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="1639666438836544393">"PIN2 ಯಶಸ್ವಿಯಾಗಿ ಬದಲಾಯಿಸಲಾಗಿದೆ."</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"PUK2 ಕೋಡ್‌ ಟೈಪ್‌ ಮಾಡಿ"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"ಪಾಸ್‌ವರ್ಡ್‌ ತಪ್ಪಾಗಿದೆ, PIN2 ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ. PIN2 ಬದಲಿಸಿ ಮತ್ತು ಮರು ಪ್ರಯತ್ನಿಸಿ!"</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"ಪಾಸ್‌ವರ್ಡ್‌ ತಪ್ಪಾಗಿರುವುದರಿಂದ, SIM ಲಾಕ್‌ ಆಗಿದೆ. PUK2 ಅನ್ನು ವಿನಂತಿಸಲಾಗಿದೆ."</string>
+    <string name="badPuk2" msgid="7910064009531541708">"PUK2 ತಪ್ಪಾಗಿದೆ. ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
+    <string name="badPin2" msgid="6646896629970023109">"ಹಳೆಯ PIN2 ತಪ್ಪಾಗಿದೆ. ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2s ಹೊಂದಿಕೆಯಾಗುತ್ತಿಲ್ಲ. ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"4 ರಿಂದ 8 ಸಂಖ್ಯೆಗಳ PIN2 ನಮೂದಿಸಿ."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"8 ಸಂಖ್ಯೆಗಳ PUK2 ನಮೂದಿಸಿ."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 ನವೀಕರಿಸಲಾಗಿದೆ"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"PUK2 ಕೋಡ್ ನಮೂದಿಸಿ"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"ಪಾಸ್‌ವರ್ಡ್ ತಪ್ಪಾಗಿದೆ. PIN2 ಇದೀಗ ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ. ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಲು, PIN 2 ಬದಲಾಯಿಸಿ."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"ಪಾಸ್‌ವರ್ಡ್ ತಪ್ಪಾಗಿದೆ. SIM ಅನ್ನು ಇದೀಗ ಲಾಕ್ ಮಾಡಲಾಗಿದೆ. PUK2 ನಮೂದಿಸಿ."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 ಅನ್ನು ಶಾಶ್ವತವಾಗಿ ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n" <xliff:g id="NUMBER">%d</xliff:g> ಪ್ರಯತ್ನಗಳು ಉಳಿದಿವೆ."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 ನಿರ್ಬಂಧ ತೆಗೆಯಲಾಗಿದೆ!"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"ನೀವು <xliff:g id="NUMBER">%d</xliff:g> ಬಾಕಿ ಉಳಿದಿರುವ ಪ್ರಯತ್ನಗಳನ್ನು ಹೊಂದಿರುವಿರಿ."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 ಇನ್ನು ಮುಂದೆ ನಿರ್ಬಂಧಿತವಾಗಿರುವುದಿಲ್ಲ"</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_redialing" msgid="8253487008234167266">"ಮರು ಡಯಲ್ ಮಾಡಲಾಗುತ್ತಿದೆ"</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_dialing" msgid="2107666444937350731">"ಡಯಲ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"ತಪ್ಪಿ ಹೋದ ಕರೆ"</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_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%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>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"ಕರೆ ಮಾಡಲು ಏರ್‌ಪ್ಲೇನ್ ಮೋಡ್ ಆಫ್ ಮಾಡಿ."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"ಏರ್‌ಪ್ಲೇನ್ ಮೋಡ್ ಆಫ್ ಮಾಡಿ ಅಥವಾ ಕರೆ ಮಾಡಲು ವೈರ್‌ಲೆಸ್ ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಂಪರ್ಕಪಡಿಸಿ."</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_error_out_of_service" msgid="4100065333878929223">"ಸೆಲ್ಯುಲಾರ್ ನೆಟ್‌ವರ್ಕ್‌ ಲಭ್ಯವಿಲ್ಲ."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"ಸೆಲ್ಯುಲಾರ್ ನೆಟ್‌ವರ್ಕ್ ಲಭ್ಯವಿಲ್ಲ. ಕರೆ ಮಾಡಲು ವೈರ್‌ಲೆಸ್ ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಂಪರ್ಕಪಡಿಸಿ."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"ಕರೆಯನ್ನು ಮಾಡಲು, ಮಾನ್ಯವಾದ ಸಂಖ್ಯೆಯನ್ನು ನಮೂದಿಸಿ."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"ಕರೆ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ."</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_unknown" msgid="655570339115407698">"ಸೇವೆಯು ಬೆಂಬಲಿತವಾಗಿಲ್ಲ"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"ಕರೆಗಳನ್ನು ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"ಕರೆಯನ್ನು ಪ್ರತ್ಯೇಕಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"ವರ್ಗಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</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="incall_error_supp_service_reject" msgid="8998568661508655638">"ಕರೆಯನ್ನು ತಿರಸ್ಕರಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"ಕರೆ(ಗಳು) ಬಿಡುಗಡೆ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"ಕರೆ ಮಾಡಲು ವೈರ್‌ಲೆಸ್ ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಂಪರ್ಕಪಡಿಸಿ."</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="7969515493359619960">"ಕರೆ ಮಾಡಲಾಗಿಲ್ಲ. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ತುರ್ತು ಸಂಖ್ಯೆಯಲ್ಲ!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"ಕರೆ ಮಾಡಲಾಗಿಲ್ಲ. ತುರ್ತು ಸಂಖ್ಯೆಗೆ ಡಯಲ್‌ ಮಾಡಿ!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"ಯಾವುದೇ ಸೇವೆ ಇಲ್ಲ. ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಲಾಗುತ್ತಿದೆ..."</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"ಕರೆ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ಇದು ತುರ್ತು ಸಂಖ್ಯೆಯಲ್ಲ."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"ಕರೆ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ. ತುರ್ತು ಸಂಖ್ಯೆಯನ್ನು ಡಯಲ್ ಮಾಡಿ."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"ಡಯಲ್‌ ಮಾಡಲು ಕೀಬೋರ್ಡ್‌ ಬಳಸಿ"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"ಹೋಲ್ಡ್‌‌ ಮಾಡು"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"ಮುಕ್ತಾಯ"</string>
@@ -440,7 +474,7 @@
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"ವೀಡಿಯೊ ಕರೆ"</string>
     <string name="importSimEntry" msgid="6614358325359736031">"ಆಮದು"</string>
     <string name="importAllSimEntries" msgid="1503181169636198673">"ಎಲ್ಲವನ್ನೂ ಆಮದು ಮಾಡು"</string>
-    <string name="importingSimContacts" msgid="7374056215462575769">"SIM ಸಂಪರ್ಕಗಳನ್ನು ಆಮದು ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
+    <string name="importingSimContacts" msgid="7374056215462575769">"ಸಿಮ್‌ ಸಂಪರ್ಕಗಳನ್ನು ಆಮದು ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
     <string name="importToFDNfromContacts" msgid="2130620207013368580">"ಸಂಪರ್ಕಗಳಿಂದ ಆಮದು ಮಾಡು"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"ಶ್ರವಣ ಸಾಧನಗಳು"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"ಶ್ರವಣ ಸಾಧನ ಹೊಂದಾಣಿಕೆಯನ್ನು ಆನ್‌ ಮಾಡಿ"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"ಸಾಮಾನ್ಯ"</item>
     <item msgid="2883365539347850535">"ದೀರ್ಘವಾದ"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"ನೆಟ್‌ವರ್ಕ್‌ ಸಂದೇಶ"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"ನೆಟ್‌ವರ್ಕ್‌ ಸಂದೇಶ"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"ದೋಷ ಸಂದೇಶ"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"ನಿಮ್ಮ ಫೋನ್ ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"ನಿಮ್ಮ ಫೋನ್‌ ಸೇವೆಯನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲು ವಿಶೇಷ ಕರೆಯೊಂದನ್ನು ಮಾಡಬೇಕಾಗುತ್ತದೆ. \n\n “ಸಕ್ರಿಯಗೊಳಿಸು” ಒತ್ತಿದ ಬಳಿಕ ನಿಮ್ಮ ಫೋನ್ ಸಕ್ರಿಯಗೊಳಿಸಲು ನೀಡಲಾಗುವ ಸೂಚನೆಗಳನ್ನು ಕೇಳಿ."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"ಸಕ್ರಿಯಗೊಳಿಸಲಾಗುತ್ತಿದೆ..."</string>
@@ -469,8 +504,8 @@
     <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="3420314892609254729">"ನಿಮ್ಮ ಫೋನ್‌ ಅನ್ನು ಪ್ರೋಗ್ರಾಮ್ ಮಾಡುವಾಗ ನಿರೀಕ್ಷಿಸಿ."</string>
-    <string name="ota_failure" msgid="4311299546379674378">"ಪ್ರೋಗ್ರಾಮಿಂಗ್ ಯಶಸ್ವಿಯಾಗಿಲ್ಲ"</string>
+    <string name="ota_progress" msgid="460876637828044519">"ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಪ್ರೊಗ್ರಾಮ್ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಪ್ರೊಗ್ರಾಮ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ"</string>
     <string name="ota_successful" msgid="1880780692887077407">"ನಿಮ್ಮ ಫೋನ್‌ ಇದೀಗ ಸಕ್ರಿಯಗೊಂಡಿದೆ. ಸೇವೆ ಪ್ರಾರಂಭಿಸಲು ಇದು ಸುಮಾರು 15 ನಿಮಿಷಗಳ ಕಾಲಾವಕಾಶ ತೆಗೆದುಕೊಳ್ಳಬಹುದು."</string>
     <string name="ota_unsuccessful" msgid="8072141612635635357">"ನಿಮ್ಮ ಫೋನ್‌ ಸಕ್ರಿಯಗೊಳ್ಳಲಿಲ್ಲ. \n ಅತ್ಯುತ್ತಮ ಪ್ರಸಾರವ್ಯಾಪ್ತಿ ಹೊಂದಿರುವ ಪ್ರದೇಶವನ್ನು ಹುಡುಕಬೇಕಾಗಬಹುದು (ಕಿಟಕಿ ಹತ್ತಿರ ಅಥವಾ ಹೊರಗಡೆ). \n\nಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ ಅಥವಾ ಇನ್ನಷ್ಟು ಆಯ್ಕೆಗಳಿಗಾಗಿ ಗ್ರಾಹಕ ಸೇವೆಗೆ ಕರೆ ಮಾಡಿ."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"ಮಿತಿಮೀರಿದ SPC ವೈಫಲ್ಯಗಳು"</string>
@@ -481,18 +516,18 @@
     <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="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="2585506997024726599">"ತುರ್ತು ಕಾಲ್‌ಬ್ಯಾಕ್‌‌ ಮೋಡ್‌ನಲ್ಲಿರುವಾಗ ಆಯ್ಕೆ ಮಾಡಿದ ಕ್ರಿಯೆಯು ಲಭ್ಯವಿರುವುದಿಲ್ಲ. <xliff:g id="COUNT">%s</xliff:g> ನಿಮಿಷದವರೆಗೆ ಫೋನ್‌‌ ಈ ಮೋಡ್‌ನಲ್ಲಿರುತ್ತದೆ. ನೀವು ಈಗಲೇ ನಿರ್ಗಮಿಸಲು ಬಯಸುವಿರಾ?"</item>
-    <item quantity="other" msgid="6115622137771382224">"ತುರ್ತು ಕಾಲ್‌ಬ್ಯಾಕ್‌‌ ಮೋಡ್‌ನಲ್ಲಿರುವಾಗ ಆಯ್ಕೆ ಮಾಡಿದ ಕ್ರಿಯೆಯು ಲಭ್ಯವಿರುವುದಿಲ್ಲ. <xliff:g id="COUNT">%s</xliff:g> ನಿಮಿಷಗಳವೆರೆಗೆ ಫೋನ್‌‌ ಈ ಮೋಡ್‌ನಲ್ಲಿರುತ್ತದೆ. ನೀವು ಈಗಲೇ ನಿರ್ಗಮಿಸಲು ಬಯಸುವಿರಾ?"</item>
-  </plurals>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="one"> <xliff:g id="COUNT_1">%s</xliff:g> ನಿಮಿಷಗಳ ಕಾಲ ಯಾವುದೇ ಡೇಟಾ ಸಂಪರ್ಕವಿಲ್ಲ</item>
+      <item quantity="other"> <xliff:g id="COUNT_1">%s</xliff:g> ನಿಮಿಷಗಳ ಕಾಲ ಯಾವುದೇ ಡೇಟಾ ಸಂಪರ್ಕವಿಲ್ಲ</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="one">ಪೋನ್‌ <xliff:g id="COUNT_1">%s</xliff:g> ನಿಮಿಷಗಳ ಕಾಲ ತುರ್ತು ಮರಳಿ ಕರೆಮಾಡು ಮೋಡ್‌ನಲ್ಲಿರುತ್ತದೆ. ಈ ಮೋಡ್‌ನಲ್ಲಿರುವಾಗ ಯಾವುದೇ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಡೇಟಾ ಸಂಪರ್ಕವನ್ನು ಬಳಸಿಕೊಂಡು ಬಳಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ನೀವು ಇದೀಗ ನಿರ್ಗಮಿಸಲು ಬಯಸುವಿರಾ?</item>
+      <item quantity="other">ಪೋನ್‌ <xliff:g id="COUNT_1">%s</xliff:g> ನಿಮಿಷಗಳ ಕಾಲ ತುರ್ತು ಮರಳಿ ಕರೆಮಾಡು ಮೋಡ್‌ನಲ್ಲಿರುತ್ತದೆ. ಈ ಮೋಡ್‌ನಲ್ಲಿರುವಾಗ ಯಾವುದೇ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಡೇಟಾ ಸಂಪರ್ಕವನ್ನು ಬಳಸಿಕೊಂಡು ಬಳಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ನೀವು ಇದೀಗ ನಿರ್ಗಮಿಸಲು ಬಯಸುವಿರಾ?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="one">ತುರ್ತು ಮರಳಿ ಕರೆಮಾಡು ಮೋಡ್‌ನಲ್ಲಿರುವಾಗ ಆಯ್ಕೆಮಾಡಿದ ಕ್ರಿಯೆಯು ಲಭ್ಯವಿರುವುದಿಲ್ಲ. ಫೋನ್‌ <xliff:g id="COUNT_1">%s</xliff:g> ನಿಮಿಷಗಳ ಕಾಲ ಈ ಮೋಡ್‌ನಲ್ಲಿರುತ್ತದೆ. ನೀವು ಇದೀಗ ನಿರ್ಗಮಿಸಲು ಬಯಸುವಿರಾ?</item>
+      <item quantity="other">ತುರ್ತು ಮರಳಿ ಕರೆಮಾಡು ಮೋಡ್‌ನಲ್ಲಿರುವಾಗ ಆಯ್ಕೆಮಾಡಿದ ಕ್ರಿಯೆಯು ಲಭ್ಯವಿರುವುದಿಲ್ಲ. ಫೋನ್‌ <xliff:g id="COUNT_1">%s</xliff:g> ನಿಮಿಷಗಳ ಕಾಲ ಈ ಮೋಡ್‌ನಲ್ಲಿರುತ್ತದೆ. ನೀವು ಇದೀಗ ನಿರ್ಗಮಿಸಲು ಬಯಸುವಿರಾ?</item>
+    </plurals>
     <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>
@@ -506,110 +541,23 @@
     <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="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="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="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_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="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="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>
-    <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">"&lt;ಹೊಂದಿಸಿಲ್ಲ&gt;"</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="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="7877142631803238549">"ಇಂಟರ್ನೆಟ್‌ ಕರೆ ಮಾಡಲು, ಮೊದಲು ನಿಮ್ಮ ಇಂಟರ್ನೆಟ್‌‌ ಸಂಪರ್ಕವನ್ನು ಪರಿಶೀಲಿಸಿ."</string>
-    <string name="no_wifi_available" msgid="1225073547318465713">"ಇಂಟರ್ನೆಟ್‌ ಕರೆಗಳಿಗಾಗಿ ನೀವು Wi-Fi ನೆಟ್‌ವರ್ಕ್‌ ಸಂಪರ್ಕಗೊಳಿಸಬೇಕಾದ ಅಗತ್ಯವಿದೆ (ವೈರ್‌ಲೆಸ್‌‌‌ &amp; ನೆಟ್‌ವರ್ಕ್‌ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಬಳಸಿ)."</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_setting_title" msgid="3754000371039709383">"ತ್ವರಿತ ಪ್ರತಿಕ್ರಿಯೆಗಳು"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></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="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_ringtone_title" msgid="2609519527849101590">"ಧ್ವನಿ"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"ಡೀಫಾಲ್ಟ್‌ ಧ್ವನಿ (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</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="dial_pad_autocomplete" msgid="494525952035761075">"ಡಯಲ್‌‌ ಪ್ಯಾಡ್ ಸ್ವಯಂಪೂರ್ಣತೆ"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"ರಿಂಗ್‌ಟೋನ್‌‌ &amp; ವೈಬ್ರೇಟ್‌"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"ಕರೆ ಮಾಡಲು Wi-Fi ಬಳಸುವುದೇ?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"ಹೌದು"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"ಬೇಡ"</string>
-    <string name="pstn_connection_service_label" msgid="1743245930577325900">"ಅಂತರ್-ರಚಿತ SIM ಕಾರ್ಡ್‌ಗಳು"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"ಅಂತರ್ನಿರ್ಮಿತ ಇಂಟರ್ನೆಟ್‌ ಕರೆಮಾಡುವಿಕೆ"</string>
+    <string name="pstn_connection_service_label" msgid="1743245930577325900">"ಅಂತರ್-ರಚಿತ ಸಿಮ್‌ ಕಾರ್ಡ್‌ಗಳು"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"ವೀಡಿಯೊ ಕರೆಯನ್ನು ಆನ್ ಮಾಡಿ"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"ವೀಡಿಯೊ ಕರೆ ಮಾಡುವಿಕೆಯನ್ನು ಆನ್ ಮಾಡಲು, ನೀವು ನೆಟ್‌ವರ್ಕ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ವರ್ಧಿಸಲಾದ 4G LTE ಮೋಡ್ ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುವ ಅಗತ್ಯವಿದೆ."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"ನೆಟ್‌ವರ್ಕ್‌ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"ಮುಚ್ಚು"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"ತುರ್ತು ಕರೆಗಳು"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"ತುರ್ತು ಕರೆ ಮಾಡುವಿಕೆ ಮಾತ್ರ"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM ಕಾರ್ಡ್, ಸ್ಲಾಟ್: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"ಪ್ರವೇಶಿಸುವಿಕೆ"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"ಒಳಬರುವ ವೈ-ಫೈ ಕರೆ"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"ವೈ-ಫೈ ಕರೆ"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"ತೆರೆಯಲು ಮತ್ತೊಮ್ಮೆ ಸ್ಪರ್ಶಿಸಿ"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"ಸಂದೇಶವನ್ನು ಡೀಕೋಡ್ ಮಾಡುವಾಗ ದೋಷವುಂಟಾಗಿದೆ."</string>
 </resources>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
new file mode 100644
index 0000000..d57dca0
--- /dev/null
+++ b/res/values-ko/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"전 세계"</item>
+    <item msgid="6753774959494729275">"LTE/CDMA"</item>
+    <item msgid="8658695584186942227">"LTE/GSM/UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-ko/config.xml b/res/values-ko/config.xml
deleted file mode 100644
index 8cc670d..0000000
--- a/res/values-ko/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"거짓"</string>
-</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 44eab51..84bdbec 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -16,14 +16,14 @@
 
 <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="tablet" msgid="1107073389495104784">"이동통신 데이터"</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">"FDN 목록"</string>
     <string name="unknown" msgid="6878797917991465859">"알 수 없음"</string>
     <string name="private_num" msgid="6713286113000232309">"비공개 번호"</string>
-    <string name="payphone" msgid="1931775086311769314">"공중전화"</string>
+    <string name="payphone" msgid="4793877574636445118">"공중전화"</string>
     <string name="onHold" msgid="9035493194749959955">"대기 중"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI 코드 시작됨"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD 코드 실행 중..."</string>
@@ -52,18 +52,41 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"네트워크 잠금해제 요청 중..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"네트워크 잠금해제 요청이 실패했습니다."</string>
     <string name="unlock_success" msgid="6770085622238180152">"네트워크의 잠금을 해제했습니다."</string>
-    <string name="mobile_network_settings_not_available" msgid="7355254462995117896">"이 사용자는 모바일 네트워크 설정을 사용할 수 없습니다."</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"이 사용자는 이동통신망 설정을 사용할 수 없습니다."</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM 통화 설정"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"GSM 통화 설정(<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA 통화 설정"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"CDMA 통화 설정(<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"APN"</string>
     <string name="settings_label" msgid="3876743539816984008">"네트워크 설정"</string>
-    <string name="connection_service" msgid="978745922583410219">"사용할 연결 서비스"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"전화 계정"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"전화 걸기 대상"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"SIP 전화 걸기 대상"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"먼저 질문하기"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"설정"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"계정 선택"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"전화 계정"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"SIP 계정 추가"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"계정 설정 조정"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi 통화"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Wi-Fi 통화 사용 안함"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"통화 도우미 사용 안함"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"선택 안함"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"통화 도우미"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"통화 도우미 사용"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"통화 도우미 선택"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"다음으로 통화에 사용되는 네트워크 관리"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"앱 또는 서비스로 통화에 사용되는 네트워크 관리"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"구성"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"내장된 연결 서비스"</string>
     <string name="voicemail" msgid="8693759337917898954">"음성사서함"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"음성사서함(<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
     <string name="networks" msgid="8873030692174541976">"네트워크 운영자"</string>
-    <string name="call_settings" msgid="1630474923393095156">"통화 설정"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"긴급 방송"</string>
+    <string name="call_settings" msgid="6112441768261754562">"통화 설정"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"추가 설정"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"추가 설정(<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
@@ -77,29 +100,32 @@
     <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="call_forwarding_settings_with_label" msgid="8569489414006897127">"착신전환 설정(<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="sum_cfu_disabled" msgid="8384177689501334080">"사용 안함"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"다른 용무 중인 경우"</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="sum_cfb_disabled" msgid="4913145177320506827">"사용 안함"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"휴대전화가 사용 중일 때 착신전환 사용 중지를 이동통신사에서 지원하지 않습니다."</string>
-    <string name="labelCFNRy" msgid="3646316323834351390">"받지 않은 경우"</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"전화를 받지 않은 경우"</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="sum_cfnry_disabled" msgid="3884684060443538097">"사용 안함"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"휴대전화가 응답하지 않을 때 착신전환 사용 중지를 이동통신사에서 지원하지 않습니다."</string>
-    <string name="labelCFNRc" msgid="47183615370850000">"받을 수 없는 경우"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"연락할 수 없는 경우"</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="5646361343094064333">"이동통신사에서 전화를 받을 수 없을 때 착신전환 사용 중지를 지원하지 않습니다."</string>
     <string name="updating_title" msgid="6146755386174019046">"통화 설정"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"기본 사용자만 통화 설정을 변경할 수 있습니다."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"통화 설정(<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"통화 설정 오류"</string>
     <string name="reading_settings" msgid="1920291699287055284">"설정을 읽는 중..."</string>
     <string name="updating_settings" msgid="8171225533884883252">"설정 업데이트 중..."</string>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"사용"</string>
+    <string name="disable" msgid="4678348128118573672">"사용 중지"</string>
     <string name="change_num" msgid="239476305819844391">"업데이트"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"네트워크 기본값"</item>
@@ -123,8 +149,8 @@
     <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="voicemail_default" msgid="2001233554889016880">"이동통신사"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"이동통신망 설정"</string>
     <string name="label_available" msgid="1181658289009300430">"사용 가능한 네트워크"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"검색 중..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"네트워크를 찾을 수 없습니다."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"기본 네트워크 모드: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"기본 네트워크 모드: 글로벌"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"기본 네트워크 모드: LTE/WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"기본 네트워크 모드: LTE/GSM/UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"기본 네트워크 모드: LTE/CDMA"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="7886739962255042385">"LTE/WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"GSM 전용"</item>
     <item msgid="3817924849415716259">"GSM/WCDMA로 기본 설정"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"향상된 4G LTE 모드"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"LTE 서비스를 사용하여 음성 및 기타 통신을 개선할 수 있습니다(권장)."</string>
     <string name="data_enabled" msgid="5972538663568715366">"데이터 사용"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"모바일 네트워크에서 데이터 액세스 사용"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"데이터 사용 허용"</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="8913735676127858115">"데이터 로밍을 사용 중지한 상태에서 홈 네트워크를 벗어났으므로 데이터 연결이 끊어졌습니다."</string>
-    <string name="roaming_warning" msgid="7820963598559553967">"데이터 로밍을 허용하시겠습니까? 높은 로밍 요금이 부과될 수 있습니다."</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"많은 요금이 부과될 수 있습니다."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"데이터 로밍을 허용하시겠습니까?"</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>
@@ -190,7 +221,7 @@
     <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="throttle_help_subtext" msgid="3633091498168446044">"이동통신사의 이동통신망 데이터 사용 정책에 대한 자세한 정보"</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>
@@ -303,7 +334,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"데이터 서비스 설정"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"이동통신사 설정"</string>
     <string name="fdn" msgid="7878832555095183202">"발신 허용 번호"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"발신 허용 번호(<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FDN 목록"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"FDN 목록(<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FDN 활성화"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"발신 허용 번호 사용"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"발신 허용 번호 사용 중지됨"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"TTY 모드 설정"</string>
     <string name="auto_retry_mode_title" msgid="4073265511427813322">"자동으로 다시 시도"</string>
     <string name="auto_retry_mode_summary" msgid="4973886004067532288">"자동 다시 시도 모드 사용"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"화상 통화 중에는 TTY 모드 변경이 허용되지 않습니다."</string>
     <string name="menu_add" msgid="1882023737425114762">"연락처 추가"</string>
     <string name="menu_edit" msgid="7143003705504672374">"연락처 수정"</string>
     <string name="menu_delete" msgid="3977150783449642851">"연락처 삭제"</string>
@@ -344,7 +378,7 @@
     <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="1846161429087789936">"SIM 카드에서 주소록을 가져오려면 먼저 비행기 모드를 사용 중지하세요."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"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>
@@ -354,42 +388,40 @@
     <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="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="1796577128488773946">"비밀번호가 잘못되어 PIN이 차단되었습니다. PUK를 요청했습니다."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"SIM PIN 삭제"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"SIM PIN 설정"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"PIN 설정 중…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN 설정됨"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN이 삭제되었습니다."</string>
+    <string name="pin_failed" msgid="5644377896213584760">"잘못된 PIN입니다."</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN이 업데이트되었습니다."</string>
+    <string name="puk_requested" msgid="5921393215789090200">"비밀번호가 잘못되어 PIN이 차단되었으며 PUK를 요청했습니다."</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="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="1639666438836544393">"PIN2가 변경되었습니다."</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"PUK2 코드 입력"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"비밀번호가 잘못되어 PIN2가 차단되었습니다. PIN2를 변경한 후 다시 시도하세요."</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"비밀번호 틀림. SIM 잠겨 있음. PUK2 요청한 상태임."</string>
+    <string name="badPuk2" msgid="7910064009531541708">"PUK2가 잘못되었습니다. 다시 시도하세요."</string>
+    <string name="badPin2" msgid="6646896629970023109">"이전 PIN2가 잘못되었습니다. 다시 시도하세요."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2가 일치하지 않습니다. 다시 시도하세요."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"PIN2(4~8자리)를 입력합니다."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"PUK2(8자리)를 입력합니다."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2가 업데이트되었습니다."</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"PUK2 코드를 입력합니다."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"잘못된 비밀번호입니다. 이제 PIN2가 차단되었습니다. 다시 시도하려면 PIN2를 변경하세요."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"비밀번호가 잘못되어 SIM이 잠겼습니다. PUK2를 입력하세요."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2가 완전히 차단되었습니다."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"<xliff:g id="NUMBER">%d</xliff:g>번의 기회가 남았습니다."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2이 차단 해제되었습니다."</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"<xliff:g id="NUMBER">%d</xliff:g>번의 기회가 남았습니다."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 차단이 해제되었습니다."</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_redialing" msgid="8253487008234167266">"재다이얼 중"</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_dialing" msgid="2107666444937350731">"전화 거는 중"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"부재중 전화"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"부재중 통화"</string>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"전화를 걸려면 비행기 모드를 사용 중지하세요."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"전화를 걸려면 비행기 모드를 사용 중지하거나 무선 네트워크에 연결하세요."</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_error_out_of_service" msgid="4100065333878929223">"사용 가능한 이동통신망이 없습니다."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"모바일 네트워크를 사용할 수 없습니다. 전화를 걸려면 무선 네트워크에 연결하세요."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"전화를 걸려면 올바른 번호를 입력하세요."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"전화를 걸 수 없습니다."</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_unknown" msgid="655570339115407698">"지원되지 않는 서비스입니다."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"통화를 전환할 수 없습니다."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"통화를 분리할 수 없습니다."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"통화를 전환할 수 없습니다."</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="incall_error_supp_service_reject" msgid="8998568661508655638">"통화를 거절할 수 없습니다."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"통화를 끊을 수 없습니다."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"전화를 걸려면 무선 네트워크에 연결하세요."</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="7969515493359619960">"<xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g>은(는) 긴급 번호가 아니므로 전화를 걸지 못했습니다."</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"전화를 걸지 못했습니다. 비상 전화번호로 전화를 걸어 보세요."</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"서비스를 사용할 수 없습니다. 다시 시도 중..."</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"전화를 걸 수 없습니다. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g>은(는) 긴급 번호가 아닙니다."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"전화를 걸 수 없습니다. 긴급 번호를 사용하세요."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"키보드를 사용하여 전화걸기"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"대기"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"종료"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"보통"</item>
     <item msgid="2883365539347850535">"길게"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"네트워크 메시지"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"네트워크 메시지"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"오류 메시지"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"전화 활성화"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"전화 서비스를 활성화하려면 특수 통화를 해야 합니다. \n\n\'활성화\'를 누른 다음 지시사항을 듣고 전화를 활성화하세요."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"활성화 중..."</string>
@@ -469,8 +504,8 @@
     <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="3420314892609254729">"전화가 프로그래밍되는 동안 기다려 주세요."</string>
-    <string name="ota_failure" msgid="4311299546379674378">"프로그래밍 실패"</string>
+    <string name="ota_progress" msgid="460876637828044519">"휴대전화를 프로그래밍하는 중…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"휴대전화를 프로그래밍할 수 없습니다."</string>
     <string name="ota_successful" msgid="1880780692887077407">"전화가 이제 활성화되었습니다. 서비스가 시작하는 데 최대 15분이 걸릴 수 있습니다."</string>
     <string name="ota_unsuccessful" msgid="8072141612635635357">"전화가 활성화되지 않았습니다. \n신호가 잘 잡히는 지역(창 근처나 바깥)을 찾아야 할 수도 있습니다. \n\n다시 시도하거나 고객지원팀에 전화해서 다른 옵션에 대해 문의하세요."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"너무 많은 SPC 실패"</string>
@@ -481,18 +516,18 @@
     <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="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="2585506997024726599">"긴급 콜백 모드에서는 선택한 작업을 사용할 수 없습니다. 휴대전화가 <xliff:g id="COUNT">%s</xliff:g>분간 현재 모드를 유지합니다. 종료하시겠습니까?"</item>
-    <item quantity="other" msgid="6115622137771382224">"긴급 콜백 모드에서는 선택한 작업을 사용할 수 없습니다. 휴대전화가 <xliff:g id="COUNT">%s</xliff:g>분간 현재 모드를 유지합니다. 종료하시겠습니까?"</item>
-  </plurals>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g>분 동안 데이터 연결 없음</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g>분 동안 데이터 연결 없음</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other">휴대전화가 <xliff:g id="COUNT_1">%s</xliff:g>분 동안 긴급 콜백 모드로 전환됩니다. 긴급 콜백 모드에서는 데이터 연결을 이용하는 애플리케이션을 사용할 수 없습니다. 지금 종료하시겠습니까?</item>
+      <item quantity="one">휴대전화가 <xliff:g id="COUNT_0">%s</xliff:g>분 동안 긴급 콜백 모드로 전환됩니다. 긴급 콜백 모드에서는 데이터 연결을 이용하는 앱을 사용할 수 없습니다. 지금 종료하시겠습니까?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other">긴급 콜백 모드에서는 선택한 작업을 수행할 수 없습니다. 휴대전화가 <xliff:g id="COUNT_1">%s</xliff:g>분 동안 긴급 콜백 모드로 전환됩니다. 지금 종료하시겠습니까?</item>
+      <item quantity="one">긴급 콜백 모드에서는 선택한 작업을 수행할 수 없습니다. 휴대전화가 <xliff:g id="COUNT_0">%s</xliff:g>분 동안 긴급 콜백 모드로 전환됩니다. 지금 종료하시겠습니까?</item>
+    </plurals>
     <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>
@@ -506,110 +541,23 @@
     <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="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="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="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_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="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="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>
-    <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">"&lt;설정 안 됨&gt;"</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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"음성통화 지원되지 않음"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"빠른 응답"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"1"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"2"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"3"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"4"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"5"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"6"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"7"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"8"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"9"</string>
-    <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_dial_button" msgid="7459705245418435351">"전화걸기"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"백스페이스"</string>
-    <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_ringtone_title" msgid="2609519527849101590">"알림음"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"기본 알림음(<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</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="dial_pad_autocomplete" msgid="494525952035761075">"다이얼패드 자동완성"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"벨소리 및 진동"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"전화 걸 때 Wi-Fi를 사용하시겠습니까?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"예"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"아니요"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"내장된 SIM 카드"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"내장된 인터넷 전화"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"화상 통화 사용"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"화상 통화를 사용하려면 네트워크 설정에서 향상된 4G LTE 모드를 사용 설정해야 합니다."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"네트워크 설정"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"닫기"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"긴급 전화"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"긴급 전화 전용"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM 카드, 슬롯: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"접근성"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Wi-Fi 수신 전화"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi 통화"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"다시 터치하여 열기"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"메시지를 디코딩하는 중에 오류가 발생했습니다."</string>
 </resources>
diff --git a/res/values-ky-rKG/arrays.xml b/res/values-ky-rKG/arrays.xml
new file mode 100644
index 0000000..ebaa329
--- /dev/null
+++ b/res/values-ky-rKG/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Глобалдуу"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-ky-rKG/config.xml b/res/values-ky-rKG/config.xml
deleted file mode 100644
index 5aae117..0000000
--- a/res/values-ky-rKG/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"жалган"</string>
-</resources>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
new file mode 100644
index 0000000..41b6aec
--- /dev/null
+++ b/res/values-ky-rKG/strings.xml
@@ -0,0 +1,844 @@
+<?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="1107073389495104784">"Уюлдук дайындар"</string>
+    <!-- no translation found for phoneAppLabel (906161039445636857) -->
+    <skip />
+    <!-- no translation found for emergencyDialerIconLabel (7812140032168171053) -->
+    <skip />
+    <!-- no translation found for phoneIconLabel (2331230813161304895) -->
+    <skip />
+    <!-- no translation found for fdnListLabel (8630418672279521003) -->
+    <skip />
+    <!-- no translation found for unknown (6878797917991465859) -->
+    <skip />
+    <!-- no translation found for private_num (6713286113000232309) -->
+    <skip />
+    <string name="payphone" msgid="4793877574636445118">"Таксофон"</string>
+    <!-- no translation found for onHold (9035493194749959955) -->
+    <skip />
+    <!-- no translation found for mmiStarted (6347869857061147003) -->
+    <skip />
+    <!-- no translation found for ussdRunning (485588686340541690) -->
+    <skip />
+    <!-- no translation found for mmiCancelled (2771923949751842276) -->
+    <skip />
+    <!-- no translation found for cancel (5044513931633602634) -->
+    <skip />
+    <string name="enter_input" msgid="1810529547726803893">"USSD билдирүүсү <xliff:g id="MIN_LEN">%d</xliff:g> - <xliff:g id="MAX_LEN">%d</xliff:g> белгиден турушу керек. Сураныч, кайрадан аракеттениңиз."</string>
+    <string name="manageConferenceLabel" msgid="4691922394301969053">"Конференц-чалууну башкаруу"</string>
+    <!-- no translation found for ok (3811371167865772377) -->
+    <skip />
+    <!-- no translation found for audio_mode_speaker (27649582100085266) -->
+    <skip />
+    <!-- no translation found for audio_mode_earpiece (4156527186373869107) -->
+    <skip />
+    <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Зымдуу кулакчын"</string>
+    <!-- no translation found for audio_mode_bluetooth (3047641300848211128) -->
+    <skip />
+    <!-- no translation found for wait_prompt_str (7601815427707856238) -->
+    <skip />
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Тоналдык жөнөтүү болууда \n"</string>
+    <!-- no translation found for send_button (4106860097497818751) -->
+    <skip />
+    <!-- no translation found for pause_prompt_yes (3564467212025151797) -->
+    <skip />
+    <!-- no translation found for pause_prompt_no (6686238803236884877) -->
+    <skip />
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Атайын белгини муну менен алмаштыр"</string>
+    <!-- no translation found for no_vm_number (4164780423805688336) -->
+    <skip />
+    <!-- no translation found for no_vm_number_msg (1300729501030053828) -->
+    <skip />
+    <!-- no translation found for add_vm_number_str (4676479471644687453) -->
+    <skip />
+    <!-- no translation found for puk_unlocked (2284912838477558454) -->
+    <skip />
+    <!-- no translation found for label_ndp (780479633159517250) -->
+    <skip />
+    <!-- no translation found for sim_ndp_unlock_text (683628237760543009) -->
+    <skip />
+    <!-- no translation found for sim_ndp_dismiss_text (1604823375752456947) -->
+    <skip />
+    <!-- no translation found for requesting_unlock (6412629401033249351) -->
+    <skip />
+    <!-- no translation found for unlock_failed (6490531697031504225) -->
+    <skip />
+    <!-- no translation found for unlock_success (6770085622238180152) -->
+    <skip />
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Уюктук тармак жөндөөлөрү бул колдонуучу үчүн жеткиликтүү эмес"</string>
+    <!-- no translation found for labelGSMMore (5930842194056092106) -->
+    <skip />
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"GSM чалуунун жөндөөлөрү (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <!-- no translation found for labelCDMAMore (1630676740428229339) -->
+    <skip />
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"CDMA чалуунун жөндөөлөрү (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <!-- no translation found for apn_settings (9043423184895642077) -->
+    <skip />
+    <!-- no translation found for settings_label (3876743539816984008) -->
+    <skip />
+    <string name="phone_accounts" msgid="6376603393888116364">"Чалуучу каттоо эсептери"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Чалууларды төмөнкү менен жасоо"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"SIP чалууларын төмөнкү менен жасоо"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Биринчи сурасын"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Жөндөөлөр"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Каттоо эсептерин тандоо"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Телефон каттоо эсептери"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"SIP каттоо эсебин кошуу"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Каттоо эсеп жөндөөлөрүн конфигурациялоо"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi чалуу"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Wi-Fi чалуу колдонулбасын"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Чалуу жардамчысы колдонулбасын"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Эч нерсе жок"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Чалуу жардамчысы"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Чалуу жардамчысын колдонуу"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Чалуу жардамчысын тандоо"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Чалуулар үчүн колдонулган тармактарды башкаруу"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Чалуулар үчүн колдонулган тармактарды колдонмолор же кызматтар башкарышына уруксат берүү"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Конфигурациялоо"</string>
+    <string name="connection_service_default_label" msgid="1498481943805913754">"Кыналган туташуу кызматы"</string>
+    <!-- no translation found for voicemail (8693759337917898954) -->
+    <skip />
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Үн почтасы (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <!-- no translation found for voicemail_abbreviated (2215592488517217448) -->
+    <skip />
+    <!-- no translation found for networks (8873030692174541976) -->
+    <skip />
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Шашылыш таркатмалар"</string>
+    <!-- no translation found for call_settings (6112441768261754562) -->
+    <skip />
+    <!-- no translation found for additional_gsm_call_settings (1391795981938800617) -->
+    <skip />
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Кошумча жөндөөлөр (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <!-- no translation found for sum_gsm_call_settings (4076647190996778012) -->
+    <skip />
+    <!-- no translation found for additional_cdma_call_settings (8628958775721886909) -->
+    <skip />
+    <!-- no translation found for sum_cdma_call_settings (284753265979035549) -->
+    <skip />
+    <!-- no translation found for labelNwService (4699970172021870983) -->
+    <skip />
+    <!-- no translation found for labelCallerId (3888899447379069198) -->
+    <skip />
+    <string name="sum_loading_settings" msgid="1826692909391168620">"Тууралоолор жүктөлүүдө…"</string>
+    <!-- no translation found for sum_hide_caller_id (1071407020290873782) -->
+    <skip />
+    <!-- no translation found for sum_show_caller_id (6768534125447290401) -->
+    <skip />
+    <!-- no translation found for sum_default_caller_id (1954518825510901365) -->
+    <skip />
+    <!-- no translation found for labelCW (6120513814915920200) -->
+    <skip />
+    <!-- no translation found for sum_cw_enabled (8083061901633671397) -->
+    <skip />
+    <!-- no translation found for sum_cw_disabled (3648693907300104575) -->
+    <skip />
+    <!-- no translation found for call_forwarding_settings (3378927671091537173) -->
+    <skip />
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Чалууну багыттоо жөндөөлөрү (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <!-- no translation found for labelCF (2574386948026924737) -->
+    <skip />
+    <!-- no translation found for labelCFU (8147177368148660600) -->
+    <skip />
+    <!-- no translation found for messageCFU (3560082430662923687) -->
+    <skip />
+    <!-- no translation found for sum_cfu_enabled_indicator (4014187342724130197) -->
+    <skip />
+    <!-- no translation found for sum_cfu_enabled (2450052502198827927) -->
+    <skip />
+    <!-- no translation found for sum_cfu_enabled_no_number (6591985777096823616) -->
+    <skip />
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Өчүк"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Бош эмес болсо"</string>
+    <!-- no translation found for messageCFB (3711089705936187129) -->
+    <skip />
+    <!-- no translation found for sum_cfb_enabled (5984198104833116690) -->
+    <skip />
+    <string name="sum_cfb_disabled" msgid="4913145177320506827">"Өчүк"</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Сиздин операторуңуз, телефон бош эмес болгондо чалууну багыттоону токтотууну колдобойт."</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"Жооп бербей жатса"</string>
+    <!-- no translation found for messageCFNRy (672317899884380374) -->
+    <skip />
+    <!-- no translation found for sum_cfnry_enabled (6955775691317662910) -->
+    <skip />
+    <string name="sum_cfnry_disabled" msgid="3884684060443538097">"Өчүк"</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Сиздин операторуңуз, телефон жооп бербесе чалууну багыттоону токтотууну колдобойт."</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"Жеткиликтүү эмес болсо"</string>
+    <!-- no translation found for messageCFNRc (6380695421020295119) -->
+    <skip />
+    <!-- no translation found for sum_cfnrc_enabled (7010898346095497421) -->
+    <skip />
+    <!-- no translation found for sum_cfnrc_disabled (7222141261321276464) -->
+    <skip />
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Сиздин операторуңуз, телефон жеткиликсиз болгондо чалууну багыттоону токтотууну колдобойт."</string>
+    <!-- no translation found for updating_title (6146755386174019046) -->
+    <skip />
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"Чалуу жөндөөлөрүн алгачкы колдонуучу гана өзгөртө алат."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Чалуу жөндөөлөрү (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <!-- no translation found for error_updating_title (7970259216988931777) -->
+    <skip />
+    <!-- no translation found for reading_settings (1920291699287055284) -->
+    <skip />
+    <!-- no translation found for updating_settings (8171225533884883252) -->
+    <skip />
+    <!-- no translation found for reverting_settings (4752151682666912828) -->
+    <skip />
+    <!-- no translation found for response_error (6674110501330139405) -->
+    <skip />
+    <!-- no translation found for exception_error (7027667130619518211) -->
+    <skip />
+    <string name="fdn_check_failure" msgid="18200614306525434">"Сиздин телефонуңуздун Бекитилген Номурду Терүү колдонмосу жандырылган. Натыйжасында, чалууга байланыштуу айрым мүмкүнчүлүктөр иштебей турат."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"Бул тууралоолорду көрүш үчүн, алгач радиону иштетишиңиз керек."</string>
+    <!-- no translation found for close_dialog (2365884406356986917) -->
+    <skip />
+    <string name="enable" msgid="7248657275000173526">"Күйгүзүү"</string>
+    <string name="disable" msgid="4678348128118573672">"Өчүрүү"</string>
+    <!-- no translation found for change_num (239476305819844391) -->
+    <skip />
+    <!-- no translation found for clir_display_values:0 (5560134294467334594) -->
+    <!-- no translation found for clir_display_values:1 (7876195870037833661) -->
+    <!-- no translation found for clir_display_values:2 (1108394741608734023) -->
+    <!-- no translation found for vm_changed (380744030726254139) -->
+    <skip />
+    <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>
+    <!-- no translation found for no_change (3186040086622435212) -->
+    <skip />
+    <!-- no translation found for sum_voicemail_choose_provider (59911196126278922) -->
+    <skip />
+    <string name="voicemail_default" msgid="2001233554889016880">"Операторуңуз"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Уюктук тармак жөндөөлөрү"</string>
+    <!-- no translation found for label_available (1181658289009300430) -->
+    <skip />
+    <!-- no translation found for load_networks_progress (5230707536168902952) -->
+    <skip />
+    <!-- no translation found for empty_networks_list (4249426905018815316) -->
+    <skip />
+    <!-- no translation found for search_networks (1601136049300882441) -->
+    <skip />
+    <!-- no translation found for network_query_error (6828516148953325006) -->
+    <skip />
+    <!-- no translation found for register_on_network (9055203954040805084) -->
+    <skip />
+    <string name="not_allowed" msgid="5613353860205691579">"Сиздин SIM-картаңыз бул түйүнгө кошулганга жол бербейт."</string>
+    <string name="connect_later" msgid="2308119155752343975">"Бул түйүнгө азыр кошулуу мүмкүн эмес. Бир аздан соң кайра аракеттениңиз."</string>
+    <!-- no translation found for registration_done (495135664535876612) -->
+    <skip />
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Оператор тандоо"</string>
+    <!-- no translation found for sum_search_networks (2921092249873272715) -->
+    <skip />
+    <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="2336624679902659306">"Артыкчылыктуу желенин түрү"</string>
+    <!-- no translation found for preferred_network_mode_summary (1434820673166126609) -->
+    <skip />
+    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Артыкчылыктуу желенин түрү"</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 />
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Артыкчылыктуу желе тартиби: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Артыкчылыктуу желе тартиби: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Артыкчылыктуу желе тартиби: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Артыкчылыктуу желе тартиби: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Артыкчылыктуу желе тартиби: Глобалдуу"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Артыкчылыктуу желе тартиби: LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Жактырылган тармак режими: LTE / GSM / UMTS"</string>
+    <!-- no translation found for preferred_network_mode_lte_cdma_summary (3722647806454528426) -->
+    <skip />
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="7886739962255042385">"LTE / WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"Глобалдуу"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"EvDo гана"</item>
+    <item msgid="1508557726283094448">"CDMA EvDo\'суз"</item>
+    <item msgid="4341433122263841224">"CDMA/EvDo авто"</item>
+    <item msgid="5958053792390386668">"GSM/WCDMA авто"</item>
+    <item msgid="7913148405605373434">"WCDMA гана"</item>
+    <item msgid="1524224863879435516">"GSM гана"</item>
+    <item msgid="3817924849415716259">"GSM/WCDMA артыкчылыктуу"</item>
+  </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Жакшыртылган 4G LTE режими"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Үн жана башка байлнштрд жакшыртуу үчүн LTE кызматтарын пайдаланыңыз (сунушталат)"</string>
+    <!-- no translation found for data_enabled (5972538663568715366) -->
+    <skip />
+    <string name="data_enable_summary" msgid="2382798156640007971">"Дайындарды пайдаланууга уруксат берүү"</string>
+    <!-- no translation found for roaming (8871412572928323707) -->
+    <skip />
+    <!-- no translation found for roaming_enable (7331106985174381987) -->
+    <skip />
+    <!-- no translation found for roaming_disable (1843417228755568110) -->
+    <skip />
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Мобилдик берүү байланышын жоготтуңуз, анткени сиз мобилдик интернет роумингин иштетпестен, өзүңүздүн түйүнүңүздөн сырткары чыгып кеттиңиз."</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"Бир кыйла төлөмдөргө учурашыңыз мүмкүн."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Интернет-роумингге жол берилсинби?"</string>
+    <!-- no translation found for gsm_umts_options (6538311689850981686) -->
+    <skip />
+    <!-- no translation found for cdma_options (4016822858172249884) -->
+    <skip />
+    <!-- no translation found for throttle_data_usage (3715677828160555808) -->
+    <skip />
+    <!-- no translation found for throttle_current_usage (8762280193043815361) -->
+    <skip />
+    <!-- no translation found for throttle_time_frame (1915198770363734685) -->
+    <skip />
+    <!-- no translation found for throttle_rate (4710388992676803508) -->
+    <skip />
+    <!-- no translation found for throttle_help (243651091785169900) -->
+    <skip />
+    <!-- no translation found for throttle_status_subtext (1657318943142085170) -->
+    <skip />
+    <!-- no translation found for throttle_data_usage_subtext (6029276011123694701) -->
+    <skip />
+    <!-- no translation found for throttle_data_rate_reduced_subtext (7492763592720107737) -->
+    <skip />
+    <!-- no translation found for throttle_time_frame_subtext (7732763021560399960) -->
+    <skip />
+    <!-- no translation found for throttle_rate_subtext (2149102656120726855) -->
+    <skip />
+    <string name="throttle_help_subtext" msgid="3633091498168446044">"Операторуңуздун уюктук тармак дайындарын пайдалануу саясаты тууралуу көбүрөөк маалымат"</string>
+    <!-- no translation found for cell_broadcast_sms (5584192824053625842) -->
+    <skip />
+    <!-- no translation found for enable_disable_cell_bc_sms (4851147873691392255) -->
+    <skip />
+    <!-- no translation found for cell_bc_sms_enable (6441688565738921084) -->
+    <skip />
+    <!-- no translation found for cell_bc_sms_disable (3398365088309408749) -->
+    <skip />
+    <!-- no translation found for cb_sms_settings (651715019785107312) -->
+    <skip />
+    <!-- no translation found for enable_disable_emergency_broadcast (2157014609041245335) -->
+    <skip />
+    <!-- no translation found for emergency_broadcast_enable (2645980025414010211) -->
+    <skip />
+    <!-- no translation found for emergency_broadcast_disable (3665199821267569426) -->
+    <skip />
+    <!-- no translation found for enable_disable_administrative (6501582322182059412) -->
+    <skip />
+    <!-- no translation found for administrative_enable (1750086122962032235) -->
+    <skip />
+    <!-- no translation found for administrative_disable (8433273857248698539) -->
+    <skip />
+    <!-- no translation found for enable_disable_maintenance (1819693083025106678) -->
+    <skip />
+    <!-- no translation found for maintenance_enable (8566636458770971189) -->
+    <skip />
+    <!-- no translation found for maintenance_disable (7340189100885066077) -->
+    <skip />
+    <!-- no translation found for general_news_settings (4968779723948432978) -->
+    <skip />
+    <!-- no translation found for bf_news_settings (3935593091894685267) -->
+    <skip />
+    <!-- no translation found for sports_news_settings (7649399631270052835) -->
+    <skip />
+    <!-- no translation found for entertainment_news_settings (5051153952959405035) -->
+    <skip />
+    <!-- no translation found for enable_disable_local (7890281063123416120) -->
+    <skip />
+    <!-- no translation found for local_enable (6370463247609136359) -->
+    <skip />
+    <!-- no translation found for local_disable (4405691986943795798) -->
+    <skip />
+    <!-- no translation found for enable_disable_regional (4905652414535565872) -->
+    <skip />
+    <!-- no translation found for regional_enable (4434680415437834759) -->
+    <skip />
+    <!-- no translation found for regional_disable (5359325527213850077) -->
+    <skip />
+    <!-- no translation found for enable_disable_national (236278090206880734) -->
+    <skip />
+    <!-- no translation found for national_enable (1172443648912246952) -->
+    <skip />
+    <!-- no translation found for national_disable (326018148178601166) -->
+    <skip />
+    <!-- no translation found for enable_disable_international (7535348799604565592) -->
+    <skip />
+    <!-- no translation found for international_enable (5855356769925044927) -->
+    <skip />
+    <!-- no translation found for international_disable (2850648591041088931) -->
+    <skip />
+    <!-- no translation found for list_language_title (2841683501919760043) -->
+    <skip />
+    <!-- no translation found for list_language_summary (8109546531071241601) -->
+    <skip />
+    <!-- no translation found for list_language_entries:0 (6137851079727305485) -->
+    <!-- no translation found for list_language_entries:1 (1151988412809572526) -->
+    <!-- no translation found for list_language_entries:2 (577840534704312665) -->
+    <!-- no translation found for list_language_entries:3 (8385712091143148180) -->
+    <!-- no translation found for list_language_entries:4 (1858401628368130638) -->
+    <!-- no translation found for list_language_entries:5 (1933212028684529632) -->
+    <!-- no translation found for list_language_entries:6 (1908428006803639064) -->
+    <!-- no translation found for list_language_values:0 (1804908636436467150) -->
+    <!-- no translation found for list_language_values:1 (289708030346890334) -->
+    <!-- no translation found for list_language_values:2 (1121469729692402684) -->
+    <!-- no translation found for list_language_values:3 (2614093115912897722) -->
+    <!-- no translation found for list_language_values:4 (2411164639857960614) -->
+    <!-- no translation found for list_language_values:5 (5884448729274543324) -->
+    <!-- no translation found for list_language_values:6 (5511864807618312598) -->
+    <!-- no translation found for list_language_dtitle (5442908726538951934) -->
+    <skip />
+    <!-- no translation found for enable_disable_local_weather (986967454867219114) -->
+    <skip />
+    <!-- no translation found for local_weather_enable (6199315114382448922) -->
+    <skip />
+    <!-- no translation found for local_weather_disable (2510158089142626480) -->
+    <skip />
+    <!-- no translation found for enable_disable_atr (8339572391278872343) -->
+    <skip />
+    <!-- no translation found for atr_enable (5541757457789181799) -->
+    <skip />
+    <!-- no translation found for atr_disable (7085558154727596455) -->
+    <skip />
+    <!-- no translation found for enable_disable_lafs (668189073721277199) -->
+    <skip />
+    <!-- no translation found for lafs_enable (2791978667205137052) -->
+    <skip />
+    <!-- no translation found for lafs_disable (2391212397725495350) -->
+    <skip />
+    <!-- no translation found for enable_disable_restaurants (6240381945336814024) -->
+    <skip />
+    <!-- no translation found for restaurants_enable (5137657479469118847) -->
+    <skip />
+    <!-- no translation found for restaurants_disable (3678480270938424092) -->
+    <skip />
+    <!-- no translation found for enable_disable_lodgings (1822029172658551202) -->
+    <skip />
+    <!-- no translation found for lodgings_enable (3230042508992850322) -->
+    <skip />
+    <!-- no translation found for lodgings_disable (3387879742320682391) -->
+    <skip />
+    <!-- no translation found for enable_disable_retail_directory (1357809784475660303) -->
+    <skip />
+    <!-- no translation found for retail_directory_enable (3280626290436111496) -->
+    <skip />
+    <!-- no translation found for retail_directory_disable (6479739816662879027) -->
+    <skip />
+    <!-- no translation found for enable_disable_advertisements (5999495926176182128) -->
+    <skip />
+    <!-- no translation found for advertisements_enable (2050305021264683786) -->
+    <skip />
+    <!-- no translation found for advertisements_disable (8350985908788707935) -->
+    <skip />
+    <!-- no translation found for enable_disable_stock_quotes (6397810445293533603) -->
+    <skip />
+    <!-- no translation found for stock_quotes_enable (4384802470887170543) -->
+    <skip />
+    <!-- no translation found for stock_quotes_disable (4781450084565594998) -->
+    <skip />
+    <!-- no translation found for enable_disable_eo (4863043263443942494) -->
+    <skip />
+    <!-- no translation found for eo_enable (8623559062015685813) -->
+    <skip />
+    <!-- no translation found for eo_disable (3863812478090907609) -->
+    <skip />
+    <string name="enable_disable_mhh" msgid="908214593528968522">"Медициналык, Ден соолук жана Оорукана"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"Медициналык, Ден соолук жана Оорукана иштетилди"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"Медициналык, Ден соолук жана Оорукана токтотулду"</string>
+    <!-- no translation found for enable_disable_technology_news (3517184627114999149) -->
+    <skip />
+    <!-- no translation found for technology_news_enable (7995209394210455181) -->
+    <skip />
+    <!-- no translation found for technology_news_disable (5483490380561851946) -->
+    <skip />
+    <!-- no translation found for enable_disable_multi_category (626771003122899280) -->
+    <skip />
+    <!-- no translation found for multi_category_enable (1179299804641721768) -->
+    <skip />
+    <!-- no translation found for multi_category_disable (880104702904139505) -->
+    <skip />
+    <string name="network_lte" msgid="7702681952521375754">"LTE (сунушталат)"</string>
+    <string name="network_4G" msgid="2723512640529983138">"4G (сунушталат)"</string>
+    <string name="network_global" msgid="1323190488685355309">"Глобалдуу"</string>
+    <!-- no translation found for cdma_system_select_title (5757657769327732833) -->
+    <skip />
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"CDMA роуминг тартибин алмаштыруу"</string>
+    <!-- no translation found for cdma_system_select_dialogtitle (6083355415165359075) -->
+    <skip />
+    <!-- no translation found for cdma_system_select_choices:0 (176474317493999285) -->
+    <!-- no translation found for cdma_system_select_choices:1 (1205664026446156265) -->
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"CDMA жазылуу"</string>
+    <!-- no translation found for cdma_subscription_summary (2530890766115781140) -->
+    <skip />
+    <!-- no translation found for cdma_subscription_dialogtitle (2699527950523333110) -->
+    <skip />
+    <!-- no translation found for cdma_subscription_choices:0 (2258014151300708431) -->
+    <!-- no translation found for cdma_subscription_choices:1 (5127722015571873880) -->
+    <!-- no translation found for cdma_subscription_values:0 (7494167883478914080) -->
+    <!-- no translation found for cdma_subscription_values:1 (6043847456049107742) -->
+    <!-- no translation found for cdma_activate_device (3793805892364814518) -->
+    <skip />
+    <!-- no translation found for cdma_lte_data_service (4255018217292548962) -->
+    <skip />
+    <string name="carrier_settings_title" msgid="9028166176523012300">"Оператордун тууралоолору"</string>
+    <!-- no translation found for fdn (7878832555095183202) -->
+    <skip />
+    <string name="fdn_with_label" msgid="187084204115493366">"Туруктуу терүү номерлери (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <!-- no translation found for manage_fdn_list (8777755791892122369) -->
+    <skip />
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"FDN тизмеси (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <!-- no translation found for fdn_activation (2156479741307463576) -->
+    <skip />
+    <!-- no translation found for fdn_enabled (5238109009915521240) -->
+    <skip />
+    <!-- no translation found for fdn_disabled (4700049736675368279) -->
+    <skip />
+    <!-- no translation found for enable_fdn (3740191529180493851) -->
+    <skip />
+    <!-- no translation found for disable_fdn (7944020890722540616) -->
+    <skip />
+    <!-- no translation found for change_pin2 (2153563695382176676) -->
+    <skip />
+    <!-- no translation found for enable_fdn_ok (7215588870329688132) -->
+    <skip />
+    <!-- no translation found for disable_fdn_ok (5727046928930740173) -->
+    <skip />
+    <!-- no translation found for sum_fdn (1959399454900272878) -->
+    <skip />
+    <!-- no translation found for sum_fdn_change_pin (6666549734792827932) -->
+    <skip />
+    <!-- no translation found for sum_fdn_manage_list (8431088265332628316) -->
+    <skip />
+    <string name="voice_privacy" msgid="3776841382844614716">"Үн купуялуулугу"</string>
+    <!-- no translation found for voice_privacy_summary (3159383389833516214) -->
+    <skip />
+    <!-- no translation found for tty_mode_option_title (9033098925144434669) -->
+    <skip />
+    <!-- no translation found for tty_mode_option_summary (1073835131534808732) -->
+    <skip />
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"Авто-чалуу"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Авто-чалуу тартибин иштетүү"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"Видео чалуу учурунда Телетайп түзмөк режимин өзгөртүүгө уруксат жок"</string>
+    <!-- no translation found for menu_add (1882023737425114762) -->
+    <skip />
+    <!-- no translation found for menu_edit (7143003705504672374) -->
+    <skip />
+    <!-- no translation found for menu_delete (3977150783449642851) -->
+    <skip />
+    <string name="get_pin2" msgid="8204677063922225311">"PIN2 териңиз"</string>
+    <!-- no translation found for name (7329028332786872378) -->
+    <skip />
+    <!-- no translation found for number (7905950798349903858) -->
+    <skip />
+    <!-- no translation found for save (4094274636321939086) -->
+    <skip />
+    <!-- no translation found for add_fdn_contact (2481915899633353976) -->
+    <skip />
+    <!-- no translation found for adding_fdn_contact (7627379633721940991) -->
+    <skip />
+    <!-- no translation found for fdn_contact_added (7458335758501736665) -->
+    <skip />
+    <!-- no translation found for edit_fdn_contact (7976936035587081480) -->
+    <skip />
+    <!-- no translation found for updating_fdn_contact (8370929876849803600) -->
+    <skip />
+    <!-- no translation found for fdn_contact_updated (5497828782609005017) -->
+    <skip />
+    <!-- no translation found for delete_fdn_contact (6668958073074151717) -->
+    <skip />
+    <!-- no translation found for deleting_fdn_contact (5669163206349319969) -->
+    <skip />
+    <!-- no translation found for fdn_contact_deleted (7154162327112259569) -->
+    <skip />
+    <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="fdn_failed" msgid="540018079008319747">"БНТ иши кыйрады."</string>
+    <!-- no translation found for simContacts_emptyLoading (2203331234764498011) -->
+    <skip />
+    <!-- no translation found for simContacts_empty (5270660846489561932) -->
+    <skip />
+    <!-- no translation found for simContacts_title (1861472842524839921) -->
+    <skip />
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"SIM картадан байланыштарды импорттоо үчүн учак режимин өчүрүңүз."</string>
+    <!-- no translation found for enable_pin (5422767284133234860) -->
+    <skip />
+    <!-- no translation found for change_pin (9174186126330785343) -->
+    <skip />
+    <!-- no translation found for enter_pin_text (8532615714751931951) -->
+    <skip />
+    <!-- no translation found for oldPinLabel (5287773661246368314) -->
+    <skip />
+    <!-- no translation found for newPinLabel (207488227285336897) -->
+    <skip />
+    <!-- no translation found for confirmPinLabel (257597715098070206) -->
+    <skip />
+    <string name="badPin" msgid="8955102849303984935">"Сиз киргизген эски PIN-кодуңуз туура эмес. Кайра аракеттениңиз."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"Сиз терген PIN\'дер дал келишпейт. Кайра аракеттениңиз."</string>
+    <!-- no translation found for invalidPin (5981171102258684792) -->
+    <skip />
+    <string name="disable_sim_pin" msgid="3419351358300716472">"SIM PIN тазалоо"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"SIM PIN орнотуу"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"PIN орнотулууда…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN орнотулду"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN тазаланды"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN туура эмес"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN жаңыртылды"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Сырсөз туура эмес. PIN азыр бөгөттөлдү. PUK талап кылынат."</string>
+    <!-- no translation found for enter_pin2_text (8339444124477720345) -->
+    <skip />
+    <!-- no translation found for oldPin2Label (8559146795026261502) -->
+    <skip />
+    <!-- no translation found for newPin2Label (4573956902204349054) -->
+    <skip />
+    <!-- no translation found for confirmPin2Label (8100319484454787708) -->
+    <skip />
+    <string name="badPuk2" msgid="7910064009531541708">"PUK2 туура эмес. Кайра аракет кылыңыз."</string>
+    <string name="badPin2" msgid="6646896629970023109">"Эски PIN2 туура эмес. Кайра аракет кылыңыз."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2лер дал келбейт. Кайра аракет кылыңыз."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"4-8 сандан турган PIN2 киргизиңиз."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"8 сандан турган PUK2 киргизиңиз."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 жаңыртылды"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"PUK2 кодун киргизиңиз"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Сырсөз туура эмес. PIN2 азыр бөгөттөлдү. Кайра аракет кылып, PIN 2ни өзгөртүңүз."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Сырсөз туура эмес. SIM азыр кулпуланды. PUK2 киргизиңиз."</string>
+    <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 биротоло бөгөттөлдү."</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"Сизде <xliff:g id="NUMBER">%d</xliff:g> аракет калды."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"Мындан ары PIN2 бөгөттөлбөйт"</string>
+    <!-- no translation found for doneButton (2859593360997984240) -->
+    <skip />
+    <!-- no translation found for voicemail_settings_number_label (8524164258691887790) -->
+    <skip />
+    <!-- no translation found for card_title_dialing (5769417478498348054) -->
+    <skip />
+    <string name="card_title_redialing" msgid="8253487008234167266">"Кайра терүү"</string>
+    <!-- no translation found for card_title_conf_call (1162980346189744501) -->
+    <skip />
+    <!-- no translation found for card_title_incoming_call (7364539451234646909) -->
+    <skip />
+    <!-- no translation found for card_title_call_ended (5544730338889702298) -->
+    <skip />
+    <!-- no translation found for card_title_on_hold (821463117892339942) -->
+    <skip />
+    <!-- no translation found for card_title_hanging_up (3999101620995182450) -->
+    <skip />
+    <!-- no translation found for card_title_in_call (6346543933068225205) -->
+    <skip />
+    <string name="notification_dialing" msgid="2107666444937350731">"Терилүүдө"</string>
+    <!-- no translation found for notification_missedCallTitle (7554385905572364535) -->
+    <skip />
+    <!-- no translation found for notification_missedCallsTitle (1361677948941502522) -->
+    <skip />
+    <!-- no translation found for notification_missedCallsMsg (4575787816055205600) -->
+    <skip />
+    <!-- no translation found for notification_missedCallTicker (504686252427747209) -->
+    <skip />
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Учурдагы чалуу"</string>
+    <!-- no translation found for notification_on_hold (3480694969511790465) -->
+    <skip />
+    <!-- no translation found for notification_incoming_call (2820429205043529642) -->
+    <skip />
+    <!-- no translation found for notification_voicemail_title (8933468752045550523) -->
+    <skip />
+    <!-- no translation found for notification_voicemail_title_count (4366360747660929916) -->
+    <skip />
+    <!-- no translation found for notification_voicemail_text_format (4447323569453981685) -->
+    <skip />
+    <!-- no translation found for notification_voicemail_no_vm_number (760963466895609716) -->
+    <skip />
+    <!-- no translation found for notification_network_selection_title (4224455487793492772) -->
+    <skip />
+    <!-- no translation found for notification_network_selection_text (2607085729661923269) -->
+    <skip />
+    <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="2947938060513306698">"Чалуу үчүн учак режимин өчүрүңүз."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Чалуу үчүн учак режимин өчүрүңүз же зымсыз тармакка туташыңыз."</string>
+    <!-- no translation found for incall_error_emergency_only (4678640422710818317) -->
+    <skip />
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Уюктук тармак жеткиликтүү эмес."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Уюлдук тармак жеткиликтүү эмес. Чалуу үчүн зымсыз тармакка туташыңыз."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Чалуу үчүн, жарактуу номер киргизиңиз."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Чалынбай жатат."</string>
+    <!-- no translation found for incall_status_dialed_mmi (3672498861336189563) -->
+    <skip />
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Кызмат колдоого алынбайт"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Чалуулар которуштурулбай жатат."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Чалуу бөлүнбөй жатат."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Өткөрүлбөй жатат."</string>
+    <!-- no translation found for incall_error_supp_service_conference (2505727299596357312) -->
+    <skip />
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Чалуу четке кагылбай жатат."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Чалуу(лар) бошотулбай жатат."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Чалуу үчүн зымсыз тармакка туташыңыз."</string>
+    <!-- no translation found for emergency_enable_radio_dialog_title (4627849966634578257) -->
+    <skip />
+    <!-- no translation found for emergency_enable_radio_dialog_message (207613549344420291) -->
+    <skip />
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Кызмат жок. Кайра аракет кылууда…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Чалынбай жатат. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> өзгөчө кырдаал номери эмес."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Чалынбай жатат. Өзгөчө кырдаал номерин териңиз."</string>
+    <!-- no translation found for dialerKeyboardHintText (9192914825413747792) -->
+    <skip />
+    <!-- no translation found for onscreenHoldText (2285258239691145872) -->
+    <skip />
+    <!-- no translation found for onscreenEndCallText (4403855834875398585) -->
+    <skip />
+    <!-- no translation found for onscreenShowDialpadText (8561805492659639893) -->
+    <skip />
+    <!-- no translation found for onscreenMuteText (5011369181754261374) -->
+    <skip />
+    <!-- no translation found for onscreenAddCallText (5140385634712287403) -->
+    <skip />
+    <!-- no translation found for onscreenMergeCallsText (6640195098064538950) -->
+    <skip />
+    <!-- no translation found for onscreenSwapCallsText (1602990689244030047) -->
+    <skip />
+    <!-- no translation found for onscreenManageCallsText (5473231160123254154) -->
+    <skip />
+    <!-- no translation found for onscreenManageConferenceText (6485935856534311346) -->
+    <skip />
+    <!-- no translation found for onscreenAudioText (1710087112800041743) -->
+    <skip />
+    <string name="onscreenVideoCallText" msgid="4800924186056115442">"Видео чалуу"</string>
+    <!-- no translation found for importSimEntry (6614358325359736031) -->
+    <skip />
+    <!-- no translation found for importAllSimEntries (1503181169636198673) -->
+    <skip />
+    <!-- no translation found for importingSimContacts (7374056215462575769) -->
+    <skip />
+    <!-- no translation found for importToFDNfromContacts (2130620207013368580) -->
+    <skip />
+    <!-- no translation found for hac_mode_title (8740268574688743289) -->
+    <skip />
+    <!-- no translation found for hac_mode_summary (6833851160514929341) -->
+    <skip />
+    <!-- no translation found for tty_mode_entries:0 (512950011423868021) -->
+    <!-- no translation found for tty_mode_entries:1 (3971695875449640648) -->
+    <!-- no translation found for tty_mode_entries:2 (1937509904407445684) -->
+    <!-- no translation found for tty_mode_entries:3 (5644925873488772224) -->
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"DTMF сигналдары"</string>
+    <!-- no translation found for dtmf_tones_summary (3351820372864020331) -->
+    <skip />
+    <!-- no translation found for dtmf_tone_entries:0 (899650777817315681) -->
+    <!-- no translation found for dtmf_tone_entries:1 (2883365539347850535) -->
+    <string name="network_info_message" msgid="7738596060242881930">"Түйүн билдирүүсү"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Ката жөнүндө билдирүү"</string>
+    <!-- no translation found for ota_title_activate (8616918561356194398) -->
+    <skip />
+    <!-- no translation found for ota_touch_activate (6553212803262586244) -->
+    <skip />
+    <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Жандырылууда..."</string>
+    <string name="ota_hfa_activation_dialog_message" msgid="8092479227918463415">"Телефон сиздин мобилдик берүү кызматыңызды жандырууда.\n\nБул 5 мүнөткө чейин созулушу мүмкүн."</string>
+    <!-- no translation found for ota_skip_activation_dialog_title (2943366608272261306) -->
+    <skip />
+    <!-- no translation found for ota_skip_activation_dialog_message (2440770373498870550) -->
+    <skip />
+    <!-- no translation found for ota_skip_activation_dialog_skip_label (3458532775091563208) -->
+    <skip />
+    <!-- no translation found for ota_activate (1368528132525626264) -->
+    <skip />
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"Телефон жандырылды."</string>
+    <!-- no translation found for ota_title_problem_with_activation (7095824491970084367) -->
+    <skip />
+    <!-- no translation found for ota_listen (162923839877584937) -->
+    <skip />
+    <!-- no translation found for ota_speaker (6904589278542719647) -->
+    <skip />
+    <string name="ota_progress" msgid="460876637828044519">"Телефонуңуз программаланууда…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Телефонуңуз программаланбай койду"</string>
+    <!-- no translation found for ota_successful (1880780692887077407) -->
+    <skip />
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"Телефонуңуз жандырылган жок.\nБалким байланышты жакшыраак кармаган орун табышыңыз керек (терезенин жаны же эшикте).\n\nКайрадан аракет кылыңыз же көбүрөөк мүмкүнчүлүк алыш үчүн, кардарларды колдоо кызматына чалыңыз."</string>
+    <!-- no translation found for ota_spc_failure (3909983542575030796) -->
+    <skip />
+    <!-- no translation found for ota_call_end (4537279738134612388) -->
+    <skip />
+    <!-- no translation found for ota_try_again (7685477206465902290) -->
+    <skip />
+    <!-- no translation found for ota_next (3904945374358235910) -->
+    <skip />
+    <!-- no translation found for ecm_exit_dialog (4448531867763097533) -->
+    <skip />
+    <!-- no translation found for phone_entered_ecm_text (6266424252578731203) -->
+    <skip />
+    <!-- no translation found for phone_in_ecm_notification_title (3226896828951687085) -->
+    <skip />
+    <!-- no translation found for phone_in_ecm_call_notification_text (4611608947314729773) -->
+    <skip />
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> мүнөт бою маалыматтык туташуу болбойт</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> мүнөт бою маалыматтык туташуу болбойт</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other">Телефон Шашылыш кайра чалуу режиминде <xliff:g id="COUNT_1">%s</xliff:g> мүнөт бою болот. Бул режим күйүп турганда маалыматтык туташууну пайдаланган эч бир колдонмо иштетилбейт. Азыр чыгып кеткиңиз келеби?</item>
+      <item quantity="one">Телефон Шашылыш кайра чалуу режиминде <xliff:g id="COUNT_0">%s</xliff:g> мүнөт бою болот. Бул режим күйүп турганда маалыматтык туташууну пайдаланган эч бир колдонмо иштетилбейт. Азыр чыгып кеткиңиз келеби?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other">Тандалган аракет Шашылыш кайра чалуу режиминде жеткиликтүү эмес. Телефон бул режимде <xliff:g id="COUNT_1">%s</xliff:g> мүнөт бою болот. Азыр чыгып кеткиңиз келеби?</item>
+      <item quantity="one">Тандалган аракет Шашылыш кайра чалуу режиминде жеткиликтүү эмес. Телефон бул режимде <xliff:g id="COUNT_0">%s</xliff:g> мүнөт бою болот. Азыр чыгып кеткиңиз келеби?</item>
+    </plurals>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"Куткаруучуларга чалуу учурунда, бул тандалган аракет аткарылбайт."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Куткаруучулардын Кайра Чалуусу тартибинен чыгуу"</string>
+    <!-- no translation found for alert_dialog_yes (6674268047820703974) -->
+    <skip />
+    <!-- no translation found for alert_dialog_no (1476091437797628703) -->
+    <skip />
+    <!-- no translation found for alert_dialog_dismiss (2491494287075907171) -->
+    <skip />
+    <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>
+    <!-- no translation found for other_settings (3672912580359716394) -->
+    <skip />
+    <string name="calling_via_template" msgid="4839419581866928142">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> аркылуу чалуу"</string>
+    <!-- no translation found for contactPhoto (4713193418046639466) -->
+    <skip />
+    <!-- no translation found for goPrivate (865837794424530980) -->
+    <skip />
+    <!-- no translation found for selectContact (781975788478987237) -->
+    <skip />
+    <!-- no translation found for not_voice_capable (2739898841461577811) -->
+    <skip />
+    <!-- no translation found for description_dial_button (7459705245418435351) -->
+    <skip />
+    <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="2609519527849101590">"Үнү"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Рингтон жана Титирөө"</string>
+    <string name="pstn_connection_service_label" msgid="1743245930577325900">"Кыналган SIM карталар"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Видео чалууну күйгүзүү"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Видео чалууну күйгүзүү үчүн, тармак жөндөөлөрүнөн Жакшыртылган 4G LTE режимин иштетишиңиз керек."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Тармак жөндөөлөрү"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Жабуу"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Шашылыш чалуулар"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Шашылыш чалуу гана"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM-карта, оюкча: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Жеткиликтүүлүк"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Кирүүчү Wi-Fi чалуу"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi чалуу"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Ачуу үчүн кайра тийиңиз"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"Билдирүү дешифрленип жатканда ката кеткен."</string>
+</resources>
diff --git a/res/values-lo-rLA/arrays.xml b/res/values-lo-rLA/arrays.xml
new file mode 100644
index 0000000..2c6f119
--- /dev/null
+++ b/res/values-lo-rLA/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"ທົ່ວໂລກ"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-lo-rLA/config.xml b/res/values-lo-rLA/config.xml
deleted file mode 100644
index 6d3b239..0000000
--- a/res/values-lo-rLA/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"ບໍ່ຖືກຕ້ອງ"</string>
-</resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 8c37fe2..13c16c3 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -16,14 +16,14 @@
 
 <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="tablet" msgid="1107073389495104784">"ຂໍ້​ມູນ​ເຊວ​ລູ​ລາ"</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">"ລາຍຊື່ FDN"</string>
     <string name="unknown" msgid="6878797917991465859">"ບໍ່ຮູ້ຈັກ"</string>
     <string name="private_num" msgid="6713286113000232309">"ເບີສ່ວນໂຕ"</string>
-    <string name="payphone" msgid="1931775086311769314">"ໂທລະສັບສາທາລະນະ"</string>
+    <string name="payphone" msgid="4793877574636445118">"ຕູ້​ໂທ​ລະ​ສັບ​ສາ​ທາ​ລະ​ນະ"</string>
     <string name="onHold" msgid="9035493194749959955">"ພັກສາຍຊົ່ວຄາວ"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"ເລີ່ມລະຫັດ MMI ແລ້ວ"</string>
     <string name="ussdRunning" msgid="485588686340541690">"ກຳລັງແລ່ນລະຫັດ USSD..."</string>
@@ -52,18 +52,41 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"ກຳລັງຮ້ອງຂໍການປົດລັອກເຄືອຂ່າຍ..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"ຄຳຂໍການປົດລັອກເຄືອຂ່າຍບໍ່ສຳເລັດ."</string>
     <string name="unlock_success" msgid="6770085622238180152">"ການປົດລັອກເຄືອຂ່າຍບໍ່ສຳເລັດ."</string>
-    <string name="mobile_network_settings_not_available" msgid="7355254462995117896">"​ການ​ຕັ້ງ​ຄ່າ​ເຄືອ​ຂ່າຍ​ມ​ື​ຖືບໍ່​ສາ​ມາດ​ໃຊ້​ໄດ້​ກັບ​ຜູ່​ໃຊ້​ນີ້"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"​ການ​ຕັ້ງ​ຄ່າ​ເຄືອ​ຂ່າຍ​ມ​ື​ຖືບໍ່​ສາ​ມາດ​ໃຊ້​ໄດ້​ກັບ​ຜູ່​ໃຊ້​ນີ້"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"ການຕັ້ງຄ່າການໂທ GSM"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"ການ​ຕັ້ງ​ຄ່າ GSM (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"ການຕັ້ງຄ່າໂທ CDMA"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"ການ​ຕັ້ງ​ຄ່າ CDMA (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"ຊື່ຂອງຈຸດການເຂົ້າເຖິງ (APN)"</string>
     <string name="settings_label" msgid="3876743539816984008">"ການຕັ້ງຄ່າເຄືອຂ່າຍ"</string>
-    <string name="connection_service" msgid="978745922583410219">"ບໍ​ລິ​ການ​ການ​ເຊື່ອມ​ຕໍ່​ເພື່ອ​ໃຊ້"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"ບັນ​ຊີ​ໂທ"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"ໂທ​ດ້ວຍ"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"ໂທ SIP ດ້ວຍ"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"​ຖາມ​ກ່ອນ"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"ການ​ຕັ້ງ​ຄ່າ"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"ເລືອກ​ບັນ​ຊີ"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"ບັນ​ຊີ​ໂທລະ​ສັບ"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"ເພີ່ມ​ບັນ​ຊີ SIP"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"ຕັ້ງ​​ການ​ຕັ້ງ​ຄ່າ​ບັນ​ຊີ"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"ການ​ໂທ Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"ຢ່າໃຊ້ການ​ໂທ​ດ້ວຍ Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"ຢ່າ​ໃຊ້​ຕົວ​ຊ່ວຍ​ການ​ໂທ"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"ບໍ່ມີ"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"ຕົວ​ຊ່ວຍ​ການ​ໂທ"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"ໃຊ້​ຕົວ​ຊ່ວຍ​ການ​ໂທ"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"ເລືອກ​ຕົວ​ຊ່ວຍ​ການ​ໂທ"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"ຈັດ​ການ​ເຄືອ​ຂ່າຍ​ທີ່​ໃຊ້​ສຳ​ລັບ​ສາຍ​ໂທ​ກັບ"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"ໃຫ້​ແອັບ ຫຼື​ການ​ບໍ​ລິ​ການ​ຈັດ​ການ​ເຄືອ​ຂ່າຍ​ທີ່​ໃຊ້​ສຳ​ລັບ​ການ​ໂທ"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"ຕັ້ງຄ່າ"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"ບໍ​ລິ​ການ​ການ​ເຊື່ອມ​ຕໍ່​ທີ່​ມີ​ມາ​ນຳ"</string>
     <string name="voicemail" msgid="8693759337917898954">"ຂໍ້ຄວາມສຽງ"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"ຂໍ້​ຄວາມ​ສຽງ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM​:"</string>
     <string name="networks" msgid="8873030692174541976">"ຜູ່ໃຫ້ບໍລິການເຄືອຂ່າຍ"</string>
-    <string name="call_settings" msgid="1630474923393095156">"​ການ​ຕັ້ງ​ຄ່າ​ການ​ໂທ"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"​ການ​ອອກອາກາດ​ສຸກ​ເສີນ"</string>
+    <string name="call_settings" msgid="6112441768261754562">"ການຕັ້ງຄ່າການໂທ"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"ການຕັ້ງຄ່າເພີ່ມເຕີມ"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"ການ​ຕັ້ງ​ຄ່າ​ເພີ່ມ​ເຕີມ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
@@ -77,29 +100,32 @@
     <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="call_forwarding_settings_with_label" msgid="8569489414006897127">"ການ​ຕັ້ງ​ຄ່າ​ການ​ໂອນ​ສາຍ​ໂທ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="sum_cfu_disabled" msgid="8384177689501334080">"ປິດ"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"ເມື່ອ​ບໍ່​ຫວ່າງ"</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="sum_cfb_disabled" msgid="4913145177320506827">"ປິດ"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"ຜູ່ໃຫ້ບໍລິການຂອງທ່ານ ບໍ່ຮອງຮັບການປິດການໂອນສາຍ ເມື່ອໂທລະສັບຂອງທ່ານສາຍບໍ່ຫວ່າງ."</string>
-    <string name="labelCFNRy" msgid="3646316323834351390">"ສົ່ງຕໍ່ສາຍເມື່ອບໍ່ມີຄົນຮັບ"</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"ເມື່ອ​ບໍ່​ມີ​ຜູ້​ຮັບ​ສາຍ"</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="sum_cfnry_disabled" msgid="3884684060443538097">"ປິດ"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"ຜູ່ໃຫ້ບໍລິການຂອງທ່ານ ບໍ່ຮອງຮັບການປິດການໂອນສາຍ ເມື່ອໂທລະສັບຂອງທ່ານບໍ່ມີຜູ່ຮັບສາຍ."</string>
-    <string name="labelCFNRc" msgid="47183615370850000">"ໂອນສາຍເມື່ອຕິດຕໍ່ບໍ່ໄດ້"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"ເມື່ອ​ບໍ່​ສາ​ມາດ​ຕິດ​ຕໍ່ໄດ້"</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="sum_cfnrc_disabled" msgid="7222141261321276464">"ປິດການນຳໃຊ້ແລ້ວ"</string>
     <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"ຜູ່ໃຫ້ບໍລິການຂອງທ່ານ ບໍ່ຮອງຮັບການປິດການໂອນສາຍ ເມື່ອໂທລະສັບຂອງທ່ານບໍ່ມີສັນຍານ."</string>
     <string name="updating_title" msgid="6146755386174019046">"ການຕັ້ງຄ່າການໂທ"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"ມີ​ແຕ່​ຜູ້​ໃຊ້​ຕົ້ນ​ຕໍ​ເທົ່າ​ນັ້ນ​ທີ່​ສາ​ມາດ​ປ່ຽນການ​ຕັ້ງ​ຄ່າ​ການ​ໂທ​ໄດ້."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"ການ​ຕັ້ງ​ຄ່າ​ການ​ໂທ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"ການຕັ້ງຄ່າການໂທຜິດພາດ"</string>
     <string name="reading_settings" msgid="1920291699287055284">"ກຳລັງອ່ານການຕັ້ງຄ່າ..."</string>
     <string name="updating_settings" msgid="8171225533884883252">"ກຳລັງອັບເດດການຕັ້ງຄ່າ..."</string>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"ເປີດ​"</string>
+    <string name="disable" msgid="4678348128118573672">"ປິດ"</string>
     <string name="change_num" msgid="239476305819844391">"ອັບເດດ"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"ເຄືອຂ່າຍເລີ່ມຕົ້ນ"</item>
@@ -123,8 +149,8 @@
     <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="voicemail_default" msgid="2001233554889016880">"ຜູ້​ໃຫ້​ບໍ​ລິ​ການ​ຂອງ​ທ່ານ"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"ການ​ຕັ້ງ​ຄ່າ​ເຄືອ​ຂ່າຍ​ມື​ຖື"</string>
     <string name="label_available" msgid="1181658289009300430">"ເຄືອຂ່າຍທີ່ມີ"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"ກຳລັງຊອກຫາ..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"ບໍ່ພົບເຄືອຂ່າຍ."</string>
@@ -138,7 +164,7 @@
     <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="register_automatically" msgid="6017849844573519637">"ກຳລັງລົງທະບຽນອັດຕະໂນມັດ..."</string>
     <string name="preferred_network_mode_title" msgid="2336624679902659306">"ປະ​ເພດ​ເຄືອ​ຂ່າຍທີ່ຕ້ອງການ"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"ປ່ຽນຮູບແບບປະຕິບັດການຂອງເຄືອຂ່າຍ"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"ປະ​ເພດ​ເຄືອ​ຂ່າຍທີ່ຕ້ອງການ"</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"ຮູບແບບເຄືອຂ່າຍທີ່ຕ້ອງການ: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"ຮູບແບບເຄືອຂ່າຍທີ່ຕ້ອງການ: ທົ່ວໂລກ"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"ຮູບແບບເຄືອຂ່າຍທີ່ຕ້ອງການ: LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"ໂໝດ​ເຄືອ​ຂ່າຍ​ທີ່​ເລືອກ: LTE / GSM / UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"ຮູບແບບເຄືອຂ່າຍທີ່ຕ້ອງການ: LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="7886739962255042385">"LTE / WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"GSM ເທົ່ານັ້ນ"</item>
     <item msgid="3817924849415716259">"ຕ້ອງການ GSM/WCDMA"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"ໂໝດ Enhanced 4G LTE"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"ໃຊ້​ການ​ບໍ​ລິ​ການ LTE ເພື່ອ​ປັບ​ປຸງ​ສຽງ ແລະ​ການ​ບໍ​ລິ​ການ​ອື່ນໆ (ແນະ​ນຳ)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"ເປີດໃຊ້ເດຕາ"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"ເປີດໃຊ້ການເຂົ້າເຖິງຂໍ້ມູນຜ່ານເຄືອຂ່າຍມືຖື"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"​ອະ​ນຸ​ຍາດ​ໃຫ້​ໃຊ້​ຂໍ້​ມູນ"</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="8913735676127858115">"ທ່ານໄດ້ຖືກຕັດການເຊື່ອມຕໍ່ຂໍ້ມູນ ເນື່ອງຈາກທ່ານອອກຈາກເຄືອຂ່າຍພາຍໃນ ໂດຍທີ່ປິດການໂຣມມິງໄວ້."</string>
-    <string name="roaming_warning" msgid="7820963598559553967">"ອະນຸຍາດໃຫ້ໂຣມມິງຂໍ້ມູນໄດ້? ທ່ານອາດຖືກຮຽກເກັບຄ່າໂຣມມິງທີ່ແພງຫຼາຍ!"</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"ທ່ານ​ອາດ​ຈະ​ເສຍ​ຄ່າ​ໃຊ້​ຈ່າຍ​ຫຼາຍ."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"ອະນຸຍາດໃຫ້ໂຣມມິງຂໍ້ມູນບໍ?"</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>
@@ -190,7 +221,7 @@
     <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="throttle_help_subtext" msgid="3633091498168446044">"ຂໍ້ມູນ​ເພີ່ມເຕີມກ່ຽວກັບ​ນະໂຍບາຍການ​ໃຊ້​ຂໍ້ມູນເຄືອຂ່າຍມືຖື​ຂອງຜູ່ໃຫ້​ບໍລິການ​ຂອງທ່ານ"</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>
@@ -303,7 +334,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"ຕັ້ງຄ່າບໍລິການຂໍ້ມູນ"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"ການຕັ້ງຄ່າຜູ່ໃຫ້ບໍລິການ"</string>
     <string name="fdn" msgid="7878832555095183202">"ໝາຍເລກຈຳກັດການໂທອອກ"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"ເບີ​ໂທ​ອອກ​ທີ່​ກຳ​ນົດ​ໄວ້ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"ລາຍ​ຊື່ FDN"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"ລາຍ​ຊື່ FDN (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"ການເປີດໃຊ້ FDN"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"ເປີດໃຊ້ໝາຍເລກຈຳກັດການໂທອອກແລ້ວ."</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"ປິດການໃຊ້ໝາຍເລກຈຳກັດການໂທອອກແລ້ວ"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"ຕັ້ງຮູບ​ແບບ TTY"</string>
     <string name="auto_retry_mode_title" msgid="4073265511427813322">"ລອງໃໝ່ອັດຕະໂນມັດ"</string>
     <string name="auto_retry_mode_summary" msgid="4973886004067532288">"ເປີດໃຊ້ການລອງໃໝ່ອັດຕະໂນມັດ"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"ບໍ່​ອະ​ນຸ​ຍາດ​ໃຫ້​ປ່ຽນ​ໂໝດ TTY ຢູ່​ໃນ​ລະ​ຫວ່າງ​ການ​ໂທວິ​ດີ​ໂອ"</string>
     <string name="menu_add" msgid="1882023737425114762">"ເພີ່ມລາຍຊື່ຜູ່ຕິດຕໍ່"</string>
     <string name="menu_edit" msgid="7143003705504672374">"ແກ້ໄຂລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
     <string name="menu_delete" msgid="3977150783449642851">"ລຶບລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
@@ -344,7 +378,7 @@
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"ກຳລັງອ່ານຈາກ SIM card..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"ບໍ່ມີລາຍຊື່ຜູ່ຕິດຕໍ່ໃນ SIM card ຂອງທ່ານ."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"ເລືອກລາຍຊື່ເພື່ອນຳເຂົ້າ"</string>
-    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"ເພື່ອນຳລາຍຊື່ຜູ່ຕິດຕໍ່ເຂົ້າມາຈາກ SIM card,​ ກະລຸນາປິດການໃຊ້ໂໝດຢູ່ເທິງຍົນກ່ອນ."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"ປິດໂໝດເຄື່ອງບິນເພື່ອນໍາເຂົ້າລາຍຊື່ຈາກແຜ່ນ 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>
@@ -354,42 +388,40 @@
     <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="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="1796577128488773946">"ລະ​ຫັດ​ຜ່ານ​ບໍ່​ຖືກ​ຕ້ອງ​, PIN ຖືກບລັອກ! ຕ້ອງໃຊ້ລະຫັດ PUK​​."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"ລຶບ SIM PIN"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"ຕັ້ງ SIM PIN"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"ກຳ​ລັງ​ຕັ້ງ PIN…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"ຕັ້ງ PIN ແລ້ວ"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"ລຶບ PIN ແລ້ວ"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN ​ບໍ່​ຖືກ​ຕ້ອງ"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"ອັບ​ເດດ PIN ແລ້ວ"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"ລະ​ຫັດ​ຜ່ານ​ບໍ່​ຖືກ​ຕ້ອງ. PIN ຖືກ​ລັອກ​ແລ້ວ​ດຽວ​ນີ້. ຂໍ PUK ແລ້ວ."</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="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="1639666438836544393">"ປ່ຽນລະຫັດ PIN2 ສຳເລັດແລ້ວ."</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"ພິມລະຫັດ PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"ລະ​ຫັດ​ຜ່ານ​ບໍ່​ຖືກ​ຕ້ອງ​, PIN2 ຖືກບລັອກ. ກະ​ລຸ​ນາ​​ປ່ຽນ​ PIN2 ແລະລອງໃໝ່ອີກ!"</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"ລະຫັດຜ່ານບໍ່ຖືກຕ້ອງ, SIM ຖືກລັອກ. ຕ້ອງໃຊ້ລະຫັດ PUK2."</string>
+    <string name="badPuk2" msgid="7910064009531541708">"PUK2 ບໍ່​ຖືກ​ຕ້ອງ. ລອງ​ໃໝ່​ອີກ."</string>
+    <string name="badPin2" msgid="6646896629970023109">"PIN2 ເກົ່າ​ບໍ່​ຖືກ​ຕ້ອງ. ລອງ​ໃໝ່​ອີກ."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2 ບໍ່​ກົງ​ກັນ. ລອງ​ໃໝ່​ອີກ."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"ປ້ອນ PIN2 ທີ່​ມີ 4 ຫາ 8 ຕົວ​ເລກ​ເຂົ້າ​ໄປ."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"ປ້ອນ PUK2 ທີ່​ມີ 8 ຕົວ​ເລກ​ເຂົ້າ​ໄປ."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"ອັບ​ເດດ PIN2 ແລ້ວ"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"ປ້ອນ​ລະ​ຫັດ PUK2 ເຂົ້າ​ໄປ"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"ລະ​ຫັດ​ຜ່ານ​ບໍ່​ຖືກ​ຕ້ອງ. PIN2 ຖືກບ​ລັອກ​ແລ້ວ​ດຽວ​ນີ້. ລອງ​ໃໝ່​ອີກ, ປ່ຽນ PIN 2."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"ລະ​ຫັດ​ຜ່ານ​ບໍ່​ຖືກ​ຕ້ອງ​. SIM ຖືກ​ລັອກ​ແລ້ວ​ດຽວ​ນີ້​. ປ້ອນ PUK2 ເຂົ້າ​ໄປ​."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 ຖືກບລັອກຢ່າງຖາວອນແລ້ວ."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"ທ່ານສາມາດລອງໄດ້ອີກ <xliff:g id="NUMBER">%d</xliff:g> ເທື່ອ."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 ຖືກປົດບລັອກແລ້ວ!"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"ທ່ານ​ຍັງ​ພະ​ຍາ​ຍາມ​ໄດ້​ອີກ <xliff:g id="NUMBER">%d</xliff:g> ຄັ້ງ."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 ບໍ່​ຖືກ​ບ​ລັອກ​ອີກ"</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_redialing" msgid="8253487008234167266">"ກຳ​ລັງ​ໂທ​ຄືນ"</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_dialing" msgid="2107666444937350731">"ກຳລັງໂທ"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"ສາຍທີ່ບໍ່ໄດ້ຮັບ"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"ສາຍທີ່ບໍ່ໄດ້ຮັບ"</string>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"ປິດໂໝດເຄື່ອງບິນເພື່ອເຮັດການໂທ."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"ປິດໂໝດເຄື່ອງບິນ ຫຼືເຊື່ອມຕໍ່ກັບເຄືອຂ່າຍໄຮ້ສາຍເພື່ອເຮັດການໂທ."</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_error_out_of_service" msgid="4100065333878929223">"ບໍ່​ມີ​ເຄືອ​ຂ່າຍ​ມື​ຖື​ທີ່​ສາ​ມາດ​ໃຊ້​ໄດ້."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"ເຄືອຂ່າຍເຊລລູລາບໍ່ພ້ອມໃຊ້ງານ. ໃຫ້ເຊື່ອມຕໍ່ກັບເຄືອຂ່າຍໄຮ້ສາຍເພື່ອເຮັດການໂທ."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"ເພື່ອ​ທີ່​ຈະ​ໂທ, ປ້ອນ​ເບີ​ໂທ​ທີ່​ໃຊ້​ໄດ້​ເຂົ້າ​ໄປ."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"ບໍ່​ສາ​ມາດ​ໂທ​ໄດ້."</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_unknown" msgid="655570339115407698">"ການ​ບໍ​ລິ​ການ​ບໍ່​ຮອງ​ຮັບ"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"ບໍ່​ສາ​ມາດ​ສະ​ຫຼັບ​ສາ​ຍ​ໂທ​ໄດ້."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"ບໍ່​ສາ​ມາດ​ແຍກ​ສາຍ​ໂທ​ໄດ້."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"ບໍ່​ສາ​ມາດ​ໂອນ​ໄດ້."</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="incall_error_supp_service_reject" msgid="8998568661508655638">"ບໍ່​ສາ​ມາດ​ປະ​ຕິ​ເສດ​ສາຍ​ໂທ​ໄດ້."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"ບໍ່​ສາ​ມາດ​ປ່ອຍ​ສາຍ​ໂທ​ໄດ້."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"ເຊື່ອມຕໍ່ກັບເຄືອຂ່າຍໄຮ້ສາຍເພື່ອເຮັດການໂທ."</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="7969515493359619960">"ບໍ່ໄດ້ໂທອອກເທື່ອ. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ບໍ່ແມ່ນໝາຍເລກສຸກເສີນ!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"ບໍ່ໄດ້ໂທອອກ. ກົດຫາໝາຍເລກສຸກເສີນ!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"ບໍ່​ມີ​ການ​ບໍ​ລິ​ການ. ກຳ​ລັງ​ລອງ​ໃໝ່​ອີກ…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"ບໍ່​ສາ​ມາດ​ໂທ​ໄດ້. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ບໍ່​ແມ່ນ​ເບີ​ໂທ​ສຸກ​ເສີນ."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"ບໍ່​ສາ​ມາດ​ໂທ​ໄດ້. ກົດ​ເບີ​ໂທ​ສຸກ​ເສີນ."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"ໃຊ້ແປ້ນພິມເພື່ອກົດໂທ"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"ພັກສາຍຊົ່ວຄາວ"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"ວາງສາຍ"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"ປົກກະຕິ"</item>
     <item msgid="2883365539347850535">"ຍາວ"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"ຂໍ້ຄວາມເຄືອຂ່າຍ"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"ຂໍ້ຄວາມເຄືອຂ່າຍ"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"ຂໍ້​ຄວາມ​ຂັດ​ຂ້ອງ"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"ເປີດນຳໃຊ້ໂທລະສັບຂອງທ່ານ"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"ຕ້ອງໃຊ້ການໂທພິເສດ ເພື່ອເປີດນຳໃຊ້ບໍລິການໂທລະສັບຂອງທ່ານ. \n\nຫຼັງຈາກກົດປຸ່ມ “ເປີດນຳໃຊ້” ແລ້ວ, ໃຫ້ຟັງຄຳແນະນຳທີ່ລະບຸເພື່ອເປີດນຳໃຊ້ໂທລະສັບຂອງທ່ານ."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"ກຳລັງເປີດນຳໃຊ້..."</string>
@@ -469,8 +504,8 @@
     <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="3420314892609254729">"ລໍຖ້າຂະນະທີ່ໂທລະສັບຂອງທ່ານ ກຳລັງຖືກຕັ້ງໂປຣແກຣມ."</string>
-    <string name="ota_failure" msgid="4311299546379674378">"ການຕັ້ງໂປຣແກຣມບໍ່ສຳເລັດ"</string>
+    <string name="ota_progress" msgid="460876637828044519">"ກຳ​ລັງ​ຕັ້ງ​ໂປ​ຣ​ແກ​ຣມ​ໂທ​ລະ​ສັບ​ຂອງ​ທ່ານ…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"ບໍ່​ສາ​ມາດດ​ຕັ້ງ​ໂປ​ຣ​ແກ​ຣມ​ໂທ​ລະ​ສັບ​ຂອງ​ທ່ານ​ໄດ້"</string>
     <string name="ota_successful" msgid="1880780692887077407">"ຕອນນີ້ໂທລະສັບຂອງທ່ານຖືກເປີດນຳໃຊ້ແລ້ວ. ມັນອາດໃຊ້ເວລາເຖິງ 15 ນາທີເພື່ອໃຫ້ບໍລິການຕ່າງໆ ເລີ່ມເຮັດວຽກໄດ້."</string>
     <string name="ota_unsuccessful" msgid="8072141612635635357">"ໂທລະສັບຂອງທ່ານຍັງບໍ່ໄດ້ເປີດນຳໃຊ້ເທື່ອ. \nທ່ານອາດຕ້ອງຊອກຫາບ່ອນທີ່ມີສັນຍານດີກວ່າ (ເຊັ່ນ: ໃກ້ປ່ອງຢ້ຽມ ຫຼືຢູ່ນອກຕຶກອາຄານ). \n\nລອງໃໝ່ອີກຄັ້ງ ຫຼືໂທຫາສູນບໍລິການສຳລັບທາງເລືອກເພີ່ມເຕີມ."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"SPC ສ່ວນເກີນລົ້ມເຫລວ"</string>
@@ -481,18 +516,18 @@
     <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="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="2585506997024726599">"ການດຳເນີນການທີ່ເລືອກ ບໍ່ສາມາດໃຊ້ໄດ້ໃນຂະນະທີ່ຢູ່ໃນໂໝດໂທກັບສຸກເສີນ. ໂທລະສັບຈະຢູ່ໃນໂໝດນີ້ອີກ <xliff:g id="COUNT">%s</xliff:g> ນາທີ. ທ່ານຕ້ອງການອອກດຽວນີ້ບໍ່?"</item>
-    <item quantity="other" msgid="6115622137771382224">"ການດຳເນີນການທີ່ເລືອກ ບໍ່ສາມາດໃຊ້ໄດ້ໃນຂະນະທີ່ຢູ່ໃນໂໝດໂທກັບສຸກເສີນ. ໂທລະສັບຈະຢູ່ໃນໂໝດນີ້ອີກ <xliff:g id="COUNT">%s</xliff:g> ນາທີ. ທ່ານຕ້ອງການອອກດຽວນີ້ບໍ່?"</item>
-  </plurals>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other"> <xliff:g id="COUNT_1">%s</xliff:g> ນາ​ທີ</item>
+      <item quantity="one">ບໍ່​ມີ​ການ​ເຊື່ອມ​ຕໍ່​ຂໍ້​ມູນ​ເປັນ​ເວ​ລາ <xliff:g id="COUNT_0">%s</xliff:g> ນາ​ທີ</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other">ໂທ​ລະ​ສັບ​ຈະ​ຢູ່​ໃນ​ໂໝດ​ການ​ໂທ​​ສຸກ​ເສີນ​ເປັນ​ເວ​ລາ <xliff:g id="COUNT_1">%s</xliff:g> ນາ​ທີ. ໃນ​ຂະ​ນະ​ທີ່​ຢູ່​ໃນ​ໂໝດ​ນີ້ ບໍ່​ມີ​ແອພ​ພ​ລິ​ເຄ​ຊັນທີ່​ໃຊ້​ການ​ເຊື່ອມ​ຕໍ່​ຂໍ້​ມູນ​ທີ່​ສາ​ມາດ​ໃຊ້​ໄດ້. ທ່ານ​ຕ້ອງ​ການ​ອອກ​ດຽວ​ນີ້​ບໍ?</item>
+      <item quantity="one">ໂທ​ລະ​ສັບ​ຈະ​ຢູ່​ໃນ​ໂໝດ​ການ​ໂທ​​ສຸກ​ເສີນ​ເປັນ​ເວ​ລາ <xliff:g id="COUNT_0">%s</xliff:g> ນາ​ທີ. ໃນ​ຂະ​ນະ​ທີ່​ຢູ່​ໃນ​ໂໝດ​ນີ້ ບໍ່​ມີ​ແອັບ​ທີ່​ໃຊ້​ການ​ເຊື່ອມ​ຕໍ່​ຂໍ້​ມູນ​ທີ່​ສາ​ມາດ​ໃຊ້​ໄດ້. ທ່ານ​ຕ້ອງ​ການ​ອອກ​ດຽວ​ນີ້​ບໍ?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other">. ໂທ​ລະ​ສັບ​ຈະ​ຢູ່​ໃນ​ໂໝດ​ນີ້​ເປັນ​ເວ​ລາ <xliff:g id="COUNT_1">%s</xliff:g> ນາ​ທີ. ທ່ານ​ຕ້ອງ​ການ​ອອກ​ດຽວ​ນີ້​ບໍ?</item>
+      <item quantity="one">ການດຳເນີນການທີ່ເລືອກໄວ້ ບໍ່ສາມາດໃຊ້ໄດ້ໃນຂະນະທີ່ຢູ່ໃນການໂທສຸກເສີນ. ໂທ​ລະ​ສັບ​ຈະ​ຢູ່​ໃນ​ໂໝດ​ນີ້​ເປັນ​ເວ​ລາ <xliff:g id="COUNT_0">%s</xliff:g> ນາ​ທີ. ທ່ານ​ຕ້ອງ​ການ​ອອກ​ດຽວ​ນີ້​ບໍ?</item>
+    </plurals>
     <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>
@@ -506,110 +541,23 @@
     <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="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="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="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_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="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="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>
-    <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">"ທີ່ຢູ່ Proxy ຂາອອກ"</string>
-    <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="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">"&lt;ບໍ່ໄດ້ຕັ້ງເທື່ອ&gt;"</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="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="7877142631803238549">"ເພື່ອໂທຜ່ານອິນເຕີເນັດ, ໃຫ້ກວດສອບການເຊື່ອມຕໍ່ອິນເຕີເນັດຂອງທ່ານກ່ອນ."</string>
-    <string name="no_wifi_available" msgid="1225073547318465713">"ທ່ານຕ້ອງເຊື່ອມຕໍ່ກັບເຄືອຂ່າຍ Wi-Fi ເພື່ອໃຊ້ການໂທຜ່ານອິນເຕີເນັດ (ໄປທີ່ເມນູ ລະບົບໄຮ້ສາຍ &amp; ການຕັ້ງຄ່າເຄືອຂ່າຍ)"</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_setting_title" msgid="3754000371039709383">"ຕອບກັບດ່ວນ"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></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="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_ringtone_title" msgid="2609519527849101590">"ສຽງ"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"ສຽງເລີ່ມຕົ້ນ (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</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="dial_pad_autocomplete" msgid="494525952035761075">"Dial pad autocomplete"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"ຣິງໂທນ &amp; ການສັ່ນເຕືອນ"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"ໃຊ້ Wi-Fi ເພື່ອ​ໂທ​ບໍ?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"ແມ່ນແລ້ວ"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"ບໍ່​"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"SIM ກາດ​ທີ່​ມາ​ກັບ​ເຄື່ອງ"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"ການ​ໂທ​ຜ່ານ​ອິນ​ເຕີ​ເນັດ​​ທີ່​ມາ​ກັບ​ເຄື່ອງ"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"​ເປີດ​ການ​ໂທ​ດ້ວຍ​ວິ​ດີ​ໂອ"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"ເພື່ອ​ເປີດ​ການ​ໂທວິ​ດີ​ໂອ, ທ່ານ​ຕ້ອງ​ເປີດ​ໃຊ້​ງານ​ໂໝດ Enhanced 4G LTE​ ຢູ່​ໃນ​ການ​ຕັ້ງ​ຄ່າ​ເຄືອ​ຂ່າຍ."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"ການ​ຕັ້ງ​ຄ່າ​ເຄືອ​ຂ່າຍ"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"ປິດ"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"​ການ​ໂທ​ສຸກ​ເສີນ"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"ການ​ໂທ​ສຸກ​ເສີນ​ເທົ່າ​ນັ້ນ"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"ແຜ່ນ SIM, ຊ່ອງ: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"​ການ​ຊ່ວຍ​ເຂົ້າ​ເຖິງ"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"ສາຍໂທເຂົ້າ Wi-Fi"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"ການ​ໂທ Wi-Fi"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"​ແຕະ​ອີກ​ເທື່ອ​ນຶ່ງ​ເພື່ອ​ເປີດ"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"ມີຂໍ້ຜິດພາດໃນລະຫວ່າງຖອດລະຫັດຂໍ້ຄວາມດັ່ງກ່າວ."</string>
 </resources>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
new file mode 100644
index 0000000..0d1591f
--- /dev/null
+++ b/res/values-lt/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Pasaulinis"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-lt/config.xml b/res/values-lt/config.xml
deleted file mode 100644
index 9110e08..0000000
--- a/res/values-lt/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"netiesa"</string>
-</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 9df1bba..6cb7487 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -16,14 +16,14 @@
 
 <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">"Duomenys mobiliesiems"</string>
+    <string name="phoneAppLabel" product="tablet" msgid="1107073389495104784">"Korinio ryšio duomenys"</string>
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Telefonas"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Pagalbos numerio rinkiklis"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Telefonas"</string>
     <string name="fdnListLabel" msgid="8630418672279521003">"FDN sąrašas"</string>
     <string name="unknown" msgid="6878797917991465859">"Nežinomas"</string>
     <string name="private_num" msgid="6713286113000232309">"Privatus numeris"</string>
-    <string name="payphone" msgid="1931775086311769314">"Mokamas telefonas"</string>
+    <string name="payphone" msgid="4793877574636445118">"Taksofonas"</string>
     <string name="onHold" msgid="9035493194749959955">"Sulaikyta"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Paleistas MMI kodas"</string>
     <string name="ussdRunning" msgid="485588686340541690">"Paleistas USSD kodas..."</string>
@@ -52,18 +52,41 @@
     <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="mobile_network_settings_not_available" msgid="7355254462995117896">"Mobiliojo ryšio tinklo nustatymai nepasiekiami šiam naudotojui"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Korinio tinklo nustatymai nepasiekiami šiam naudotojui"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM skambinimo nustatymai"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"GSM skambučių nustatymai (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA skambučio nustatymai"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"CDMA skambučių nustatymai (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Prieigos taškų pavadinimai"</string>
     <string name="settings_label" msgid="3876743539816984008">"Tinklo nustatymai"</string>
-    <string name="connection_service" msgid="978745922583410219">"Ryšio paslauga, kuri bus naudojama"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Skambinimo paskyros"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Skambinti naudojant"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Atlikti SIP skambučius naudojant"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Pirmiausia paklausti"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Nustatymai"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Pasirinkti paskyras"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Telefono paskyros"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Pridėti SIP paskyrą"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Paskyros nustatymų konfigūravimas"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"„Wi-Fi“ skambinimas"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Nenaudoti „Wi-Fi“ skambinimo"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Nenaudoti skambučių pagelbiklio"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Nėra"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Skambučių pagelbiklis"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Naudoti skambučių pagelbiklį"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Pasirinkti skambučių pagelbiklį"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Tvarkyti tinklus, naudojamus skambučiams atlikti"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Leisti programoms ar paslaugoms tvarkyti skambučiams naudojamus tinklus"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Konfigūruoti"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Įtaisytosios ryšio paslaugos"</string>
     <string name="voicemail" msgid="8693759337917898954">"Balso paštas"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Balso paštas (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"BP:"</string>
     <string name="networks" msgid="8873030692174541976">"Tinklo operatoriai"</string>
-    <string name="call_settings" msgid="1630474923393095156">"Skambučių nustatymai"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Avarinės transliacijos"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Skambinimo nustatymai"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Papildomi nustatymai"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Papildomi nustatymai (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Papildomi tik GSM skambinimo nustatymai"</string>
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Papildomi CDMA skambučio nustatymai"</string>
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Papildomi tik CDMA nustatymai"</string>
@@ -74,32 +97,35 @@
     <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>
     <string name="labelCW" msgid="6120513814915920200">"Laukiantis skambutis"</string>
-    <string name="sum_cw_enabled" msgid="8083061901633671397">"Skambučio metu praneškite man apie įeinančius skambučius"</string>
-    <string name="sum_cw_disabled" msgid="3648693907300104575">"Skambučio metu praneškite man apie įeinančius skambučius"</string>
+    <string name="sum_cw_enabled" msgid="8083061901633671397">"Skambučio metu praneškite man apie gaunamuosius skambučius"</string>
+    <string name="sum_cw_disabled" msgid="3648693907300104575">"Skambučio metu praneškite man apie gaunamuosius skambučius"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Skambučio peradresavimo nustatymai"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Skambučių peradresavimo nustatymai (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Skambučio peradresavimas"</string>
-    <string name="labelCFU" msgid="8147177368148660600">"Visada persiųsti"</string>
+    <string name="labelCFU" msgid="8147177368148660600">"Visada peradresuoti"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Visada naudoti šį numerį"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Peradresuojami visi skambučiai"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Visi skambučiai peradresuojami į <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Numeris negalimas"</string>
-    <string name="sum_cfu_disabled" msgid="3698472522160364904">"Išjungta"</string>
-    <string name="labelCFB" msgid="218938523102207587">"Persiųsti, kai užimta"</string>
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Išjungta"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Kai užimta"</string>
     <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="sum_cfb_disabled" msgid="4913145177320506827">"Išjungta"</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="labelCFNRy" msgid="1736067178393744351">"Kai neatsako"</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="sum_cfnry_disabled" msgid="3884684060443538097">"Išjungta"</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="labelCFNRc" msgid="2614827454402079766">"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="5646361343094064333">"Operatorius nepalaiko skambučių peradresavimo išjungimo, kai telefonas nepasiekiamas."</string>
     <string name="updating_title" msgid="6146755386174019046">"Skambinimo nustatymai"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"Skambučių nustatymus gali keisti tik pagrindinis naudotojas."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Skambučių nustatymai (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Skambinimo nustatymų klaida"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Skaitomi nustatymai..."</string>
     <string name="updating_settings" msgid="8171225533884883252">"Atnaujinami nustatymai..."</string>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"Įjungti"</string>
+    <string name="disable" msgid="4678348128118573672">"Išjungti"</string>
     <string name="change_num" msgid="239476305819844391">"Naujinimas"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Numatytieji tinklo nustatymai"</item>
@@ -123,8 +149,8 @@
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Nepavyko pateikti ir išsaugoti dabartinio peradresavimo numerio nustatymų.\nVis 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>
-    <string name="voicemail_default" msgid="5902099213882352338">"Mano operatorius"</string>
-    <string name="mobile_networks" msgid="5540397602919106177">"Mobilaus tinklo nustatymai"</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"Jūsų operatorius"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Korinio tinklo nustatymai"</string>
     <string name="label_available" msgid="1181658289009300430">"Galimi tinklai"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Ieškoma…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Nerasta tinklų."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Pageidaujamas tinklo režimas: CDMA ir LTE / EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Pageidaujamas tinklo režimas: pasaulinis"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Pageidaujamas tinklo režimas: LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Pageidautinas tinklo režimas: LTE / GSM / UMTS"</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="7886739962255042385">"LTE / WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"Tik GSM"</item>
     <item msgid="3817924849415716259">"Pageidaujama GSM / WCDMA"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Patobulintas 4G LTE režimas"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Naudoti LTE paslaugas „Voice“ ir kitiems ryšiams patobulinti (rekomenduojama)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Duomenys įgalinti"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Įgalinti duomenų prieigą mobiliajame tinkle"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Leisti naudoti duomenis"</string>
     <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="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="roaming_warning" msgid="1603164667540144353">"Galite būti apmokestinti dideliais mokesčiais."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Leisti tarptinklinį duomenų ryšį?"</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>
@@ -190,7 +221,7 @@
     <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"Viršytas <xliff:g id="USED_0">%1$s</xliff:g> maksimumas\nDuomenų perdavimo sparta sumažinta iki <xliff:g id="USED_1">%2$d</xliff:g> Kb / sek."</string>
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"Praėjo <xliff:g id="USED_0">%1$d</xliff:g>٪ ciklo\nKitas 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="throttle_help_subtext" msgid="3633091498168446044">"Daugiau informacijos apie operatoriaus korinio tinklo duomenų naudojimo politiką"</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>
@@ -303,7 +334,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Nustatyti duomenų paslaugą"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Operatoriaus nustatymai"</string>
     <string name="fdn" msgid="7878832555095183202">"Fiksuoto rinkimo numeriai"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Fiksuotojo rinkimo numeriai (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FDN sąrašas"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"Fiksuotojo rinkimo numerių sąrašas (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FDN aktyvinimas"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Įgalinti fiksuoto rinkimo numeriai"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Fiksuoto rinkimo numeriai išjungti"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Nustatyti TTY 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="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"Vykstant vaizdo skambučiui negalima keisti TTY režimo"</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>
@@ -344,7 +378,7 @@
     <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="1846161429087789936">"Jei norite importuoti kontaktus iš SIM kortelės, pirmiausia išjunkite lėktuvo režimą."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Išjunkite lėktuvo režimą, kad galėtumėte importuoti kontaktus iš SIM kortelės."</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>
@@ -354,42 +388,40 @@
     <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="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="1796577128488773946">"Slaptažodis netinkamas, PIN kodas užblokuotas. Būtina įvesti PUK kodą."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"Išvalyti SIM PIN kodą"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"Nustatyti SIM PIN kodą"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"Nustatomas PIN kodas…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN kodas nustatytas"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN kodas išvalytas"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"Netinkamas PIN kodas"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN kodas atnaujintas"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Netinkamas slaptažodis. PIN kodas užblokuotas. Reikia įvesti PUK kodą."</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="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="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="3674058967950559397">"Netinkamas slaptažodis, PIN2 kodas užblokuotas. Pakeiskite PIN2 kodą ir bandykite iš naujo."</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"Slaptažodis neteisingas, todėl SIM kortelė užrakinta. Būtina įvesti PUK2 kodą."</string>
+    <string name="badPuk2" msgid="7910064009531541708">"PUK2 kodas netinkamas. Bandykite dar kartą."</string>
+    <string name="badPin2" msgid="6646896629970023109">"Senas PIN2 kodas netinkamas. Bandykite dar kartą."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2 kodai neatitinka. Bandykite dar kartą."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Įveskite 4–8 skaitmenų PIN2 kodą."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Įveskite 8 skaitmenų PUK2 kodą."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 kodas atnaujintas"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Įveskite PUK2 kodą"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Netinkamas slaptažodis. PIN2 kodas užblokuotas. Jei norite bandyti dar kartą, pakeiskite PIN2 kodą."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Netinkamas slaptažodis. SIM kortelė užrakinta. Įveskite PUK2 kodą."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 kodas visam laikui užblokuotas."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Liko <xliff:g id="NUMBER">%d</xliff:g> band."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 kodas atblokuotas."</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"Liko <xliff:g id="NUMBER">%d</xliff:g> bandym."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 kodas atblokuotas"</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="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_redialing" msgid="8253487008234167266">"Numeris renkamas pakartotinai"</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_incoming_call" msgid="7364539451234646909">"Gaunamasis 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>
     <string name="card_title_in_call" msgid="6346543933068225205">"Skambinant"</string>
-    <string name="card_title_my_phone_number" msgid="112428362494434191">"Mano numeris: <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Renkamas numeris"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Praleistas skambutis"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Praleisti skambučiai"</string>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"Išjunkite lėktuvo režimą, kad galėtumėte skambinti."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Išjunkite lėktuvo režimą arba prisijunkite prie belaidžio ryšio tinklo, kad galėtumėte skambinti."</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_error_out_of_service" msgid="4100065333878929223">"Korinis tinklas nepasiekiamas"</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Mobiliojo ryšio tinklas nepasiekiamas. Prisijunkite prie belaidžio ryšio tinklo, kad galėtumėte skambinti."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Kad galėtumėte paskambinti, įveskite tinkamą numerį."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Nepavyko paskambinti."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Paleidžiama MMI 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>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Neįmanoma perkelti skambučio."</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Paslauga nepalaikoma"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Nepavyko perjungti skambučių."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Nepavyko atskirti skambučio."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Nepavyko peradresuoti."</string>
     <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Neįmanoma atlikti konferencinių skambučių."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Neįmanoma atmesti skambučio."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Neleisti atšaukti skambučių."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Skambutis internetu"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Nepavyko atmesti skambučio."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Nepavyko atjungti skamb."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Prisijunkite prie belaidžio ryšio tinklo, kad galėtumėte skambinti."</string>
     <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="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="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Nėra ryšio. Bandoma dar kartą…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Nepavyko paskambinti. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nėra pagalbos numeris."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Nepavyko paskambinti. Surinkite pagalbos numerį."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Naudokite klaviatūrą ir rinkite numerius"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Sulaikyti"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Pabaiga"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"Įprastas"</item>
     <item msgid="2883365539347850535">"Ilgas"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Tinklo pranešimas"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Tinklo pranešimas"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Klaidos 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\nPaspaudę „Aktyvinti“ klausykite pateikiamų telefono aktyvinimo instrukcijų."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Aktyvinama..."</string>
@@ -469,8 +504,8 @@
     <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_speaker" msgid="6904589278542719647">"Garsiakalbis"</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_progress" msgid="460876637828044519">"Programuojamas telefonas…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Nepavyko suprogramuoti telefono"</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="8072141612635635357">"Telefonas nebuvo suaktyvintas. \nGalbūt reikia rasti vietą, kurioje ryšys veikia geriau (prie lango arba lauke). \n\nBandykite 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>
@@ -481,18 +516,24 @@
     <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>
     <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Duomenų ryšys išjungtas"</string>
-  <plurals name="phone_in_ecm_notification_time">
-    <item quantity="one" msgid="4866221796252472622">"Jokio duomenų ryšio <xliff:g id="COUNT">%s</xliff:g> min."</item>
-    <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="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="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>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="one">Jokio duomenų ryšio <xliff:g id="COUNT_1">%s</xliff:g> minutę</item>
+      <item quantity="few">Jokio duomenų ryšio <xliff:g id="COUNT_1">%s</xliff:g> minutes</item>
+      <item quantity="many">Jokio duomenų ryšio <xliff:g id="COUNT_1">%s</xliff:g> minutės</item>
+      <item quantity="other">Jokio duomenų ryšio <xliff:g id="COUNT_1">%s</xliff:g> minučių</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="one">Telefonas veiks pagalbos tarnybos atskambinimo režimu <xliff:g id="COUNT_1">%s</xliff:g> minutę. Įgalinus šį režimą negalima naudoti jokių programų, kurioms reikalingas duomenų ryšys. Norite dabar išeiti iš šio režimo?</item>
+      <item quantity="few">Telefonas veiks pagalbos tarnybos atskambinimo režimu <xliff:g id="COUNT_1">%s</xliff:g> minutes. Įgalinus šį režimą negalima naudoti jokių programų, kurioms reikalingas duomenų ryšys. Norite dabar išeiti iš šio režimo?</item>
+      <item quantity="many">Telefonas veiks pagalbos tarnybos atskambinimo režimu <xliff:g id="COUNT_1">%s</xliff:g> minutės. Įgalinus šį režimą negalima naudoti jokių programų, kurioms reikalingas duomenų ryšys. Norite dabar išeiti iš šio režimo?</item>
+      <item quantity="other">Telefonas veiks pagalbos tarnybos atskambinimo režimu <xliff:g id="COUNT_1">%s</xliff:g> minučių. Įgalinus šį režimą negalima naudoti jokių programų, kurioms reikalingas duomenų ryšys. Norite dabar išeiti iš šio režimo?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="one">Įgalinus pagalbos tarnybos atskambinimo režimą pasirinkto veiksmo atlikti negalima. Telefonas veiks pagalbos tarnybos atskambinimo režimu <xliff:g id="COUNT_1">%s</xliff:g> minutę. Norite dabar išeiti iš šio režimo?</item>
+      <item quantity="few">Įgalinus pagalbos tarnybos atskambinimo režimą pasirinkto veiksmo atlikti negalima. Telefonas veiks pagalbos tarnybos atskambinimo režimu <xliff:g id="COUNT_1">%s</xliff:g> minutes. Norite dabar išeiti iš šio režimo?</item>
+      <item quantity="many">Įgalinus pagalbos tarnybos atskambinimo režimą pasirinkto veiksmo atlikti negalima. Telefonas veiks pagalbos tarnybos atskambinimo režimu <xliff:g id="COUNT_1">%s</xliff:g> minutės. Norite dabar išeiti iš šio režimo?</item>
+      <item quantity="other">Įgalinus pagalbos tarnybos atskambinimo režimą pasirinkto veiksmo atlikti negalima. Telefonas veiks pagalbos tarnybos atskambinimo režimu <xliff:g id="COUNT_1">%s</xliff:g> minučių. Norite dabar išeiti iš šio režimo?</item>
+    </plurals>
     <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>
@@ -506,110 +547,23 @@
     <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_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_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="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="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="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="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_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="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="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>
-    <string name="username_title" msgid="2479375923477682328">"Naudotojo vardas"</string>
-    <string name="password_title" msgid="3323555249068171531">"Slaptažodis"</string>
-    <string name="display_name_title" msgid="2459768196312249937">"Pateikti vardą"</string>
-    <string name="proxy_address_title" msgid="4828301345351614273">"Išsiuntimo tarpinio serverio adresas"</string>
-    <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="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>
-    <string name="auth_username_title" msgid="851473016307947120">"Tapatumo nustatymo naudotojo vardas"</string>
-    <string name="auth_username_summary" msgid="6782012405225938629">"Tapatumui nustatyti naudotas naudotojo vardas"</string>
-    <string name="default_preference_summary" msgid="868766740121667450">"&lt;Nenustatyta&gt;"</string>
-    <string name="display_name_summary" msgid="8636377460518225523">"&lt;Kaip naudotojo vardas&gt;"</string>
-    <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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"Skambinimas balsu nepalaikomas"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Greiti atsakai"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"vienas"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"du"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"trys"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"keturi"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"penki"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"šeši"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"septyni"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"aštuoni"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"devyni"</string>
-    <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_dial_button" msgid="7459705245418435351">"rinkti numerį"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"naikinimo klavišas"</string>
-    <string name="description_target_answer" msgid="7205604197797472471">"Atsakyti"</string>
-    <string name="description_target_send_sms" msgid="2098326025587950144">"Siųsti SMS pranešimą"</string>
-    <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="2609519527849101590">"Garsas"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Numatytasis garsas (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <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="dial_pad_autocomplete" msgid="494525952035761075">"Skambinimo skydelio automatinis užbaig."</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Skambėjimo tonas ir vibracija"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Skambinti naudojant „Wi-Fi“?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Taip"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"Ne"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Įtaisytosios SIM kortelės"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Įtaisytoji skambučių internetu paslauga"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Įjungti vaizdo skambutį"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Kad įjungtumėte vaizdo skambutį, tinklo nustatymuose turite įgalinti patobulintą 4G LTE režimą."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Tinklo nustatymai"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Uždaryti"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Skambučiai pagalbos numeriu"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Tik skambučiai pagalbos numeriu"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM kortelė, lizdas: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Pritaikymas neįgaliesiems"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Gaunamasis „Wi-Fi“ skamb."</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"„Wi-Fi“ skambutis"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Palieskite dar kartą, kad atidarytumėte"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"Iškoduojant pranešimą įvyko klaida."</string>
 </resources>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
new file mode 100644
index 0000000..b5ca70c
--- /dev/null
+++ b/res/values-lv/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Globāls"</item>
+    <item msgid="6753774959494729275">"LTE/CDMA"</item>
+    <item msgid="8658695584186942227">"LTE/GSM/UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-lv/config.xml b/res/values-lv/config.xml
deleted file mode 100644
index 1ed951f..0000000
--- a/res/values-lv/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"nepatiesi"</string>
-</resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 57895f8..ee80b25 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -16,14 +16,14 @@
 
 <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">"Mobilo ierīču dati"</string>
+    <string name="phoneAppLabel" product="tablet" msgid="1107073389495104784">"Mobilie dati"</string>
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Tālrunis"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Ārkārtas numuru sastādītājs"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Tālrunis"</string>
     <string name="fdnListLabel" msgid="8630418672279521003">"FNSN saraksts"</string>
     <string name="unknown" msgid="6878797917991465859">"Nezināms"</string>
     <string name="private_num" msgid="6713286113000232309">"Privāts numurs"</string>
-    <string name="payphone" msgid="1931775086311769314">"Taksofons"</string>
+    <string name="payphone" msgid="4793877574636445118">"Maksas tālrunis"</string>
     <string name="onHold" msgid="9035493194749959955">"Aizturēts"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI kods ir startēts."</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD kods darbojas…"</string>
@@ -52,18 +52,41 @@
     <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="mobile_network_settings_not_available" msgid="7355254462995117896">"Mobilā tīkla iestatījumi šim lietotājam nav pieejami."</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Mobilā tīkla iestatījumi šim lietotājam nav pieejami."</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM zvanu iestatījumi"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"GSM zvanu iestatījumi (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA zvanu iestatījumi"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"CDMA zvanu iestatījumi (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Piekļuves punktu nosaukumi"</string>
     <string name="settings_label" msgid="3876743539816984008">"Tīkla iestatījumi"</string>
-    <string name="connection_service" msgid="978745922583410219">"Izmantojamais savienojuma izveides pakalpojums"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Zvanu konti"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Zvaniem izmantot..."</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"SIP zvaniem izmantot..."</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Vispirms jautāt"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Iestatījumi"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Izvēlieties kontus"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Tālruņa konti"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Pievienot SIP kontu"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Konta iestatījumu konfigurēšana"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi zvani"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Neizmantot Wi-Fi zvanus"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Neizmantot zvanu palīgu"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Nav"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Zvanu palīgs"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Izmantot zvanu palīgu"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Izvēlēties zvanu palīgu"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Pārvaldīt tīklus, kas tiek izmantoti zvaniem ar:"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Ļaut lietotnēm vai pakalpojumiem pārvaldīt zvaniem izmantotos tīklus"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Konfigurēt"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Iebūvēts savienojuma izveides pakalpojums"</string>
     <string name="voicemail" msgid="8693759337917898954">"Balss pasts"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Balss pasts (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"BP:"</string>
     <string name="networks" msgid="8873030692174541976">"Tīkla operatori"</string>
-    <string name="call_settings" msgid="1630474923393095156">"Zvanu iestatījumi"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Ārkārtas paziņojumi"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Zvanu iestatījumi"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Papildu iestatījumi"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Papildu iestatījumi (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Tikai GSM zvanu papildu iestatījumi"</string>
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"CDMA zvanu papildu iestatījumi"</string>
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Tikai CDMA zvanu papildu iestatījumi"</string>
@@ -77,29 +100,32 @@
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Zvana laikā informēt mani par ienākošajiem zvaniem"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Zvana laikā informēt mani par ienākošajiem zvaniem"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Zvanu pāradresācijas iestatījumi"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Zvanu pāradresācijas iestatījumi (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Zvanu pāradresācija"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Vienmēr pāradresēt"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Vienmēr izmantot šo numuru"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Tiek pāradresēti visi zvani"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Visu zvanu pāradresēšana uz: <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Numurs nav pieejams"</string>
-    <string name="sum_cfu_disabled" msgid="3698472522160364904">"Atspējots"</string>
-    <string name="labelCFB" msgid="218938523102207587">"Pāradresēt, ja aizņemts"</string>
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Izslēgta"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Kad aizņemts"</string>
     <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="sum_cfb_disabled" msgid="4913145177320506827">"Izslēgta"</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="labelCFNRy" msgid="1736067178393744351">"Kad netiek atbildēts"</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="sum_cfnry_disabled" msgid="3884684060443538097">"Izslēgta"</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="labelCFNRc" msgid="2614827454402079766">"Kad nav sasniedzams"</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="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="call_settings_primary_user_only" msgid="5679923943740900965">"Tikai galvenais lietotājs var mainīt zvanu iestatījumus."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Zvanu iestatījumi (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
     <string name="updating_settings" msgid="8171225533884883252">"Notiek iestatījumu atjaunināšana..."</string>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"Ieslēgt"</string>
+    <string name="disable" msgid="4678348128118573672">"Izslēgt"</string>
     <string name="change_num" msgid="239476305819844391">"Atjaunināt"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Tīkla noklusējums"</item>
@@ -123,8 +149,8 @@
     <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.\nVai 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>
-    <string name="voicemail_default" msgid="5902099213882352338">"Mans mobilo sakaru operators"</string>
-    <string name="mobile_networks" msgid="5540397602919106177">"Mobilā tīkla iestatījumi"</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"Jūsu operators"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Mobilā tīkla iestatījumi"</string>
     <string name="label_available" msgid="1181658289009300430">"Pieejamie tīkli"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Notiek meklēšana…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Neviens tīkls nav atrasts."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Vēlamais tīkla režīms: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Vēlamais tīkla režīms: Globāls"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Vēlamais tīkla režīms: LTE/WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Vēlamais tīkla režīms: LTE/GSM/UMTS"</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="7886739962255042385">"LTE/WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"Tikai GSM"</item>
     <item msgid="3817924849415716259">"Ieteicams GSM/WCDMA režīms"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Uzlabota 4G LTE režīms"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Lietojiet LTE pakalpojumus, lai uzlabotu balss un cita veida saziņu (ieteicams)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Dati ir iespējoti."</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Iespējot datu piekļuvi mobilajā tīklā"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Atļaut datu izmantošanu"</string>
     <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="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="roaming_warning" msgid="1603164667540144353">"Var rasties ievērojamas izmaksas."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Vai atļaut datu viesabonēšanu?"</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>
@@ -192,7 +223,7 @@
     <!-- no translation found for throttle_time_frame_subtext (7732763021560399960) -->
     <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="throttle_help_subtext" msgid="3633091498168446044">"Plašāka informācija par mobilo sakaru operatora mobilā tīkla datu lietošanas politiku"</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>
@@ -305,7 +336,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Datu pakalpojuma iestatīšana"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Operatora iestatījumi"</string>
     <string name="fdn" msgid="7878832555095183202">"Fiksētie numuru sastādīšanas numuri"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Ierobežotais zvanu saraksts (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FNSN saraksts"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"FDN saraksts (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FNSN aktivizācija"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Fiksētie numuru sastādīšanas numuri ir iespējoti."</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Fiksētie numuru sastādīšanas numuri ir atspējoti."</string>
@@ -323,6 +356,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Iestatīt teletaipa 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="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"Videozvana laikā nav atļauts mainīt teksta tālruņa 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>
@@ -346,7 +380,7 @@
     <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="1846161429087789936">"Lai importētu kontaktinformāciju no SIM kartes, vispirms izslēdziet lidojuma režīmu."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Lai importētu kontaktpersonas no SIM kartes, 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>
@@ -356,42 +390,40 @@
     <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="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="1796577128488773946">"Parole nav pareiza, PIN kods ir bloķēts. Ievadiet PUK kodu."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"SIM kartes PIN notīrīšana"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"SIM kartes PIN iestatīšana"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"Notiek PIN iestatīšana…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN ir iestatīts"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN notīrīts"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN nav pareizs"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN atjaunināts"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Parole nav pareiza. PIN bloķēts. Pieprasīts PUK."</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="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="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="3674058967950559397">"Parole nav pareiza, PIN2 kods ir bloķēts. Lūdzu, mainiet PIN2 kodu 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="badPuk2" msgid="7910064009531541708">"PUK2 nav pareizs. Mēģiniet vēlreiz."</string>
+    <string name="badPin2" msgid="6646896629970023109">"Vecais PIN2 nav pareizs. Mēģiniet vēlreiz."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2 kodi nesaskan. Mēģiniet vēlreiz."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Ievadiet 4–8 ciparu PIN2 kodu."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Ievadiet 8 ciparu PUK2 kodu."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 atjaunināts"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Ievadiet PUK2 kodu"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Parole nav pareiza. PIN2 bloķēts. Lai mēģinātu vēlreiz, mainiet PIN2."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Parole nav pareiza. SIM bloķēta. Ievadiet PUK2."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 kods ir neatgriezeniski bloķēts."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Varat mēģināt vēl <xliff:g id="NUMBER">%d</xliff:g> reizi(-es)."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 kods ir atbloķēts!"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"Jums atlikuši <xliff:g id="NUMBER">%d</xliff:g> mēģinājumi."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 vairs nav bloķēts"</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="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_redialing" msgid="8253487008234167266">"Notiek atkārtota zvanīš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_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>
     <string name="card_title_in_call" msgid="6346543933068225205">"Notiek saruna"</string>
-    <string name="card_title_my_phone_number" msgid="112428362494434191">"Mans tālruņa numurs: <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Notiek numura sastādīšana"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Neatbildēts zvans"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Neatbildētie zvani"</string>
@@ -409,25 +441,27 @@
     <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_power_off" msgid="2947938060513306698">"Lai veiktu zvanu, izslēdziet lidojuma režīmu."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Lai veiktu zvanu, izslēdziet lidojuma režīmu vai izveidojiet savienojumu ar bezvadu tīklu."</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_error_out_of_service" msgid="4100065333878929223">"Mobilais tīkls nav pieejams."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Mobilais tīkls nav pieejams. Lai veiktu zvanu, izveidojiet savienojumu ar bezvadu tīklu."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Lai veiktu zvanu, ievadiet derīgu numuru."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Nevar veikt zvanu."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Notiek MMI 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>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Nevar pārsūtīt zvanu."</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Pakalpojums netiek atbalstīts"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Nevar pārslēgt zvanus."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Nevar nošķirt zvanu."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Nevar pāradresēt."</string>
     <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Nevar veikt konferences zvanus."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Nevar noraidīt zvanu."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Nevar atvienot zvanu(-us)."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Interneta zvans"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Nevar noraidīt zvanu."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Nevar pārtraukt zvanu(-us)."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Lai veiktu zvanu, izveidojiet savienojumu ar bezvadu tīklu."</string>
     <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="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="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Nav pakalpojuma. Notiek atkārtots mēģinājums…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Nevar veikt zvanu. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nav ārkārtas numurs."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Nevar veikt zvanu. Zvaniet ārkārtas numuram."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Izmantojiet tastatūru, lai sastādītu numuru."</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Aizturēt"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Beigt"</string>
@@ -458,7 +492,8 @@
     <item msgid="899650777817315681">"Normāls"</item>
     <item msgid="2883365539347850535">"Ilgs"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Tīkla ziņojums"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Tīkla ziņojums"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Kļūdas 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\nNospiediet uz Aktivizēt un pēc tam klausieties tālruņa aktivizēšanas norādījumus."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Notiek aktivizācija..."</string>
@@ -471,8 +506,8 @@
     <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_speaker" msgid="6904589278542719647">"Skaļrunis"</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_progress" msgid="460876637828044519">"Notiek tālruņa programmēšana…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Nevarēja ieprogrammēt tālruni"</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="8072141612635635357">"Tālrunis netika aktivizēts.\nIespējams, ir jāatrod vieta ar labāku tīkla pārklājumu (pie loga vai ārpus telpām).\n\nMēģ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>
@@ -483,18 +518,21 @@
     <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>
     <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Datu savienojums ir atspējots."</string>
-  <plurals name="phone_in_ecm_notification_time">
-    <item quantity="one" msgid="4866221796252472622">"Nav datu savienojuma <xliff:g id="COUNT">%s</xliff:g> minūti"</item>
-    <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="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="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>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="zero"><xliff:g id="COUNT_1">%s</xliff:g> minūtes nav datu savienojuma</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> minūti nav datu savienojuma</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> minūtes nav datu savienojuma</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="zero">Tālrunī <xliff:g id="COUNT_1">%s</xliff:g> minūtes būs aktivizēts ārkārtas atzvana režīms. Šajā režīmā nevar izmantot lietotnes, kurās tiek lietots datu savienojums. Vai vēlaties to aizvērt tūlīt?</item>
+      <item quantity="one">Tālrunī <xliff:g id="COUNT_1">%s</xliff:g> minūti būs aktivizēts ārkārtas atzvana režīms. Šajā režīmā nevar izmantot lietotnes, kurās tiek lietots datu savienojums. Vai vēlaties to aizvērt tūlīt?</item>
+      <item quantity="other">Tālrunī <xliff:g id="COUNT_1">%s</xliff:g> minūtes būs aktivizēts ārkārtas atzvana režīms. Šajā režīmā nevar izmantot lietotnes, kurās tiek lietots datu savienojums. Vai vēlaties to aizvērt tūlīt?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="zero">Atlasītā darbība nav pieejama ārkārtas atzvana režīmā. Šis režīms tālrunī būs aktivizēts <xliff:g id="COUNT_1">%s</xliff:g> minūtes. Vai vēlaties to aizvērt tūlīt?</item>
+      <item quantity="one">Atlasītā darbība nav pieejama ārkārtas atzvana režīmā. Šis režīms tālrunī būs aktivizēts <xliff:g id="COUNT_1">%s</xliff:g> minūti. Vai vēlaties to aizvērt tūlīt?</item>
+      <item quantity="other">Atlasītā darbība nav pieejama ārkārtas atzvana režīmā. Šis režīms tālrunī būs aktivizēts <xliff:g id="COUNT_1">%s</xliff:g> minūtes. Vai vēlaties to aizvērt tūlīt?</item>
+    </plurals>
     <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>
@@ -508,110 +546,23 @@
     <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_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_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="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="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="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="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_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="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="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>
-    <string name="username_title" msgid="2479375923477682328">"Lietotājvārds"</string>
-    <string name="password_title" msgid="3323555249068171531">"Parole"</string>
-    <string name="display_name_title" msgid="2459768196312249937">"Attēlojamais vārds"</string>
-    <string name="proxy_address_title" msgid="4828301345351614273">"Izejošā starpniekservera adrese"</string>
-    <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="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>
-    <string name="auth_username_title" msgid="851473016307947120">"Autentifikācijai izmantotais lietotājvārds"</string>
-    <string name="auth_username_summary" msgid="6782012405225938629">"Autentifikācijai izmantotais lietotājvārds"</string>
-    <string name="default_preference_summary" msgid="868766740121667450">"&lt;Nav iestatītas&gt;"</string>
-    <string name="display_name_summary" msgid="8636377460518225523">"&lt;Tāds pats kā lietotājvārds&gt;"</string>
-    <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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"Balss zvani netiek atbalstīti"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Ātrās atbildes"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"viens"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"divi"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"trīs"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"četri"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"pieci"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"seši"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"septiņi"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"astoņi"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"deviņi"</string>
-    <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_dial_button" msgid="7459705245418435351">"sastādīt numuru"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"atpakaļatkāpe"</string>
-    <string name="description_target_answer" msgid="7205604197797472471">"Atbildēt"</string>
-    <string name="description_target_send_sms" msgid="2098326025587950144">"Sūtīt īsziņu"</string>
-    <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="2609519527849101590">"Signāls"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Noklusējuma signāls (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <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="dial_pad_autocomplete" msgid="494525952035761075">"Numuru sast. tast. autom. pabeigšana"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Zvana signāls un vibrācija"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Vai zvana veikšanai izmantot Wi-Fi?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Jā"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"Nē"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Iebūvētās SIM kartes"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Iebūvēta zvanīšanas funkcija internetā"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Ieslēgt videozvanus"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Lai ieslēgtu videozvanus, jums tīkla iestatījumos jāiespējo uzlabota 4G LTE režīms."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Tīkla iestatījumi"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Aizvērt"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Ārkārtas izsaukumi"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Tikai ārkārtas izsaukumi"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM karte, slots: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Pieejamība"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Ienākošs Wi-Fi zvans"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi zvans"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Lai atvērtu, pieskarieties vēlreiz."</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"Atšifrējot ziņojumu, radās kļūda."</string>
 </resources>
diff --git a/res/values-mcc310-mnc004/config.xml b/res/values-mcc310-mnc004/config.xml
index bbe9e7b..198e65f 100755
--- a/res/values-mcc310-mnc004/config.xml
+++ b/res/values-mcc310-mnc004/config.xml
@@ -19,4 +19,7 @@
 <resources>
     <!-- Flag indicating if dtmf tone type is enabled -->
     <bool name="support_swap_after_merge" translatable="false">false</bool>
+    <!-- Determine whether the voicemail notification is persistent in the notification bar.
+         If true, the voicemail notifications cannot be dismissed from the notification bar. -->
+    <bool name="voicemail_notification_persistent">true</bool>
 </resources>
diff --git a/res/values-mcc310-mnc120/config.xml b/res/values-mcc310-mnc120/config.xml
index 7c269e0..93a8079 100644
--- a/res/values-mcc310-mnc120/config.xml
+++ b/res/values-mcc310-mnc120/config.xml
@@ -19,4 +19,7 @@
 <resources>
     <!-- Flag indicating if dtmf tone type is enabled -->
     <bool name="dtmf_type_enabled">true</bool>
+    <!-- Determine whether the voicemail notification is persistent in the notification bar.
+         If true, the voicemail notifications cannot be dismissed from the notification bar. -->
+    <bool name="voicemail_notification_persistent">true</bool>
 </resources>
diff --git a/res/values-mcc310-mnc410/config.xml b/res/values-mcc310-mnc410/config.xml
new file mode 100644
index 0000000..bf89c34
--- /dev/null
+++ b/res/values-mcc310-mnc410/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2015 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<resources>
+    <bool name="support_pause_ims_video_calls" translatable="false">false</bool>
+</resources>
\ No newline at end of file
diff --git a/res/values-mcc311-mnc480/config.xml b/res/values-mcc311-mnc480/config.xml
index df95aa4..b7d0d6e 100755
--- a/res/values-mcc311-mnc480/config.xml
+++ b/res/values-mcc311-mnc480/config.xml
@@ -20,4 +20,8 @@
     <!-- Flag indicating if dtmf tone type is enabled -->
     <bool name="dtmf_type_enabled">true</bool>
     <bool name="support_swap_after_merge" translatable="false">false</bool>
+    <!-- Determine whether the voicemail notification is persistent in the notification bar.
+         If true, the voicemail notifications cannot be dismissed from the notification bar. -->
+    <bool name="voicemail_notification_persistent">true</bool>
+    <bool name="support_pause_ims_video_calls" translatable="false">true</bool>
 </resources>
diff --git a/res/values-mcc311-mnc490/config.xml b/res/values-mcc311-mnc490/config.xml
index 7c269e0..93a8079 100644
--- a/res/values-mcc311-mnc490/config.xml
+++ b/res/values-mcc311-mnc490/config.xml
@@ -19,4 +19,7 @@
 <resources>
     <!-- Flag indicating if dtmf tone type is enabled -->
     <bool name="dtmf_type_enabled">true</bool>
+    <!-- Determine whether the voicemail notification is persistent in the notification bar.
+         If true, the voicemail notifications cannot be dismissed from the notification bar. -->
+    <bool name="voicemail_notification_persistent">true</bool>
 </resources>
diff --git a/res/values-mk-rMK/arrays.xml b/res/values-mk-rMK/arrays.xml
new file mode 100644
index 0000000..832ccf7
--- /dev/null
+++ b/res/values-mk-rMK/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Глобална"</item>
+    <item msgid="6753774959494729275">"LTE/CDMA"</item>
+    <item msgid="8658695584186942227">"LTE/GSM/UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-mk-rMK/config.xml b/res/values-mk-rMK/config.xml
deleted file mode 100644
index d9f4022..0000000
--- a/res/values-mk-rMK/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"неточно"</string>
-</resources>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
new file mode 100644
index 0000000..e25a6a8
--- /dev/null
+++ b/res/values-mk-rMK/strings.xml
@@ -0,0 +1,569 @@
+<?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="1107073389495104784">"Мобилни податоци"</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">"FDN список"</string>
+    <string name="unknown" msgid="6878797917991465859">"Непознато"</string>
+    <string name="private_num" msgid="6713286113000232309">"Приватен број"</string>
+    <string name="payphone" msgid="4793877574636445118">"Говорница"</string>
+    <string name="onHold" msgid="9035493194749959955">"На чекање"</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="enter_input" msgid="1810529547726803893">"Пораката на USSD мора да биде меѓу <xliff:g id="MIN_LEN">%d</xliff:g> и <xliff:g id="MAX_LEN">%d</xliff:g> знаци. Обидете се повторно."</string>
+    <string name="manageConferenceLabel" msgid="4691922394301969053">"Управувај со конференциски повик"</string>
+    <string name="ok" msgid="3811371167865772377">"Во ред"</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">"Bluetooth"</string>
+    <string name="wait_prompt_str" msgid="7601815427707856238">"Испрати ги следниве тонови?\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="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="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="requesting_unlock" msgid="6412629401033249351">"Барање за отклучување мрежа..."</string>
+    <string name="unlock_failed" msgid="6490531697031504225">"Барањето за отклучување мрежа е неуспешно."</string>
+    <string name="unlock_success" msgid="6770085622238180152">"Отклучувањето мрежа е успешно."</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Поставките за мобилна мрежа не се достапни за овој корисник"</string>
+    <string name="labelGSMMore" msgid="5930842194056092106">"GSM подесувања на повик"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"Поставки за повик преку GSM (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA подесувања на повик"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"Поставки за повик преку CDMA (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="apn_settings" msgid="9043423184895642077">"Имиња на точка на пристап"</string>
+    <string name="settings_label" msgid="3876743539816984008">"Подесувања на мрежа"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Сметки за повикување"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Повикувајте со"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Повикувајте со СИП со"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Прво прашај"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Поставки"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Изберете сметки"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Телефонски сметки"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Додајте сметка на СИП"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Конфигурирајте ги поставките на сметка"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Повикување преку Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Не користете повикување преку Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Не користете помошник за повикување"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Нема"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Помошник за повикување"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Користете помошник за повикување"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Изберете помошник за повикување"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Управувајте со мрежите што се користат за повици со"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Дозволете апликациите или услугите да управуваат со мрежи кои се користат за повици"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Конфигурирај"</string>
+    <string name="connection_service_default_label" msgid="1498481943805913754">"Вградена услуга на поврзување"</string>
+    <string name="voicemail" msgid="8693759337917898954">"Говорна пошта"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Говорна пошта (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="voicemail_abbreviated" msgid="2215592488517217448">"ГП:"</string>
+    <string name="networks" msgid="8873030692174541976">"Оператори на мрежа"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Итни емитувања"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Подесувања на повик"</string>
+    <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Дополнителни подесувања"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Дополнителни поставки (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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_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>
+    <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="call_forwarding_settings_with_label" msgid="8569489414006897127">"Поставки за проследување повик (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="8384177689501334080">"Исклучено"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Кога е зафатено"</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="4913145177320506827">"Исклучено"</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Вашиот оператор не поддржува оневозможување проследување повик кога вашиот телефон е зафатен."</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"Кога е неодговорено"</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="3884684060443538097">"Исклучено"</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Вашиот оператор не поддржува оневозможување проследување повик кога нема да одговорите на вашиот телефон."</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"Кога е недостапно"</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="5646361343094064333">"Вашиот оператор не поддржува оневозможување проследување повик кога вашиот телефон е недостапен."</string>
+    <string name="updating_title" msgid="6146755386174019046">"Подесувања на повик"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"Поставките за повик може да ги промени само главниот корисник."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Поставки за повик (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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">"Грешка со мрежа или СИМ картичка."</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="7248657275000173526">"Вклучи"</string>
+    <string name="disable" msgid="4678348128118573672">"Исклучи"</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="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="2001233554889016880">"Вашиот оператор"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Поставки за мобилна мрежа"</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="5613353860205691579">"Вашата СИМ картичка не дозволува поврзување со оваа мрежа."</string>
+    <string name="connect_later" msgid="2308119155752343975">"Не може да се поврзе со оваа мрежа во моментов. Обидете се повторно подоцна."</string>
+    <string name="registration_done" msgid="495135664535876612">"Регистрирање на мрежа."</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="2336624679902659306">"Претпочитан тип мрежа"</string>
+    <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Промени го режимот на работа на мрежата"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Претпочитан тип мрежа"</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_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Претпочитан режим на мрежа: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Претпочитан режим на мрежа: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Претпочитан режим на мрежа: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Претпочитан режим на мрежа: CDMA + LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Претпочитан режим на мрежа: глобален"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Претпочитан режим на мрежа: LTE/WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Претпочитан режим на мрежа: LTE/GSM/UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Претпочитан режим на мрежа: LTE/CDMA"</string>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="7886739962255042385">"LTE/WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"Глобална"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"Само EvDo"</item>
+    <item msgid="1508557726283094448">"CDMA без EvDo"</item>
+    <item msgid="4341433122263841224">"Автоматска CDMA/EvDo"</item>
+    <item msgid="5958053792390386668">"Автоматска GSM/WCDMA"</item>
+    <item msgid="7913148405605373434">"Само WCDMA"</item>
+    <item msgid="1524224863879435516">"Само GSM"</item>
+    <item msgid="3817924849415716259">"GSM/WCDMA претпочитана"</item>
+  </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Режим на подобрени 4G LTE"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Користете ги услугите на LTE за да ја подобрите гласовната и другите видови комуникација (препорачано)"</string>
+    <string name="data_enabled" msgid="5972538663568715366">"Податоците се овозможени"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Дозволи користење податоци"</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="8913735676127858115">"Изгубивте поврзување податоци зашто на вашата домашна мрежа исклучивте роаминг на податоци."</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"Може да направите големи трошоци."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Дозволи роаминг на податоци?"</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.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_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> кб/с"</string>
+    <!-- String.format failed for translation -->
+    <!-- no translation found for throttle_time_frame_subtext (7732763021560399960) -->
+    <skip />
+    <string name="throttle_rate_subtext" msgid="2149102656120726855">"Стапката на податоци се сведува на <xliff:g id="USED">%1$d</xliff:g> кб/с ако се надмине границата на користење податоци"</string>
+    <string name="throttle_help_subtext" msgid="3633091498168446044">"Повеќе информации за политиката на користање податоци на мобилната мрежа на вашиот оператор"</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="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="network_lte" msgid="7702681952521375754">"LTE (препорачано)"</string>
+    <string name="network_4G" msgid="2723512640529983138">"4G (препорачано)"</string>
+    <string name="network_global" msgid="1323190488685355309">"Глобална"</string>
+    <string name="cdma_system_select_title" msgid="5757657769327732833">"Избирање систем"</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_subscription_title" msgid="1162564010076763284">"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>
+    <string name="carrier_settings_title" msgid="9028166176523012300">"Подесувања на оператор"</string>
+    <string name="fdn" msgid="7878832555095183202">"Броеви на фиксно бирање"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Броеви за фиксно бирање (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="manage_fdn_list" msgid="8777755791892122369">"FDN список"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"Список на FDN (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="fdn_activation" msgid="2156479741307463576">"FDN активација"</string>
+    <string name="fdn_enabled" msgid="5238109009915521240">"Броевите на фиксно бирање се овозможени"</string>
+    <string name="fdn_disabled" msgid="4700049736675368279">"Броевите на фиксно бирање се оневозможени"</string>
+    <string name="enable_fdn" msgid="3740191529180493851">"Овозможи FDN"</string>
+    <string name="disable_fdn" msgid="7944020890722540616">"Оневозможи FDN"</string>
+    <string name="change_pin2" msgid="2153563695382176676">"Промени ПИН2"</string>
+    <string name="enable_fdn_ok" msgid="7215588870329688132">"Оневозможи FDN"</string>
+    <string name="disable_fdn_ok" msgid="5727046928930740173">"Овозможи FDN"</string>
+    <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="3776841382844614716">"Приватност на глас"</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="4073265511427813322">"Автоматски повторен обид"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Овозможи режим на автоматски повторен обид"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"Промена на режим TTY не е дозволена за време на видеоповик"</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="8204677063922225311">"Впише ПИН2"</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="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="fdn_failed" msgid="540018079008319747">"Операцијата со FDN не успеа."</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="5254946758982621072">"Исклучете го авионскиот режим за да ги увезете контактите од СИМ-картичката."</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="8955102849303984935">"Стариот ПИН што го впишавте не е точен. Обидете се повторно."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"ПИН кодовите што ги внесовте не се совпаѓаат. Обидете се повторно."</string>
+    <string name="invalidPin" msgid="5981171102258684792">"Внеси ПИН од 4 до 8 броеви."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"Исчисти ПИН на СИМ"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"Поставете ПИН на СИМ"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"ПИН-кодот се поставува…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"ПИН-кодот е поставен"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"ПИН-кодот е исчистен"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"ПИН-кодот е неточен"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"ПИН-кодот е ажуриран"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Лозинката е неточна. ПИН-кодот е сега блокиран. Се бара ПУК."</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="7910064009531541708">"ПУК2 е неточен. Обидете се повторно."</string>
+    <string name="badPin2" msgid="6646896629970023109">"Стариот ПИН2 е неточен. Обидете се повторно."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"ПУК2-кодовите не се совпаѓаат. Обидете се повторно."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Внесете ПИН2 кој содржи од 4 до 8 броеви."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Внесете ПУК2 кој содржи 8 броеви."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"ПИН2-кодот е ажуриран"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Внесете го ПУК2-кодот"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Лозинката е неточна. ПИН2-кодот е сега блокиран. За да се обидете повторно, променете го ПИН2-кодот."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Лозинката е неточна. СИМ-картичката е сега заклучена. Внесете го ПУК2-кодот."</string>
+    <string name="puk2_blocked" msgid="3150263853077280049">"ПУК2 кодот е трајно блокиран."</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"Имате уште <xliff:g id="NUMBER">%d</xliff:g> обиди."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"ПИН2-кодот веќе не е блокиран"</string>
+    <string name="doneButton" msgid="2859593360997984240">"Готово"</string>
+    <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Број на говорна пошта"</string>
+    <string name="card_title_dialing" msgid="5769417478498348054">"Бирање"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Повторно бирање"</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="notification_dialing" msgid="2107666444937350731">"Бирање"</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_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>
+    <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="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="2947938060513306698">"Исклучете го авионскиот режим за да повикате."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Исклучете го авионскиот режим или поврзете се на безжична мрежа за да повикате."</string>
+    <string name="incall_error_emergency_only" msgid="4678640422710818317">"Не е регистриран на мрежа."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Не е достапна мобилна мрежа."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Не е достапна мобилна мрежа. Поврзете се на безжична мрежа за да повикате."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"За да повикате, внесете важечки број."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Не може да повика."</string>
+    <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Започнува MMI низа..."</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Услугата не е поддржана"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Не може да префрли повици."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Не може да оддели повик."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Не може да пренесе."</string>
+    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Не може да оствари конференциски повици."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Не може да отфрли повик."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Не може да реализира повик(ци)."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Поврзете се на безжична мрежа за да повикате."</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="5960061579996526883">"Нема услуга. Се обидува повторно…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Не може да повика. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> не е број за итни повици."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Не може да повика. Бирајте го бројот за итни повици."</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="onscreenVideoCallText" msgid="4800924186056115442">"Видео повик"</string>
+    <string name="importSimEntry" msgid="6614358325359736031">"Увези"</string>
+    <string name="importAllSimEntries" msgid="1503181169636198673">"Увези ги сите"</string>
+    <string name="importingSimContacts" msgid="7374056215462575769">"Увезување контакти од СИМ"</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="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_info_message" msgid="7738596060242881930">"Порака во мрежа"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Порака за грешка"</string>
+    <string name="ota_title_activate" msgid="8616918561356194398">"Активирај го телефонот"</string>
+    <string name="ota_touch_activate" msgid="6553212803262586244">"Треба да се направи посебен повик за да ја активирате вашата телефонска услуга. \n\nПо притискање на „Активирај“, слушнете ги упатствата дадени за да го активирате вашиот телефон."</string>
+    <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Се активира..."</string>
+    <string name="ota_hfa_activation_dialog_message" msgid="8092479227918463415">"Телефонот ја активира услугата за мобилни податоци.\n\nОва може да потрае до 5 минути."</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="6570240212263372046">"Телефонот е активиран."</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="460876637828044519">"Телефонот се програмира…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Телефонот не можеше да се програмира"</string>
+    <string name="ota_successful" msgid="1880780692887077407">"Вашиот телефон е сега активиран. Може да поминат и до 15 минути за услугата да започне."</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="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" formatted="false" msgid="8308381858502470919">
+      <item quantity="one">Нема врска на податоци <xliff:g id="COUNT_1">%s</xliff:g> минута</item>
+      <item quantity="other">Нема врска на податоци  <xliff:g id="COUNT_1">%s</xliff:g> минути</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="one">Телефонот ќе биде во режим на итен повик <xliff:g id="COUNT_1">%s</xliff:g> минута. Кога е во овој режим, не може да се користат апликации што користат врска со податоци. Дали сакате да излезете сега?</item>
+      <item quantity="other">Телефонот ќе биде во режим на итен повик <xliff:g id="COUNT_1">%s</xliff:g> минути. Кога е во овој режим, не може да се користат апликации што користат врска со податоци. Дали сакате да излезете сега?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="one">Избраното дејство не е достапно во режим на итен повик. Телефонот ќе биде во режим на итен повик <xliff:g id="COUNT_1">%s</xliff:g> минута. Дали сакате да излезете сега?</item>
+      <item quantity="other">Избраното дејство не е достапно во режим на итен повик. Телефонот ќе биде во режим на итен повик <xliff:g id="COUNT_1">%s</xliff:g> минути. Дали сакате да излезете сега?</item>
+    </plurals>
+    <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_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="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="not_voice_capable" msgid="2739898841461577811">"Гласовното повикување не е поддржано"</string>
+    <string name="description_dial_button" msgid="7459705245418435351">"бирај"</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="2609519527849101590">"Звук"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Мелодија и вибрации"</string>
+    <string name="pstn_connection_service_label" msgid="1743245930577325900">"Вградени СИМ-картички"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Вклучи видеоповикување"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"За да вклучите видеоповикување, треба да овозможите Режим на подобрени 4G LTE во поставките за мрежа."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Мрежни поставки"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Затвори"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Итни повици"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Само итни повикувања"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"СИМ-картичка, отвор: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Пристапност"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Дојдовен повик преку Wi-Fi"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Повик преку Wi-Fi"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Допрете повторно за да отворите"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"Настана грешка при дешифрирање на пораката."</string>
+</resources>
diff --git a/res/values-ml-rIN/arrays.xml b/res/values-ml-rIN/arrays.xml
new file mode 100644
index 0000000..dd5634f
--- /dev/null
+++ b/res/values-ml-rIN/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"ഗ്ലോബൽ"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-ml-rIN/config.xml b/res/values-ml-rIN/config.xml
deleted file mode 100644
index 73c19d2..0000000
--- a/res/values-ml-rIN/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"തെറ്റ്"</string>
-</resources>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index a1592c0..364199d 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -16,14 +16,14 @@
 
 <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="tablet" msgid="1107073389495104784">"സെല്ലുലാർ ഡാറ്റ"</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">"FDN ലിസ്റ്റ്"</string>
     <string name="unknown" msgid="6878797917991465859">"അജ്ഞാതം"</string>
     <string name="private_num" msgid="6713286113000232309">"സ്വകാര്യ നമ്പർ"</string>
-    <string name="payphone" msgid="1931775086311769314">"പണം നൽകി ഉപയോഗിക്കുന്ന ഫോൺ"</string>
+    <string name="payphone" msgid="4793877574636445118">"പണം നൽകി ഉപയോഗിക്കുന്ന ഫോൺ"</string>
     <string name="onHold" msgid="9035493194749959955">"ഹോള്‍ഡിലാണ്"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI കോഡ് ആരംഭിച്ചു"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD കോഡ് പ്രവർത്തിക്കുന്നു…"</string>
@@ -35,7 +35,7 @@
     <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">"Bluetooth"</string>
+    <string name="audio_mode_bluetooth" msgid="3047641300848211128">"ബ്ലൂടൂത്ത്"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"ഇനിപ്പറയുന്ന ടോണുകൾ അയയ്‌ക്കണോ?\n"</string>
     <string name="pause_prompt_str" msgid="1789964702154314806">"ടോണുകൾ അയയ്‌ക്കുന്നു\n"</string>
     <string name="send_button" msgid="4106860097497818751">"അയയ്‌ക്കുക"</string>
@@ -43,27 +43,50 @@
     <string name="pause_prompt_no" msgid="6686238803236884877">"വേണ്ട"</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="no_vm_number_msg" msgid="1300729501030053828">"സിം കാർഡിൽ വോയ്‌സ്‌മെയിൽ നമ്പറൊന്നും സംഭരിച്ചിട്ടില്ല."</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="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="requesting_unlock" msgid="6412629401033249351">"നെറ്റ്‌വർക്ക് അൺലോക്ക് അഭ്യർത്ഥിക്കുന്നു…"</string>
     <string name="unlock_failed" msgid="6490531697031504225">"നെറ്റ്‌വർക്ക് അൺലോക്ക് അഭ്യർത്ഥന പരാജയപ്പെട്ടു."</string>
     <string name="unlock_success" msgid="6770085622238180152">"നെറ്റ്‌വർക്ക് അൺലോക്ക് വിജയിച്ചു."</string>
-    <string name="mobile_network_settings_not_available" msgid="7355254462995117896">"ഈ ഉപയോക്താവിന് മൊബൈൽ നെറ്റ്‌വർക്ക് ക്രമീകരണങ്ങൾ ലഭ്യമല്ല"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"ഈ ഉപയോക്താവിന് സെല്ലുലാർ നെറ്റ്‌വർക്ക് ക്രമീകരണങ്ങൾ ലഭ്യമല്ല"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM കോൾ ക്രമീകരണങ്ങൾ"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"GSM കോൾ ക്രമീകരണം (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA കോൾ ക്രമീകരണങ്ങൾ"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"CDMA കോൾ ക്രമീകരണം (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"ആക്‌സസ്സ് പോയിന്റ് പേരുകൾ"</string>
     <string name="settings_label" msgid="3876743539816984008">"നെറ്റ്‌വർക്ക് ക്രമീകരണങ്ങൾ"</string>
-    <string name="connection_service" msgid="978745922583410219">"ഉപയോഗിക്കാനുള്ള കണക്ഷൻ സേവനം"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"കോളുചെയ്യാനുള്ള അക്കൗണ്ട്"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"ഇത് ഉപയോഗിച്ച് കോളുചെയ്യുക"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"ഇതുപയോഗിച്ച് SIP കോളുചെയ്യുക"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"ആദ്യതവണ ചോദിക്കുക"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"ക്രമീകരണങ്ങൾ"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"അക്കൗണ്ടുകൾ തിരഞ്ഞെടുക്കുക"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"ഫോൺ അക്കൗണ്ടുകൾ"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"SIP അക്കൗണ്ട് ചേർക്കുക"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"അക്കൗണ്ട് ക്രമീകരണങ്ങൾ കോൺഫിഗർചെയ്യുക"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi കോളിംഗ്"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Wi-Fi കോൾ ചെയ്യൽ ഉപയോഗിക്കരുത്"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"കോൾ സഹായി ഉപയോഗിക്കരുത്"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"ഒന്നുമില്ല"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"കോൾ സഹായി"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"കോൾ സഹായി ഉപയോഗിക്കുക"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"കോൾ സഹായി തിരഞ്ഞെടുക്കുക"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"കോളുകൾക്കായി ഉപയോഗിക്കുന്ന നെറ്റ്‌വർക്കുകൾ നിയന്ത്രിക്കുക"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"കോളുകൾക്കായി ഉപയോഗിച്ച നെറ്റ്‌വർക്കുകൾ നിയന്ത്രിക്കുന്നതിന് അപ്ലിക്കേഷനുകളെയോ സേവനങ്ങളെയോ അനുവദിക്കുക"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"കോൺഫിഗർ ചെയ്യുക"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"അന്തർ നിർമ്മിത കണക്ഷൻ സേവനം"</string>
     <string name="voicemail" msgid="8693759337917898954">"വോയ്സ് മെയില്‍"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"വോയ്‌സ്‌മെയിൽ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
     <string name="networks" msgid="8873030692174541976">"നെറ്റ്‌വർക്ക് ഓപ്പറേറ്റർമാർ"</string>
-    <string name="call_settings" msgid="1630474923393095156">"കോൾ ക്രമീകരണങ്ങൾ"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"അടിയന്തര പ്രക്ഷേപണങ്ങൾ"</string>
+    <string name="call_settings" msgid="6112441768261754562">"കോൾ ക്രമീകരണങ്ങൾ"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"അധിക ക്രമീകരണങ്ങൾ"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"കൂടുതൽ ക്രമീകരണങ്ങൾ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
@@ -77,40 +100,43 @@
     <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="call_forwarding_settings_with_label" msgid="8569489414006897127">"കോൾ ഫോർവാഡുചെയ്യൽ ക്രമീകരണങ്ങൾ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="sum_cfu_disabled" msgid="8384177689501334080">"ഓഫാണ്"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"തിരക്കിലായിരിക്കുമ്പോൾ"</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="sum_cfb_disabled" msgid="4913145177320506827">"ഓഫാണ്"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"നിങ്ങളുടെ ഫോൺ തിരക്കിലായിരിക്കുമ്പോൾ കോൾ കൈമാറൽ പ്രവർത്തനരഹിതമാക്കുന്നതിനെ നിങ്ങളുടെ ഓപ്പറേറ്റർ പിന്തുണയ്‌ക്കുന്നില്ല."</string>
-    <string name="labelCFNRy" msgid="3646316323834351390">"മറുപടി നൽകുന്നില്ലെങ്കിൽ കൈമാറുക"</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"പ്രതികരണമില്ലാതിരിക്കുമ്പോൾ"</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="sum_cfnry_disabled" msgid="3884684060443538097">"ഓഫാണ്"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"നിങ്ങളുടെ ഫോൺ മറുപടി നൽകാതിരിക്കുമ്പോൾ കോൾ കൈമാറൽ പ്രവർത്തനരഹിതമാക്കുന്നതിനെ നിങ്ങളുടെ ഓപ്പറേറ്റർ പിന്തുണയ്‌ക്കുന്നില്ല."</string>
-    <string name="labelCFNRc" msgid="47183615370850000">"പരിധിയ്‌ക്ക് പുറത്താണെങ്കിൽ കൈമാറുക"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"ലഭ്യമല്ലാതിരിക്കുമ്പോൾ"</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="5646361343094064333">"നിങ്ങളുടെ ഫോൺ പരിധിയ്ക്ക് പുറത്തായിരിക്കുമ്പോൾ കോൾ കൈമാറൽ പ്രവർത്തനരഹിതമാക്കുന്നതിനെ നിങ്ങളുടെ ഓപ്പറേറ്റർ പിന്തുണയ്‌ക്കുന്നില്ല."</string>
     <string name="updating_title" msgid="6146755386174019046">"കോൾ ക്രമീകരണങ്ങൾ"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"കോൾ ക്രമീകരണങ്ങൾ, പ്രാഥമിക ഉപയോക്താവിന് മാത്രമെ മാറ്റാനാവൂ."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"കോൾ ക്രമീകരണങ്ങൾ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="exception_error" msgid="7027667130619518211">"നെറ്റ്‌വർക്ക് അല്ലെങ്കിൽ സിം കാർഡ് പിശക്."</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>
+    <string name="enable" msgid="7248657275000173526">"ഓണാക്കുക"</string>
+    <string name="disable" msgid="4678348128118573672">"ഓഫുചെയ്യുക"</string>
     <string name="change_num" msgid="239476305819844391">"അപ്‌ഡേറ്റ്  ചെയ്യുക"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"സ്ഥിര നെറ്റ്‌വർക്ക്"</item>
@@ -123,18 +149,18 @@
     <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="voicemail_default" msgid="2001233554889016880">"നിങ്ങളുടെ കാരിയർ"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"സെല്ലുലാർ നെറ്റ്‌വർക്ക് ക്രമീകരണങ്ങൾ"</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="5613353860205691579">"നിങ്ങളുടെ SIM കാർഡ് ഈ നെറ്റ്‌വർക്കിലേക്ക് ഒരു കണക്ഷൻ അനുവദിക്കുന്നില്ല."</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="3494252551249882718">"ഒരു നെ‌റ്റ്‌വർക്ക് ഓപ്പറേറ്റർ തിരഞ്ഞെടുക്കുക"</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>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"തിരഞ്ഞെടുത്ത നെറ്റ്‌വർക്ക് മോഡ്: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"തിരഞ്ഞെടുത്ത നെറ്റ്‌വർക്ക് മോഡ്: ഗ്ലോബൽ"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"തിരഞ്ഞെടുത്ത നെറ്റ്‌വർക്ക് മോഡ്: LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"തിരഞ്ഞെടുത്ത നെറ്റ്‌വർക്ക് മോഡ്: LTE / GSM / UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"തിരഞ്ഞെടുത്ത നെറ്റ്‌വർക്ക് മോഡ്: LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="7886739962255042385">"LTE / WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"GSM മാത്രം"</item>
     <item msgid="3817924849415716259">"GSM/WCDMA തിരഞ്ഞെടുത്തത്"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"മെച്ചപ്പെടുത്തിയ 4G LTE മോഡ്"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"വോയ്‌സ്, മറ്റ് ആശയവിനിമയങ്ങൾ (ശുപാർശിതം) എന്നിവ മികച്ചതാക്കുന്നതിന് LTE സേവനങ്ങൾ ഉപയോഗിക്കുക"</string>
     <string name="data_enabled" msgid="5972538663568715366">"ഡാറ്റ പ്രവർത്തനക്ഷമമാക്കി"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"മൊബൈൽ നെറ്റ്‌വർക്കിലൂടെയുള്ള ഡാറ്റ ആക്‌സസ്സ് പ്രവർത്തനക്ഷമമാക്കുക"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"ഡാറ്റ ഉപയോഗം അനുവദിക്കുക"</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="8913735676127858115">"നിങ്ങൾ ഡാറ്റ റോമിംഗ് ഓഫുചെയ്‌തതിനൊപ്പം നിങ്ങളുടെ ഹോം നെ‌റ്റ്‌വർക്കും വിട്ടതിനാൽ നിങ്ങൾക്ക് ഡാറ്റ കണക്റ്റിവിറ്റി നഷ്‌ടപ്പെട്ടു."</string>
-    <string name="roaming_warning" msgid="7820963598559553967">"ഡാറ്റ റോമിംഗ് അനുവദിക്കണോ? നിങ്ങൾക്ക് കാര്യമായ റോമിംഗ് നിരക്കുകൾക്ക് ഇടയാക്കാം!"</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"നിങ്ങളിൽ നിന്ന് നിർദ്ദിഷ്‌ട നിരക്കുകൾ ഈടാക്കിയേക്കാം."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"ഡാറ്റ റോമിംഗ് അനുവദിക്കണോ?"</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>
@@ -190,7 +221,7 @@
     <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 ആയി കുറച്ചു"</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 ആയി കുറയ്‌ക്കുന്നു"</string>
-    <string name="throttle_help_subtext" msgid="5217706521499010816">"നിങ്ങളുടെ കാരിയറിന്റെ മൊബൈൽ നെറ്റ്‌വർക്ക് ഡാറ്റ ഉപയോഗ നയത്തെക്കുറിച്ചുള്ള കൂടുതൽ വിവരങ്ങൾ"</string>
+    <string name="throttle_help_subtext" msgid="3633091498168446044">"നിങ്ങളുടെ കാരിയറിന്റെ സെല്ലുലാർ നെറ്റ്‌വർക്ക് ഡാറ്റ ഉപയോഗ നയത്തെക്കുറിച്ചുള്ള കൂടുതൽ വിവരങ്ങൾ"</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>
@@ -289,10 +320,10 @@
     <item msgid="1205664026446156265">"യാന്ത്രികമായി"</item>
   </string-array>
     <string name="cdma_subscription_title" msgid="1162564010076763284">"CDMA സബ്‌സ്‌ക്രിപ്‌ഷൻ"</string>
-    <string name="cdma_subscription_summary" msgid="2530890766115781140">"RUIM/SIM-നും NV-യ്‌ക്കും ഇടയിലുള്ള മാറ്റം"</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/SIM"</item>
+    <item msgid="2258014151300708431">"RUIM/സിം"</item>
     <item msgid="5127722015571873880">"NV"</item>
   </string-array>
   <string-array name="cdma_subscription_values">
@@ -303,7 +334,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"ഡാറ്റ സേവനം സജ്ജീകരിക്കുക"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"കാരിയർ ക്രമീകരണങ്ങൾ"</string>
     <string name="fdn" msgid="7878832555095183202">"സ്ഥിര ഡയലിംഗ് നമ്പറുകൾ"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"സ്ഥിരമായി ഡയൽചെയ്യുന്ന നമ്പറുകൾ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FDN ലിസ്റ്റ്"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"FDN ലിസ്‌റ്റ് (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FDN സജീവമാക്കൽ"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"സ്ഥിര ഡയലിംഗ് നമ്പറുകൾ പ്രവർത്തനക്ഷമമാക്കി"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"സ്ഥിര ഡയലിംഗ് നമ്പറുകൾ പ്രവർത്തനരഹിതമാക്കി"</string>
@@ -313,7 +346,7 @@
     <string name="enable_fdn_ok" msgid="7215588870329688132">"FDN പ്രവർത്തനരഹിതമാക്കുക"</string>
     <string name="disable_fdn_ok" msgid="5727046928930740173">"FDN പ്രവർത്തനക്ഷമമാക്കുക"</string>
     <string name="sum_fdn" msgid="1959399454900272878">"സ്ഥിര ഡയലിംഗ് നമ്പറുകൾ നിയന്ത്രിക്കുക"</string>
-    <string name="sum_fdn_change_pin" msgid="6666549734792827932">"FDN ആക്‌സസ്സിനായി PIN മാറ്റുക"</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="3776841382844614716">"വോയ്‌സ് സ്വകാര്യത"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"മെച്ചപ്പെടുത്തിയ സ്വകാര്യതാ മോഡ് പ്രവർത്തനക്ഷമമാക്കി"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"TTY മോഡ് സജ്ജമാക്കുക"</string>
     <string name="auto_retry_mode_title" msgid="4073265511427813322">"യാന്ത്രികമായി വീണ്ടും ശ്രമിക്കുക"</string>
     <string name="auto_retry_mode_summary" msgid="4973886004067532288">"യാന്ത്രികമായി വീണ്ടും ശ്രമിക്കൽ മോഡ് പ്രവർത്തനക്ഷമമാക്കുക"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"വീഡിയോ കോൾ സമയത്ത് TTY മോഡ് മാറ്റം അനുവദനീയമല്ല"</string>
     <string name="menu_add" msgid="1882023737425114762">"കോൺടാക്റ്റ് ചേർക്കുക"</string>
     <string name="menu_edit" msgid="7143003705504672374">"കോൺടാക്റ്റ് എഡിറ്റുചെയ്യുക"</string>
     <string name="menu_delete" msgid="3977150783449642851">"കോണ്‍‌ടാക്റ്റ് ഇല്ലാതാക്കുക"</string>
@@ -337,59 +371,57 @@
     <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="5470854099230755944">"നിങ്ങൾ തെറ്റായ PIN നൽകിയതിനാൽ FDN അപ്‌ഡേറ്റുചെയ്‌തില്ല."</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="fdn_failed" msgid="540018079008319747">"FDN പ്രവർത്തനം പരാജയപ്പെട്ടു."</string>
-    <string name="simContacts_emptyLoading" msgid="2203331234764498011">"SIM കാർഡിൽ നിന്നും റീഡുചെയ്യുന്നു…"</string>
-    <string name="simContacts_empty" msgid="5270660846489561932">"നിങ്ങളുടെ SIM കാർഡിൽ കോൺടാക്റ്റുകളൊന്നുമില്ല."</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="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="8955102849303984935">"നിങ്ങൾ ടൈപ്പുചെയ്‌ത പഴയ PIN തെറ്റാണ്. വീണ്ടും ശ്രമിക്കുക."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"SIM കാർഡിൽ നിന്ന് കോൺടാക്റ്റുകൾ ഇമ്പോർട്ടുചെയ്യാൻ വിമാന മോഡ് ഓഫാക്കുക."</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="8955102849303984935">"നിങ്ങൾ ടൈപ്പുചെയ്‌ത പഴയ പിൻ തെറ്റാണ്. വീണ്ടും ശ്രമിക്കുക."</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="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="1796577128488773946">"പാസ്‌വേഡ് തെറ്റായതിനാൽ PIN തടഞ്ഞു! PUK അഭ്യർത്ഥിച്ചു."</string>
+    <string name="invalidPin" msgid="5981171102258684792">"4 മുതൽ 8 വരെ അക്കങ്ങളുള്ള ഒരു പിൻ ടൈപ്പുചെയ്യുക."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"SIM PIN മായ്‌ക്കുക"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"SIM PIN സജ്ജീകരിക്കുക"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"PIN ക്രമീകരിക്കുന്നു …"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN സജ്ജീകരിക്കുക"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN മായ്‌ച്ചു"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN തെറ്റാണ്"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN അപ്ഡേറ്റുചെയ്‌തു"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"പാസ്‌വേഡ് തെറ്റാണ്. PIN ഇപ്പോൾ ലോക്കുചെയ്‌തിരിക്കുന്നു. PUK അഭ്യർത്ഥിച്ചു."</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="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="1639666438836544393">"PIN2 മാറ്റി."</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"PUK2 കോഡ് ടൈപ്പുചെയ്യുക"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"പാസ്‌വേഡ് തെറ്റാണ്, PIN2 തടഞ്ഞു. PIN2 മാറ്റിയതിനുശേഷം വീണ്ടും ശ്രമിക്കൂ!"</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"പാസ്‌വേഡ് തെറ്റായതിനാൽ SIM ലോക്കുചെയ്‌തു. PUK2 അഭ്യർത്ഥിച്ചു."</string>
+    <string name="badPuk2" msgid="7910064009531541708">"PUK2 തെറ്റാണ്. വീണ്ടും ശ്രമിക്കുക."</string>
+    <string name="badPin2" msgid="6646896629970023109">"പഴയ PIN2 തെറ്റാണ്. വീണ്ടും ശ്രമിക്കുക."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2-കൾ പൊരുത്തപ്പെടുന്നില്ല. വീണ്ടും ശ്രമിക്കുക."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"4 മുതൽ 8 അക്കമുള്ള PIN2 നൽകുക."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"8 അക്കമുള്ള PUK2 നൽകുക."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 അപ്‌ഡേറ്റുചെയ്‌തു"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"PUK2 കോഡ് നൽകുക"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"പാസ്‌വേഡ് തെറ്റാണ്. PIN2 ഇപ്പോൾ തടഞ്ഞിരിക്കുന്നു. വീണ്ടും ശ്രമിക്കുന്നതിന് PIN 2 മാറ്റുക."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"പാസ്‌വേഡ് തെറ്റാണ്. SIM ഇപ്പോൾ ലോക്കുചെയ്‌തിരിക്കുന്നു. PUK2 നൽകുക."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 ശാശ്വതമായി തടഞ്ഞിരിക്കുന്നു."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"<xliff:g id="NUMBER">%d</xliff:g> ശ്രമങ്ങൾ ശേഷിക്കുന്നു."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 തടഞ്ഞത് മാറ്റി!"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"നിങ്ങൾക്ക് <xliff:g id="NUMBER">%d</xliff:g> ശ്രമങ്ങൾ ശേഷിക്കുന്നു."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 ഇനി തടയില്ല"</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_redialing" msgid="8253487008234167266">"വീണ്ടും ഡയൽചെയ്യുന്നു"</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_dialing" msgid="2107666444937350731">"ഡയൽ ചെയ്യുന്നു"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"മിസ്‌ഡ് കോൾ"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"മിസ്‌ഡ് കോളുകൾ"</string>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"ഒരു കോൾ വിളിക്കാൻ വിമാന മോഡ് ഓഫാക്കുക."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"ഒരു കോൾ വിളിക്കാൻ വിമാന മോഡ് ഓഫാക്കുക അല്ലെങ്കിൽ വയർലെസ്സ് നെറ്റ്‌വർക്കിലേക്ക് കണക്റ്റുചെയ്യുക."</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_error_out_of_service" msgid="4100065333878929223">"സെല്ലുലാർ നെറ്റ്‌വർക്ക് ലഭ്യമല്ല."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"സെല്ലുലാർ നെറ്റ്‌വർക്ക് ലഭ്യമല്ല. കോൾ വിളിക്കാൻ വയർലെസ്സ് നെറ്റ്‌വർക്കിലേക്ക് കണക്റ്റുചെയ്യുക."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"ഒരു കോൾ ചെയ്യുന്നതിന്, സാധുതയുള്ള നമ്പർ നൽകുക."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"കോൾ ചെയ്യാനായില്ല."</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_unknown" msgid="655570339115407698">"സേവനം പിന്തുണയ്‌ക്കുന്നില്ല"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"കോളുകൾ മാറാനാവില്ല."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"കോൾ വേർതിരിക്കാനാവില്ല."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"കൈമാറ്റം ചെയ്യാനാവില്ല."</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="incall_error_supp_service_reject" msgid="8998568661508655638">"കോൾ നിരസിക്കാനാവില്ല."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"കോൾ (കോളുകൾ) വിളിക്കാനാവില്ല."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"ഒരു കോൾ വിളിക്കാൻ വയർലെസ്സ് നെറ്റ്‌വർക്കിലേക്ക് കണക്റ്റുചെയ്യുക."</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="7969515493359619960">"കോൾ ചെയ്യാനായില്ല. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ഒരു അടിയന്തര നമ്പർ അല്ല!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"കോൾ ചെയ്യാനായില്ല. ഒരു അടിയന്തര നമ്പർ ഡയൽ ചെയ്യുക!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"സേവനമൊന്നുമില്ല. വീണ്ടും ശ്രമിക്കുന്നു…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"കോൾ ചെയ്യാനാവില്ല. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> എന്നത് ഒരു അടിയന്തിര നമ്പരല്ല."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"കോൾ ചെയ്യാനാവില്ല. ഒരു അടിയന്തിര കോൾ നമ്പർ ഡയൽചെയ്യുക."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"ഡയൽ ചെയ്യാൻ കീബോർഡ് ഉപയോഗിക്കുക"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"ഹോള്‍ഡുചെയ്യുക"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"അവസാനിപ്പിക്കുക"</string>
@@ -440,7 +474,7 @@
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"വീഡിയോ കോൾ"</string>
     <string name="importSimEntry" msgid="6614358325359736031">"ഇമ്പോർട്ടുചെയ്യുക"</string>
     <string name="importAllSimEntries" msgid="1503181169636198673">"എല്ലാം ഇമ്പോർട്ടുചെയ്യുക"</string>
-    <string name="importingSimContacts" msgid="7374056215462575769">"SIM കോൺടാക്റ്റുകൾ ഇമ്പോർട്ടുചെയ്യുന്നു"</string>
+    <string name="importingSimContacts" msgid="7374056215462575769">"സിം കോൺടാക്റ്റുകൾ ഇമ്പോർട്ടുചെയ്യുന്നു"</string>
     <string name="importToFDNfromContacts" msgid="2130620207013368580">"കോൺടാക്റ്റുകളിൽ നിന്ന് ഇമ്പോർട്ടുചെയ്യുക"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"ശ്രവണ സഹായികൾ"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"ശ്രവണസഹായി അനുയോജ്യത ഓൺ ചെയ്യുക"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"സാധാരണം"</item>
     <item msgid="2883365539347850535">"ദൈർഘ്യമുള്ളത്"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"നെറ്റ്‌വർക്ക് സന്ദേശം"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"നെറ്റ്‌വർക്ക് സന്ദേശം"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"പിശക് സന്ദേശം"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"നിങ്ങളുടെ ഫോൺ സജീവമാക്കുക"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"നിങ്ങളുടെ ഫോൺ സേവനം സജീവമാക്കുന്നതിന് ഒരു പ്രത്യേക കോൾ നടത്തേണ്ടതുണ്ട്. \n\n“സജീവമാക്കുക” അമർത്തിയതിനുശേഷം, ഫോൺ സജീവമാക്കാൻ നൽകിയിരിക്കുന്ന നിർദ്ദേശങ്ങൾ കേൾക്കുക."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"സജീവമാക്കുന്നു..."</string>
@@ -469,8 +504,8 @@
     <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="3420314892609254729">"നിങ്ങളുടെ ഫോൺ പ്രോഗ്രാം ചെയ്യുമ്പോൾ കാത്തിരിക്കുക."</string>
-    <string name="ota_failure" msgid="4311299546379674378">"പ്രോഗ്രാമിംഗ് പരാജയപ്പെട്ടു"</string>
+    <string name="ota_progress" msgid="460876637828044519">"നിങ്ങളുടെ ഫോൺ പ്രോഗ്രാമിംഗ് ചെയ്യുന്നു…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"നിങ്ങളുടെ ഫോണിൽ പ്രോഗ്രാം ചെയ്യാനായില്ല"</string>
     <string name="ota_successful" msgid="1880780692887077407">"നിങ്ങളുടെ ഫോൺ ഇപ്പോൾ സജീവമാക്കി. സേവനം ആരംഭിക്കാൻ 15 മിനിറ്റ് വരെയെടുക്കാം."</string>
     <string name="ota_unsuccessful" msgid="8072141612635635357">"നിങ്ങളുടെ ഫോൺ സജീവമാക്കാനായില്ല. \nമികച്ച കവറേജ് ഉള്ള ഒരു ഇടം നിങ്ങൾ കണ്ടെത്തേണ്ടതുണ്ട് (ജനാലയ്‌ക്കരികിലോ പുറത്തോ). \n\nവീണ്ടും ശ്രമിക്കുക അല്ലെങ്കിൽ കൂടുതൽ ഓപ്ഷനുകൾക്കായി ഉപയോക്തൃ സേവനത്തിലേക്ക് വിളിക്കുക."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"അമിത SPC പരാജയങ്ങൾ"</string>
@@ -481,135 +516,48 @@
     <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="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="2585506997024726599">"അടിയന്തര കോൾബാക്ക് മോഡിലായിരിക്കുമ്പോൾ തിരഞ്ഞെടുത്ത പ്രവർത്തനം ലഭ്യമല്ല. ഫോൺ <xliff:g id="COUNT">%s</xliff:g> മിനിറ്റ് നേരത്തേക്ക് ഈ മോഡിലായിരിക്കും. ഇപ്പോൾ പുറത്തുകടക്കണോ?"</item>
-    <item quantity="other" msgid="6115622137771382224">"അടിയന്തര കോൾബാക്ക് മോഡിലായിരിക്കുമ്പോൾ തിരഞ്ഞെടുത്ത പ്രവർത്തനം ലഭ്യമല്ല. ഫോൺ <xliff:g id="COUNT">%s</xliff:g> മിനിറ്റ് നേരത്തേക്ക് ഈ മോഡിലായിരിക്കും. ഇപ്പോൾ പുറത്തുകടക്കണോ?"</item>
-  </plurals>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> മിനിറ്റ് നേരത്തേക്ക് ഡാറ്റ കണക്ഷൻ ലഭ്യമല്ല</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> മിനിറ്റ് നേരത്തേക്ക് ഡാറ്റ കണക്ഷൻ ലഭ്യമല്ല</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> മിനിറ്റിനുള്ളിൽ ഫോൺ അടിയന്തര കോൾബാക്ക് മോഡിലാകും. ഈ മോഡിലാകുമ്പോൾ ഡാറ്റ കണക്ഷൻ ഉപയോഗിക്കുന്ന അപ്ലിക്കേഷനുകളൊന്നും ഉപയോഗിക്കാനാവില്ല. നിങ്ങൾക്കിപ്പോൾ പുറത്തുപോകണോ?</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> മിനിറ്റിനുള്ളിൽ ഫോൺ അടിയന്തര കോൾബാക്ക് മോഡിലാകും. ഈ മോഡിലാകുമ്പോൾ ഡാറ്റ കണക്ഷൻ ഉപയോഗിക്കുന്ന അപ്ലിക്കേഷനുകളൊന്നും ഉപയോഗിക്കാനാവില്ല. നിങ്ങൾക്കിപ്പോൾ പുറത്തുപോകണോ?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other">അടിയന്തര കോൾബാക്ക് മോഡിലായിരിക്കുമ്പോൾ തിരഞ്ഞെടുത്ത പ്രവർത്തനമൊന്നും ലഭ്യമാകില്ല. <xliff:g id="COUNT_1">%s</xliff:g> മിനിറ്റിനുള്ളിൽ ഫോൺ ഈ മോഡിലാകും. നിങ്ങൾക്കിപ്പോൾ പുറത്തുപോകണോ?</item>
+      <item quantity="one">അടിയന്തര കോൾബാക്ക് മോഡിലായിരിക്കുമ്പോൾ തിരഞ്ഞെടുത്ത പ്രവർത്തനമൊന്നും ലഭ്യമാകില്ല. <xliff:g id="COUNT_0">%s</xliff:g> മിനിറ്റിനുള്ളിൽ ഫോൺ ഈ മോഡിലാകും. നിങ്ങൾക്കിപ്പോൾ പുറത്തുപോകണോ?</item>
+    </plurals>
     <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_provider" msgid="5135942703327136909">"സേവനം"</string>
-    <string name="voicemail_settings" msgid="72448049107749316">"സജ്ജീകരിക്കുക"</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="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_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="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="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="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_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="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="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>
-    <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">"&lt;സജ്ജീകരിച്ചിട്ടില്ല&gt;"</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="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="7877142631803238549">"ഒരു ഇന്റർനെറ്റ് കോൾ വിളിക്കുന്നതിന്, ആദ്യം നിങ്ങളുടെ ഇന്റർനെറ്റ് കണക്ഷൻ പരിശോധിക്കുക."</string>
-    <string name="no_wifi_available" msgid="1225073547318465713">"ഇന്റർനെറ്റ് കോളുകൾക്കായി നിങ്ങൾ Wi-Fi നെറ്റ്‌വർക്കിൽ കണക്റ്റുചെയ്യേണ്ടതുണ്ട് (വയർലെസ് &amp; നെറ്റ്‌വർക്ക് ക്രമീകരണങ്ങൾ ഉപയോഗിക്കുക)."</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_setting_title" msgid="3754000371039709383">"ദ്രുത പ്രതികരണങ്ങൾ"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></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="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_ringtone_title" msgid="2609519527849101590">"ശബ്‌ദം"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"സ്ഥിര ശബ്‌ദം (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</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="dial_pad_autocomplete" msgid="494525952035761075">"ഡയൽ പാഡ് യാന്ത്രികപൂർത്തീകരണം"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"റിംഗ്ടോണും വൈബ്രേറ്റുചെയ്യലും"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"കോൾ ചെയ്യാൻ Wi-Fi ഉപയോഗിക്കണോ?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"ഉവ്വ്"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"ഇല്ല"</string>
-    <string name="pstn_connection_service_label" msgid="1743245930577325900">"അന്തർ നിർമ്മിത SIM കാർഡുകൾ"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"അന്തർനിർമ്മിത ഇന്റർനെറ്റ് കോൾ ചെയ്യൽ"</string>
+    <string name="pstn_connection_service_label" msgid="1743245930577325900">"അന്തർ നിർമ്മിത സിം കാർഡുകൾ"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"വീഡിയോ കോളുചെയ്യൽ ഓണാക്കുക"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"വീഡിയോ കോൾ ചെയ്യൽ ഓണാക്കുന്നതിന്, നെറ്റ്‌വർക്ക് ക്രമീകരണങ്ങളിൽ മെച്ചപ്പെട്ട 4G LTE മോഡ് പ്രവർത്തനക്ഷമമാക്കേണ്ടതുണ്ട്."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"നെറ്റ്‌വർക്ക് ക്രമീകരണങ്ങൾ"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"അടയ്‌ക്കുക"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"അടിയന്തിര കോളുകൾ"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"അടിയന്തിര കോൾചെയ്യൽ മാത്രം"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM കാർഡ്, സ്ലോട്ട്: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"പ്രവേശനക്ഷമത"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"ഇൻകമിംഗ് Wi-Fi കോൾ"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi കോൾ"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"തുറക്കുന്നതിന് വീണ്ടും സ്‌പർശിക്കുക"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"സന്ദേശം ഡീകോഡുചെയ്യുമ്പോൾ ഒരു പിശകുണ്ടായി."</string>
 </resources>
diff --git a/res/values-mn-rMN/arrays.xml b/res/values-mn-rMN/arrays.xml
new file mode 100644
index 0000000..d658c73
--- /dev/null
+++ b/res/values-mn-rMN/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Глобал"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-mn-rMN/config.xml b/res/values-mn-rMN/config.xml
deleted file mode 100644
index 9ed02ae..0000000
--- a/res/values-mn-rMN/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"Худал"</string>
-</resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 6200582..a81679f 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -16,14 +16,14 @@
 
 <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="tablet" msgid="1107073389495104784">"Үүрэн мэдээлэл"</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">"FDN жагсаалт"</string>
     <string name="unknown" msgid="6878797917991465859">"Тодорхойгүй"</string>
     <string name="private_num" msgid="6713286113000232309">"Нууцлагдсан дугаар"</string>
-    <string name="payphone" msgid="1931775086311769314">"Төлбөртэй утас"</string>
+    <string name="payphone" msgid="4793877574636445118">"Payphone"</string>
     <string name="onHold" msgid="9035493194749959955">"Хүлээлгэнд"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI код эхэллээ"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD код ажиллаж байна…"</string>
@@ -52,18 +52,41 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Сүлжээг тайлах хүсэлтийг илгээж байна…"</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Сүлжээг тайлах хүсэлт амжилтгүй боллоо."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Сүлжээг амжилттай тайллаа."</string>
-    <string name="mobile_network_settings_not_available" msgid="7355254462995117896">"Энэ хэрэглэгч мобайл сүлжээний тохиргоог ашиглах боломжгүй"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Энэ хэрэглэгчийн хувьд үүрэн сүлжээний тохиргоо ашиглах боломжгүй"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM дуудлагын тохиргоо"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"GSM дуудлагын тохиргоо (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA дуудлагын тохиргоо"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"CDMA дуудлагын тохиргоо (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Хандалтын Цэгийн Нэрс"</string>
     <string name="settings_label" msgid="3876743539816984008">"Сүлжээний тохиргоо"</string>
-    <string name="connection_service" msgid="978745922583410219">"Ашиглах холболтын үйлчилгээ"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Дуудах акаунт"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Дараахаар дуудлага хийх"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Дараахаар SIP дуудлага хийх"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Эхлэж хандах"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Тохиргоонууд"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Акаунт сонгох"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Гар утасны акаунт"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"SIP акаунт нэмэх"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Акаунтын тохиргоог хийх"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi дуудлага"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Wi-Fi дуудлагыг бүү ашигла"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Дуудлагын туслагчийг бүү ашигла"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Байхгүй"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Дуудлагын туслагч"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Дуудлагын туслагчийг ашигла"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Дуудлагын туслагчийг сонгох"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"-тай дуудлага хийхэд ашигласан сүлжээнүүдийг тохируулах"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Дуудлага хийх сүлжээг апликейшн эсвэл үйлчилгээгээр удирдуул"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Тохируулах"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Суурилагдсан холболтын үйлчилгээ"</string>
     <string name="voicemail" msgid="8693759337917898954">"Дуут шуудан"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Дуут шуудан ( <xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g> )"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"ДШ:"</string>
     <string name="networks" msgid="8873030692174541976">"Сүлжээний операторууд"</string>
-    <string name="call_settings" msgid="1630474923393095156">"Дуудлагын тохиргоо"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Онцгой байдлын нэвтрүүлэг"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Дуудлагын тохиргоо"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Нэмэлт тохиргоо"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Нэмэлт тохиргоо (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
@@ -77,29 +100,32 @@
     <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="call_forwarding_settings_with_label" msgid="8569489414006897127">"Дуудлага шилжүүлэх тохиргоонууд (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="sum_cfu_disabled" msgid="8384177689501334080">"Идэвхгүй"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Завгүй бол"</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="sum_cfb_disabled" msgid="4913145177320506827">"Идэвхгүй"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Таны оператороос утас завгүй байхад дуудлагыг дамжуулахыг зогсоох үйлчилгээг дэмждэггүй."</string>
-    <string name="labelCFNRy" msgid="3646316323834351390">"Хариулаагүй үед дамжуулах"</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"Дуудлагыг хүлээн авах боломжгүй бол"</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="sum_cfnry_disabled" msgid="3884684060443538097">"Идэвхгүй"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Таны оператороос утас хариу өгөхгүй байхад дуудлагыг дамжуулахыг зогсоох үйлчилгээг дэмждэггүй."</string>
-    <string name="labelCFNRc" msgid="47183615370850000">"Холбогдохгүй бол дамжуулах"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"Холбогдох боломжгүй бол"</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="5646361343094064333">"Таны үүрэн холбоо үзүүлэгчээс утас завгүй байхад дуудлагыг дамжуулахыг зогсоох үйлчилгээг дэмждэггүй."</string>
     <string name="updating_title" msgid="6146755386174019046">"Дуудлагын тохиргоо"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"Дуудлагын тохиргоог зөвхөн үндсэн хэрэглэгч өөрчлөх боломжтой."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Дуудлагын тохиргоо (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Дуудлагын тохиргооны алдаа"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Тохиргоог уншиж байна…"</string>
     <string name="updating_settings" msgid="8171225533884883252">"Тохиргоог шинэчилж байна…"</string>
@@ -109,8 +135,8 @@
     <string name="fdn_check_failure" msgid="18200614306525434">"Таны Phone апп-н FDN тохиргоо асаалттай байна. Тус шалтгаанаар дуудлагатай холбоотой зарим функц ажиллахгүй."</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>
+    <string name="enable" msgid="7248657275000173526">"Асаах"</string>
+    <string name="disable" msgid="4678348128118573672">"Унтраах"</string>
     <string name="change_num" msgid="239476305819844391">"Шинэчлэх"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Сүлжээний тохиргоогоор"</item>
@@ -123,8 +149,8 @@
     <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="voicemail_default" msgid="2001233554889016880">"Таны оператор компани"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Үүрэн сүлжээний тохиргоо"</string>
     <string name="label_available" msgid="1181658289009300430">"Боломжтой сүлжээнүүд"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Хайж байна..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Сүлжээ олдсонгүй."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Давуу сүлжээний төлөв: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Давуу сүлжээний төлөв: Global"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Давуу сүлжээний төлөв: LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Хамгийн тохиромжтой горимууд: LTE / GSM / UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Давуу сүлжээний төлөв: LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="7886739962255042385">"LTE / WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"Зөвхөн GSM"</item>
     <item msgid="3817924849415716259">"GSM/WCDMA эхэнд нь"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Сайжруулсан 4G LTE горим"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"LTE-г ашиглан дуут болон бусад төрлийн харилцаа холбооны хэрэгслийг сайжруул (зөвлөхүйц)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Өгөгдөл идэвхжсэн"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Мобайль сүлжээгээр өгөгдөлт хандалт хийхийг идэвхжүүлэх"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Дата ашиглалтыг зөвшөөрөх"</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="8913735676127858115">"Та төрөлх сүлжээнээс дата роумингыг унтраагаад гарсан тул дата холболтоо алдлаа."</string>
-    <string name="roaming_warning" msgid="7820963598559553967">"Дата роумингыг зөвшөөрөх үү? Танд нэлээд их роумингын төлбөр гарч болно!"</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"Таны төлбөр өндөр гарах магадлалтайг анхааруулж байна."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Дата роуминг үйлчилгээг идэвхжүүлэх үү?"</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>
@@ -190,7 +221,7 @@
     <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="throttle_help_subtext" msgid="3633091498168446044">"Таны үүрэн холбооны компанийн үүрэн сүлжээний дата ашиглалтын бодлогын талаар дэлгэрэнгүй мэдээлэл"</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>
@@ -303,7 +334,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Дата үйлчилгээний тохиргоо"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Операторын тохиргоо"</string>
     <string name="fdn" msgid="7878832555095183202">"Тогтвортой Залгах Дугаар"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Тогтсон Дуудлагын Дугаарууд(<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FDN жагсаалт"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"FDN жагсаалт (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FDN идэвхжүүлэлт"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Тогтвортой Залгах Дугааруудыг идэвхжсэн"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Тогтвортой Залгах Дугааруудыг идэвхгүйжүүлсэн"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"TTY төлвийг тохируулах"</string>
     <string name="auto_retry_mode_title" msgid="4073265511427813322">"Автоматаар дахин оролдох"</string>
     <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Автоматаар дахин оролдох төлвийг идэвхжүүлэх"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"Видео дуудлагын үед TTY горимыг өөрчилж үл болно"</string>
     <string name="menu_add" msgid="1882023737425114762">"Харилцагч нэмэх"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Харилцагчийг засварлах"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Харилцагч устгах"</string>
@@ -344,7 +378,7 @@
     <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="1846161429087789936">"Харилцагчдыг SIM картаас оруулахын тулд Нислэгийн төлвийг унтраана уу."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Сим картнаас дугаар импортлохын тулд онгоцны горимыг унтраа"</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>
@@ -354,42 +388,40 @@
     <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="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="1796577128488773946">"Нууц үг буруу, ПИН түгжигдсэн! ПҮК оруулна уу."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"SIM-ний PIN-г цэвэрлэх"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"SIM-ний ПИН-г тохируулах"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"ПИН-г тохируулж байна..."</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN-г тохирууллаа"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN цэвэрлэгдсэн"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN буруу байна"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN шинэчлэгдсэн"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Нууц үг буруу байна. PIN код одоо түгжигдсэн. PUK кодыг авах хүсэлт тавигдсан."</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="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="1639666438836544393">"PIN2 амжилттай өөрчлөгдлөө."</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"PUK2 код оруулна уу"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Нууц үг буруу, ПИН2 Түгжигдсэн. ПИН2-г өөрчилсний дараа дахин оролдоно уу!"</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"Нууц үг буруу, SIM түгжигдсэн. PUK2 шаардлагатай."</string>
+    <string name="badPuk2" msgid="7910064009531541708">"PUK2 буруу байна. Дахин оролдоно уу."</string>
+    <string name="badPin2" msgid="6646896629970023109">"Хуучин PIN2 буруу байна. Дахин оролдоно уу."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2s таарахгүй байна. Дахин оролдоно уу."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"4 - 8 оронгийн PIN2 оруулна уу."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"8 оронгийн PUK2 оруулна уу."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 шинэчлэгдсэн"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"PUK2 кодыг оруулна уу"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Нууц үг буруу байна. PIN2 одоо түгжигдсэн. Дахин оролдохыг хүсвэл PIN2-г солино уу."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Нууц үг буруу байна. SIM карт одоо түгжигдсэн. PUK2 кодыг оруулна уу."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"ПҮК2 бүрмөсөн түгжигдсэн."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Одоо <xliff:g id="NUMBER">%d</xliff:g> оролдлого хийх боломж үлдлээ."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"ПИН2 Тайлагдсан!"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"Танд <xliff:g id="NUMBER">%d</xliff:g> оролдлого үлдлээ."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 түгжээгүй болсон"</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_redialing" msgid="8253487008234167266">"Дахин залгаж байна"</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_dialing" msgid="2107666444937350731">"Залгаж байна"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Аваагүй дуудлага"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Аваагүй дуудлагууд"</string>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"Дуудлага хийхийн тулд онгоцны горимыг унтраа."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Дуудлага хийхийн тулд онгоцны горимыг унтраа эсвэл утасгүй интернетэд холбогдоно уу."</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_error_out_of_service" msgid="4100065333878929223">"Үүрэн сүлжээ байхгүй."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Үүрэн сүлжээнд холбогдох боломжгүй байна. Дуудлага хийхийн тулд утасгүй интернетэд холбогдоно уу."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Дуудлага хийхийн тулд хүчин төгөлдөр дугаар оруулна уу."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Дуудлага хийх боломжгүй байна."</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_unknown" msgid="655570339115407698">"Үйлчилгээг дэмждэггүй байна"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Дуудлагыг солих боломжгүй байна."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Дуудлагыг салгаж чадахгүй байна."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Шилжүүлэх боломжгүй байна."</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="incall_error_supp_service_reject" msgid="8998568661508655638">"Дуудлага татгалзах боломжгүй байна."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Дуудлага чөлөөлөх боломжгүй байна."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Дуудлага хийхийн тулд утасгүй интернетэд холбогдоно уу."</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="7969515493359619960">"Дуудлага илгээгдсэнгүй. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> нь ослын дугаар биш!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Дуудлага илгээгдсэнгүй. Ослын дугаар руу залгана уу!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Ажиллагаагүй байна. Дахин оролдоно уу..."</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Дуудлага хийх боломжгүй. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> нь түргэн тусламжийн дугаар биш байна."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Дуудлага хийх боломжгүй. Түргэн тусламжийн дугаар луу залга."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Залгахдаа гар ашиглах"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Саатуулах"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Дуусгах"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"Энгийн"</item>
     <item msgid="2883365539347850535">"Урт"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Сүлжээний зурвас"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Сүлжээний зурвас"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Алдаатай зурвас"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Утсаа идэвхжүүлнэ үү"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Таны утасны үйлчилгээ идэвхжүүлэхийн тулд тусгай дуудлага хийх шаардлагатай. \n\n“Идэвхжүүлэх” гэснийг дарсны дараа өгч байгаа зааврыг сонсон утсаа идэвхжүүлнэ үү."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Идэвхжүүлж байна..."</string>
@@ -469,8 +504,8 @@
     <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="3420314892609254729">"Таны утсыг програмчлах зуур түр хүлээнэ үү."</string>
-    <string name="ota_failure" msgid="4311299546379674378">"Програмчлах амжилтгүй боллоо"</string>
+    <string name="ota_progress" msgid="460876637828044519">"Таны утсыг програмчилж байна..."</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Таны утсыг програмчилж болсонгүй"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Таны утсыг идэвхжүүллээ. Үйлчилгээ эхэлтэл 15 хүртэл минут зарцуулагдаж болно."</string>
     <string name="ota_unsuccessful" msgid="8072141612635635357">"Таны утас идэвхжээгүй байна. \nТа сүлжээ илүү сайн барьдаг газар (цонхны ойролцоо буюу гадаа) очих хэрэгтэй. \n\nДахиж оролдох буюу хэрэглэгчийн үйлчилгээний төв рүү залгаж өөр сонголтууд хийнэ үү."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"ИЛҮҮ SPC АЛДААНУУД"</string>
@@ -481,18 +516,18 @@
     <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="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="2585506997024726599">"Сонгосон үйлдлийг Ослын Дуудлага хүлээн авах төлөвт гүйцэтгэх боломжгүй. Утас энэ төлөвт <xliff:g id="COUNT">%s</xliff:g> минут байх болно. Энэ төлвөөс одоо гаргах уу?"</item>
-    <item quantity="other" msgid="6115622137771382224">"Сонгосон үйлдлийг Ослын Дуудлага хүлээн авах төлөвт гүйцэтгэх боломжгүй. Утас энэ төлөвт <xliff:g id="COUNT">%s</xliff:g> минут байх болно. Энэ төлвөөс одоо гаргах уу?"</item>
-  </plurals>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other">Интернет <xliff:g id="COUNT_1">%s</xliff:g> минут тасарсан байна</item>
+      <item quantity="one">Интернет <xliff:g id="COUNT_0">%s</xliff:g> минут тасарсан байна</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other">Таны гар утас яаралтай түргэн тусламжийн дуудлагын хэлбэрт<xliff:g id="COUNT_1">%s</xliff:g> минут байна. Энэ горимд байгаа тохиолдолд интернет холболт ашигладаг ямар ч програмыг ашиглаж үл болно. Та гарахыг хүсэж байна уу?</item>
+      <item quantity="one">Таны гар утас яаралтай түргэн тусламжийн дуудлагын хэлбэрт <xliff:g id="COUNT_0">%s</xliff:g> минут байна. Энэ горимд байгаа тохиолдолд интернет холболт ашигладаг ямар ч програмыг ашиглаж үл болно. Та гарахыг хүсэж байна уу?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other">Сонгосон үйлдлийг яаралтай түргэн тусламжийн горимд байгаа үед ашиглах боломжгүй. Таны гар утас энэ горимд <xliff:g id="COUNT_1">%s</xliff:g> минут байх болно. Та гарахыг хүсэж байна уу?</item>
+      <item quantity="one">Сонгосон үйлдлийг яаралтай түргэн тусламжийн горимд байгаа үед ашиглах боломжгүй. Таны гар утас энэ горимд <xliff:g id="COUNT_0">%s</xliff:g> минут байх болно. Та гарахыг хүсэж байна уу?</item>
+    </plurals>
     <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>
@@ -506,110 +541,23 @@
     <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="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="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="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_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="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="4908446367559341757">"Акаунтын бүртгэл амжилтгүй боллооl: Хэрэглэгчийн нэр буюу нууц үг буруу"</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>
-    <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">"&lt;Тохируулаагүй&gt;"</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="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="7877142631803238549">"Интернэт дуудлага хийхийн тулд эхлээд Интернэт холболтоо шалгана уу."</string>
-    <string name="no_wifi_available" msgid="1225073547318465713">"Та Интернэт дуудлага хийхийн тулд Wi-Fi сүлжээнд холбогдсон байх шаардлагатай (Wireless &amp; Сүлжээний тохиргоог ашиглана уу)."</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_setting_title" msgid="3754000371039709383">"Шуурхай хариунууд"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></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">"ухраах"</string>
-    <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_ringtone_title" msgid="2609519527849101590">"Дуу"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Үндсэн дуу (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</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="dial_pad_autocomplete" msgid="494525952035761075">"Дугаар цуглуулагчийг автоматаар бөглөх"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Хонхны ая &amp; Чичиргээ"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Дуудлага хийхэд Wi-Fi ашиглах уу?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Тийм"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"Үгүй"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Суурилагдсан SIM карт"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Суурилагдсан Интернет дуудлага"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Видео дуудлагыг идэвхжүүлэх"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Видео дуудлагыг асаахын тулд сүлжээний тохиргооноос сайжруулсан 4G LTE горимыг идэвхжүүлэх хэрэгтэй."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Сүлжээний тохиргоо"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Хаах"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Яаралтай дуудлага"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Зөвхөн яаралтай дуудлага"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM карт, оролт: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Хандалт"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Орж ирсэн Wi-Fi дуудлага"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi дуудлага"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Нээхийн тулд дахин хүрнэ үү"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"Зурвасын кодыг тайлах явцад алдаа гарсан."</string>
 </resources>
diff --git a/res/values-mr-rIN/arrays.xml b/res/values-mr-rIN/arrays.xml
new file mode 100644
index 0000000..3bb1eaf
--- /dev/null
+++ b/res/values-mr-rIN/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"जागतिक"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-mr-rIN/config.xml b/res/values-mr-rIN/config.xml
deleted file mode 100644
index 9e6e3e8..0000000
--- a/res/values-mr-rIN/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"असत्य"</string>
-</resources>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 4d76089..1e8cdaf 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -16,14 +16,14 @@
 
 <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="tablet" msgid="1107073389495104784">"सेल्‍युलर डेटा"</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">"FDN सूची"</string>
     <string name="unknown" msgid="6878797917991465859">"अज्ञात"</string>
     <string name="private_num" msgid="6713286113000232309">"खाजगी नंबर"</string>
-    <string name="payphone" msgid="1931775086311769314">"देय फोन"</string>
+    <string name="payphone" msgid="4793877574636445118">"सार्वजनिक फोन"</string>
     <string name="onHold" msgid="9035493194749959955">"होल्ड वर"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI कोड प्रारंभ केला"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD कोड चालू…"</string>
@@ -35,7 +35,7 @@
     <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">"Bluetooth"</string>
+    <string name="audio_mode_bluetooth" msgid="3047641300848211128">"ब"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"खालील टोन पाठवायचे?\n"</string>
     <string name="pause_prompt_str" msgid="1789964702154314806">"टोन पाठवित आहे\n"</string>
     <string name="send_button" msgid="4106860097497818751">"पाठवा"</string>
@@ -52,18 +52,41 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"नेटवर्क अनलॉकची विनंती करत आहे..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"नेटवर्क अनलॉक विनंती अयशस्वी."</string>
     <string name="unlock_success" msgid="6770085622238180152">"नेटवर्क अनलॉक यशस्वी."</string>
-    <string name="mobile_network_settings_not_available" msgid="7355254462995117896">"या वापरकर्त्यासाठी मोबाईल नेटवर्क सेटिंग्ज उपलब्ध नाहीत"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"या वापरकर्त्यासाठी सेल्युलर नेटवर्क सेटिंग्ज उपलब्ध नाहीत"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM कॉल सेटिंग्ज"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"GSM कॉल सेटिंग्ज (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA कॉल सेटिंग्ज"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"CDMA कॉल सेटिंग्ज (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"प्रवेश बिंदू नावे"</string>
     <string name="settings_label" msgid="3876743539816984008">"नेटवर्क सेटिंग्ज"</string>
-    <string name="connection_service" msgid="978745922583410219">"वापरण्‍यासाठी कनेक्‍शन सेवा"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"कॉल करण्याची खाती"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"यासह कॉल करा"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"यासह SIP कॉल करा"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"प्रथम विचारा"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"सेटिंग्ज"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"खाती निवडा"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"फोन खाती"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"SIP खाते जोडा"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"खाते सेटिंग्ज कॉन्‍फिगर करा"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"वाय-फाय कॉलिंग"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"वाय-फाय कॉल करणे वापरू नका"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"कॉल सहाय्यक वापरू नका"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"काहीही नाही"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"कॉल सहाय्यक"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"कॉल सहाय्यक निवडा"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"कॉल सहाय्य्क निवडा"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"यासह कॉल करण्यासाठी वापरलेले नेटवर्क व्यवस्थापित करा"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"अ‍ॅप्स किंवा सेवांना कॉलसाठी वापरलेले नेटवर्क व्यवस्‍थापित करू द्या"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"कॉन्फिगर करा"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"अंगभूत कनेक्शन सेवा"</string>
     <string name="voicemail" msgid="8693759337917898954">"व्हॉइसमेल"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"व्हॉइसमेल (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
     <string name="networks" msgid="8873030692174541976">"नेटवर्क ऑपरेटर"</string>
-    <string name="call_settings" msgid="1630474923393095156">"कॉल सेटिंग्ज"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"आणीबाणी प्रसारणे"</string>
+    <string name="call_settings" msgid="6112441768261754562">"कॉल सेटिंग्ज"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"अतिरिक्त सेटिंग्ज"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"(<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>) अतिरिक्त सेटिंग्ज"</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>
@@ -77,29 +100,32 @@
     <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="call_forwarding_settings_with_label" msgid="8569489414006897127">"(<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>) कॉल अग्रेषण सेटिंग्ज"</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="sum_cfu_disabled" msgid="8384177689501334080">"बंद"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"व्यस्त असताना"</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="sum_cfb_disabled" msgid="4913145177320506827">"बंद"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"आपला फोन व्‍यस्‍त असताना आपला ऑपरेटर कॉल अग्रेषण करणे अक्षम करण्‍यास समर्थन करीत नाही."</string>
-    <string name="labelCFNRy" msgid="3646316323834351390">"अनुत्तरीत असताना अग्रेषित करा"</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"अनुत्तरीत असताना"</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="sum_cfnry_disabled" msgid="3884684060443538097">"बंद"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"आपला फोन उत्तर देत नसताना आपला ऑपरेटर कॉल अग्रेषण करणे अक्षम करण्‍यास समर्थन करीत नाही."</string>
-    <string name="labelCFNRc" msgid="47183615370850000">"पोहचण्‍यायोग्‍य नसताना अग्रेषित करा"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"पोहचण्‍यायोग्‍य नसताना"</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="5646361343094064333">"आपला फोन पोहचण्‍यायोग्‍य नसताना आपला वाहक कॉल अग्रेषण करणे अक्षम करण्‍यास समर्थन करीत नाही."</string>
     <string name="updating_title" msgid="6146755386174019046">"कॉल सेटिंग्ज"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"कॉल सेटिंग्ज केवळ प्राथमिक वापरकर्त्याद्वारे बदलल्‍या जाउ शकतात."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"(<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>) कॉल सेटिंग्ज"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"कॉल सेटिंग्ज त्रुटी"</string>
     <string name="reading_settings" msgid="1920291699287055284">"सेटिंग्‍ज वाचत आहे…"</string>
     <string name="updating_settings" msgid="8171225533884883252">"सेटिंग्ज अद्यतनित करीत आहे..."</string>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"चालू करा"</string>
+    <string name="disable" msgid="4678348128118573672">"बंद करा"</string>
     <string name="change_num" msgid="239476305819844391">"अद्यतनित करा"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"नेटवर्क डीफॉल्ट"</item>
@@ -123,8 +149,8 @@
     <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="voicemail_default" msgid="2001233554889016880">"आपला वाहक"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"सेल्युलर नेटवर्क सेटिंग्ज"</string>
     <string name="label_available" msgid="1181658289009300430">"उपलब्ध नेटवर्क"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"शोधत आहे..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"कोणतीही नेटवर्क आढळली नाहीत."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"प्राधान्‍यकृत नेटवर्क मोड: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"प्राधान्‍यकृत नेटवर्क मोड: जागतिक"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"प्राधान्‍यकृत नेटवर्क मोड: LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"प्राधान्यीकृत नेटवर्क मोड: LTE / GSM / UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"प्राधान्‍यकृत नेटवर्क मोड: LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="7886739962255042385">"LTE / WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"केवळ GSM"</item>
     <item msgid="3817924849415716259">"GSM/WCDMA प्राधान्‍यकृत"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"वर्धित 4G LTE मोड"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"व्‍हॉइस आणि इतर संप्रेषणे (शिफारस केलेली) सुधारित करण्‍यासाठी LTE सेवांचा वापर करा"</string>
     <string name="data_enabled" msgid="5972538663568715366">"डेटा सक्षम केला"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"मोबाईल नेटवर्कवर डेटा प्रवेश सक्षम करा"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"डेटा वापरास अनुमती द्या"</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="8913735676127858115">"आपण डेटा रोमिंग बंद करून आपले होम नेटवर्क सोडल्यामुळे आपण डेटा कनेक्टिव्हिटी गमावली आहे."</string>
-    <string name="roaming_warning" msgid="7820963598559553967">"डेटा रोमिंगला अनुमती द्यायची? आपल्‍याला लक्षणिय रोमिंग शुल्‍क लागू शकते!"</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"आपल्‍याला लक्षणीय रोमिंग शुल्‍क लागू शकते."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"डेटा रोमिंगला अनुमती द्यायची?"</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>
@@ -190,7 +221,7 @@
     <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="throttle_help_subtext" msgid="3633091498168446044">"आपल्‍या वाहकाच्‍या सेल्युलर नेटवर्क डेटा वापर धोरणाविषयी अधिक माहिती"</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>
@@ -289,10 +320,10 @@
     <item msgid="1205664026446156265">"स्वयंचलित"</item>
   </string-array>
     <string name="cdma_subscription_title" msgid="1162564010076763284">"CDMA सदस्‍यता"</string>
-    <string name="cdma_subscription_summary" msgid="2530890766115781140">"RUIM/SIM आणि NV मध्‍ये बदला"</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/SIM"</item>
+    <item msgid="2258014151300708431">"RUIM/सिम"</item>
     <item msgid="5127722015571873880">"NV"</item>
   </string-array>
   <string-array name="cdma_subscription_values">
@@ -303,7 +334,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"डेटा सेवा सेट अप करा"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"वाहक सेटिंग्ज"</string>
     <string name="fdn" msgid="7878832555095183202">"निश्चित डायलिंग नंबर"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"(<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>) निश्चित डायलिंग नंबर"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FDN सूची"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"(<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>) FDN सूची"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FDN सक्रिय करणे"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"निश्चित डायलिंग नंबर सक्षम केले"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"निश्चित डायलिंग नंबर अक्षम केले"</string>
@@ -313,7 +346,7 @@
     <string name="enable_fdn_ok" msgid="7215588870329688132">"FDN अक्षम करा"</string>
     <string name="disable_fdn_ok" msgid="5727046928930740173">"FDN सक्षम करा"</string>
     <string name="sum_fdn" msgid="1959399454900272878">"निश्चित डायलिंग नंबर व्‍यवस्‍थापित करा"</string>
-    <string name="sum_fdn_change_pin" msgid="6666549734792827932">"FDN प्रवेशासाठी PIN बदला"</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="3776841382844614716">"आवाज गोपनीयता"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"वर्धित गोपनीयता मोड सक्षम करा"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"TTY मोड सेट करा"</string>
     <string name="auto_retry_mode_title" msgid="4073265511427813322">"स्‍वयं-पुन्‍हा प्रयत्‍न करा"</string>
     <string name="auto_retry_mode_summary" msgid="4973886004067532288">"स्‍वयं-पुन्हा प्रयत्‍न करा मोड सक्षम करा"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"व्हिहिओ कॉल दरम्यान TTY मोड बदलास अनुमती नाही"</string>
     <string name="menu_add" msgid="1882023737425114762">"संपर्क जोडा"</string>
     <string name="menu_edit" msgid="7143003705504672374">"संपर्क संपादित करा"</string>
     <string name="menu_delete" msgid="3977150783449642851">"संपर्क हटवा"</string>
@@ -337,59 +371,57 @@
     <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="5470854099230755944">"आपण चुकीचा PIN टाईप केल्‍याने FDN अद्यतनित केले नव्‍हते."</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="fdn_failed" msgid="540018079008319747">"FDN कार्य अयशस्‍वी झाले."</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="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="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">"सिम 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="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="1796577128488773946">"संकेतशब्द चुकीचा आहे, PIN अवरोधित केला! PUK ची विनंती केली."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"सिम कार्डमधील संपर्क आयात करण्‍यासाठी विमान मोड बंद करा."</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="8955102849303984935">"आपण टाईप केलेला जुना पिन बरोबर नाही. पुन्‍हा प्रयत्‍न करा."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"आपण टाईप केले ते पिन जुळत नाहीत. पुन्‍हा प्रयत्‍न करा."</string>
+    <string name="invalidPin" msgid="5981171102258684792">"4 ते 8 अंकांचा पिन टाईप करा."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"सिम पिन साफ करा"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"सिम पिन सेट करा"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"पिन सेट करीत आहे…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"पिन सेट केला"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"पिन साफ केला"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"पिन चुकीचा आहे"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"पिन अद्यतनित केला"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"संकेतशब्द चुकीचा आहे. पिन आता अवरोधित केला. PUK ची विनंती केली."</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="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="1639666438836544393">"PIN2 यशस्वीरित्या बदलला."</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"PUK2 कोड टाईप करा"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"संकेतशब्‍द चुकीचा आहे, PIN2 अवरोधित केला. कृपया PIN2 बदला आणि पुन्‍हा प्रयत्‍न करा!"</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"संकेतशब्द चुकीचा आहे, सिम लॉक केले आहे. PUK2 ची विनंती केली."</string>
+    <string name="badPuk2" msgid="7910064009531541708">"PUK2 चुकीचा आहे. पुन्हा प्रयत्न करा."</string>
+    <string name="badPin2" msgid="6646896629970023109">"जुना पिन2 चुकीचा आहे. पुन्हा प्रयत्न करा."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"पिन2 जुळत नाहीत. पुन्हा प्रयत्न करा."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"4 ते 8 अंक असलेला एक पिन2 प्रविष्‍ट करा."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"8 अंक असलेला एक PUK2 प्रविष्‍ट करा."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"पिन2 अद्यतनित केला"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"PUK2 कोड प्रविष्‍ट करा"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"संकेतशब्द चुकीचा आहे. पिन2 आता अवरोधित केला. पुन्हा प्रयत्न करण्‍यासाठी, पिन 2 बदला."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"संकेतशब्द चुकीचा आहे. सिम आता लॉक केले आहे. PUK2 प्रविष्‍ट करा."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 कायमचे अवरोधित केले आहे."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"शिल्‍लक <xliff:g id="NUMBER">%d</xliff:g> प्रयत्‍न."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 अवरोधित करणे रद्द केले!"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"आपल्‍याकडे <xliff:g id="NUMBER">%d</xliff:g> शिल्लक प्रयत्न आहेत."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"पिन2 अवरोधित केला नाही"</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_redialing" msgid="8253487008234167266">"रीडायल करत आहे"</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_dialing" msgid="2107666444937350731">"डायल करीत आहे"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"सुटलेला कॉल"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"सुटलेले कॉल"</string>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"कॉल करण्‍यासाठी विमान मोड बंद करा."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"कॉल करण्‍यासाठी विमान मोड बंद करा किंवा वायरलेस नेटवर्कशी कनेक्‍ट करा."</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_error_out_of_service" msgid="4100065333878929223">"सेल्युलर नेटवर्क उपलब्ध नाही."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"सेल्युलर नेटवर्क उपलब्‍ध नाही. कॉल करण्‍यासाठी वायरलेस नेटवर्कशी कनेक्‍ट करा."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"कॉल करण्यासाठी, एक वैध नंबर प्रविष्ट करा."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"कॉल करू शकत नाही."</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_unknown" msgid="655570339115407698">"सेवा समर्थित नाही"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"कॉल स्विच करू शकत नाही."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"कॉल विभक्त करू शकत नाही."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"हस्तांतर करू शकत नाही."</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="incall_error_supp_service_reject" msgid="8998568661508655638">"कॉल नाकारू शकत नाही."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"कॉल रिलीझ करू शकत नाही."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"कॉल करण्‍यासाठी वायरलेस नेटवर्कशी कनेक्‍ट करा."</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="7969515493359619960">"कॉल पाठविला नाही. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> हा आणीबाणीचा नंबर नाही!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"कॉल पाठविला नाही. आणीबाणीचा नंबर डायल करा!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"सेवा नाही. पुन्हा प्रयत्न करत आहे…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"कॉल करू शकत नाही. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> हा आणीबाणी नंबर नाहीये."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"कॉल करू शकत नाही. आणीबाणी नंबर डायल करा."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"डायल करण्‍यासाठी कीबोर्डचा वापर करा"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"होल्ड करा"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"शेवट"</string>
@@ -456,21 +490,22 @@
     <item msgid="899650777817315681">"सामान्य"</item>
     <item msgid="2883365539347850535">"दीर्घ"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"नेटवर्क संदेश"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"नेटवर्क संदेश"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"त्रुटी संदेश"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"आपला फोन सक्रिय करा"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"आपली फोन सेवा सक्रिय करण्‍यासाठी एक विशिष्‍ट कॉल केला जाणे आवश्‍यक आहे. \n\n“सक्रिय करा” दाबल्‍यानंतर, आपला फोन सक्रिय करण्‍यासाठी प्रदान केलेल्‍या सूचना ऐका."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"सक्रिय करीत आहे..."</string>
     <string name="ota_hfa_activation_dialog_message" msgid="8092479227918463415">"फोन आपली मोबाइल डेटा सेवा सक्रिय करीत आहे.\n\nयास सुमारे 5 मिनिटे लागतील."</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">"आपण सक्रिय करणे वगळल्‍यास, आपण कॉल करू शकत नाही किंवा मोबाइल डेटा नेटवर्कशी कनेक्‍ट करू शकत नाही (आपण वाय-फाय नेटवर्कशी कनेक्‍ट करू शकत असला तरीही). आपण आपला फोन सक्रिय करेपर्यंत, आपण तो प्रत्‍येक वेळी चालू करताना आपल्‍याला तो सक्रिय करण्‍यास सांगितले जाईल."</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="6570240212263372046">"फोन सक्रिय केला आहे."</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="3420314892609254729">"आपला फोन प्रोग्राम केला जात असताना प्रतीक्षा करा."</string>
-    <string name="ota_failure" msgid="4311299546379674378">"प्रोग्रामिंग अयशस्वी"</string>
+    <string name="ota_progress" msgid="460876637828044519">"आपल्‍या फोनचे प्रोग्रामिंग करीत आहे…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"आपला फोन प्रोग्राम करणे शक्य झाले नाही"</string>
     <string name="ota_successful" msgid="1880780692887077407">"आपला फोन आता सक्रिय केला आहे. सेवा सुरू होण्‍यास सुमारे 15 मिनिटे लागू शकतात."</string>
     <string name="ota_unsuccessful" msgid="8072141612635635357">"आपला फोन सक्रिय केला नव्‍हता. \nआपल्‍याला अधिक चांगले कव्‍हरेज असलेले क्षेत्र (खिडकीजवळ किंवा बाहेर) शोधण्‍याची आवश्‍यकता असू शकते. \n\nपुन्‍हा प्रयत्‍न करा किंवा अधिक पर्यायांसाठी ग्राहक सेवेस कॉल करा."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"अत्‍याधिक SPC अपयश"</string>
@@ -481,18 +516,18 @@
     <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="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="2585506997024726599">"आणीबाणी कॉलबॅक मोडमध्‍ये असताना निवडलेली क्रिया उपलब्‍ध नाही. फोन <xliff:g id="COUNT">%s</xliff:g> मिनिटासाठी या मोडमध्‍ये असेल. आपण आता बाहेर पडू इच्छिता?"</item>
-    <item quantity="other" msgid="6115622137771382224">"आणीबाणी कॉलबॅक मोडमध्‍ये असताना निवडलेली क्रिया उपलब्‍ध नाही. फोन <xliff:g id="COUNT">%s</xliff:g> मिनिटांसाठी या मोडमध्‍ये असेल. आपण आता बाहेर पडू इच्छिता?"</item>
-  </plurals>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="one"><xliff:g id="COUNT_1">%s</xliff:g> मिनिटासाठी कोणतेही डेटा कनेक्‍शन नाही</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> मिनिटांसाठी कोणतेही डेटा कनेक्‍शन नाही</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="one">फोन <xliff:g id="COUNT_1">%s</xliff:g> मिनिटासाठी आणीबाणी कॉलबॅक मोडमध्ये राहील. या मोडमध्ये असताना डेटा कनेक्शन वापरणारे कोणतेही अनुप्रयोग वापरले जाऊ शकत नाहीत. आपण आता बाहेर पडू इच्छिता?</item>
+      <item quantity="other">फोन <xliff:g id="COUNT_1">%s</xliff:g> मिनिटांसाठी आणीबाणी कॉलबॅक मोडमध्ये राहील. या मोडमध्ये असताना डेटा कनेक्शन वापरणारे कोणतेही अनुप्रयोग वापरले जाऊ शकत नाहीत. आपण आता बाहेर पडू इच्छिता?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="one">आणीबाणी कॉलबॅक मोडमध्ये असताना निवडलेली क्रिया उपलब्ध नसते. फोन <xliff:g id="COUNT_1">%s</xliff:g> मिनिटासाठी या मोडमध्ये राहील. आपण आता बाहेर पडू इच्छिता?</item>
+      <item quantity="other">आणीबाणी कॉलबॅक मोडमध्ये असताना निवडलेली क्रिया उपलब्ध नसते. फोन <xliff:g id="COUNT_1">%s</xliff:g> मिनिटांसाठी या मोडमध्ये राहील. आपण आता बाहेर पडू इच्छिता?</item>
+    </plurals>
     <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>
@@ -506,110 +541,23 @@
     <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="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="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="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_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="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="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>
-    <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">"&lt;सेट नाही&gt;"</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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"व्‍हॉइस कॉलिंंग समर्थित नाही"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"द्रुत प्रतिसाद"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></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="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_ringtone_title" msgid="2609519527849101590">"ध्वनी"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"डीफॉल्ट आवाज (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</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="dial_pad_autocomplete" msgid="494525952035761075">"डायल पॅड स्‍वयंपूर्ण"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"रिंगटोन आणि कंपन"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"कॉल करण्यासाठी Wi-Fi वापरायचे?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"होय"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"नाही"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"अंगभूत सिम कार्डे"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"अंगभूत इंटरनेट कॉलिंग"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"व्हिडिओ कॉलिंग चालू करा"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"व्हिडिओ कॉल करणे चालू करण्‍यासाठी, आपल्‍याला नेटवर्क सेटिंग्ज मधील वर्धित 4G LTE मोड सक्षम करणे आवश्‍यक आहे."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"नेटवर्क सेटिंग्ज"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"बंद करा"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"आणीबाणी कॉल"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"केवळ आणीबाणी कॉल करणे"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"सिम कार्ड, स्लॉट: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"प्रवेशयोग्यता"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"येणारा वाय-फाय कॉल"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"वाय-फाय कॉल"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"उघडण्यासाठी पुन्हा स्पर्श करा"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"संदेश डीकोड करताना एक त्रुटी आली."</string>
 </resources>
diff --git a/res/values-ms-rMY/arrays.xml b/res/values-ms-rMY/arrays.xml
new file mode 100644
index 0000000..773739b
--- /dev/null
+++ b/res/values-ms-rMY/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Global"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-ms-rMY/config.xml b/res/values-ms-rMY/config.xml
deleted file mode 100644
index 51fdac2..0000000
--- a/res/values-ms-rMY/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"palsu"</string>
-</resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 99fde92..c50ec0c 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -16,14 +16,14 @@
 
 <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">"Data Mudah Alih"</string>
+    <string name="phoneAppLabel" product="tablet" msgid="1107073389495104784">"Data Selular"</string>
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Telefon"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Pendail Kecemasan"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Telefon"</string>
     <string name="fdnListLabel" msgid="8630418672279521003">"Senarai FDN"</string>
     <string name="unknown" msgid="6878797917991465859">"Tidak diketahui"</string>
     <string name="private_num" msgid="6713286113000232309">"Nombor peribadi"</string>
-    <string name="payphone" msgid="1931775086311769314">"Telefon awam"</string>
+    <string name="payphone" msgid="4793877574636445118">"Telefon Awam"</string>
     <string name="onHold" msgid="9035493194749959955">"Ditunda"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Kod MMI dimulakan"</string>
     <string name="ussdRunning" msgid="485588686340541690">"Kod USSD dijalankan..."</string>
@@ -52,18 +52,41 @@
     <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="mobile_network_settings_not_available" msgid="7355254462995117896">"Tetapan rangkaian mudah alih tidak tersedia untuk pengguna ini"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Tetapan rangkaian selular tidak tersedia untuk pengguna ini"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Tetapan panggilan GSM"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"Tetapan panggilan GSM (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Tetapan panggilan CDMA"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"Tetapan panggilan CDMA (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Nama Titik Capaian"</string>
     <string name="settings_label" msgid="3876743539816984008">"Tetapan rangkaian"</string>
-    <string name="connection_service" msgid="978745922583410219">"Perkhidmatan sambungan yang hendak digunakan"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Akaun panggilan"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Buat panggilan dengan"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Buat panggilan SIP dengan"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Tanya dahulu"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Tetapan"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Pilih akaun"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Akaun telefon"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Tambah akaun SIP"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Konfigurasi tetapan akaun"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Panggilan Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Jangan gunakan panggilan Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Jangan gunakan pembantu panggilan"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Tiada"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Pembantu panggilan"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Gunakan pembantu panggilan"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Pilih pembantu panggilan"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Urus rangkaian yang digunakan untuk panggilan dengan"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Biarkan apl atau perkhidmatan mengurus rangkaian yang digunakan untuk panggilan"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Konfigurasi"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Perkhidmatan sambungan terbina dalam"</string>
     <string name="voicemail" msgid="8693759337917898954">"Mel suara"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Mel suara (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
     <string name="networks" msgid="8873030692174541976">"Pengendali rangkaian"</string>
-    <string name="call_settings" msgid="1630474923393095156">"Tetapan Panggilan"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Siaran kecemasan"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Tetapan panggilan"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Tetapan tambahan"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Tetapan tambahan (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Tetapan panggilan tambahan GSM sahaja"</string>
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Tetapan panggilan tambahan CDMA"</string>
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Tetapan panggilan tambahan CDMA sahaja"</string>
@@ -77,29 +100,32 @@
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Semasa dalam panggilan, beritahu saya jika ada panggilan masuk"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Semasa dalam panggilan, beritahu saya jika ada panggilan masuk"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Tetapan pemajuan panggilan"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Tetapan pemajuan panggilan (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Pemajuan panggilan"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Sentiasa majukan"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Sentiasa gunakan nombor ini"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Memajukan semua panggilan"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Memajukan semua panggilan ke <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Nombor tidak tersedia"</string>
-    <string name="sum_cfu_disabled" msgid="3698472522160364904">"Dilumpuhkan"</string>
-    <string name="labelCFB" msgid="218938523102207587">"Majukan apabila sibuk"</string>
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Dimatikan"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Semasa sibuk"</string>
     <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="sum_cfb_disabled" msgid="4913145177320506827">"Dimatikan"</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="labelCFNRy" msgid="1736067178393744351">"Semasa 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="sum_cfnry_disabled" msgid="3884684060443538097">"Dimatikan"</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="labelCFNRc" msgid="2614827454402079766">"Semasa 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="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="call_settings_primary_user_only" msgid="5679923943740900965">"Tetapan panggilan hanya boleh diubah oleh pengguna utama."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Tetapan panggilan (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Ralat tetapan panggilan"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Membaca tetapan..."</string>
     <string name="updating_settings" msgid="8171225533884883252">"Mengemas kini tetapan..."</string>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"Hidupkan"</string>
+    <string name="disable" msgid="4678348128118573672">"Matikan"</string>
     <string name="change_num" msgid="239476305819844391">"Kemas kini"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Lalai rangkaian"</item>
@@ -123,8 +149,8 @@
     <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>
-    <string name="voicemail_default" msgid="5902099213882352338">"Pembawa saya"</string>
-    <string name="mobile_networks" msgid="5540397602919106177">"Tetapan rangkaian mudah alih"</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"Pembawa anda"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Tetapan rangkaian selular"</string>
     <string name="label_available" msgid="1181658289009300430">"Rangkaian sedia ada"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Mencari..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Tiada rangkaian ditemui."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Mod rangkaian pilihan: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Mod rangkaian pilihan: Global"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Mod rangkaian pilihan: LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Mod rangkaian pilihan: LTE / GSM / UMTS"</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="7886739962255042385">"LTE / WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"GSM sahaja"</item>
     <item msgid="3817924849415716259">"GSM/WCDMA diutamakan"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Mod 4G LTE Dipertingkat"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Gunakan perkhidmatan LTE untuk memperbaik suara dan komunikasi lain (disyorkan)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Data didayakan"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Dayakan akses data melalui rangkaian Mudah Alih"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Benarkan penggunaan data"</string>
     <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="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="roaming_warning" msgid="1603164667540144353">"Anda boleh dikenakan caj yang ketara."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Benarkan perayauan data?"</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>
@@ -190,7 +221,7 @@
     <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"Melebihi maksimum <xliff:g id="USED_0">%1$s</xliff:g>\nKadar data dikurangkan kepada <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>٪ daripada kitaran telah berlalu\nTempoh 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="throttle_help_subtext" msgid="3633091498168446044">"Lagi maklumat mengenai dasar penggunaan data rangkaian selular pembawa anda"</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>
@@ -303,7 +334,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Penyediaan perkhidmatan data"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Tetapan pembawa"</string>
     <string name="fdn" msgid="7878832555095183202">"Nombor Dailan Tetap"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Nombor Dailan Tetap (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Senarai FDN"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"Senarai FDN (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Pengaktifan FDN"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Nombor Dailan Tetap didayakan"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Nombor Dailan Tetap dilumpuhkan"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Tetapkan mod TTY"</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="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"Pertukaran mod TTY tidak dibenarkan semasa panggilan video"</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>
@@ -344,7 +378,7 @@
     <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="1846161429087789936">"Untuk mengimport kenalan dari kad SIM, mula-mula matikan mod Pesawat."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Matikan mod pesawat untuk mengimport kenalan daripada kad SIM."</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>
@@ -354,42 +388,40 @@
     <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="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="1796577128488773946">"Kata laluan tidak betul, PIN Disekat! PUK diminta."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"Kosongkan PIN SIM"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"Tetapkan PIN SIM"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"Menetapkan PIN..."</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN ditetapkan"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN dikosongkan"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN tidak betul"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN dikemas kini"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Kata laluan tidak betul. PIN kini disekat. PUK 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="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="1639666438836544393">"PIN2 berjaya ditukar."</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"Taipkan kod PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Kata laluan tidak betul, PIN2 Disekat. Sila tukar PIN2 dan cuba lagi!"</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"Kata laluan salah, SIM dikunci. PUK2 diminta."</string>
+    <string name="badPuk2" msgid="7910064009531541708">"PUK2 tidak betul. Cuba lagi."</string>
+    <string name="badPin2" msgid="6646896629970023109">"PIN2 lama tidak betul. Cuba lagi."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2 tidak sepadan. Cuba lagi."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Masukkan PIN2 yang mengandungi 4 hingga 8 nombor."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Masukkan PUK2 yang mengandungi 8 nombor."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 dikemas kini"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Masukkan kod PUK2"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Kata laluan tidak betul. PIN2 kini Disekat. Untuk mencuba lagi, tukar PIN 2."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Kata laluan tidak betul. SIM kini dikunci. Masukkan PUK2."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 disekat secara kekal."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Masih ada <xliff:g id="NUMBER">%d</xliff:g> percubaan lagi."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 Dinyahsekat!"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"Anda mempunyai <xliff:g id="NUMBER">%d</xliff:g> percubaan lagi."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 tidak disekat lagi"</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="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_redialing" msgid="8253487008234167266">"Mendail 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_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>
     <string name="card_title_in_call" msgid="6346543933068225205">"Dalam panggilan"</string>
-    <string name="card_title_my_phone_number" msgid="112428362494434191">"Nombor saya ialah <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Mendail"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Panggilan tidak dijawab"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Panggilan tidak dijawab"</string>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"Matikan mod pesawat untuk membuat panggilan."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Matikan mod pesawat atau sambungkan ke rangkaian wayarles untuk membuat panggilan."</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_error_out_of_service" msgid="4100065333878929223">"Rangkaian selular tidak tersedia."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Rangkaian selular tidak tersedia. Sambungkan ke rangkaian wayarles untuk membuat panggilan."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Untuk membuat panggilan, masukkan nombor yang sah."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Tidak dapat memanggil."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Memulakan jujukan MMI..."</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>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Tidak boleh memindahkan panggilan."</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Perkhidmatan tidak disokong"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Tidak dapat menukar panggilan."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Tidak dapat mengasingkan panggilan."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Tidak dapat memindahkan panggilan."</string>
     <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Tidak boleh membuat panggilan sidang."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Tidak dapat menolak panggilan."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Tidak dapat melepaskan panggilan."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Panggilan internet"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Tidak dapat menolak panggilan."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Tidak dapat melepaskan panggilan."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Sambungkan ke rangkaian wayarles untuk membuat panggilan."</string>
     <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="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="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Tiada perkhidmatan. Mencuba lagi..."</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Tidak dapat memanggil. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> bukan nombor kecemasan."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Tidak dapat memanggil. Dail nombor kecemasan."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Gunakan papan kekunci untuk mendail"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Tunda"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Tamat"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"Biasa"</item>
     <item msgid="2883365539347850535">"Panjang"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Mesej rangkaian"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Mesej rangkaian"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Mesej ralat"</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\nSelepas menekan “Aktifkan”, dengar arahan yang diberi untuk mengaktifkan telefon anda."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Mengaktifkan..."</string>
@@ -469,8 +504,8 @@
     <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_speaker" msgid="6904589278542719647">"Pembesar suara"</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_progress" msgid="460876637828044519">"Mengatur cara telefon anda..."</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Tidak dapat mengatur cara telefon anda"</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="8072141612635635357">"Telefon anda tidak diaktifkan. \nAnda mungkin perlu mencari kawasan yang mempunyai liputan yang lebih baik (berhampiran tingkap atau di luar). \n\nCuba lagi atau hubungi khidmat pelanggan untuk mendapatkan lagi pilihan."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"KEGAGALAN SPC BERLEBIHAN"</string>
@@ -481,18 +516,18 @@
     <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>
     <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Sambungan data dilumpuhkan"</string>
-  <plurals name="phone_in_ecm_notification_time">
-    <item quantity="one" msgid="4866221796252472622">"Tiada sambungan data selama <xliff:g id="COUNT">%s</xliff:g> minit"</item>
-    <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="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="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>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other">Tiada sambungan data selama <xliff:g id="COUNT_1">%s</xliff:g> minit</item>
+      <item quantity="one">Tiada sambungan data selama <xliff:g id="COUNT_0">%s</xliff:g> minit</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other">Telefon akan berada dalam mod Panggilan Balik Kecemasan selama <xliff:g id="COUNT_1">%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">Telefon akan berada dalam mod Panggilan Balik Kecemasan selama <xliff:g id="COUNT_0">%s</xliff:g> seminit. Semasa berada dalam mod ini tiada apl yang menggunakan sambungan data boleh digunakan. Adakah anda mahu keluar sekarang?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other">Tindakan yang dipilih tidak tersedia semasa berada dalam mod Panggilan Balik Kecemasan. Telefon akan berada dalam mod ini selama <xliff:g id="COUNT_1">%s</xliff:g> minit. Adakah anda mahu keluar sekarang?</item>
+      <item quantity="one">Tindakan yang dipilih tidak tersedia semasa berada dalam mod Panggilan Balik Kecemasan. Telefon akan berada dalam mod ini selama <xliff:g id="COUNT_0">%s</xliff:g> minit. Adakah anda mahu keluar sekarang?</item>
+    </plurals>
     <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>
@@ -506,110 +541,23 @@
     <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_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_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="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="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="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="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_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="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="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>
-    <string name="username_title" msgid="2479375923477682328">"Nama pengguna"</string>
-    <string name="password_title" msgid="3323555249068171531">"Kata laluan"</string>
-    <string name="display_name_title" msgid="2459768196312249937">"Nama paparan"</string>
-    <string name="proxy_address_title" msgid="4828301345351614273">"Alamat proksi keluar"</string>
-    <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="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>
-    <string name="auth_username_title" msgid="851473016307947120">"Nama pengguna pengesahan"</string>
-    <string name="auth_username_summary" msgid="6782012405225938629">"Nama pengguna yang digunakan untuk pengesahan"</string>
-    <string name="default_preference_summary" msgid="868766740121667450">"&lt;Tidak ditetapkan&gt;"</string>
-    <string name="display_name_summary" msgid="8636377460518225523">"&lt;Sama dengan nama pengguna&gt;"</string>
-    <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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"Panggilan suara tidak disokong"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Respons pantas"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"satu"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"dua"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"tiga"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"empat"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"lima"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"enam"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"tujuh"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"lapan"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"sembilan"</string>
-    <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_dial_button" msgid="7459705245418435351">"dail"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="description_target_answer" msgid="7205604197797472471">"Jawapan"</string>
-    <string name="description_target_send_sms" msgid="2098326025587950144">"Hantar SMS"</string>
-    <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="2609519527849101590">"Bunyi"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Bunyi lalai (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <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="dial_pad_autocomplete" msgid="494525952035761075">"Autolengkap pad pendail"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Nada dering &amp; Bergetar"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Gunakan Wi-Fi untuk membuat panggilan?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Ya"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"Tidak"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Kad SIM terbina dalam"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Panggilan Internet terbina dalam"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Hidupkan panggilan video"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Untuk mengaktifkan panggilan video, anda perlu mendayakan Mod LTE 4G Dipertingkat dalam tetapan rangkaian."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Tetapan rangkaian"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Tutup"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Panggilan kecemasan"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Panggilan kecemasan sahaja"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"Kad SIM, slot: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Kebolehaksesan"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Panggilan Wi-Fi masuk"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Panggilan Wi-Fi"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Sentuh lagi untuk membuka"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"Terdapat ralat semasa menyahkodkan mesej."</string>
 </resources>
diff --git a/res/values-my-rMM/arrays.xml b/res/values-my-rMM/arrays.xml
new file mode 100644
index 0000000..beba0b9
--- /dev/null
+++ b/res/values-my-rMM/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"တစ်ကမ္ဘာလုံးဆိုင်ရာ"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"၁၀"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-my-rMM/config.xml b/res/values-my-rMM/config.xml
deleted file mode 100644
index 07bddc8..0000000
--- a/res/values-my-rMM/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"အမှား"</string>
-</resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
new file mode 100644
index 0000000..930c146
--- /dev/null
+++ b/res/values-my-rMM/strings.xml
@@ -0,0 +1,563 @@
+<?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="1107073389495104784">"ဆဲလ်လူလာ ဒေတာ"</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">"FDN အမှတ်စဉ်"</string>
+    <string name="unknown" msgid="6878797917991465859">"အကြောင်းအရာ မသိရှိ"</string>
+    <string name="private_num" msgid="6713286113000232309">"လျို့ဝှက် နံပါတ်"</string>
+    <string name="payphone" msgid="4793877574636445118">"ငွေပေးရသည့်ဖုန်း"</string>
+    <string name="onHold" msgid="9035493194749959955">"ခဏ ကိုင်ထားစဉ်"</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="enter_input" msgid="1810529547726803893">"USSD စာများဟာ စာလုံးရေ <xliff:g id="MIN_LEN">%d</xliff:g> မှ<xliff:g id="MAX_LEN">%d</xliff:g> အတွင်း ဖြစ်ရပါမည်။ နောက်တစ်ခေါက်ကြိုးစားပါ"</string>
+    <string name="manageConferenceLabel" msgid="4691922394301969053">"ကွန်းဖရင့် ခေါ်ဆိုမှုကို ထိန်းချုပ်သည်"</string>
+    <string name="ok" msgid="3811371167865772377">"ကောင်းပြီ"</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="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="5543521676355533577">"wildစာလုံးကို အစားထိုးရန်မှာ"</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="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="requesting_unlock" msgid="6412629401033249351">"ကွန်ယက်သော့ဖွင့်ခြင်း တောင်းဆိုနေပါသည်…"</string>
+    <string name="unlock_failed" msgid="6490531697031504225">"ကွန်ယက်ဖွင့်ရန် တောင်းဆိုမှု မအောင်မြင်ပါ"</string>
+    <string name="unlock_success" msgid="6770085622238180152">"ကွန်ယက်ဖွင့်ခြင်း မအောင်မြင်ပါ"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"ဒီအသုံးပြုသူ အတွက် မိုဘိုင်း ကွန်ရက် ဆက်တင်များ မရှိ"</string>
+    <string name="labelGSMMore" msgid="5930842194056092106">"ဂျီအက်စ်အမ် ခေါ်ဆိုမှု ဆက်တင်"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"GSM ခေါ်ဆိုမှု ဆက်တင်များ ( <xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g> )"</string>
+    <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA ဖုန်းခေါ်ဆိုမှု ဆက်တင်"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"CDMA ခေါ်ဆိုမှု ဆက်တင်များ ( <xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g> )"</string>
+    <string name="apn_settings" msgid="9043423184895642077">"ချိတ်ဆက်သောပွိုင့်အမည်များ"</string>
+    <string name="settings_label" msgid="3876743539816984008">"ကွန်ရက် ဆက်တင်များ"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"ခေါ်ဆိုသော အကောင့်များ"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"ဖြင့် ခေါ်ဆိုမှုများပြုလုပ်မည်"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"ဖြင့် SIP ခေါ်ဆိုမှုများ ပြုလုပ်မည်"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"အရင်မေးပါ"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"ဆက်တင်များ"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"အကောင့်များ ရွေးချယ်မည်။"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"ဖုန်းအကောင့်များ"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"SIP အကောင့်ပေါင်းထည့်မည်။"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"အကောင့် ချိန်ညှိချက်များ ပြုပြင်မည်"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"ဝိုင်ဖိုင် ခေါ်ဆိုမှု"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"ကြိုးမဲ့ ခေါ်ဆိုမှုကို မသုံးပါနှင့်"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"ခေါ်ဆိုမှု အကူ အသုံးမပြုပါ"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"မရှိ"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"ခေါ်ဆိုမှု အကူ"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"ခေါ်ဆိုမှု အကူအသုံးပြုမည်"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"ခေါ်ဆိုမှုအကူ ရွေးချယ်မည်"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"ခေါ်ဆိုရန် အသုံးပြုသည့် ကွန်ရက်များကို စီမံကွပ်ကဲရန်"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"ခေါ်ဆိုမှုအတွက် အသုံးပြုမည့် ကွန်ရကန်များအား app များသို့မဟုတ် ဝန်ဆောင်မှုများကို စီမံစေမည်"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"ပုံပေါ်စေသည်"</string>
+    <string name="connection_service_default_label" msgid="1498481943805913754">"တပ်ဆင်ပြီး ချိတ်ဆက်ရေး ဝန်ဆောင်မှု"</string>
+    <string name="voicemail" msgid="8693759337917898954">"အသံစာပို့စနစ်"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"အသံစာပို့စနစ် ( <xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g> )"</string>
+    <string name="voicemail_abbreviated" msgid="2215592488517217448">"အသံစာပို့နစ်အမှတ် -"</string>
+    <string name="networks" msgid="8873030692174541976">"ကွန်ရက် အော်ပရေတာများ"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"အရေးပေါ် ထုတ်လွှင့်မှုများ"</string>
+    <string name="call_settings" msgid="6112441768261754562">"ခေါ်ဆိုခြင်း အဆင်အပြင်များ"</string>
+    <string name="additional_gsm_call_settings" msgid="1391795981938800617">"ပိုမိုသော အပြင်အဆင်များ"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"နောက်ထပ် ချိန်ညှိချက်များ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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_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>
+    <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="call_forwarding_settings_with_label" msgid="8569489414006897127">"ခေါ်ဆိုမှု ထပ်ဆင့်ပို့ခြင်း ချိန်ညှိချက်များ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="8384177689501334080">"ပိတ်ထားရန်"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"မအားလပ်ချိန်"</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="4913145177320506827">"ပိတ်ထားရန်"</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"သင့် ဖုန်း အလုပ်များနေစဉ် call forwarding ပြုလုပ်မှု ပယ်ဖျက်ရန် သင့် အော်ပရေတာမှ ခွင့်မပြုပါ"</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"ဖုန်းမကိုင်ချိန်"</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="3884684060443538097">"ပိတ်ထားရန်"</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"သင့် ဖုန်း မကိုင်စဉ် call forwarding ပြုလုပ်မှု ပယ်ဖျက်ရန် သင့် အော်ပရေတာမှ ခွင့်မပြုပါ"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"ဆက်သွယ်၍ မရချိန်"</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="5646361343094064333">"သင့် ဖုန်း ဆက်သွယ်မှု လုပ်လို့မရစဉ် call forwarding ပြုလုပ်မှု ပယ်ဖျက်ရန် သင့် အော်ပရေတာမှ ခွင့်မပြုပါ"</string>
+    <string name="updating_title" msgid="6146755386174019046">"ခေါ်ဆိုခြင်း အဆင်အပြင်များ"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"အဓိက အသုံးပြုသူသာလျှင် ခေါ်ဆိုမှု ချိန်ညှိချက်များကို ပြောင်းလဲနိုင်ပါသည်။"</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"ခေါ်ဆိုမှု ချိန်ညှိချက်များ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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">"ကွန်ရက် သို့မဟုတ် ဆင်းမ်ကဒ်အမှား"</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="7248657275000173526">"ဖွင့်ထားရန်"</string>
+    <string name="disable" msgid="4678348128118573672">"ပိတ်မည်"</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="3352934863246208918">"အသံစာပို့စနစ် နံပါတ်အား ပြောင်းလို့ မရပါ။\nဒီပြသနာ ဆက်ဖြစ်နေပါက သင့်ဖုန်းလိုင်းဝန်ဆောင်မှုဌာနကို ဆက်သွယ်ပါ"</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"forwarding နံပါတ်အား ပြောင်းလို့ မရပါ။\nဒီပြသနာ ဆက်ဖြစ်နေပါက သင့်ရဲ့ မိုဘိုင်း ဆက်သွယ်ရေးဝန်ဆောင်မှု ပေးသူကို ဆက်သွယ်ပါ"</string>
+    <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"လက်ရှိ forwarding နံပါတ် အပြင်အဆင်အား ရယူခြင်းနှင့် သိမ်းဆည်းခြင်း ပြုလုပ်မရပါ\nဘယ်လိုဖြစ်ဖြစ် ဝန်ဆောင်မှု ပေးသူ အသစ်ပြောင်းပါမလား။"</string>
+    <string name="no_change" msgid="3186040086622435212">"အပြောင်းအလဲများ မပြုလုပ်ထားပါ"</string>
+    <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"အသံစာပို့စနစ် ဝန်ဆောင်မှု ရွေးပါ"</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"သင့် မိုဘိုင်းဆက်သွယ်ရေး ဝန်ဆောင်မှုဌာန"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"ဆယ်လူလာ ကွန်ရက် ဆက်တင်များ"</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="5613353860205691579">"ဒီကွန်ယက်ကို ဆက်သွယ်ရန် သင့်ရဲ့ ဆင်းမ်ကဒ်မှ ခွင့်မပြုပါ"</string>
+    <string name="connect_later" msgid="2308119155752343975">"ကွန်ယက်ကို ဆက်သွယ်လို့မရပါ။ နောင်မှ ပြန်ကြိုးစားပါ"</string>
+    <string name="registration_done" msgid="495135664535876612">"ကွန်ယက်ပေါ်တွင် မှတ်ပုံတင်ထားခြင်း"</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="2336624679902659306">"ပိုမိုနှစ်သက်သော ကွန်ယက်အမျိုးအစား"</string>
+    <string name="preferred_network_mode_summary" msgid="1434820673166126609">"ကွန်ရက် လုပ်ဆောင်မှုစနစ်အား ပြောင်းပါ"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"ပိုမိုကြိုက်သော ကွန်ယက်အမျိုးအစား"</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_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"ပိုမိုကြိုက်သော ကွန်ယက်စနစ်- CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"ပိုမိုကြိုက်သော ကွန်ယက်အခြေအနေ: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"ပိုမိုကြိုက်သော ကွန်ယက်စနစ်- GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"ပိုမိုကြိုက်သော ကွန်ယက်စနစ်- CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"ပိုမိုကြိုက်သော ကွန်ယက်စနစ်-တစ်ကမ်ဘာလုံးဆိုင်ရာ"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"ပိုမိုကြိုက်သော ကွန်ယက်စနစ်- LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"ပိုနှစ်သက်သည့် ကွန်ရက်မုဒ်: LTE / GSM / UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"ပိုနှစ်သက်သည့် ကွန်ရက်မုဒ်: LTE / CDMA"</string>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="7886739962255042385">"LTE / WCDMA"</item>
+    <item msgid="577652050447385699">"မြန်နှုန်းမြင့်လိုင်း"</item>
+    <item msgid="6813597571293773656">"တစ်ကမ္ဘာလုံးဆိုင်ရာ"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"EvDo သာ"</item>
+    <item msgid="1508557726283094448">"CDMA w/o EvDo"</item>
+    <item msgid="4341433122263841224">"CDMA/EvDo auto"</item>
+    <item msgid="5958053792390386668">"GSM/WCDMA auto"</item>
+    <item msgid="7913148405605373434">"WCDMA သာ"</item>
+    <item msgid="1524224863879435516">"GSM သာ"</item>
+    <item msgid="3817924849415716259">"GSM/WCDMA preferred"</item>
+  </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"မြှင့်တင်ထား 4G LTE မုဒ်"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"အသံခေါ်ဆိုမှုနှင့် အခြားဆက်သွယ်ရေးများ တိုးတက်စေရန် LTE ဝန်ဆောင်မှုများ ကိုအသုံးပြုမည် (အကြံပြုထား)"</string>
+    <string name="data_enabled" msgid="5972538663568715366">"ဒေတာ ဖွင့်ထားပြီး"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"ဒေတာ သုံးစွဲမှု ခွင့်ပြုရန်"</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="8913735676127858115">"ဒေတာဆက်သွယ်မှုပြတ်တောက်သွားပါသည် အဘယ်ကြောင့်ဆိုသော် သင့်အိမ်၏ကွန်ယက်မှထွက်ကာ ဒေတာရုန်းမင်းကွန်ယက်ကိုလဲပိတ်ထားသောကြောင့်ဖြစ်သည်"</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"သိသာသည့် ငွေနူန်းထားသင့်အား ကျသင့်နိုင်ပါသည်။"</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"ကွန်ရက်ပြင်ပဒေတာအသုံးပြုခြင်း ခွင့်​ပြုမည်လား?"</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_0">%1$s</xliff:g> (<xliff:g id="USED_1">%2$d</xliff:g>٪) မှ <xliff:g id="USED_2">%3$s</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_0">%1$s</xliff:g> (<xliff:g id="USED_1">%2$d</xliff:g>٪)၏ <xliff:g id="USED_2">%3$s</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="3633091498168446044">"သင့် အတွက် စီမံပေးသူ၏ မိုဘိုင်ကွန်ရက် ဒေတာအသုံးပြုမှု မူဝါဒ အကြောင်း အချက်အလက်များကို ပိုမိုသိရှိရန်"</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">"၁"</item>
+    <item msgid="289708030346890334">"၂"</item>
+    <item msgid="1121469729692402684">"၃"</item>
+    <item msgid="2614093115912897722">"၄"</item>
+    <item msgid="2411164639857960614">"၅"</item>
+    <item msgid="5884448729274543324">"၆"</item>
+    <item msgid="5511864807618312598">"၇"</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="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="network_lte" msgid="7702681952521375754">"LTE (အကြံပြု)"</string>
+    <string name="network_4G" msgid="2723512640529983138">"4G (အကြုံပြု)"</string>
+    <string name="network_global" msgid="1323190488685355309">"တစ်ကမ္ဘာလုံးဆိုင်ရာ"</string>
+    <string name="cdma_system_select_title" msgid="5757657769327732833">"စစ်စတန် ရွေးချယ်ရန်"</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_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">"၀"</item>
+    <item msgid="6043847456049107742">"၁"</item>
+  </string-array>
+    <string name="cdma_activate_device" msgid="3793805892364814518">"စက်ကို အက်တီဗိတ် လုပ်ရန်"</string>
+    <string name="cdma_lte_data_service" msgid="4255018217292548962">"ဒေတာဝန်ဆောင်မှု စတင်ရန်"</string>
+    <string name="carrier_settings_title" msgid="9028166176523012300">"ဖုန်းလိုင်းဝန်ဆောင်မှုပေးသူ၏ အပြင်အဆင်"</string>
+    <string name="fdn" msgid="7878832555095183202">"ခေါ်ဆိုသည့်အခြေစိုက်နံပါတ်များ"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"အထိုင်ဖုန်းနံပါတ် (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="manage_fdn_list" msgid="8777755791892122369">"FDN စာရင်း"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"FDN စာရင်း (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="fdn_activation" msgid="2156479741307463576">"FDN အက်တီဗေးရှင်း ပြုလုပ်သည်"</string>
+    <string name="fdn_enabled" msgid="5238109009915521240">"ပုံသေခေါ်ဆိုမှု နံပါတ်များအား ဖွင့်ထားသည်"</string>
+    <string name="fdn_disabled" msgid="4700049736675368279">"ပုံသေခေါ်ဆိုမှု နံပါတ်များအား ပိတ်ထားသည်"</string>
+    <string name="enable_fdn" msgid="3740191529180493851">"FDN ကို သုံးနိုင်ရန်"</string>
+    <string name="disable_fdn" msgid="7944020890722540616">"FDN ကို ပိတ်ထားရန်"</string>
+    <string name="change_pin2" msgid="2153563695382176676">"ပင်နံပါတ်၂ ကို ပြောင်းရန်"</string>
+    <string name="enable_fdn_ok" msgid="7215588870329688132">"FDN ကို ပယ်ဖျက်ရန်"</string>
+    <string name="disable_fdn_ok" msgid="5727046928930740173">"FDN ကို သုံးနိုင်ရန်"</string>
+    <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="3776841382844614716">"အသံလုံခြုံရေး"</string>
+    <string name="voice_privacy_summary" msgid="3159383389833516214">"တိုးမြှင့်လုံခြုံရေးစနစ် ပြုလုပ်ခြင်း"</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="4073265511427813322">"အလိုအလျောက် ပြန်ကြိုးစားခြင်း"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"အလိုအလျောက် ပြန်ကြိုးစားခြင်းအား ပြုလုပ်ထားခြင်း"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"ဗီဒီယိုခေါ်ဆိုမှုအတွင်း TTY မုဒ်ပြောင်းလဲရန် ခွင့်မပြုပါ"</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="8204677063922225311">"ပင် နံပါတ် ၂ ကို ရိုက်ပါ"</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="5470854099230755944">"ပင်နံပါတ် မမှန်သောကြောင့် FDNကို အဆင့်မြှင့်တင်ခြင်းမပြုလုပ်နိုင်ပါ"</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"နံပါတ် အလုံးရေ (၂၀) ထက် ရှည်လို့ မရသောကြောင့် FDN ကို မပြင်ဆင်ဖြစ်ပါ"</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN ပြောင်းလဲမှု မဖြစ်ပါ။ ပင်နံပါတ် ၂ မှားယွင်းခြင်း သို့မဟုတ် ဖုန်းနံပါတ်ကို ငြင်းဖယ်ခံရခြင်း တစ်ခုခုဖြစ်ပါသည်"</string>
+    <string name="fdn_failed" msgid="540018079008319747">"FDN လုပ်ဆောင်ချက် မအောင်မြင်ပါ"</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="5254946758982621072">"SIM ကဒ်မှ အဆက်အသွယ်များ သွင်းယူရန် လေယာဉ်ပျံမုဒ် ပိတ်ထားပါ။"</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="8955102849303984935">"သင် ရိုက်ထည့်သော ပင်နံပါတ်အဟောင်း မမှန်ကန်ပါ။ နောက်တစ်ကြိမ် ကြိုးစားပါ"</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"ရိုက်ထည့်သော ပင်နံပါတ်များ တူညီမှု မရှိပါ။ ပြန်လည်ကြိုးစားပါ"</string>
+    <string name="invalidPin" msgid="5981171102258684792">"ဂဏန်း၄ လုံးမှ ဂ လုံးအထိ ရှိသော ပင်နံပါတ် ရိုက်ထည့်ပါ"</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"SIM ပင်အား ရှင်းလင်းမည်"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"SIM ပင်နံပါတ် သတ်မှတ်မည်"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"ပင်နံပါတ် သတ်မှတ်နေသည်…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"ပင်နံပါတ် သတ်မှတ်သည်"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"ပင်နံပါတ် ရှင်းလင်းပြီးပါပြီ"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"ပင်နံပါတ် မမှန်ကန်ပါ"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"ပင်နံပါတ် အသစ်မွမ်းမံပြီးပါပြီ။"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"လျှို့ဝှက်စကားလုံး မမှန်ကန်ပါ။ ပင်နံပါတ် ယခုအဆက်ဖြတ်လိုက်ပါပြီ။ PUK တောင်းဆိုထားသည်။"</string>
+    <string name="enter_pin2_text" msgid="8339444124477720345">"ပင်နံပါတ် ၂"</string>
+    <string name="oldPin2Label" msgid="8559146795026261502">"ပင်နံပါတ် ၂ အဟောင်း"</string>
+    <string name="newPin2Label" msgid="4573956902204349054">"ပင်နံပါတ် ၂ အသစ်"</string>
+    <string name="confirmPin2Label" msgid="8100319484454787708">"ပင်နံပါတ်၂ အသစ်ကို အတည်ပြုရန်"</string>
+    <string name="badPuk2" msgid="7910064009531541708">"PUK2 မမှန်ကန်ပါ။ ထပ်မံကြိုးစားပါ။"</string>
+    <string name="badPin2" msgid="6646896629970023109">"ပင်နံပါတ်2 အဟောင်း မမှန်ကန်ပါ။ ထပ်မံကြိုးစားပါ။"</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2s မကိုက်ညီပါ။ ထပ်မံကြိုးစားပါ။"</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"နံပါတ် 4 လုံးမှ 8 လုံးရှိသည့် ပင်နံပါတ် 2 အားရိုက်ထည့်ပါ။"</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"နံပါတ် 8 လုံးရှိသည့် PUK2 ရိုက်ထည့်ပါ။"</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"ပင်နံပါတ်2 အသစ်မွမ်းမံလိုက်ပါပြီ။"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"PUK2 ကုဒ် ရိုက်ထည့်ပါ။"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"လျှို့ဝှက်စကားလုံး မမှန်ကန်ပါ။ ပင်နံပါတ်2 ယခုပိတ်လိုက်ပါပြီ။ ထပ်မံကြိုးစားရန်၊ ပင်နံပါတ် 2 အားပြောင်းမည်။"</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"လျှို့ဝှက်စကားလုံး မမှန်ကန်ပါ။ SIM ယခုသော့ခတ်လိုက်ပါပြီ။ PUK2 ရိုက်ထည့်ပါ။"</string>
+    <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 ကို ထာ၀ရ ပိတ်ထားပါသည်"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"သင့်တွင် လက်ကျန် ကြိုးစားခွင့် <xliff:g id="NUMBER">%d</xliff:g> ရှိသည်။"</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"ပင်နံပါတ်2 အား အဆက်မဖြတ်တော့ပါ။"</string>
+    <string name="doneButton" msgid="2859593360997984240">"ပြီးပါပြီ"</string>
+    <string name="voicemail_settings_number_label" msgid="8524164258691887790">"အသံစာပို့စနစ်နံပါတ်"</string>
+    <string name="card_title_dialing" msgid="5769417478498348054">"ဖုန်းခေါ်နေစဉ်"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"ပြန်ခေါ်ရန်"</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="notification_dialing" msgid="2107666444937350731">"ဖုန်းခေါ်နေစဉ်"</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_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>
+    <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="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="2947938060513306698">"ဖုန်းခေါ်ရန် လေယာဉ်ပျံမုဒ် ပိတ်ထားပါ။"</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"ဖုန်းခေါ်ရန် လေယာဉ်ပျံမုဒ် ပိတ်ပါ သို့မဟုတ် ကြိုးမဲ့ကွန်ယက်သို့ ချိတ်ဆက်ပါ။"</string>
+    <string name="incall_error_emergency_only" msgid="4678640422710818317">"ကွန်ယက်ပေါ်မှာ မှတ်ပုံတင်မှု မပြုလုပ်ထားပါ"</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"ဆယ်လူလာ ကွန်ရက် မရှိပါ။"</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"ဆဲလူလာ ကွန်ယက် မရပါ။ ဖုန်းခေါ်ရန် ကြိုးမဲ့ကွန်ယက်သို့ ချိတ်ဆက်ပါ။"</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"ဖုန်းခေါ်ရန်အတွက်၊ သင့်လျော်သည့်နံပါတ် ရိုက်ထည့်ပါ။"</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"မခေါ်ဆိုနိုင်ပါ။"</string>
+    <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI အမှတ်စဉ်ကို စတင်နေပါသည်…"</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"ဤဝန်ဆောင်မှုအား မပံ့ပိုးပါ။"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"ဖုန်းခေါ်ခြင်းများကြား မကူးပ​ြောင်းနိုင်ပါ။"</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"ဖုန်းခေါ်ခြင်းအား မခွဲထုတ်နိုင်ပါ။"</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"မလွှဲပြောင်းနိုင်ပါ။"</string>
+    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"ကွန်းဖရင့် ပြုလုပ်၍ မရပါ"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"ဖုန်းခေါ်ခြင်းအား မငြင်းဆိုနိုင်ပါ။"</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"ဖုန်းခေါ်ခြင်း(များ)အား လွှတ်မပေးနိုင်ပါ။"</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"ဖုန်းခေါ်ရန် ကြိုးမဲကွန်ယက်တစ်ခုသို့ ချိတ်ဆက်ပါ။"</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="5960061579996526883">"ဝန်ဆောင်မှု မရှိပါ။ ထပ်မံကြိုးစားပါ…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"မခေါ်ဆိုနိုင်ပါ။ <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> က အရေးပေါ်နံပါတ် မဟုတ်ပါ။"</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"မခေါ်ဆိုနိုင်ပါ။ အရေးပေါ်နံပါတ်အား ခေါ်ဆိုပါ။"</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="onscreenVideoCallText" msgid="4800924186056115442">"ဗီဒီယိုခေါ်ဆိုမှု"</string>
+    <string name="importSimEntry" msgid="6614358325359736031">"ထည့်ရန်"</string>
+    <string name="importAllSimEntries" msgid="1503181169636198673">"အားလုံးကို ထည့်သွင်းပါ"</string>
+    <string name="importingSimContacts" msgid="7374056215462575769">"ဆင်းမ်ကဒ်မှ လိပ်စာများအား ထည့်ပါ"</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="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_info_message" msgid="7738596060242881930">"ကွန်ရက် စာပို့"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"အမှားစာ"</string>
+    <string name="ota_title_activate" msgid="8616918561356194398">"သင့်ဖုန်းကို အက်တီဗိတ်လုပ်ပါ"</string>
+    <string name="ota_touch_activate" msgid="6553212803262586244">"ဖုန်းဝန်ဆောင်မှုကို အက်တီဗိတ်လုပ်ရန် စပယ်ရှယ်ဖုန်းခေါ်ဆိုမှု လုပ်ရမည်ဖြစ်ပါသည်။ \n \n“Activate” ဆိုတာကို နှိပ်ပြီးလျင် ပြောကြားသော ညွှန်းကြားချက်များကို လိုက်နာပါ။"</string>
+    <string name="ota_hfa_activation_title" msgid="2234246934160473981">"အက်တီဗိတ် လုပ်နေပါသည်…"</string>
+    <string name="ota_hfa_activation_dialog_message" msgid="8092479227918463415">"ဖုန်းမှာ မိုဘိုင်းဒေတာဝန်ဆောင်မှုကို အက်တီဗိတ် လုပ်နေပါသည်။\n\n ၅ မိနစ်အထိ ကြာနိုင်ပါသည်"</string>
+    <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"အက်တီဗေးရှင်းကို ကျော်သွားမလား"</string>
+    <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"အက်တီဗေးရှင်းကို မလုပ်ပဲ ကျော်သွားပါက သင်ဖုန်းပြောနိုင်မှာ မဟုတ်သလို မိုဘိုင်းဒေတာ ကွန်ယက်များနဲ့ ဆက်သွယ်နိုင်မှာလည်း မဟုတ်ပါ (ဝိုင်ဖိုင်ကွန်ယက်ကိုတော့ ဆက်သွယ်နိုင်ပါသည်)။ သင့်ဖုန်းကို အက်တီဗိတ် မလုပ်သရွေ့ အကြိမ်တိုင်း သင့်ကို အက်တီဗိတ် လုပ်ရန် မေးမြန်းပါလိမ့်မည်။"</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="6570240212263372046">"ဖုန်းက အက်တီဗိတ်ဖြစ်နေပါပြီ"</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="460876637828044519">"သင့်ဖုန်းအား ပရိုဂရမ်ပြုလုပ်နေသည်…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"သင့်ဖုန်းအား ပရိုဂရမ်လုပ်၍မရပါ။"</string>
+    <string name="ota_successful" msgid="1880780692887077407">"သင့်ဖုန်းမှာ အခု အက်တီဗိတ် ဖြစ်နေပါပြီ။ ဝန်ဆောင်မှုများ စတင်ရန် ၁၅ မိနစ်ထိ ကြာနိုင်ပါသည်"</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="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" formatted="false" msgid="8308381858502470919">
+      <item quantity="other"> ဒေတာဆက်သွယ်မှု <xliff:g id="COUNT_1">%s</xliff:g> မိနစ်မရှိပါ</item>
+      <item quantity="one"> ဒေတာဆက်သွယ်မှု <xliff:g id="COUNT_0">%s</xliff:g> မိနစ်မရှိပါ</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other"> ဖုန်းသည် <xliff:g id="COUNT_1">%s</xliff:g> မိနစ်လောက် အရေးပေါ် ပြန်ခေါ်ခြင်းမုဒ်တွင် ရှိနေလိမ့်မည်။ ဤမုဒ်တွင် ဒေတာချိတ်ဆက်မှုအသုံးပြုသည့် app များကို အသုံးပြု၍ ရနိုင်မည်မဟုတ်ပါ။ ယခုထွက်လိုပါသလား? </item>
+      <item quantity="one"> ဖုန်းသည် <xliff:g id="COUNT_0">%s</xliff:g> မိနစ်လောက် အရေးပေါ် ပြန်ခေါ်ခြင်းမုဒ်တွင် ရှိနေလိမ့်မည်။ ဤမုဒ်တွင် ဒေတာချိတ်ဆက်မှုအသုံးပြုသည့် app များကို အသုံးပြု၍ ရနိုင်မည်မဟုတ်ပါ။ ယခုထွက်လိုပါသလား?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other"> ရွေးချယ်ထားသော အပြုအမူမှာ အရေပေါ်ခေါ်ဆိုမှုပြုလုပ်နေစဉ် မရှိနိုင်ပါ။ ဖုန်းသည်ဤ မုဒ်တွင် <xliff:g id="COUNT_1">%s</xliff:g> မိနစ်ရှိနေမည်ဖြစ်သည်။ ယခုထွက်လိုပါသလား?</item>
+      <item quantity="one"> အရေးပေါ် ပြန်လည်ခေါ်ဆိုခြင်းမုဒ်တွင် ရွေးချယ်သည့် လုပ်ရပ်မလုပ်ဆောင်နိုင်ပါ။ ဖုန်းသည်ဤ မုဒ်တွင် <xliff:g id="COUNT_0">%s</xliff:g> မိနစ်ရှိနေမည်ဖြစ်သည်။ ယခုထွက်လိုပါသလား?</item>
+    </plurals>
+    <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_provider" msgid="5135942703327136909">"ဝန်ဆောင်မှု"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"ပြင်ဆင်သည်"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"မသတ်မှတ်ထားပါ"</string>
+    <string name="other_settings" msgid="3672912580359716394">"တခြားခေါ်ဆိုမှုဆိုင်ရာ ဆက်တင်"</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="not_voice_capable" msgid="2739898841461577811">"အသံခေါ်ဆိုမှု ထောက်ံပံ့ခြင်းမရှိပါ"</string>
+    <string name="description_dial_button" msgid="7459705245418435351">"ဖုန်းခေါ်ခြင်း"</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="2609519527849101590">"အသံ"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"ဖုန်းမြည်သံ &amp; တုန်ခါသံ"</string>
+    <string name="pstn_connection_service_label" msgid="1743245930577325900">"တပ်ဆင်ပြီး ဆင်းမ် ကဒ်များ"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"ဗီဒီယို ခေါ်ဆိုမှုများကို ဖွင့်ထားရန်"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"ဗွီဒီယို ခေါ်ဆိုမှု ဖွင့်ရန်၊ မြှင့်ထားသည့် 4G LTE မုဒ်ကို ကွန်ရက် ချိိန်ညှိချက်များတွင် ဖွင့်ပေးရပါမည်။"</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"ကွန်ရက် ဆက်တင်များ"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"ပိတ်ရန်"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"အရေးပေါ် ခေါ်ဆိုမှုများ"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"အရေးပေါ် ခေါ်ဆိုမှုသာလျှင်"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM ကဒ်၊ အပေါက်: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"ရယူသုံးနိုင်မှု"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"ဝင်လာသော ဝိုင်ဖိုင်ခေါ်ဆိုမှု"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"ဝိုင်ဖိုင်ခေါ်ဆိုမှု"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"ဖွင့်ရန် ထပ်ပြီး ထိပါ"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"စာကို ကုဒ်ဖွင့်နေစဉ် အမှားရှိခဲ့သည်။"</string>
+</resources>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
new file mode 100644
index 0000000..b07d877
--- /dev/null
+++ b/res/values-nb/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Globalt"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-nb/config.xml b/res/values-nb/config.xml
deleted file mode 100644
index 32dd2ae..0000000
--- a/res/values-nb/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"falsk"</string>
-</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index f37b3a8..d12a556 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -16,19 +16,19 @@
 
 <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">"Mobildata"</string>
+    <string name="phoneAppLabel" product="tablet" msgid="1107073389495104784">"Mobildata"</string>
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Telefon"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Nødnummer"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Telefon"</string>
     <string name="fdnListLabel" msgid="8630418672279521003">"Faste nummer"</string>
     <string name="unknown" msgid="6878797917991465859">"Ukjent"</string>
     <string name="private_num" msgid="6713286113000232309">"Hemmelig nummer"</string>
-    <string name="payphone" msgid="1931775086311769314">"Telefonkiosk"</string>
+    <string name="payphone" msgid="4793877574636445118">"Telefonkiosk"</string>
     <string name="onHold" msgid="9035493194749959955">"Parkert"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI-kode påbegynt"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD-kode kjører…"</string>
     <string name="mmiCancelled" msgid="2771923949751842276">"MMI-kode avbrutt"</string>
-    <string name="cancel" msgid="5044513931633602634">"Avbrutt"</string>
+    <string name="cancel" msgid="5044513931633602634">"Avbryt"</string>
     <string name="enter_input" msgid="1810529547726803893">"USSD-meldingen må ha <xliff:g id="MIN_LEN">%d</xliff:g> til <xliff:g id="MAX_LEN">%d</xliff:g> tegn. Prøv på nytt."</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Administrer konferansesamtale"</string>
     <string name="ok" msgid="3811371167865772377">"OK"</string>
@@ -52,18 +52,41 @@
     <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="mobile_network_settings_not_available" msgid="7355254462995117896">"Innstillinger for mobilnettverk er ikke tilgjengelig for denne brukeren"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Innstillingene for mobilnettverk er ikke tilgjengelige for denne brukeren"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Innstillinger for GSM-samtaler"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"Anropsinnstillinger for GSM (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Innstillinger for CDMA-samtaler"</string>
-    <string name="apn_settings" msgid="9043423184895642077">"Navn på aksesspunkt"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"Anropsinnstillinger for CDMA (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="apn_settings" msgid="9043423184895642077">"Navn på tilgangspunkt"</string>
     <string name="settings_label" msgid="3876743539816984008">"Nettverksinnstillinger"</string>
-    <string name="connection_service" msgid="978745922583410219">"Tilkoblingstjenesten som skal brukes"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Ringekontoer"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Ring med"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Foreta SIP-oppringing med"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Spør først"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Innstillinger"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Velg kontoer"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Telefonkontoer"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Legg til SIP-konto"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Konfigurer kontoinnstillingene"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi-anrop"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Ikke bruk Wi-Fi for å ringe"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Ikke bruk ringeassistenten"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Ingen"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Ringeassistent"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Bruk ringeassistenten"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Velg ringeassistent"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Administrer nettverk som brukes for anrop med"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Tillater apper eller tjenester å administrere nettverk som brukes for å ringe"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Konfigurer"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Innebygd tilkoblingstjeneste"</string>
     <string name="voicemail" msgid="8693759337917898954">"Telefonsvarer"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Talpostkasse (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"Svarer:"</string>
     <string name="networks" msgid="8873030692174541976">"Nettoperatører"</string>
-    <string name="call_settings" msgid="1630474923393095156">"Anropsinnstillinger"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Nødvarsler"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Samtaleinnstillinger"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Flere innstillinger"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Flere innstillinger (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Flere GSM-spesifikke innstillinger"</string>
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Flere CDMA-innstillinger"</string>
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Flere CDMA-spesifikke innstillinger"</string>
@@ -77,29 +100,32 @@
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Under samtaler, varsle om innkommende anrop"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Under samtaler, ikke varsle om innkommende anrop"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Innstillinger for viderekobling"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Innstillinger for videresending av anrop (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Viderekobling"</string>
-    <string name="labelCFU" msgid="8147177368148660600">"Alltid viderekoble"</string>
+    <string name="labelCFU" msgid="8147177368148660600">"Viderekoble alltid"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Alltid bruk dette nummeret"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Viderekoble alle anrop"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Viderekobler alle anrop til <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Nummeret er ikke tilgjengelig"</string>
-    <string name="sum_cfu_disabled" msgid="3698472522160364904">"Deaktivert"</string>
-    <string name="labelCFB" msgid="218938523102207587">"Viderekoble når opptatt"</string>
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Av"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Når det er opptatt"</string>
     <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="sum_cfb_disabled" msgid="4913145177320506827">"Av"</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="labelCFNRy" msgid="1736067178393744351">"Når ingen svarer"</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="sum_cfnry_disabled" msgid="3884684060443538097">"Av"</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="labelCFNRc" msgid="2614827454402079766">"Når mottaker ikke kan nås"</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="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="call_settings_primary_user_only" msgid="5679923943740900965">"Anropsinnstillinger kan bare endres av hovedbrukeren."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Anropsinnstillinger (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Feil ved samtaleinnstillinger"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Leser innstillinger…"</string>
     <string name="updating_settings" msgid="8171225533884883252">"Oppdaterer innstillinger…"</string>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"Slå på"</string>
+    <string name="disable" msgid="4678348128118573672">"Slå av"</string>
     <string name="change_num" msgid="239476305819844391">"Oppdater"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Nettverksstandard"</item>
@@ -123,8 +149,8 @@
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Kunne ikke hente og lagre gjeldende innstillinger for viderekoblingsnummer.\nVil 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>
-    <string name="voicemail_default" msgid="5902099213882352338">"Min teleoperatør"</string>
-    <string name="mobile_networks" msgid="5540397602919106177">"Innstillinger for mobilnettverk"</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"Operatøren din"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Mobilnettverksinnstillinger"</string>
     <string name="label_available" msgid="1181658289009300430">"Tilgjengelige nettverk"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Søker…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Fant ingen nettverk."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Foretrukket nettverksmodus: CDMA + LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Foretrukket nettverksmodus: Overordnet"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Foretrukket nettverksmodus: LTE/WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Foretrukket nettverksmodus: LTE / GSM / UMTS"</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="7886739962255042385">"LTE / WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"Bare GSM"</item>
     <item msgid="3817924849415716259">"GSM/WCDMA foretrukket"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Forbedret 4G LTE-modus"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Bruk LTE-tjenester for å forbedre stemme- og andre typer kommunikasjon (anbefalt)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Data aktivert"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Aktiver datatilgang i mobilnettverk"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Tillat databruk"</string>
     <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="8913735676127858115">"Du har mistet datatilkoblingen fordi du forlot hjemmenettet med roaming avslått."</string>
-    <string name="roaming_warning" msgid="7820963598559553967">"Tillat dataroaming? Dette kan koste mye penger!"</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"Det kan medføre betydelige kostnader."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Vil du tillate roaming?"</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>
@@ -196,7 +227,7 @@
     <!-- no translation found for throttle_time_frame_subtext (7732763021560399960) -->
     <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="throttle_help_subtext" msgid="3633091498168446044">"Mer informasjon om mobiloperatørens retningslinjer for bruk av nettverksdata"</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>
@@ -309,7 +340,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Konfigurer datatjeneste"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Operatørinnstillinger"</string>
     <string name="fdn" msgid="7878832555095183202">"Faste nummer"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Faste numre (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Liste over faste nummer"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"FDN-liste (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Aktivering av faste nummer"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Kun faste nummer kan ringes"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Faste nummer er deaktivert"</string>
@@ -327,12 +360,13 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Velg TTY-modus"</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="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"Endring av TTY-modus under videosamtaler er ikke tillatt"</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="8204677063922225311">"Skriv inn PIN2"</string>
     <string name="name" msgid="7329028332786872378">"Navn"</string>
-    <string name="number" msgid="7905950798349903858">"Num,er"</string>
+    <string name="number" msgid="7905950798349903858">"Nummer"</string>
     <string name="save" msgid="4094274636321939086">"Lagre"</string>
     <string name="add_fdn_contact" msgid="2481915899633353976">"Legg til programmert telefonnummer"</string>
     <string name="adding_fdn_contact" msgid="7627379633721940991">"Legger til programmert telefonnummer ..."</string>
@@ -350,7 +384,7 @@
     <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="1846161429087789936">"Du må slå av flymodus før du kan importere kontakter fra SIM-kortet."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Slå av flymodus for å 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>
@@ -360,42 +394,40 @@
     <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="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="1796577128488773946">"Feil passord – PIN-koden er sperret. PUK-kode forespurt."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"Slett PIN-koden for SIM"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"Konfigurer PIN-kode for SIM"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"Konfigurerer PIN-kode …"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN-koden er angitt"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN-koden er slettet"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN-koden er feil"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN-koden er oppdatert"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Passordet er feil. PIN-koden er nå blokkert. PUK-kode er forespurt."</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="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="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="3674058967950559397">"Passordet er feil og PIN2 er sperret. 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="badPuk2" msgid="7910064009531541708">"PUK2-koden er feil. Prøv på nytt."</string>
+    <string name="badPin2" msgid="6646896629970023109">"Den gamle PIN2-koden er feil. Prøv på nytt."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2-kodene stemmer ikke overens. Prøv på nytt."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Skriv inn en PIN2-konto på mellom fire og åtte sifre."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Skriv inn en PUK2-kode på åtte sifre."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2-koden er oppdatert"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Tast inn PUK2-kode"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Passordet er feil. PIN2-koden er nå blokkert. Du må endre PIN 2-koden for å prøve på nytt."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Passordet er feil. PIN-koden er nå blokkert. Skriv inn en PUK2-kode."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 er permanent sperret."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Det er <xliff:g id="NUMBER">%d</xliff:g> forsøk igjen."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"Sperring av PIN2 er opphevet"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"Du har <xliff:g id="NUMBER">%d</xliff:g> forsøk igjen."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2-koden er ikke lenger blokkert"</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="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_redialing" msgid="8253487008234167266">"Slår nummer 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_call_ended" msgid="5544730338889702298">"Samtale avsluttet"</string>
+    <string name="card_title_call_ended" msgid="5544730338889702298">"Samtalen er avsluttet"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"Parkert"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Legger på"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Samtale pågår"</string>
-    <string name="card_title_my_phone_number" msgid="112428362494434191">"Nummeret mitt er <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Slår nummeret"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Tapt anrop"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Tapte anrop"</string>
@@ -413,25 +445,27 @@
     <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_power_off" msgid="2947938060513306698">"Slå av flymodus for å ringe."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Slå av flymodus eller koble til et trådløst nettverk for å ringe."</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_error_out_of_service" msgid="4100065333878929223">"Mobilnettverket er ikke tilgjengelig."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Mobilnettverk er ikke tilgjengelig. Koble til et trådløst nettverk for å ringe."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Skriv inn et gyldig nummer for å plassere en samtale."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Kan ikke ringe."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Begynner MMI-sekvens…"</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>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Kan ikke overføre samtale."</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Tjenesten støttes ikke"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Kan ikke bytte samtaler."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Kan ikke splitte opp samtale."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Kan ikke overføre."</string>
     <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Kan ikke opprette telefonmøte."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Kan ikke avvise anrop."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Kan ikke legge på."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Internett-anrop"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Kan ikke avvise anropet."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Kan ikke frigjøre samtale(r)."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Koble til et trådløst nettverk for å ringe."</string>
     <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="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="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Ingen tjeneste. Prøver på nytt …"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Kan ikke ringe. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> er ikke et nødnummer."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Kan ikke ringe. Ring et nødnummer."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Bruk tastaturet for å ringe"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Hold"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Avslutt"</string>
@@ -462,7 +496,8 @@
     <item msgid="899650777817315681">"Vanlig"</item>
     <item msgid="2883365539347850535">"Lang"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Nettverksmelding"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Nettverksmelding"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Feilmelding"</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\nTrykk «Aktiver», og lytt deretter til instruksjonene for å aktivere telefonen."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Aktiverer …"</string>
@@ -475,8 +510,8 @@
     <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_speaker" msgid="6904589278542719647">"Høyttaler"</string>
-    <string name="ota_progress" msgid="3420314892609254729">"Vent mens telefonen programmeres."</string>
-    <string name="ota_failure" msgid="4311299546379674378">"Programmeringen mislyktes"</string>
+    <string name="ota_progress" msgid="460876637828044519">"Programmerer telefonen din …"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Kunne ikke programmere telefonen din"</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="8072141612635635357">"Telefonen ble ikke aktivert.\nPrøv å finne et område med bedre dekning (ved et vindu eller utendørs).\n\nPrøv på nytt, eller ring kundetjenesten for å få flere alternativer."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"Omfattende SPC-feil"</string>
@@ -487,18 +522,18 @@
     <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>
     <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Datatilkobling deaktivert"</string>
-  <plurals name="phone_in_ecm_notification_time">
-    <item quantity="one" msgid="4866221796252472622">"Ingen datatilkobling i <xliff:g id="COUNT">%s</xliff:g> minutt"</item>
-    <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="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="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>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other">Ingen datatilkobling i <xliff:g id="COUNT_1">%s</xliff:g> minutter</item>
+      <item quantity="one">Ingen datatilkobling i <xliff:g id="COUNT_0">%s</xliff:g> minutt</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other">Telefonen er i nødsamtalemodus i <xliff:g id="COUNT_1">%s</xliff:g> minutter. Når telefonen er i denne modusen, kan du ikke bruke apper som krever datatilkobling. Vil du avslutte nå?</item>
+      <item quantity="one">Telefonen er i nødsamtalemodus i <xliff:g id="COUNT_0">%s</xliff:g> minutt. Når telefonen er i denne modusen, kan du ikke bruke apper som krever datatilkobling. Vil du avslutte nå?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other">Den valgte handlingen er ikke tilgjengelig i nødsamtalemodus. Telefonen er i nødsamtalemodus i <xliff:g id="COUNT_1">%s</xliff:g> minutter. Vil du avslutte nå?</item>
+      <item quantity="one">Den valgte handlingen er ikke tilgjengelig i nødsamtalemodus. Telefonen er i denne modusen i <xliff:g id="COUNT_0">%s</xliff:g> minutt. Vil du avslutte nå?</item>
+    </plurals>
     <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>
@@ -512,110 +547,23 @@
     <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_receive_calls" msgid="5635685570889971559">"Motta innkommende anrop"</string>
-    <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Reduserer batterilevetiden"</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="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="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="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="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_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="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="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>
-    <string name="username_title" msgid="2479375923477682328">"Brukernavn"</string>
-    <string name="password_title" msgid="3323555249068171531">"Passord"</string>
-    <string name="display_name_title" msgid="2459768196312249937">"Visningsnavn"</string>
-    <string name="proxy_address_title" msgid="4828301345351614273">"Adresse for utgående mellomtjener"</string>
-    <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="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>
-    <string name="auth_username_title" msgid="851473016307947120">"Brukernavn for autentisering"</string>
-    <string name="auth_username_summary" msgid="6782012405225938629">"Brukernavn brukes til autentisering"</string>
-    <string name="default_preference_summary" msgid="868766740121667450">"&lt;Ikke angitt&gt;"</string>
-    <string name="display_name_summary" msgid="8636377460518225523">"&lt;Samme som brukernavn&gt;"</string>
-    <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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"Taleanrop støttes ikke"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Hurtigsvar"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"en"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"to"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"tre"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"fire"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"fem"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"seks"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"syv"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"åtte"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"ni"</string>
-    <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_dial_button" msgid="7459705245418435351">"ring"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"tilbaketast"</string>
-    <string name="description_target_answer" msgid="7205604197797472471">"Svar"</string>
-    <string name="description_target_send_sms" msgid="2098326025587950144">"Send tekstmelding"</string>
-    <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="2609519527849101590">"Lyd"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Standardlyd (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <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="dial_pad_autocomplete" msgid="494525952035761075">"Autofullf. for talltast."</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Ringetone og vibrering"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Vil du bruke Wi-Fi for å ringe?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Ja"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"Nei"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Innebygde SIM-kort"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Innebygd Internett-ringing"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Slå på videosamtaler"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"For å slå på videoanrop må du aktivere forbedret 4G LTE-modus i nettverksinnstillingene."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Nettverksinnstillinger"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Lukk"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Nødanrop"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Kun nødanrop"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM-kort, spor: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Tilgjengelighet"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Wi-Fi-oppringing inn"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Oppringing via Wi-Fi"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Trykk på nytt for å åpne"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"Det oppsto en feil under dekoding av meldingen."</string>
 </resources>
diff --git a/res/values-ne-rNP/arrays.xml b/res/values-ne-rNP/arrays.xml
new file mode 100644
index 0000000..1dd72da
--- /dev/null
+++ b/res/values-ne-rNP/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"विश्वव्यापी"</item>
+    <item msgid="6753774959494729275">"LTE/CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-ne-rNP/config.xml b/res/values-ne-rNP/config.xml
deleted file mode 100644
index 5e0d047..0000000
--- a/res/values-ne-rNP/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"बेठीक"</string>
-</resources>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 2235bc1..30dde92 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -16,14 +16,14 @@
 
 <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="tablet" msgid="1107073389495104784">"सेलुलर डेटा"</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">"FDN सूची"</string>
     <string name="unknown" msgid="6878797917991465859">"अज्ञात"</string>
     <string name="private_num" msgid="6713286113000232309">"निजी नम्बर"</string>
-    <string name="payphone" msgid="1931775086311769314">"फोन तिर्नुहोस्"</string>
+    <string name="payphone" msgid="4793877574636445118">"पेफोन"</string>
     <string name="onHold" msgid="9035493194749959955">"होल्डमा"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI कोड सुरु भयो"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD कोड चल्दै..."</string>
@@ -31,11 +31,11 @@
     <string name="cancel" msgid="5044513931633602634">"रद्द गर्नुहोस्"</string>
     <string name="enter_input" msgid="1810529547726803893">"USSD सन्देश  <xliff:g id="MIN_LEN">%d</xliff:g> र <xliff:g id="MAX_LEN">%d</xliff:g> अक्षरहरूका बिच हुनै पर्दछ। कृपया पुनःप्रयास गर्नुहोस्।"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"सम्मेलन कल प्रबन्ध गर्नुहोस्"</string>
-    <string name="ok" msgid="3811371167865772377">"ठिक छ"</string>
+    <string name="ok" msgid="3811371167865772377">"ठीक छ"</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="audio_mode_bluetooth" msgid="3047641300848211128">"ब्लुटूथ"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"निम्न टोनहरू पठाउने? \n"</string>
     <string name="pause_prompt_str" msgid="1789964702154314806">"टोनहरू \n पठाउँदै"</string>
     <string name="send_button" msgid="4106860097497818751">"पठाउनुहोस्"</string>
@@ -52,18 +52,41 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"नेटवर्क अनलक गर्न अनुरोध गर्दै..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"नेटवर्क अनलक अनुरोध असफल"</string>
     <string name="unlock_success" msgid="6770085622238180152">"नेटवर्क अनलक सफल।"</string>
-    <string name="mobile_network_settings_not_available" msgid="7355254462995117896">"मोबाइल सञ्जाल सेटिङ्हरू यस प्रयोगकर्ताको लागि उपलब्ध छैनन्"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"सेलुलर सञ्जाल सेटिङहरू यस प्रयोगकर्ताको लागि उपलब्ध छैनन्"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM कल सेटिङहरू"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"GSM कल सेटिङहरू (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA कल सेटिङहरू"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"CDMA कल सेटिङहरू (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"एक्सेस प्वाइन्ट नामहरू"</string>
     <string name="settings_label" msgid="3876743539816984008">"नेटवर्क सेटिङहरू"</string>
-    <string name="connection_service" msgid="978745922583410219">"प्रयोग गर्न जडान सेवा"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"कल खाता"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"मार्फत कल गर्नुहोस्"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"मार्फत SIP कलहरू गर्नुहोस्"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"पहिले सोध्नुहोस्"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"सेटिङहरू"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"खाता छान्नुहोस्"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"फोन खाता"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"SIP खाता थप्नुहोस्"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"खाता सेटिङ कन्फिगर गर्नुहोस्"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi कलिङ"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Wi-Fi कल प्रयोग नगर्नुहोस्"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"कल सहायक प्रयोग नगर्नुहोस्"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"कुनै पनि होइन"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"कल सहायक"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"कल सहायक प्रयोग गर्नुहोस्"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"कल सहायक छान्नुहोस्"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"सँग कलहरू गर्नको लागि प्रयोग हुने संजालहरूको व्यवस्थापन गर्नुहोस्"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"कलका लागि प्रयोग हुने सञ्जालहरू व्यवस्थापन गर्न  अनुप्रयोग वा सेवालाई अनुमति दिन्छ ।"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"कन्फिगर गर्नुहोस्"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"निर्मित जडान सेवा"</string>
     <string name="voicemail" msgid="8693759337917898954">"भ्वाइसमेल"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"भ्वाइस मेल (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
     <string name="networks" msgid="8873030692174541976">"नेटवर्क संचालकहरू"</string>
-    <string name="call_settings" msgid="1630474923393095156">"कल सेटिङ्हरू"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"आकस्मिक प्रसारणहरू"</string>
+    <string name="call_settings" msgid="6112441768261754562">"कल सेटिङहरू"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"अतिरिक्त सेटिङहरू"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"अतिरिक्त सेटिङ ( <xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g> )"</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>
@@ -73,33 +96,36 @@
     <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="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="call_forwarding_settings_with_label" msgid="8569489414006897127">"(कल फर्वार्ड सेटिङहरू <xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g> )"</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="sum_cfu_disabled" msgid="8384177689501334080">"निस्कृय"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"जब व्यस्त"</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="sum_cfb_disabled" msgid="4913145177320506827">"निस्कृय"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"तपाईंको फोन व्यस्त रहँदा तपाईंको अपरेटरले कल-फर्वार्डिङ असक्षम बनाउँदा समर्थन गर्दैन।"</string>
-    <string name="labelCFNRy" msgid="3646316323834351390">"उत्तर नआएमा फर्वार्ड गर्नुहोस्"</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"जब अनुत्तरित"</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="sum_cfnry_disabled" msgid="3884684060443538097">"निस्कृय"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"तपाईंको फोनले जवाफ नदिँदा तपाईंको अपरेटरले कल-फर्वार्डिङ असक्षम बनाउँदा समर्थन गर्दैन।"</string>
-    <string name="labelCFNRc" msgid="47183615370850000">"पहुँचयोग्य नहुँदा फर्वार्ड गर्नुहोस्"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"जब पहुँचअयोग्य"</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="5646361343094064333">"तपाईंको फोन पहुँचयोग्य नहुँदा तपाईंको केरियरले कल-फर्वार्डिङ असक्षम बनाउँदा समर्थन गर्दैन।"</string>
     <string name="updating_title" msgid="6146755386174019046">"कल सेटिङहरू"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"कल सेटिङहरू केवल प्राथमिक प्रयोगकर्ताद्वारा मात्र परिवर्तन गर्न सकिन्छ।"</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"कल सेटिङ ( <xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g> )"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"कल सेटिङ त्रुटि"</string>
     <string name="reading_settings" msgid="1920291699287055284">"सेटिङहरू पढ्दै..."</string>
     <string name="updating_settings" msgid="8171225533884883252">"सेटिङहरू अद्यावधिक गर्दै..."</string>
@@ -108,9 +134,9 @@
     <string name="exception_error" msgid="7027667130619518211">"नेटवर्क वा SIM कार्ड त्रुटि।"</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>
+    <string name="close_dialog" msgid="2365884406356986917">"ठीक छ"</string>
+    <string name="enable" msgid="7248657275000173526">"सकृय पार्नुहोस्"</string>
+    <string name="disable" msgid="4678348128118573672">"निस्कृय पार्नुहोस्"</string>
     <string name="change_num" msgid="239476305819844391">"अपडेट गर्नुहोस्"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"नेटवर्क पूर्वनिर्धारित"</item>
@@ -123,8 +149,8 @@
     <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="voicemail_default" msgid="2001233554889016880">"तपाईंको वाहक"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"सेलुलर सञ्जाल सेटिङहरू"</string>
     <string name="label_available" msgid="1181658289009300430">"उपलब्ध नेटवर्कहरू"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"खोजी गर्दै..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"कुनै नेटवर्कहरू भेटिएनन्।"</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"रुचाइएको नेटवर्क मोड: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"रुचाइएको नेटवर्क मोड: विश्वव्यापी"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"रुचाइएको नेटवर्क मोड: LTE/WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"रुचाइएको सञ्जाल मोड: LTE /GSM / UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"रुचाइएको नेटवर्क मोड: LTE/CDMA"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="7886739962255042385">"LTE/WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"GSM मात्र"</item>
     <item msgid="3817924849415716259">"GSM/WCDMA रुचाइएका"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Enhanced 4G LTE Mode"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"आवाज र अन्य सञ्चार सुधार गर्न LTE सेवाहरूको प्रयोग गर्नुहोस् (सिफारिस गरिएको)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"डेटा सक्षम भयो"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"मोबाइल नेटवर्कमा डेटा पहुँच सक्षम पार्नुहोस्"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"डेटा उपयोगलाई अनुमति दिनुहोस्"</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="8913735676127858115">"तपाईँले डेटा गुमाउनु भएको छ किनभने तपाईँले डेटासहितको घर नेटवर्क रोमिङ बन्द गरेर छोड्नुभएको छ।"</string>
-    <string name="roaming_warning" msgid="7820963598559553967">"डेटा रोमिङ अनुमति दिने हो? तपाईंलाई रोमिङ शुल्क लाग्न सक्तछ!"</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"तपाईंलाई महत्त्वपूर्ण शुल्क लाग्न सक्छ।"</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"डेटा रोमिङको अनुमति दिने हो?"</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>
@@ -190,7 +221,7 @@
     <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="throttle_help_subtext" msgid="3633091498168446044">"तपाईँको केरियरक मोबाइल सञ्जाल डेटा प्रयोग नीतिको बारेमा थप जानकारी"</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>
@@ -303,7 +334,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"सेटअप डेटा सेवा"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"वाहक सेटिङ्हरू"</string>
     <string name="fdn" msgid="7878832555095183202">"स्थिर डायल गर्ने नम्बर"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"स्थिर डायल नम्बरहरू ( <xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g> )"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FDN सूची"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"FDN सूची ( <xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g> )"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FDN सक्रियता"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"स्थिर डायल गर्ने नम्बर सक्षम छन्"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"स्थिर डायल गर्ने नम्बरहरू असक्षम छन्"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"TTY मोड सेट गर्नुहोस्"</string>
     <string name="auto_retry_mode_title" msgid="4073265511427813322">"स्वतः पुनः प्रयास गर्नुहोस्"</string>
     <string name="auto_retry_mode_summary" msgid="4973886004067532288">"स्वतः-पुनः प्रयास मोड सक्षम गर्नुहोस्"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"भिडियो कल गर्ने क्रममा TTY मोड परिवर्तन गर्न अनुमति छैन"</string>
     <string name="menu_add" msgid="1882023737425114762">"सम्पर्क थप्नुहोस्"</string>
     <string name="menu_edit" msgid="7143003705504672374">"सम्पर्क सम्पादन गर्नुहोस्"</string>
     <string name="menu_delete" msgid="3977150783449642851">"सम्पर्क मेटाउनुहोस्"</string>
@@ -344,7 +378,7 @@
     <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="1846161429087789936">"SIM कार्डबाट सम्पर्क आयात गर्न पहिले हवाइजहाज मोड बन्द गर्नुहोस्।"</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"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>
@@ -354,42 +388,40 @@
     <string name="badPin" msgid="8955102849303984935">"तपाईंले टाइप गर्नुभएको पुरानो PIN सही छैन। पुनः प्रयास गर्नुहोस्।"</string>
     <string name="mismatchPin" msgid="5923253370683071889">"तपाईंले टाइप गर्नुभएको PINs मेल खाएनन्। फेरि प्रयास गर्नुहोस्।"</string>
     <string name="invalidPin" msgid="5981171102258684792">"४ देखि ८ अङ्कको 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="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="1796577128488773946">"गलत पासवर्ड, PIN रोक्का! PUK को लागि अनुरोध गरियो।"</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"स्पष्ट SIM PIN"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"SIM PIN स्थापना गर्नुहोस्"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"PIN स्थापना गर्दै..."</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN स्थापित भयो"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN खाली गरियो"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN गलत"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN अद्यावधिक गरियो"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"पासवर्ड गलत छ। PIN अब ब्लक गरिएको छ। PUK अनुरोध गरिएको छ।"</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="4851734468010000418">"तपाईंले टाइप गर्नुभएको PUK2 सही छैन। पुनः प्रयास गर्नुहोस्।"</string>
-    <string name="badPin2" msgid="1041576234483629991">"तपाईंले टाइप गर्नुभएको पुरानो PIN2 सही छैन। पुनः प्रयास गर्नुहोस्।"</string>
-    <string name="mismatchPin2" msgid="523029155918113440">"तपाईंले टाइप गर्नुभएको PIN2s मेल खाएनन्। फेरि प्रयास गर्नुहोस्।"</string>
-    <string name="invalidPin2" msgid="8237110107480395938">"४ देखि ८ नम्बर सम्मको PIN2 टाइप गर्नुहोस्।"</string>
-    <string name="invalidPuk2" msgid="1290977391033057871">"८ नम्बरको PUK2 टाइप गर्नुहोस्।"</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="3674058967950559397">"पासवर्ड गलत भयो, PIN2 रोक्का गरियो। कृपया PIN2 परिवर्तन गर्नुहोस् र पुन: प्रयास गर्नुहोस्!"</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"गलत पासवर्ड, SIM लक भयो। PUK2 अनुरोध गरियो।"</string>
+    <string name="badPuk2" msgid="7910064009531541708">"PUK2 गलत। फेरि प्रयास गर्नुहोस्।"</string>
+    <string name="badPin2" msgid="6646896629970023109">"पुरानो PIN2 गलत। फेरि प्रयास गर्नुहोस्।"</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2हरू मेल खाएनन्। फेरि प्रयास गर्नुहोस्।"</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"4 देखि 8 नम्बरको एक PIN2 प्रविष्ट गर्नुहोस्।"</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"8 नम्बरको एक PUK2 प्रविष्ट गर्नुहोस्।"</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 अद्यावधिक गरियो"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"PUK2 कोड प्रविष्ट गर्नुहोस्"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"पासवर्ड गलत छ। PIN2 अहिले ब्लक गरिएको छ। पिन 2 परिवर्तन, फेरि प्रयास गर्नुहोस्।"</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"पासवर्ड गलत छ। सिम अब ब्लक गरिएको छ। PUK2 प्रविष्ट गर्नुहोस्।"</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 स्थायी रूपमा रोक्का गरियो।"</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n" त्यहाँ <xliff:g id="NUMBER">%d</xliff:g> बाँकी प्रयासहरू छन्।"</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 अनलक गरियो!"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n" तपाईंसँग <xliff:g id="NUMBER">%d</xliff:g> प्रयास बाँकी छन्।"</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 अब ब्लक गरिएको छैन"</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_redialing" msgid="8253487008234167266">"पुन: डायल गर्दै"</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_dialing" msgid="2107666444937350731">"डायल गर्ने"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"छुटेका कल"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"छुटेका कल"</string>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"एक कल गर्न हवाइजहाज मोड बन्द गर्नुहोस्।"</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"एक कल गर्न हवाइजहाज मोड बन्द गर्नुहोस् वा एक ताररहितको सञ्जालमा जडान गर्नुहोस्।"</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_error_out_of_service" msgid="4100065333878929223">"सेलुलर सञ्जाल उपलब्ध छैन।"</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"सेलुलर सञ्जाल उपलब्ध छैन। एक कल गर्न ताररहितको सञ्जालमा जडान गर्नुहोस्।"</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"एक कल गर्नको लागि, एक वैध नम्बर प्रविष्ट गर्नुहोस्।"</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"कल गर्न सक्दैन।"</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_unknown" msgid="655570339115407698">"सेवा समर्थित छैन"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"कल स्विच गर्न सक्दैन।"</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"कल अलग गर्न सक्दैन।"</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"हस्तान्तरण गर्न सक्दैन।"</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="incall_error_supp_service_reject" msgid="8998568661508655638">"कल अस्वीकार गर्न सक्दैन।"</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"कल (हरू) जारी गर्न सकिँदैन ।"</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"एक कल गर्न एक ताररहितको सञ्जालमा जडान गर्नुहोस्।"</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="7969515493359619960">"कल पठाएको छैन। <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> आपतकालीन नम्बर हैन!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"कल पठाएको छैन। एउटा आपतकालीन नम्बर डायल गर्नुहोस्!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"कुनै सेवा छैन। फेरि प्रयास गर्दै ..."</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"कल गर्न सकिँदैन। <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> आपतकालीन नम्बर होइन।"</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"कल गर्न सकिँदैन। आपतकालीन नम्बर डायल गर्नुहोस्।"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"डायल गर्न किबोर्ड प्रयोग गर्नुहोस्"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"होल्ड गर्नुहोस्"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"अन्त्य​ गर्नुहोस्"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"साधारण"</item>
     <item msgid="2883365539347850535">"लामो"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"नेटवर्क सन्देश"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"सञ्जाल सन्देश"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"त्रुटि सन्देश"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"तपाईंको फोन सक्रिय गर्नुहोस्"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"विशेष कललाई तपाईंको फोन सेवा सक्रिय गर्न जरुरी हुन्छ। \n \n \"सक्रिय\" थिचेर तपाईंको फोन  सक्रिय गर्न दिएका निर्देशनहरू सुन्नुहोस्।"</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"सक्रिय गर्दै…"</string>
@@ -469,8 +504,8 @@
     <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="3420314892609254729">"तपाईंको फोनमा प्रोग्राम गरून्जेलसम्म प्रतिक्षा गर्नुहोस्।"</string>
-    <string name="ota_failure" msgid="4311299546379674378">"प्रोग्रामिङ असफलता"</string>
+    <string name="ota_progress" msgid="460876637828044519">"तपाईँको फोन प्रोग्राम गर्दै ..."</string>
+    <string name="ota_failure" msgid="7713756181204620397">"तपाईँको फोन प्रोग्राम गर्न सकिएन"</string>
     <string name="ota_successful" msgid="1880780692887077407">"तपाईंको फोन अहिले सक्रिय गरिएको छ। यसलाई सेवा सुरु गर्नको लागि १५ मिनटसम्म लाग्न सक्दछ।"</string>
     <string name="ota_unsuccessful" msgid="8072141612635635357">"तपाईंको फोन सक्रिय गरिएको छैन। \n तपाईंले राम्रो प्रसारणक्षेत्र (झ्यालको नजिक वा बाहिर पट्टि) का साथ  क्षेत्र खोजी गर्न आवश्यकता हुन सक्दछ। \n \n पुनःप्रयास गर्नुहोस् वा अधिक विकल्पहरूका लागि ग्राहक सेवामा कल गर्नुहोस्।"</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"अति विशेष सुविधाहरू"</string>
@@ -481,18 +516,18 @@
     <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="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="2585506997024726599">"चयन कार्य आपतकालिन कलब्याक मोडमा हुँदा यो उपलब्ध हुँदैन। फोन <xliff:g id="COUNT">%s</xliff:g> मिनटका लागि आपतकालिन कलब्याक मोडमा हुने छ। के तपाईं अहिले निस्कन चाहनु हुन्छ?"</item>
-    <item quantity="other" msgid="6115622137771382224">"चयन कार्य आपतकालिन कलब्याक मोडमा हुँदा यो उपलब्ध हुँदैन। फोन <xliff:g id="COUNT">%s</xliff:g> मिनटका लागि आपतकालिन कलब्याक मोडमा हुने छ। के तपाईं अहिले निस्कन चाहनुहुन्छ?"</item>
-  </plurals>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other"> <xliff:g id="COUNT_1">%s</xliff:g> मिनेटको लागि कुनै डेटा जडान छैन</item>
+      <item quantity="one"> <xliff:g id="COUNT_0">%s</xliff:g> मिनेटको लागि कुनै डेटा जडान छैन</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other"> फोन आपतकालीन कलब्याक मोडमा <xliff:g id="COUNT_1">%s</xliff:g> मिनेटको लागि हुनेछ। यस मोडको अवस्थामा एक डेटा जडान प्रयोग गरेर कुनै पनि अनुप्रयोगहरू प्रयोग गर्न सकिँदैन। के तपाईं अहिले निस्कन चाहनुहुन्छ?</item>
+      <item quantity="one"> फोन आपतकालीन कलब्याक मोडमा <xliff:g id="COUNT_0">%s</xliff:g> मिनेटको लागि हुनेछ। यस मोडको समयमा एक डेटा जडान प्रयोग गरेर कुनै पनि अनुप्रयोगहरू प्रयोग गर्न सकिँदैन। के तपाईं अहिले निस्कन चाहनुहुन्छ?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other"> आपतकालीन कलब्याक मोडको समयमा चयनित कार्य उपलब्ध छैन। फोन यस मोडमा <xliff:g id="COUNT_1">%s</xliff:g> मिनेटको लागि हुनेछ। के तपाईं अहिले निस्कन चाहनुहुन्छ?</item>
+      <item quantity="one"> आपतकालीन कलब्याक मोडको समयमा चयनित कार्य उपलब्ध छैन। फोन यस मोडमा <xliff:g id="COUNT_0">%s</xliff:g> मिनेटको लागि हुनेछ। के तपाईं अहिले निस्कन चाहनुहुन्छ?</item>
+    </plurals>
     <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>
@@ -506,110 +541,23 @@
     <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">"इन्टरनेट कल गर्न (वाइफाइ मात्र)को उपयोग गर्नुहोस्"</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="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="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="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_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="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">"खाता दर्ता रोकियो किनकि वाइफाइ जडान छैन।"</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="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>
-    <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">"&lt;सेट गरेको छैन&gt;"</string>
-    <string name="display_name_summary" msgid="8636377460518225523">"&lt;प्रयोगकर्ता नाम जस्तै&gt;"</string>
-    <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="6839103946505432390">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> लाई चाहिन्छ र खाली छोड्न सकिँदैन।"</string>
-    <string name="not_a_valid_port" msgid="4796149266434630292">"पोर्ट संख्या १००० र  ६५५३४को बीचमा हुनुपर्छ।"</string>
-    <string name="no_internet_available_title" msgid="3327109242858406165">"कुनै इन्टरनेट जडान छैन"</string>
-    <string name="no_wifi_available_title" msgid="747881033089378758">"वाइफाइ जडान छैन"</string>
-    <string name="no_internet_available" msgid="7877142631803238549">"इन्टरनेट कल राख्नको लागि पहिले तपाईंको इन्टरनेट जडानको जाँच गर्नुहोस्"</string>
-    <string name="no_wifi_available" msgid="1225073547318465713">"तपाईंलाई इन्टरनेट कलहरू(वायरलेस र नेटवर्क सेटिहरूको प्रयोग)को लागि वाइफाइ नेटवर्क जडान गर्न जरुरत हुन्छ।"</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_setting_title" msgid="3754000371039709383">"द्रुत प्रतिक्रियाहरू"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></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">"ब्याकस्पेस"</string>
-    <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_ringtone_title" msgid="2609519527849101590">"आवाज:"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"पूर्वनिर्धारित ध्वनि ( <xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g> )"</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="dial_pad_autocomplete" msgid="494525952035761075">"डायल प्याड स्वतःपूर्ण"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"रिङ्गटोन र भाइब्रेट"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"कल राख्नका लागि वाइफाइ प्रयोग गर्नुहुन्छ?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"हो"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"हैन"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"निर्मित SIM कार्डहरू"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"इन्टरनेट कलमा निर्मित"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"भिडियो कल खोल्नुहोस्"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"भिडियो कल सकृय पार्न, तपाईंले सञ्जाल सेटिङमा Enhanced 4G LTE Mode सक्षम गर्न आवश्यक छ।"</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"सञ्जाल सेटिङहरू"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"बन्द गर्नुहोस्"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"आपताकालीन कल"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"आपातकालीन कल मात्र"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM कार्ड, स्लट: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"पहुँचता"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"आगमन Wi-Fi कल"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi कल"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"खोल्न फेरि छुनुहोस्"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"सन्देश डिकोड गर्दा एउटा समस्या भयो।"</string>
 </resources>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
new file mode 100644
index 0000000..94a682f
--- /dev/null
+++ b/res/values-nl/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Wereldwijd"</item>
+    <item msgid="6753774959494729275">"LTE/CDMA"</item>
+    <item msgid="8658695584186942227">"LTE/GSM/UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-nl/config.xml b/res/values-nl/config.xml
deleted file mode 100644
index bd8e53b..0000000
--- a/res/values-nl/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"onwaar"</string>
-</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 9478b7e..10b4e58 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -16,14 +16,14 @@
 
 <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>
+    <string name="phoneAppLabel" product="tablet" msgid="1107073389495104784">"Mobiele gegevens"</string>
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Telefoon"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Kiezer noodoproep"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Telefoon"</string>
     <string name="fdnListLabel" msgid="8630418672279521003">"FDN-lijst"</string>
     <string name="unknown" msgid="6878797917991465859">"Onbekend"</string>
     <string name="private_num" msgid="6713286113000232309">"Privénummer"</string>
-    <string name="payphone" msgid="1931775086311769314">"Betaaltelefoon"</string>
+    <string name="payphone" msgid="4793877574636445118">"Telefooncel"</string>
     <string name="onHold" msgid="9035493194749959955">"In de wacht"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI-code gestart"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD-code uitvoeren..."</string>
@@ -52,18 +52,41 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Verzoek om ontgrendelen netwerk..."</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="mobile_network_settings_not_available" msgid="7355254462995117896">"Instellingen voor mobiele netwerken zijn niet beschikbaar voor deze gebruiker"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Instellingen voor mobiele netwerken zijn niet beschikbaar voor deze gebruiker"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM-oproepinstellingen"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"GSM-oproepinstellingen (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA-oproepinstellingen"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"CDMA-oproepinstellingen (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Namen toegangspunten"</string>
     <string name="settings_label" msgid="3876743539816984008">"Netwerkinstellingen"</string>
-    <string name="connection_service" msgid="978745922583410219">"Verbindingsservice die moet worden gebruikt"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Oproepaccounts"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Bellen met"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"SIP-oproepen uitvoeren met"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Eerst vragen"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Instellingen"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Accounts kiezen"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Telefoonaccounts"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"SIP-account toevoegen"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Accountinstellingen configureren"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Bellen via wifi"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Bellen via wifi niet gebruiken"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Oproepassistent niet gebruiken"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Geen"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Oproepassistent"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Oproepassistent gebruiken"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Oproepassistent kiezen"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"De netwerken beheren die worden gebruikt voor oproepen met"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Apps of services de netwerken laten beheren die voor oproepen worden gebruikt"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Configureren"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Ingebouwde verbindingsservice"</string>
     <string name="voicemail" msgid="8693759337917898954">"Voicemail"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Voicemail (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
     <string name="networks" msgid="8873030692174541976">"Mobiele providers"</string>
-    <string name="call_settings" msgid="1630474923393095156">"Oproepinstellingen"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Nooduitzendingen"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Oproepinstellingen"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Aanvullende instellingen"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Aanvullende instellingen (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Aanvullende oproepinstellingen voor alleen GSM"</string>
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Aanvullende CDMA-oproepinstellingen"</string>
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Aanvullende oproepinstellingen voor alleen CDMA"</string>
@@ -77,29 +100,32 @@
     <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="call_forwarding_settings" msgid="3378927671091537173">"Instellingen voor doorschakelen van oproepen"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Instellingen voor oproepen doorschakelen (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Oproep doorschakelen"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Altijd doorschakelen"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Altijd dit nummer gebruiken"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Alle oproepen doorschakelen"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Alle oproepen doorschakelen naar <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Het telefoonnummer is niet beschikbaar"</string>
-    <string name="sum_cfu_disabled" msgid="3698472522160364904">"Uitgeschakeld"</string>
-    <string name="labelCFB" msgid="218938523102207587">"Doorsch. bij in gesprek"</string>
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Uit"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Wanneer bezet"</string>
     <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="sum_cfb_disabled" msgid="4913145177320506827">"Uit"</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="labelCFNRy" msgid="1736067178393744351">"Wanneer 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="sum_cfnry_disabled" msgid="3884684060443538097">"Uit"</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="labelCFNRc" msgid="2614827454402079766">"Wanneer niet bereikbaar"</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="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="call_settings_primary_user_only" msgid="5679923943740900965">"Oproepinstellingen kunnen alleen worden gewijzigd door de primaire gebruiker."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Oproepinstellingen (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
@@ -109,9 +135,9 @@
     <string name="fdn_check_failure" msgid="18200614306525434">"De instelling \'Vaste nummers\' in uw app 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 name="enable" msgid="7248657275000173526">"Inschakelen"</string>
+    <string name="disable" msgid="4678348128118573672">"Uitschakelen"</string>
+    <string name="change_num" msgid="239476305819844391">"Updaten"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Netwerkstandaard"</item>
     <item msgid="7876195870037833661">"Nummer verbergen"</item>
@@ -123,8 +149,8 @@
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Kan huidige instellingen voor doorschakelnummer niet ophalen en opslaan.\nToch 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="voicemail_default" msgid="2001233554889016880">"Uw provider"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Instellingen voor mobiele netwerken"</string>
     <string name="label_available" msgid="1181658289009300430">"Beschikbare netwerken"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Zoeken..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Geen netwerken gevonden."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Voorkeursnetwerkmodus: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Voorkeursnetwerkmodus: Wereldwijd"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Voorkeursnetwerkmodus: LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Voorkeursmodus voor netwerk: LTE/GSM/UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Voorkeursnetwerkmodus: LTE/CDMA"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="7886739962255042385">"LTE/WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"Alleen GSM"</item>
     <item msgid="3817924849415716259">"Voorkeur voor GSM/WCDMA"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Geoptimaliseerde 4G LTE-modus"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"LTE-services gebruiken voor betere spraak- en andere communicatie (aanbevolen)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Gegevenstoegang aan"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Gegevenstoegang via mobiel netwerk inschakelen"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Gegevensgebruik toestaan"</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="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="roaming_warning" msgid="1603164667540144353">"Er kunnen hoge roamingkosten in rekening worden gebracht."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Gegevensroaming toestaan?"</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>
@@ -190,7 +221,7 @@
     <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"Maximum van <xliff:g id="USED_0">%1$s</xliff:g> overschreden\nGegevenssnelheid verlaagd tot <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>van cyclus verstreken\nDe 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="throttle_help_subtext" msgid="3633091498168446044">"Meer informatie over het beleid voor gegevensgebruik van uw mobiele provider"</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>
@@ -303,7 +334,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Gegevensservice instellen"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Providerinstellingen"</string>
     <string name="fdn" msgid="7878832555095183202">"Vaste nummers"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Fixed Dialing Numbers (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FDN-lijst"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"FDN-lijst (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FDN-activering"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Vaste nummers zijn ingeschakeld"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Vaste nummers zijn uitgeschakeld"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"TTY-modus instellen"</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="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"De TTY-modus mag niet worden gewijzigd tijdens een videogesprek"</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>
@@ -344,7 +378,7 @@
     <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="simContacts_title" msgid="1861472842524839921">"Contacten selecteren om te importeren"</string>
-    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"Voor het importeren van contacten vanaf de simkaart moet u eerst de vliegmodus uitschakelen."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Schakel de vliegtuigmodus uit om contacten van de simkaart te importeren."</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>
@@ -354,42 +388,40 @@
     <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 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="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="1796577128488773946">"Wachtwoord onjuist. Pincode geblokkeerd. Pukcode aangevraagd."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"Pincode voor simkaart wissen"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"Pincode voor simkaart instellen"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"Pincode instellen…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"Pincode ingesteld"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"Pincode gewist"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"Pincode onjuist"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"Pincode geüpdatet"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Wachtwoord onjuist. Pincode nu geblokkeerd. PUK gevraagd."</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="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="3674058967950559397">"Wachtwoord onjuist. PIN2-code geblokkeerd. 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="badPuk2" msgid="7910064009531541708">"PUK2 onjuist. Probeer het opnieuw."</string>
+    <string name="badPin2" msgid="6646896629970023109">"Oude PIN2 onjuist. Probeer het opnieuw."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2\'s komen niet overeen. Probeer het opnieuw."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Geef een PIN2 op van vier tot acht cijfers."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Geef een PUK2 op van acht cijfers."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 geüpdatet"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Geef PUK2-code op"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Wachtwoord onjuist. PIN2 nu geblokkeerd. Wijzig PIN2 om het opnieuw te proberen."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Wachtwoord onjuist. Simkaart nu vergrendeld. Geef PUK2 op."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2-code is definitief geblokkeerd."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"U heeft nog <xliff:g id="NUMBER">%d</xliff:g> pogingen over."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"Blokkering van PIN2-code opgeheven."</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"U heeft nog <xliff:g id="NUMBER">%d</xliff:g> pogingen."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 niet langer geblokkeerd"</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="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_redialing" msgid="8253487008234167266">"Opnieuw bellen"</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_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>
     <string name="card_title_in_call" msgid="6346543933068225205">"Actieve oproep"</string>
-    <string name="card_title_my_phone_number" msgid="112428362494434191">"Mijn nummer is <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Kiezen"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Gemiste oproep"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Gemiste oproepen"</string>
@@ -407,25 +439,27 @@
     <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 Vliegmodus uitschakelen."</string>
+    <string name="incall_error_power_off" msgid="2947938060513306698">"Schakel de vliegtuigmodus uit om te bellen."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Schakel de vliegtuigmodus uit of maak verbinding met een draadloos netwerk om te bellen."</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_error_out_of_service" msgid="4100065333878929223">"Mobiel netwerk niet beschikbaar."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Mobiel netwerk is niet beschikbaar. Maak verbinding met een draadloos netwerk om te bellen."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Als u wilt bellen, moet u een geldig nummer invoeren."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Kan niet bellen."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI-reeks starten..."</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>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Kan oproep niet doorschakelen."</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Service wordt niet ondersteund"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Kan niet overschakelen tussen oproepen."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Kan oproep niet scheiden."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Kan niet doorschakelen."</string>
     <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Telefonische vergaderingen niet mogelijk."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Kan oproep niet weigeren."</string>
-    <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="incall_error_supp_service_reject" msgid="8998568661508655638">"Kan oproep niet weigeren."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Kan oproep(en) niet vrijgeven."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Maak verbinding met een draadloos netwerk om te bellen."</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="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="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Geen bereik. Opnieuw proberen…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Kan niet bellen. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> is geen alarmnummer."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Kan niet bellen. Bel een alarmnummer."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Toetsen gebruiken om te bellen"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"In de wacht"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Beëindigen"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"Normaal"</item>
     <item msgid="2883365539347850535">"Lang"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Netwerkbericht"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Netwerkbericht"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Foutmelding"</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\nNadat u op \'Activeren\' heeft gedrukt, luistert u naar de instructies om uw telefoon te activeren."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Activeren..."</string>
@@ -469,8 +504,8 @@
     <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_speaker" msgid="6904589278542719647">"Luidspreker"</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_progress" msgid="460876637828044519">"Uw telefoon programmeren…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Kan uw telefoon niet programmeren"</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="8072141612635635357">"Uw telefoon is niet geactiveerd. \nZoek een plek waar u betere dekking heeft (in de buurt van een raam of buiten). \n\nProbeer het opnieuw of bel de klantenservice voor meer opties."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"VEEL SPC-FOUTEN"</string>
@@ -481,18 +516,18 @@
     <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="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>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other">Er is al <xliff:g id="COUNT_1">%s</xliff:g> minuten geen gegevensverbinding</item>
+      <item quantity="one">Er is al <xliff:g id="COUNT_0">%s</xliff:g> minuut geen gegevensverbinding</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other">De telefoon bevindt zich <xliff:g id="COUNT_1">%s</xliff:g> minuten in de modus voor noodoproepen. In deze modus kunnen geen apps worden gebruikt waarvoor een gegevensverbinding nodig is. Wilt u nu afsluiten?</item>
+      <item quantity="one">De telefoon bevindt zich <xliff:g id="COUNT_0">%s</xliff:g> minuut in de modus voor noodoproepen. In deze modus kunnen geen apps worden gebruikt waarvoor een gegevensverbinding nodig is. Wilt u nu afsluiten?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other">De geselecteerde actie is niet beschikbaar in de modus voor noodoproepen. De telefoon bevindt zich <xliff:g id="COUNT_1">%s</xliff:g> minuten in deze modus. Wilt u nu afsluiten?</item>
+      <item quantity="one">De geselecteerde actie is niet beschikbaar in de modus voor noodoproepen. De telefoon bevindt zich <xliff:g id="COUNT_0">%s</xliff:g> minuut in deze modus. Wilt u nu afsluiten?</item>
+    </plurals>
     <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>
@@ -506,110 +541,23 @@
     <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_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_title" msgid="27433718808839672">"Internetoproepen gebruiken"</string>
-    <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Internetoproepen gebruiken (alleen wifi)"</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="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="5523030209803567922">"Via het scherm \'Telefoon &gt; Instellingen &gt; Instellingen voor bellen via internet &gt; Accounts\' 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="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="52903398217017954">"Het account opslaan..."</string>
-    <string name="removing_account" msgid="7183999896088628100">"Het account verwijderen..."</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_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="4288401139400232968">"Registreren..."</string>
-    <string name="registration_status_still_trying" msgid="3185581992666091911">"Nog steeds bezig..."</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 wifi-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="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>
-    <string name="username_title" msgid="2479375923477682328">"Gebruikersnaam"</string>
-    <string name="password_title" msgid="3323555249068171531">"Wachtwoord"</string>
-    <string name="display_name_title" msgid="2459768196312249937">"Weergavenaam"</string>
-    <string name="proxy_address_title" msgid="4828301345351614273">"Adres voor uitgaande proxy"</string>
-    <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="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="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 wifi-verbinding"</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 wifi-netwerk (gebruik de instellingen bij \'Draadloos en netwerken\')."</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>
     <string name="not_voice_capable" msgid="2739898841461577811">"Spraakoproepen worden niet ondersteund"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Snelle reacties"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"één"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"twee"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"drie"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"vier"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"vijf"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"zes"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"zeven"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"acht"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"negen"</string>
-    <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_dial_button" msgid="7459705245418435351">"bellen"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="description_target_answer" msgid="7205604197797472471">"Antwoord"</string>
-    <string name="description_target_send_sms" msgid="2098326025587950144">"Sms verzenden"</string>
-    <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 name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Geluid"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Standaardgeluid (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</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="dial_pad_autocomplete" msgid="494525952035761075">"Autom. aanvul. voor toetsenblok"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Beltoon en trillen"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Wifi gebruiken om oproepen te plaatsen?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Ja"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"Nee"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Ingebouwde simkaarten"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Geïntegreerde internetoproepen"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Videogesprekken inschakelen"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Als u videogesprekken wilt inschakelen, moet u de geoptimaliseerde 4G LTE-modus inschakelen in de netwerkinstellingen."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Netwerkinstellingen"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Sluiten"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Noodoproepen"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Alleen noodoproepen"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"Simkaart, sleuf: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Toegankelijkheid"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Inkomende wifi-oproep"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wifi-oproep"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Tik nogmaals om te openen"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"Er is een fout opgetreden tijdens het decoderen van het bericht."</string>
 </resources>
diff --git a/res/values-pa-rIN/arrays.xml b/res/values-pa-rIN/arrays.xml
new file mode 100644
index 0000000..0a015ca
--- /dev/null
+++ b/res/values-pa-rIN/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"ਗਲੋਬਲ"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
new file mode 100644
index 0000000..09b4dcb
--- /dev/null
+++ b/res/values-pl/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Globalna"</item>
+    <item msgid="6753774959494729275">"LTE/CDMA"</item>
+    <item msgid="8658695584186942227">"LTE/GSM/UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-pl/config.xml b/res/values-pl/config.xml
deleted file mode 100644
index 5ac6edc..0000000
--- a/res/values-pl/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"fałsz"</string>
-</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 11ad428..cfde3c7 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -16,14 +16,14 @@
 
 <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">"Mobile Data"</string>
+    <string name="phoneAppLabel" product="tablet" msgid="1107073389495104784">"Dane komórkowe"</string>
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Telefon"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Numery alarmowe"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Telefon"</string>
     <string name="fdnListLabel" msgid="8630418672279521003">"Ustalone numery"</string>
     <string name="unknown" msgid="6878797917991465859">"Nieznany"</string>
     <string name="private_num" msgid="6713286113000232309">"Numer prywatny"</string>
-    <string name="payphone" msgid="1931775086311769314">"Płatny telefon"</string>
+    <string name="payphone" msgid="4793877574636445118">"Automat telefoniczny"</string>
     <string name="onHold" msgid="9035493194749959955">"Oczekujące"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Kod MMI został rozpoczęty"</string>
     <string name="ussdRunning" msgid="485588686340541690">"Uruchomiony kod USSD..."</string>
@@ -52,23 +52,46 @@
     <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="mobile_network_settings_not_available" msgid="7355254462995117896">"Ustawienia sieci mobilnej są niedostępne dla tego użytkownika"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Ustawienia sieci komórkowej są niedostępne dla tego użytkownika"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Ustawienia połączenia GSM"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"Ustawienia połączenia GSM (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Ustawienia połączenia CDMA"</string>
-    <string name="apn_settings" msgid="9043423184895642077">"Punkty dostępowe"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"Ustawienia połączenia CDMA (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="apn_settings" msgid="9043423184895642077">"Punkty dostępu"</string>
     <string name="settings_label" msgid="3876743539816984008">"Ustawienia sieci"</string>
-    <string name="connection_service" msgid="978745922583410219">"Wybrana usługa połączeń"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Konta telefoniczne"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Nawiązuj połączenia z konta"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Nawiązuj połączenia SIP z konta"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Najpierw zapytaj"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Ustawienia"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Wybierz konta"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Konta telefonu"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Dodaj konto SIP"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Konfigurowanie ustawień konta"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Połączenia przez Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Nie używaj połączeń Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Nie używaj asystenta połączeń"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Brak"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Asystent połączeń"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Użyj asystenta połączeń"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Wybierz asystenta połączeń"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Zarządzaj sieciami używanymi do połączeń z:"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Pozwól aplikacjom lub usługom zarządzać sieciami używanymi do nawiązywania połączeń"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Konfiguruj"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Wbudowana usługa połączeń"</string>
     <string name="voicemail" msgid="8693759337917898954">"Poczta głosowa"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Poczta głosowa (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"Poczta głosowa:"</string>
     <string name="networks" msgid="8873030692174541976">"Operatorzy sieci"</string>
-    <string name="call_settings" msgid="1630474923393095156">"Ustawienia połączeń"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Komunikaty alarmowe"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Ustawienia połączeń"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Ustawienia dodatkowe"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Ustawienia dodatkowe (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Dodatkowe ustawienia: tylko połączenia GSM"</string>
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Dodatkowe ustawienia połączenia CDMA"</string>
     <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="labelCallerId" msgid="3888899447379069198">"Nazwa 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>
@@ -77,29 +100,32 @@
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Podczas połączenia powiadamiaj mnie o połączeniach przychodzących"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Podczas połączenia powiadamiaj mnie o połączeniach przychodzących"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Ustawienia przekazywania połączeń"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Ustawienia przekierowywania połączeń (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Przekierowanie połączeń"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Przekieruj wszystkie"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Zawsze używaj tego numeru"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Przekierowanie wszystkich rozmów"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Przekazywanie wszystkich połączeń do <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Numer jest niedostępny"</string>
-    <string name="sum_cfu_disabled" msgid="3698472522160364904">"Wyłączone"</string>
-    <string name="labelCFB" msgid="218938523102207587">"Przekieruj, gdy zajęty"</string>
-    <string name="messageCFB" msgid="3711089705936187129">"Numer, gdy zajęty"</string>
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Wyłączone"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Gdy zajęty"</string>
+    <string name="messageCFB" msgid="3711089705936187129">"Przekieruj na numer"</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="sum_cfb_disabled" msgid="4913145177320506827">"Wyłączone"</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="labelCFNRy" msgid="1736067178393744351">"Gdy nie odbieram"</string>
+    <string name="messageCFNRy" msgid="672317899884380374">"Przekieruj na numer"</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="sum_cfnry_disabled" msgid="3884684060443538097">"Wyłączone"</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="labelCFNRc" msgid="2614827454402079766">"Gdy niedostępny"</string>
+    <string name="messageCFNRc" msgid="6380695421020295119">"Przekieruj na numer"</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="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="call_settings_primary_user_only" msgid="5679923943740900965">"Ustawienia połączeń może zmienić tylko użytkownik główny."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Ustawienia połączeń (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Błąd w ustawieniach połączenia"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Czytanie ustawień..."</string>
     <string name="updating_settings" msgid="8171225533884883252">"Aktualizowanie ustawień..."</string>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"Włącz"</string>
+    <string name="disable" msgid="4678348128118573672">"Wyłącz"</string>
     <string name="change_num" msgid="239476305819844391">"Aktualizuj"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Domyślna wartość dla sieci"</item>
@@ -123,8 +149,8 @@
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Nie można pobrać i zapisać bieżących ustawień numeru przekazywania.\nCzy 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>
-    <string name="voicemail_default" msgid="5902099213882352338">"Mój operator"</string>
-    <string name="mobile_networks" msgid="5540397602919106177">"Ustawienia sieci komórkowej"</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"Twój operator"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Ustawienia sieci komórkowej"</string>
     <string name="label_available" msgid="1181658289009300430">"Dostępne sieci"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Wyszukiwanie..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Nie znaleziono sieci."</string>
@@ -134,7 +160,7 @@
     <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="3494252551249882718">"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="5628402124471810174">"Wybierz automatycznie"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Automatycznie wybierz preferowaną sieć"</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Preferowany tryb sieci: CDMA + LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Preferowany tryb sieci: globalny"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Preferowany tryb sieci: LTE/WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Preferowany tryb sieci: LTE/GSM/UMTS"</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="7886739962255042385">"LTE/WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"Tylko GSM"</item>
     <item msgid="3817924849415716259">"Preferowany GSM/WCDMA"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Tryb rozszerzonego 4G LTE"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Użyj usług LTE, by poprawić łączność głosową i inną (zalecane)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Włącz przesył danych"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Włącz przesył danych przez sieć komórkową"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Zezwalaj na transmisję danych"</string>
     <string name="roaming" msgid="8871412572928323707">"Roaming danych"</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="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="roaming_warning" msgid="1603164667540144353">"Mogą się z tym wiązać wysokie opłaty."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Zezwolić na roaming danych?"</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>
@@ -190,7 +221,7 @@
     <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"Przekroczono limit: <xliff:g id="USED_0">%1$s</xliff:g>\nSzybkość transmisji zmniejszona do <xliff:g id="USED_1">%2$d</xliff:g> Kb/s"</string>
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"Minęło <xliff:g id="USED_0">%1$d</xliff:g>٪ cyklu\nNastę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="throttle_help_subtext" msgid="3633091498168446044">"Więcej informacji o zasadach korzystania z transmisji danych przez sieć komórkową operatora"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"Komunikaty SMS z sieci komórkowej"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"Komunikaty SMS z sieci komórkowej"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"Komunikaty SMS z sieci komórkowej są włączone"</string>
@@ -303,7 +334,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Skonfiguruj plan danych"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Ustawienia operatora"</string>
     <string name="fdn" msgid="7878832555095183202">"Ustalone numery"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Ustalone numery (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Ustalone numery"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"Lista ustalonych numerów (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Aktywacja usługi ustalonych numerów"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Włączono tryb ustalonych numerów"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Wyłączono tryb ustalonych numerów"</string>
@@ -314,13 +347,14 @@
     <string name="disable_fdn_ok" msgid="5727046928930740173">"Włącz ustalone numery"</string>
     <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="sum_fdn_manage_list" msgid="8431088265332628316">"Zarządzaj listą numerów telefonów"</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_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="4073265511427813322">"Automatyczne ponawianie próby"</string>
     <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Włącz tryb automatycznego ponawiania próby"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"Trybu TTY nie można zmienić w trakcie rozmowy wideo"</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>
@@ -344,7 +378,7 @@
     <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="1846161429087789936">"Aby zaimportować kontakty z karty SIM, najpierw wyłącz tryb samolotowy."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Wyłącz tryb samolotowy, by zaimportować kontakty z karty SIM."</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>
@@ -354,42 +388,40 @@
     <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="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="1796577128488773946">"Nieprawidłowe hasło, PIN został zablokowany. Musisz podać PUK."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"Wyczyść PIN karty SIM"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"Ustaw PIN karty SIM"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"Ustawiam PIN…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN został ustawiony"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN został wyczyszczony"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"Nieprawidłowy PIN"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN został zaktualizowany"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Nieprawidłowe hasło. PIN został zablokowany. Wymagane jest podanie kodu PUK."</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="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="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="3674058967950559397">"Nieprawidłowe hasło, PIN2 został zablokowany. Zmień 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="badPuk2" msgid="7910064009531541708">"PUK2 jest nieprawidłowy. Spróbuj ponownie."</string>
+    <string name="badPin2" msgid="6646896629970023109">"Stary PIN2 jest nieprawidłowy. Spróbuj ponownie."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"Kody PIN2 nie pasują do siebie. Spróbuj ponownie."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Wpisz PIN2 zawierający od 4 do 8 cyfr."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Wpisz PUK2 zawierający 8 cyfr."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 został zaktualizowany"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Wpisz kod PUK2"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Hasło jest nieprawidłowe. PIN2 został zablokowany. Aby spróbować ponownie, zmień PIN2."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Nieprawidłowe hasło. Karta SIM została zablokowana. Wpisz PUK2."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 został trwale zablokowany."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Masz jeszcze <xliff:g id="NUMBER">%d</xliff:g> prób(y)."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 został odblokowany."</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"Masz jeszcze <xliff:g id="NUMBER">%d</xliff:g> prób(y)."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 nie jest już zablokowany"</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="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_redialing" msgid="8253487008234167266">"Ponowne wybieranie numeru"</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_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>
     <string name="card_title_in_call" msgid="6346543933068225205">"Trwa połączenie"</string>
-    <string name="card_title_my_phone_number" msgid="112428362494434191">"Mój numer to <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Trwa wybieranie numeru"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Nieodebrane połączenie"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Połączenia nieodebrane"</string>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"Wyłącz tryb samolotowy, by zadzwonić."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Wyłącz tryb samolotowy lub połącz się z siecią bezprzewodową, by zadzwonić."</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_error_out_of_service" msgid="4100065333878929223">"Sieć komórkowa jest niedostępna."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Sieć komórkowa jest niedostępna. Połącz się z siecią bezprzewodową, by zadzwonić."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Aby zadzwonić, wybierz prawidłowy numer."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Nie można dzwonić."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Rozpoczynanie sekwencji MMI..."</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>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Nie można przekazać połączenia."</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Usługa nie jest obsługiwana"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Nie można przełączyć połączeń."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Nie można rozdzielić połączenia."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Nie można przekazać."</string>
     <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Nie można prowadzić rozmów konferencyjnych."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Nie można odrzucić połączenia."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Nie można zakończyć połączenia (połączeń)."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Połączenie przez internet"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Nie można odrzucić połączenia."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Nie można zwolnić połączeń."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Połącz się z siecią bezprzewodową, by zadzwonić."</string>
     <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="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="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Brak sieci. Próbuję ponownie…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Nie można dzwonić. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nie jest numerem alarmowym."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Nie można dzwonić. Wybierz numer alarmowy."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Aby zadzwonić, użyj klawiatury."</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Wstrzymaj"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Zakończ"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"Normalne"</item>
     <item msgid="2883365539347850535">"Długie"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Komunikat sieciowy"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Komunikat sieciowy"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Komunikat o błędzie"</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\nPo naciśnięciu przycisku „Aktywuj” posłuchaj dostępnych instrukcji, aby aktywować telefon."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Aktywuję..."</string>
@@ -469,8 +504,8 @@
     <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_speaker" msgid="6904589278542719647">"Głośnik"</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_progress" msgid="460876637828044519">"Programuję telefon…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Zaprogramowanie telefonu 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="8072141612635635357">"Telefon nie został aktywowany. \nByć może należy przejść do miejsca, w którym sygnał sieci jest silniejszy (w pobliżu okna lub na zewnątrz budynku). \n\nSpró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>
@@ -481,18 +516,24 @@
     <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>
     <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Połączenie transmisji danych jest wyłączone"</string>
-  <plurals name="phone_in_ecm_notification_time">
-    <item quantity="one" msgid="4866221796252472622">"Brak połączenia transmisji danych przez <xliff:g id="COUNT">%s</xliff:g> min"</item>
-    <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="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="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>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="few">Brak połączenia transmisji danych przez <xliff:g id="COUNT_1">%s</xliff:g> minuty</item>
+      <item quantity="many">Brak połączenia transmisji danych przez <xliff:g id="COUNT_1">%s</xliff:g> minut</item>
+      <item quantity="other">Brak połączenia transmisji danych przez <xliff:g id="COUNT_1">%s</xliff:g> minuty</item>
+      <item quantity="one">Brak połączenia transmisji danych przez <xliff:g id="COUNT_0">%s</xliff:g> minutę</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="few">Telefon będzie w trybie alarmowego połączenia zwrotnego przez <xliff:g id="COUNT_1">%s</xliff:g> minuty. W tym trybie nie można używać aplikacji, które korzystają z połączenia transmisji danych. Chcesz zakończyć tryb teraz?</item>
+      <item quantity="many">Telefon będzie w trybie alarmowego połączenia zwrotnego przez <xliff:g id="COUNT_1">%s</xliff:g> minut. W tym trybie nie można używać aplikacji, które korzystają z połączenia transmisji danych. Chcesz zakończyć tryb teraz?</item>
+      <item quantity="other">Telefon będzie w trybie alarmowego połączenia zwrotnego przez <xliff:g id="COUNT_1">%s</xliff:g> minuty. W tym trybie nie można używać aplikacji, które korzystają z połączenia transmisji danych. Chcesz zakończyć tryb teraz?</item>
+      <item quantity="one">Telefon będzie w trybie alarmowego połączenia zwrotnego przez <xliff:g id="COUNT_0">%s</xliff:g> minutę. W tym trybie nie można używać aplikacji, które korzystają z połączenia transmisji danych. Chcesz zakończyć tryb teraz?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="few">Wybrana czynność jest niedostępna w trybie alarmowego połączenia zwrotnego. Telefon będzie w tym trybie przez <xliff:g id="COUNT_1">%s</xliff:g> minuty. Chcesz zakończyć tryb teraz?</item>
+      <item quantity="many">Wybrana czynność jest niedostępna w trybie alarmowego połączenia zwrotnego. Telefon będzie w tym trybie przez <xliff:g id="COUNT_1">%s</xliff:g> minut. Chcesz zakończyć tryb teraz?</item>
+      <item quantity="other">Wybrana czynność jest niedostępna w trybie alarmowego połączenia zwrotnego. Telefon będzie w tym trybie przez <xliff:g id="COUNT_1">%s</xliff:g> minuty. Chcesz zakończyć tryb teraz?</item>
+      <item quantity="one">Wybrana czynność jest niedostępna w trybie alarmowego połączenia zwrotnego. Telefon będzie w tym trybie przez <xliff:g id="COUNT_0">%s</xliff:g> minutę. Chcesz zakończyć tryb teraz?</item>
+    </plurals>
     <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>
@@ -506,110 +547,23 @@
     <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_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_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="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="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="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="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_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="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="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>
-    <string name="username_title" msgid="2479375923477682328">"Nazwa użytkownika"</string>
-    <string name="password_title" msgid="3323555249068171531">"Hasło"</string>
-    <string name="display_name_title" msgid="2459768196312249937">"Nazwa wyświetlana"</string>
-    <string name="proxy_address_title" msgid="4828301345351614273">"Proxy połączeń wychodzących"</string>
-    <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="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>
-    <string name="auth_username_title" msgid="851473016307947120">"Nazwa do uwierzytelniania"</string>
-    <string name="auth_username_summary" msgid="6782012405225938629">"Nazwa użytkownika używana podczas uwierzytelniania"</string>
-    <string name="default_preference_summary" msgid="868766740121667450">"&lt;Nie ustawiono&gt;"</string>
-    <string name="display_name_summary" msgid="8636377460518225523">"&lt;Taka jak nazwa użytkownika&gt;"</string>
-    <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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"Połączenia głosowe nie są obsługiwane"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Szybkie odpowiedzi"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"jeden"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"dwa"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"trzy"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"cztery"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"pięć"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"sześć"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"siedem"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"osiem"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"dziewięć"</string>
-    <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_dial_button" msgid="7459705245418435351">"wybierz numer"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"cofnij"</string>
-    <string name="description_target_answer" msgid="7205604197797472471">"Odpowiedz"</string>
-    <string name="description_target_send_sms" msgid="2098326025587950144">"Wyślij SMS"</string>
-    <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="2609519527849101590">"Dźwięk"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Domyślny dźwięk (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <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="dial_pad_autocomplete" msgid="494525952035761075">"Autouzupełnianie klawiatury"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Dzwonek i wibracje"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Zadzwonić przez Wi-Fi?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Tak"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"Nie"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Wbudowane karty SIM"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Wbudowana funkcja telefonii internetowej"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Włącz rozmowy wideo"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Aby włączyć rozmowy wideo, musisz włączyć w ustawieniach sieci Tryb rozszerzonego 4G LTE."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Ustawienia sieci"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Zamknij"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Połączenia alarmowe"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Tylko połączenia alarmowe"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"Karta SIM, gniazdo: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Ułatwienia dostępu"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Przychodzące połączenie przez Wi-Fi"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Połączenie przez Wi-Fi"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Kliknij ponownie, by otworzyć"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"Podczas dekodowania wiadomości wystąpił błąd."</string>
 </resources>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
new file mode 100644
index 0000000..807c757
--- /dev/null
+++ b/res/values-pt-rPT/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Global"</item>
+    <item msgid="6753774959494729275">"LTE/CDMA"</item>
+    <item msgid="8658695584186942227">"LTE/GSM/UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-pt-rPT/config.xml b/res/values-pt-rPT/config.xml
deleted file mode 100644
index 0605cd7..0000000
--- a/res/values-pt-rPT/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"false"</string>
-</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 7b8d4aa..fd512c1 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -16,14 +16,14 @@
 
 <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">"Dados móveis"</string>
+    <string name="phoneAppLabel" product="tablet" msgid="1107073389495104784">"Dados móveis"</string>
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Telemóvel"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Marcador de emergência"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Telefone"</string>
     <string name="fdnListLabel" msgid="8630418672279521003">"Lista de números de marcação fixa (FDN)"</string>
     <string name="unknown" msgid="6878797917991465859">"Desconhecido"</string>
     <string name="private_num" msgid="6713286113000232309">"Número particular"</string>
-    <string name="payphone" msgid="1931775086311769314">"Telefone público"</string>
+    <string name="payphone" msgid="4793877574636445118">"Telefone público"</string>
     <string name="onHold" msgid="9035493194749959955">"Em espera"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Código de MMI iniciado"</string>
     <string name="ussdRunning" msgid="485588686340541690">"A executar código USSD..."</string>
@@ -52,18 +52,41 @@
     <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="mobile_network_settings_not_available" msgid="7355254462995117896">"As definições de rede móvel não estão disponíveis para este utilizador"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"As definições de rede móvel não estão disponíveis para este utilizador"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Definições de chamadas GSM"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"Definições de chamadas GSM (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Definições de chamada CDMA"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"Definições de chamadas CDMA (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Pontos de acesso (APN)"</string>
     <string name="settings_label" msgid="3876743539816984008">"Definições de rede"</string>
-    <string name="connection_service" msgid="978745922583410219">"Serviço de ligação a utilizar"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Contas de chamadas"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Efetuar chamadas com"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Efetuar chamadas SIP com"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Perguntar primeiro"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Definições"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Escolher contas"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Contas do telemóvel"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Adicionar conta SIP"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Configurar as definições da conta"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Chamadas Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Não utilizar chamadas de Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Não utilizar o assistente de chamadas"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Nenhum"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Assistente de chamadas"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Utilizar assistente de chamadas"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Escolher o assistente de chamadas"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Gerir as redes utilizadas para chamadas com o"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Permitir que as aplicações ou os serviços efetuem a gestão das redes utilizadas para as chamadas"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Configurar"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Serviço de ligação incorporado"</string>
     <string name="voicemail" msgid="8693759337917898954">"Correio de voz"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Correio de voz (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"Correio de voz:"</string>
     <string name="networks" msgid="8873030692174541976">"Operadores de rede"</string>
-    <string name="call_settings" msgid="1630474923393095156">"Definições de chamadas"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Transmissões de emergência"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Definições de chamada"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Definições adicionais"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Definições adicionais (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Definições adicionais de chamadas apenas GSM"</string>
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Definições adicionais de chamadas CDMA"</string>
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Definições adicionais de chamadas apenas CDMA"</string>
@@ -77,29 +100,32 @@
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Notificar-me de chamadas a receber durante uma chamada"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Notificar-me de chamadas a receber durante uma chamada"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Definições do reencaminhamento de chamadas"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Definições de reencaminhamento de chamadas (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Reencaminhamento de chamadas"</string>
-    <string name="labelCFU" msgid="8147177368148660600">"Reencaminhar sempre"</string>
+    <string name="labelCFU" msgid="8147177368148660600">"Encaminhar sempre"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Utilizar sempre este número"</string>
     <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="labelCFB" msgid="218938523102207587">"Reencaminhar quando ocupado"</string>
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Desativado"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Quando estiver ocupado(a)"</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="sum_cfb_disabled" msgid="4913145177320506827">"Desativado"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"O seu operador não suporta a desativaçã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="labelCFNRy" msgid="1736067178393744351">"Quando não tiver atendido"</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="sum_cfnry_disabled" msgid="3884684060443538097">"Desativado"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"O operador não suporta a desativaçã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="labelCFNRc" msgid="2614827454402079766">"Quando estiver 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="5646361343094064333">"O seu operador não suporta a desativaçã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="call_settings_primary_user_only" msgid="5679923943740900965">"As definições de chamadas só podem ser alteradas pelo utilizador principal."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Definições de chamadas (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
     <string name="updating_settings" msgid="8171225533884883252">"A atualizar as definições..."</string>
@@ -109,8 +135,8 @@
     <string name="fdn_check_failure" msgid="18200614306525434">"A definição Números Autorizados da aplicação do seu Telemóvel está ativada. Por conseguinte, algumas funcionalidades relacionadas com chamadas não estão a funcionar."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Ative o rádio antes de visualizar estas definições."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
-    <string name="enable" msgid="1059008390636773574">"Ativar"</string>
-    <string name="disable" msgid="7274240979164762320">"Desativar"</string>
+    <string name="enable" msgid="7248657275000173526">"Ativar"</string>
+    <string name="disable" msgid="4678348128118573672">"Desativar"</string>
     <string name="change_num" msgid="239476305819844391">"Atualizar"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Predefinição da rede"</item>
@@ -123,8 +149,8 @@
     <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.\nMudar 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>
-    <string name="mobile_networks" msgid="5540397602919106177">"Definições da rede móvel"</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"O seu operador"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Definições de rede móvel"</string>
     <string name="label_available" msgid="1181658289009300430">"Redes disponíveis"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"A pesquisar..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Nenhuma rede encontrada."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Modo de rede preferido: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Modo de rede preferido: global"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Modo de rede preferido: LTE/WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Modo de rede preferido: LTE/GSM/UMTS"</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="7886739962255042385">"LTE/WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"Apenas GSM"</item>
     <item msgid="3817924849415716259">"GSM/WCDMA preferido"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Modo 4G LTE avançado"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Utilizar os serviços LTE para melhorar a voz e outras comunicações (recomendado)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Dados ativados"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Ativar acesso a dados através de rede móvel"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Permitir a utilização de dados"</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="8913735676127858115">"A conectividade de dados foi perdida porque saiu do alcance da sua rede e o roaming de dados estava desativado."</string>
-    <string name="roaming_warning" msgid="7820963598559553967">"Permitir roaming de dados? Os encargos de roaming podem ser significativos!"</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"Podem ser cobrados custos significativos."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Pretende permitir roaming de dados?"</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>
@@ -190,7 +221,7 @@
     <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"<xliff:g id="USED_0">%1$s</xliff:g> máximo excedido\nVelocidade de transmissão de dados reduzida para <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>٪ do ciclo decorrido\nO 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="throttle_help_subtext" msgid="3633091498168446044">"Mais informações acerca da política de utilização de dados da rede móvel do seu operador."</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 ativada"</string>
@@ -303,7 +334,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Configurar serviço de dados"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Definições do operador"</string>
     <string name="fdn" msgid="7878832555095183202">"Números de marcação fixa (FDN)"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Números de marcação fixa (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Lista de números de marcação fixa (FDN)"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"Lista FDN (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Activação de FDN"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Os números de marcação fixa estão ativados"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Os números de marcação fixa estão desativados"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Definir modo TTY"</string>
     <string name="auto_retry_mode_title" msgid="4073265511427813322">"Nova tentativa automática"</string>
     <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Ativar modo Nova tentativa automática"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"Não é permitido alterar o modo teletipo durante uma videochamada"</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>
@@ -344,7 +378,7 @@
     <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="1846161429087789936">"Para importar contactos do cartão SIM, primeiro desative o Modo de Avião."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Desative o modo de avião para importar contactos do cartão SIM."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Ativar/desativar 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>
@@ -354,42 +388,40 @@
     <string name="badPin" msgid="8955102849303984935">"O PIN antigo introduzido não está correto. 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">"Desativar o PIN do SIM"</string>
-    <string name="enable_sim_pin" msgid="5803702443844458831">"Ativar o PIN do cartão SIM"</string>
-    <string name="enable_in_progress" msgid="3695303775100109650">"Queira aguardar..."</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 introduzido não estava correto."</string>
-    <string name="pin_changed" msgid="4365538014588501049">"PIN do SIM alterado com sucesso"</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Palavra-passe incorreta e PIN bloqueado! PUK solicitado."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"Limpar PIN do SIM"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"Definir PIN do SIM"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"A definir o PIN…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN definido"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN limpo"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN incorreto"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN atualizado"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Palavra-passe incorreta. PIN bloqueado. PUK 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">"Confirme o novo PIN2"</string>
-    <string name="badPuk2" msgid="4851734468010000418">"O PUK2 introduzido não está correto. Tente novamente."</string>
-    <string name="badPin2" msgid="1041576234483629991">"O PIN2 antigo introduzido não está correto. 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="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="3674058967950559397">"Palavra-passe incorreta e PIN2 bloqueado. 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="badPuk2" msgid="7910064009531541708">"PUK2 incorreto. Tente novamente."</string>
+    <string name="badPin2" msgid="6646896629970023109">"PIN2 anterior incorreto. Tente novamente."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"Os PIN2s não coincidem. Tente novamente."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Introduza um PIN2 que tenha entre 4 e 8 números."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Introduza um PUK2 que tenha 8 números."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 atualizado"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Introduzir o código PUK2"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Palavra-passe incorreta. PIN2 bloqueado. Para tentar novamente, altere o PIN 2."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Palavra-passe incorreta. SIM bloqueado. Introduza o PUK2."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 bloqueado permanentemente."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Restam <xliff:g id="NUMBER">%d</xliff:g> tentativas."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 desbloqueado!"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"Tem mais <xliff:g id="NUMBER">%d</xliff:g> tentativas."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"O PIN2 deixou de estar bloqueado"</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="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_redialing" msgid="8253487008234167266">"A marcar 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_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>
     <string name="card_title_in_call" msgid="6346543933068225205">"A chamar"</string>
-    <string name="card_title_my_phone_number" msgid="112428362494434191">"O meu número é <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"A marcar"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Chamada não atendida"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Chamadas não atendidas"</string>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"Desative o modo de avião para fazer uma chamada."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Desative o modo de avião ou ligue-se a uma rede sem fios para fazer uma chamada."</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_error_out_of_service" msgid="4100065333878929223">"Rede móvel não disponível."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"A rede móvel não está disponível. Ligue-se a uma rede sem fios para fazer uma chamada."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Para telefonar, introduza um número válido."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Não é possível telefonar."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"A iniciar sequência de MMI..."</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>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Não é possível transferir a chamada."</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Serviço não suportado"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Não é possível alternar chamadas."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Não é possível separar a chamada."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Não é possível transferir."</string>
     <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Não é possível efectuar chamadas de conferência."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Não é possível rejeitar a chamada."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Não é possível efectuar chamada(s)."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Chamada por internet"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Não é possível rejeitar a chamada."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Não é possível libertar a(s) chamada(s)."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Ligue-se a uma rede sem fios para fazer uma chamada."</string>
     <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="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="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Sem serviço. A tentar novamente…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Não é possível telefonar. <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="9130194953830414638">"Não é possível telefonar. Marque um número de emergência."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Utilizar o teclado para marcar"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Suspender"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Terminar"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"Normal"</item>
     <item msgid="2883365539347850535">"Longo"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Mensagem de rede"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Mensagem de rede"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Mensagem de erro"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Ativar o seu telefone"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"É necessário efectuar uma chamada especial para ativar o seu serviço telefónico. \n\nDepois de premir “Ativar”, ouça as instruções fornecidas para activar o telefone."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"A ativar..."</string>
@@ -469,8 +504,8 @@
     <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_speaker" msgid="6904589278542719647">"Altifalante"</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_progress" msgid="460876637828044519">"A programar o telemóvel…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Não foi possível programar o telemóvel"</string>
     <string name="ota_successful" msgid="1880780692887077407">"O seu telefone já está ativado. O início do serviço pode demorar até 15 minutos."</string>
     <string name="ota_unsuccessful" msgid="8072141612635635357">"O seu telemóvel não foi ativado. \nPode ser necessário procurar uma zona com melhor cobertura (junto a uma janela ou no exterior). \n\nTente 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>
@@ -481,18 +516,18 @@
     <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>
     <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Ligação de dados desativada"</string>
-  <plurals name="phone_in_ecm_notification_time">
-    <item quantity="one" msgid="4866221796252472622">"Sem ligação de dados durante <xliff:g id="COUNT">%s</xliff:g> minuto"</item>
-    <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="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="2585506997024726599">"A açã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 açã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>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other">Sem ligação de dados durante <xliff:g id="COUNT_1">%s</xliff:g> minutos</item>
+      <item quantity="one">Sem ligação de dados durante <xliff:g id="COUNT_0">%s</xliff:g> minuto</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other">O telemóvel fica no modo de Chamada de emergência durante <xliff:g id="COUNT_1">%s</xliff:g> minutos. Neste modo, não é possível utilizar aplicações com uma ligação de dados. Pretende sair agora?</item>
+      <item quantity="one">O telemóvel fica no modo de Chamada de emergência durante <xliff:g id="COUNT_0">%s</xliff:g> minuto. Neste modo, não é possível utilizar aplicações com uma ligação de dados. Pretende sair agora?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other">A ação selecionada não está disponível no modo de Chamada de emergência. O telemóvel fica neste modo durante <xliff:g id="COUNT_1">%s</xliff:g> minutos. Pretende sair agora?</item>
+      <item quantity="one">A ação selecionada não está disponível no modo de Chamada de emergência. O telemóvel fica neste modo durante <xliff:g id="COUNT_0">%s</xliff:g> minuto. Pretende sair agora?</item>
+    </plurals>
     <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">"A sair do modo de chamada de retorno de emergência"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Sim"</string>
@@ -506,110 +541,23 @@
     <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_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_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="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="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="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="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_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="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="4908446367559341757">"O registo da conta não teve êxito: palavra-passe ou nome de utilizador incorreto"</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á atualmente 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>
-    <string name="username_title" msgid="2479375923477682328">"Nome de utilizador"</string>
-    <string name="password_title" msgid="3323555249068171531">"Palavra-passe"</string>
-    <string name="display_name_title" msgid="2459768196312249937">"Nome a apresentar"</string>
-    <string name="proxy_address_title" msgid="4828301345351614273">"Endereço do proxy de saída"</string>
-    <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="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>
-    <string name="auth_username_title" msgid="851473016307947120">"Nome de utilizador para autenticação"</string>
-    <string name="auth_username_summary" msgid="6782012405225938629">"Nome de utilizador usado para autenticação"</string>
-    <string name="default_preference_summary" msgid="868766740121667450">"&lt;Não definido&gt;"</string>
-    <string name="display_name_summary" msgid="8636377460518225523">"&lt;Igual ao nome de utilizador&gt;"</string>
-    <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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"Chamadas de voz não suportadas"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Respostas rápidas"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"um"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"dois"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"três"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"quatro"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"cinco"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"seis"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"sete"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"oito"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"nove"</string>
-    <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_dial_button" msgid="7459705245418435351">"marcar"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"retrocesso"</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="2609519527849101590">"Som"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Som predefinido (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <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"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Preenchimento automático do teclado"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Tocar e Vibrar"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Utilizar a rede Wi-Fi para efetuar a chamada?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Sim"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"Não"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Cartões SIM incorporados"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Chamadas por Internet incorporadas"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Ativar videochamada"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Para ativar as videochamadas, tem de ativar o Modo 4G LTE avançado nas definições da rede."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Definições de rede"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Fechar"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Chamadas de emergência"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Apenas chamadas de emergência"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"Cartão SIM, ranhura: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Acessibilidade"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Chamada Wi-Fi recebida"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Chamada Wi-Fi"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Tocar novamente para abrir"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"Ocorreu um erro durante a descodificação da mensagem."</string>
 </resources>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
new file mode 100644
index 0000000..807c757
--- /dev/null
+++ b/res/values-pt/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Global"</item>
+    <item msgid="6753774959494729275">"LTE/CDMA"</item>
+    <item msgid="8658695584186942227">"LTE/GSM/UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-pt/config.xml b/res/values-pt/config.xml
deleted file mode 100644
index 0605cd7..0000000
--- a/res/values-pt/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"false"</string>
-</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 6112c8c..1c7e3b8 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -16,14 +16,14 @@
 
 <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">"Dados móveis"</string>
+    <string name="phoneAppLabel" product="tablet" msgid="1107073389495104784">"Dados celulares"</string>
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Telefone"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Discador de emergência"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Telefone"</string>
     <string name="fdnListLabel" msgid="8630418672279521003">"Lista FDN"</string>
     <string name="unknown" msgid="6878797917991465859">"Desconhecido"</string>
     <string name="private_num" msgid="6713286113000232309">"Número privado"</string>
-    <string name="payphone" msgid="1931775086311769314">"Orelhão"</string>
+    <string name="payphone" msgid="4793877574636445118">"Telefone público"</string>
     <string name="onHold" msgid="9035493194749959955">"Em espera"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Código MMI iniciado"</string>
     <string name="ussdRunning" msgid="485588686340541690">"Código USSD em execução…"</string>
@@ -52,18 +52,41 @@
     <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="mobile_network_settings_not_available" msgid="7355254462995117896">"As configurações de rede para dispositivos móveis não estão disponíveis para este usuário"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"As configurações da rede celular não estão disponíveis para este usuário"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Configurações de chamada GSM"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"Configurações de chamada GSM (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Configurações de chamada CDMA"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"Configurações de chamada CDMA (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="connection_service" msgid="978745922583410219">"Serviço de conexão a usar"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Contas de chamada"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Fazer chamadas com"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Fazer chamadas SIP com"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Perguntar primeiro"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Configurações"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Escolher contas"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Contas de telefone"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Adicionar conta SIP"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Configurar conta"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Chamadas por Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Não usar chamadas por Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Não usar o assistente de chamada"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Nenhum"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Assistente de chamada"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Usar assistente de chamada"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Escolher assistente de chamada"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Gerenciar as redes utilizadas para chamadas com"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Permitir que aplicativos ou serviços gerenciem as redes usadas para chamadas"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Configurar"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Serviço de conexão integrado"</string>
     <string name="voicemail" msgid="8693759337917898954">"Correio de voz"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Correio de voz (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
-    <string name="networks" msgid="8873030692174541976">"Operadores de rede"</string>
-    <string name="call_settings" msgid="1630474923393095156">"Configurações de chamada"</string>
-    <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Configurações adicionais"</string>
+    <string name="networks" msgid="8873030692174541976">"Operadoras de rede"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Transmissões de emergência"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Configurações de chamadas"</string>
+    <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Config. adicionais"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Config. adicionais (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Configurações adicionais somente de chamada GSM"</string>
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Configurações de chamada CDMA adicionais"</string>
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Configurações adicionais somente de chamada CDMA"</string>
@@ -76,41 +99,44 @@
     <string name="labelCW" msgid="6120513814915920200">"Chamada em espera"</string>
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Durante uma chamada, me avise sobre chamadas recebidas"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Durante uma chamada, me avise sobre chamadas recebidas"</string>
-    <string name="call_forwarding_settings" msgid="3378927671091537173">"Configurações de encaminhamento de chamada"</string>
+    <string name="call_forwarding_settings" msgid="3378927671091537173">"Config. de encaminhamento de chamada"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Config. de encaminhamento de chamada (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Encaminhamento"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Sempre encaminhar"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Sempre usar este número"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Encaminhando todas as chamadas"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Encaminhando todas as chamadas para <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Número indisponível"</string>
-    <string name="sum_cfu_disabled" msgid="3698472522160364904">"Desativado"</string>
-    <string name="labelCFB" msgid="218938523102207587">"Enc. quando ocupado"</string>
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Desativado"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Quando ocupado"</string>
     <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="sum_cfb_disabled" msgid="4913145177320506827">"Desativado"</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="labelCFNRy" msgid="1736067178393744351">"Quando 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="sum_cfnry_disabled" msgid="3884684060443538097">"Desativado"</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="labelCFNRc" msgid="2614827454402079766">"Quando inacessível"</string>
+    <string name="messageCFNRc" msgid="6380695421020295119">"Número quando inacessí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="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="call_settings_primary_user_only" msgid="5679923943740900965">"As configurações de chamada só podem ser alteradas pelo usuário principal."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Configurações de chamada (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
     <string name="updating_settings" msgid="8171225533884883252">"Atualizando configurações…"</string>
     <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_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="fdn_check_failure" msgid="18200614306525434">"A configuração \"Números de chamada fixos\" do app 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>
+    <string name="enable" msgid="7248657275000173526">"Ativar"</string>
+    <string name="disable" msgid="4678348128118573672">"Desativar"</string>
     <string name="change_num" msgid="239476305819844391">"Atualizar"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Padrão de rede"</item>
@@ -123,8 +149,8 @@
     <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.\nMudar 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>
-    <string name="voicemail_default" msgid="5902099213882352338">"Minha operadora"</string>
-    <string name="mobile_networks" msgid="5540397602919106177">"Configurações de rede para celular"</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"Sua operadora"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Configurações de rede celular"</string>
     <string name="label_available" msgid="1181658289009300430">"Redes disponíveis"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Pesquisando..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Nenhuma rede encontrada."</string>
@@ -134,7 +160,7 @@
     <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="3494252551249882718">"Selecione um operador de rede"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Selecione uma operadora de rede"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Pesquisar todas as redes disponíveis"</string>
     <string name="select_automatically" msgid="5628402124471810174">"Escolher automaticamente"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Escolher automaticamente a rede preferencial"</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Modo de rede preferencial: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Modo de rede preferencial: global"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Modo de rede preferencial: LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Modo de rede preferido: LTE/GSM/UMTS"</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="7886739962255042385">"LTE/WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"Somente GSM"</item>
     <item msgid="3817924849415716259">"GSM/WCDMA preferencial"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Modo 4G LTE avançado"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Usar serviços de LTE para melhorar a voz e outras comunicações (recomendado)"</string>
     <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="data_enable_summary" msgid="2382798156640007971">"Permitir o uso de dados"</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="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="roaming_warning" msgid="1603164667540144353">"Pode acarretar cobranças significativas"</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Permitir roaming de dados?"</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>
@@ -190,7 +221,7 @@
     <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"Máximo de <xliff:g id="USED_0">%1$s</xliff:g> excedido\nTaxa de dados reduzida para <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>٪ do ciclo expirou\nO 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="throttle_help_subtext" msgid="3633091498168446044">"Mais informações sobre a política de uso de dados da rede celular de sua operadora"</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>
@@ -303,7 +334,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Configurar serviço de dados"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Config. da operadora"</string>
     <string name="fdn" msgid="7878832555095183202">"Chamadas fixas"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Chamadas fixas (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Lista FDN"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"Lista de FDNs (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Ativação do FDN"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Os números de chamadas fixas estão ativados"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Os números de chamadas fixas estão desativados"</string>
@@ -317,10 +350,11 @@
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Gerenciar lista de números telefônicos"</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_option_title" msgid="9033098925144434669">"Modo TTY"</string>
-    <string name="tty_mode_option_summary" msgid="1073835131534808732">"Definir modo TTY"</string>
+    <string name="tty_mode_option_title" msgid="9033098925144434669">"Modo TTD"</string>
+    <string name="tty_mode_option_summary" msgid="1073835131534808732">"Definir modo TTD"</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="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"Não é permitida a alteração do modo TTD durante uma vídeo chamada"</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>
@@ -344,7 +378,7 @@
     <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="1846161429087789936">"Para importar os contatos do cartão SIM, primeiro desligue o modo avião."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Desative o modo avião para importar contatos do cartão SIM."</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>
@@ -354,42 +388,40 @@
     <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="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="1796577128488773946">"Senha incorreta. PIN bloqueado. PUK solicitado."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"Apagar PIN do SIM"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"Definir PIN do SIM"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"Definindo PIN…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN definido"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN apagado"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN incorreto"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN atualizado"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Senha incorreta. PIN bloqueado. PUK 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="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="1639666438836544393">"PIN2 alterado."</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"Digitar o código PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Senha incorreta. PIN2 bloqueado. Altere o PIN2 e tente novamente."</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"Senha incorreta. SIM bloqueado. PUK2 solicitado."</string>
+    <string name="badPuk2" msgid="7910064009531541708">"PUK2 incorreto. Tente novamente."</string>
+    <string name="badPin2" msgid="6646896629970023109">"PIN2 antigo incorreto. Tente novamente."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"Os PIN2s não coincidem. Tente novamente."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Insira um PIN2 que tenha de quatro a oito números."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Insira um PUK2 com oito números."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 atualizado"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Inserir o código PUK2"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Senha incorreta. PIN2 bloqueado. Para tentar novamente, altere o PIN 2."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Senha incorreta. SIM bloqueado. Insira o PUK2."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 permanentemente bloqueado."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Tentativas restantes: <xliff:g id="NUMBER">%d</xliff:g>."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 desbloqueado."</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"Você tem <xliff:g id="NUMBER">%d</xliff:g> tentativas restantes."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 não mais bloqueado"</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="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_redialing" msgid="8253487008234167266">"Rediscando"</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_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>
     <string name="card_title_in_call" msgid="6346543933068225205">"Em chamada"</string>
-    <string name="card_title_my_phone_number" msgid="112428362494434191">"Meu número é <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Discando"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Chamada perdida"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Chamadas perdidas"</string>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"Desative o modo avião para fazer uma chamada."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Desative o modo avião ou conecte-se a uma rede sem fio para fazer uma chamada."</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_error_out_of_service" msgid="4100065333878929223">"Rede celular não disponível."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"A rede celular não está disponível. Conecte-se a uma rede sem fio para fazer uma chamada."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Para realizar uma chamada, digite um número válido."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Não é possível realizar chamadas."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Iniciando sequência MMI…"</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>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Não é possível transferir a chamada."</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Serviço não suportado"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Não é possível alternar as chamadas."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Não é possível separar a chamada."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Não é possível transferir a chamada."</string>
     <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Não é possível realizar conferências telefônicas."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Não é possível rejeitar a chamada."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Não é possível liberar a(s) chamada(s)."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Chamada pela internet"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Não é possível rejeitar a chamada."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Não é possível liberar chamadas."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Conecte-se a uma rede sem fio para fazer uma chamada."</string>
     <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="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="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Sem serviço. Tentando novamente..."</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Não é possível realizar chamadas. <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="9130194953830414638">"Não é possível realizar chamadas. Disque um número de emergência."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Use o teclado para discar"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Em espera"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Finalizar"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"Normal"</item>
     <item msgid="2883365539347850535">"Longo"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Mensagem de rede"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Mensagem de rede"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Mensagem de erro"</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\nDepois de pressionar “Ativar”, ouça as instruções fornecidas para ativar o seu telefone."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Ativando…"</string>
@@ -469,8 +504,8 @@
     <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_speaker" msgid="6904589278542719647">"Alto-falante"</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_progress" msgid="460876637828044519">"Programando seu telefone..."</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Não foi possível programar seu telefone"</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="8072141612635635357">"Seu telefone não foi ativado. \nTalvez seja necessário encontrar uma área com uma cobertura melhor (próximo de uma janela ou no lado de fora). \n\nTente 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>
@@ -481,18 +516,18 @@
     <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>
     <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Conexão de dados desativada"</string>
-  <plurals name="phone_in_ecm_notification_time">
-    <item quantity="one" msgid="4866221796252472622">"Nenhuma conexão de dados durante <xliff:g id="COUNT">%s</xliff:g> minuto"</item>
-    <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="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="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>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="one">Nenhuma conexão de dados durante <xliff:g id="COUNT_1">%s</xliff:g> minutos</item>
+      <item quantity="other">Nenhuma conexão de dados durante <xliff:g id="COUNT_1">%s</xliff:g> minutos</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="one">O smartphone ficará no modo de retorno de chamada de emergência por <xliff:g id="COUNT_1">%s</xliff:g> minutos. Nesse modo, não será possível usar apps que utilizem conexão de dados. Deseja sair agora?</item>
+      <item quantity="other">O smartphone ficará no modo de retorno de chamada de emergência por <xliff:g id="COUNT_1">%s</xliff:g> minutos. Nesse modo, não será possível usar apps que utilizem conexão de dados. Deseja sair agora?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="one">A ação selecionada não está disponível no modo de retorno de chamada de emergência. O smartphone ficará nesse modo por <xliff:g id="COUNT_1">%s</xliff:g> minutos. Deseja sair agora?</item>
+      <item quantity="other">A ação selecionada não está disponível no modo de retorno de chamada de emergência. O smartphone ficará nesse modo por <xliff:g id="COUNT_1">%s</xliff:g> minutos. Deseja sair agora?</item>
+    </plurals>
     <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>
@@ -506,110 +541,23 @@
     <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_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_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="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="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="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="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_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="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="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>
-    <string name="username_title" msgid="2479375923477682328">"Nome de usuário"</string>
-    <string name="password_title" msgid="3323555249068171531">"Senha"</string>
-    <string name="display_name_title" msgid="2459768196312249937">"Nome de exibição"</string>
-    <string name="proxy_address_title" msgid="4828301345351614273">"End. proxy de saída"</string>
-    <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="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>
-    <string name="auth_username_title" msgid="851473016307947120">"Autenticação de nome de usuário"</string>
-    <string name="auth_username_summary" msgid="6782012405225938629">"Nome de usuário utilizado para autenticação"</string>
-    <string name="default_preference_summary" msgid="868766740121667450">"&lt;Não definido&gt;"</string>
-    <string name="display_name_summary" msgid="8636377460518225523">"&lt;Igual ao nome de usuário&gt;"</string>
-    <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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"Chamada de voz não compatível"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Respostas rápidas"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"um"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"dois"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"três"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"quatro"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"cinco"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"seis"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"sete"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"oito"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"nove"</string>
-    <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_dial_button" msgid="7459705245418435351">"discar"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="description_target_answer" msgid="7205604197797472471">"Responder"</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="2609519527849101590">"Som"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Som padrão (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <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 teclado numérico"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Autopreenchimento do teclado"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Toque e vibração"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Usar o Wi-Fi para efetuar a chamada?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Sim"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"Não"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Cartões SIM integrados"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Chamadas pela Internet integradas"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Ativar chamadas de vídeo"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Para ativar a chamada de vídeo, ative o modo 4G LTE avançado nas configurações de rede."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Configurações de rede"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Fechar"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Chamadas de emergência"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Somente chamadas de emergência"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"Cartão SIM, slot: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Acessibilidade"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Chamada por Wi-Fi recebida"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Chamada por Wi-Fi"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Toque novamente para abrir"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"Ocorreu um erro ao decodificar a mensagem."</string>
 </resources>
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
new file mode 100644
index 0000000..807c757
--- /dev/null
+++ b/res/values-ro/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Global"</item>
+    <item msgid="6753774959494729275">"LTE/CDMA"</item>
+    <item msgid="8658695584186942227">"LTE/GSM/UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-ro/config.xml b/res/values-ro/config.xml
deleted file mode 100644
index 0605cd7..0000000
--- a/res/values-ro/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"false"</string>
-</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 3ca5ea0..b309635 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -16,19 +16,19 @@
 
 <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">"Date pentru mobil"</string>
+    <string name="phoneAppLabel" product="tablet" msgid="1107073389495104784">"Date mobile"</string>
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Telefon"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Telefon de urgenţă"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Telefon"</string>
     <string name="fdnListLabel" msgid="8630418672279521003">"Listă FDN"</string>
     <string name="unknown" msgid="6878797917991465859">"Necunoscut"</string>
     <string name="private_num" msgid="6713286113000232309">"Număr privat"</string>
-    <string name="payphone" msgid="1931775086311769314">"Telefon public"</string>
+    <string name="payphone" msgid="4793877574636445118">"Telefon public"</string>
     <string name="onHold" msgid="9035493194749959955">"În aşteptare"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Cod MMI pornit"</string>
     <string name="ussdRunning" msgid="485588686340541690">"Se rulează codul USSD..."</string>
     <string name="mmiCancelled" msgid="2771923949751842276">"Cod MMI anulat"</string>
-    <string name="cancel" msgid="5044513931633602634">"Anulaţi"</string>
+    <string name="cancel" msgid="5044513931633602634">"Anulați"</string>
     <string name="enter_input" msgid="1810529547726803893">"Mesajul USSD trebuie să aibă între <xliff:g id="MIN_LEN">%d</xliff:g> și <xliff:g id="MAX_LEN">%d</xliff:g> caractere. Încercați din nou."</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Gestionaţi teleconferinţa"</string>
     <string name="ok" msgid="3811371167865772377">"OK"</string>
@@ -52,18 +52,41 @@
     <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="mobile_network_settings_not_available" msgid="7355254462995117896">"Setările pentru rețeaua mobilă nu sunt disponibile pentru acest utilizator"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Setările pentru rețeaua mobilă nu sunt disponibile pentru acest utilizator"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Setările apelului GSM"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"Setări pentru apeluri GSM (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Setările apelului CDMA"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"Setări pentru apeluri CDMA (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Numele punctelor de acces"</string>
     <string name="settings_label" msgid="3876743539816984008">"Setări de reţea"</string>
-    <string name="connection_service" msgid="978745922583410219">"Serviciu de conectare de utilizat"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Conturi pentru apelare"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Efectuați apeluri cu"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Efectuați apeluri SIP cu"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Întreabă mai întâi"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Setări"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Alegeți conturile"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Conturi telefon"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Adăugați un cont SIP"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Configurați setările contului"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Apelare prin Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Nu folosiți apelarea prin Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Nu folosiți un asistent de apelare"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Niciunul"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Asistent de apelare"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Folosiți asistentul de apelare"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Alegeți asistentul de apelare"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Gestionați rețelele folosite pentru apelurile cu"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Permiteți aplicațiilor sau serviciilor să gestioneze rețelele folosite pentru apeluri"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Configurați"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Serviciu de conectare încorporat"</string>
     <string name="voicemail" msgid="8693759337917898954">"Mesaj vocal"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Mesagerie vocală (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"MV:"</string>
     <string name="networks" msgid="8873030692174541976">"Operatori de reţea"</string>
-    <string name="call_settings" msgid="1630474923393095156">"Setări pentru apeluri"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Transmisiuni de urgență"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Setări apel"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Setări suplimentare"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Setări suplimentare (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Setări suplimentare doar pentru apelurile GSM"</string>
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Setări suplimentare pentru apelurile CDMA"</string>
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Setări suplimentare numai pentru apelurile CDMA"</string>
@@ -77,40 +100,43 @@
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Doresc să fiu notificat despre apelurile de intrare, inclusiv în timpul unui apel"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Doresc să fiu notificat despre apelurile de intrare, inclusiv în timpul unui apel"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Setările pentru redirecţionarea de apeluri"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Setări de redirecționare a apelurilor (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Redirecţionarea apelurilor"</string>
-    <string name="labelCFU" msgid="8147177368148660600">"Redirecţionaţi întotdeauna"</string>
+    <string name="labelCFU" msgid="8147177368148660600">"Redirecționează întotdeauna"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Utilizaţi întotdeauna acest număr"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Se redirecţionează toate apelurile"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Se redirecţionează toate apelurile către <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Numărul nu este disponibil"</string>
-    <string name="sum_cfu_disabled" msgid="3698472522160364904">"Dezactivat"</string>
-    <string name="labelCFB" msgid="218938523102207587">"Redirecţionaţi când este ocupat"</string>
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Dezactivat"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Când este ocupat"</string>
     <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="sum_cfb_disabled" msgid="4913145177320506827">"Dezactivat"</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="labelCFNRy" msgid="1736067178393744351">"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="sum_cfnry_disabled" msgid="3884684060443538097">"Dezactivat"</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="labelCFNRc" msgid="2614827454402079766">"Când 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="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="call_settings_primary_user_only" msgid="5679923943740900965">"Numai utilizatorul principal poate să modifice setările pentru apeluri."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Setări pentru apeluri (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
     <string name="updating_settings" msgid="8171225533884883252">"Se actualizează setările..."</string>
     <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_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="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>
+    <string name="enable" msgid="7248657275000173526">"Activați"</string>
+    <string name="disable" msgid="4678348128118573672">"Dezactivați"</string>
     <string name="change_num" msgid="239476305819844391">"Actualizaţi"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Reţea prestabilită"</item>
@@ -120,11 +146,11 @@
     <string name="vm_changed" msgid="380744030726254139">"Număr mesagerie vocală modificat."</string>
     <string name="vm_change_failed" msgid="3352934863246208918">"Nu s-a putut schimba numărul de mesagerie vocală.\nContactaţ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.\nContactaţ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.\nDoriţi să comutaţi oricum către un nou furnizor de servicii?"</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.\nDoriţ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>
-    <string name="voicemail_default" msgid="5902099213882352338">"Operatorul meu"</string>
-    <string name="mobile_networks" msgid="5540397602919106177">"Setări pentru reţeaua mobilă"</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"Operatorul dvs."</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Setările pentru rețeaua mobilă"</string>
     <string name="label_available" msgid="1181658289009300430">"Reţele disponibile"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Se caută…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Nicio reţea găsită."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Mod de rețea preferat: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Mod de rețea preferat: Global"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Mod de rețea preferat: LTE/WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Mod de rețea preferat: LTE/GSM/UMTS"</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="7886739962255042385">"LTE/WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"Numai GSM"</item>
     <item msgid="3817924849415716259">"GSM/WCDMA preferat"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Mod 4G LTE îmbunătățit"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Folosiți servicii LTE pt. a îmbunătăți comunicări vocale și altele (recomandat)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Date activate"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Activaţi accesul de date prin reţeaua mobilă"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Permiteți utilizarea datelor"</string>
     <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="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="roaming_warning" msgid="1603164667540144353">"Se pot acumula costuri mari."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Permiteți roamingul de date?"</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">"Utilizarea datelor"</string>
@@ -190,7 +221,7 @@
     <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"<xliff:g id="USED_0">%1$s</xliff:g> maximum depăşit\nRata de transfer se reduce la <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>٪ din ciclul trecut\nPerioada 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="throttle_help_subtext" msgid="3633091498168446044">"Mai multe informații despre politica de utilizare a datelor aplicată de operatorul dvs. de telefonie mobilă"</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>
@@ -206,7 +237,7 @@
     <string name="maintenance_enable" msgid="8566636458770971189">"Întreţinere activată"</string>
     <string name="maintenance_disable" msgid="7340189100885066077">"Întreţinere dezactivată"</string>
     <string name="general_news_settings" msgid="4968779723948432978">"Știri generale"</string>
-    <string name="bf_news_settings" msgid="3935593091894685267">"Știri despre afaceri şi financiare"</string>
+    <string name="bf_news_settings" msgid="3935593091894685267">"Știri despre afaceri și financiare"</string>
     <string name="sports_news_settings" msgid="7649399631270052835">"Știri din sport"</string>
     <string name="entertainment_news_settings" msgid="5051153952959405035">"Știri de divertisment"</string>
     <string name="enable_disable_local" msgid="7890281063123416120">"Local"</string>
@@ -269,9 +300,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="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_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>
@@ -289,7 +320,7 @@
     <item msgid="1205664026446156265">"Automat"</item>
   </string-array>
     <string name="cdma_subscription_title" msgid="1162564010076763284">"Abonament CMDA"</string>
-    <string name="cdma_subscription_summary" msgid="2530890766115781140">"Comutaţi între RUIM/SIM şi NV"</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>
@@ -303,7 +334,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Configuraţi serviciul de date"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Setări operator"</string>
     <string name="fdn" msgid="7878832555095183202">"Numere cu apelări restricţionate"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Numere fixe de apelare (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Listă FDN"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"Lista FDN (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Activare FDN"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Numerele cu apelări restricţionate sunt activate"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Numerele cu apelări restricţionate sunt dezactivate"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Setaţi modul TTY"</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="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"Schimbarea modului TTY nu este permisă în timpul unui apel video"</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>
@@ -344,7 +378,7 @@
     <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="1846161429087789936">"Pentru a importa agenda de pe cardul SIM, dezactivaţi mai întâi modul Avion."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Pentru a importa persoane de contact de pe cardul SIM, dezactivaț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>
@@ -354,42 +388,40 @@
     <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="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="1796577128488773946">"Parolă incorectă, codul PIN a fost blocat! Se solicită codul PUK."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"Ștergeți codul PIN pentru SIM"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"Setați codul PIN pentru SIM"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"Se setează codul PIN…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"Cod PIN setat"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"Cod PIN șters"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"Codul PIN nu este corect"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"Codul PIN a fost actualizat"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Parola nu este corectă. Codul PIN a fost blocat. Se solicită codul PUK."</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="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="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="3674058967950559397">"Parolă incorectă, codul PIN2 a fost blocat. 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="badPuk2" msgid="7910064009531541708">"Codul PUK2 nu este corect. Încercați din nou."</string>
+    <string name="badPin2" msgid="6646896629970023109">"Vechiul cod PIN2 nu este corect. Încercați din nou."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"Codurile PIN2 nu se potrivesc. Încercați din nou."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Introduceți un cod PIN2 format din 4 până la 8 cifre."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Introduceți un cod PUK2 format din 8 cifre."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"Codul PIN2 a fost actualizat"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Introduceți codul PUK2"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Parola nu este corectă. Codul PIN2 a fost blocat. Pentru a încerca din nou, schimbați codul PIN2."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Parola nu este corectă. Cardul SIM a fost blocat. Introduceți codul PUK2."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"Codul PUK2 este blocat definitiv."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Au mai rămas <xliff:g id="NUMBER">%d</xliff:g> încercări."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"Codul PIN2 a fost deblocat!"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"V-au rămas <xliff:g id="NUMBER">%d</xliff:g> (de) încercări."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"Codul PIN2 nu mai este blocat"</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="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_redialing" msgid="8253487008234167266">"Se reapelează"</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_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>
     <string name="card_title_in_call" msgid="6346543933068225205">"În timpul apelului"</string>
-    <string name="card_title_my_phone_number" msgid="112428362494434191">"Numărul meu este <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Apelează"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Apel nepreluat"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Apeluri nepreluate"</string>
@@ -400,32 +432,34 @@
     <string name="notification_incoming_call" msgid="2820429205043529642">"Apel de intrare"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Mesaj vocal nou"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Mesaj vocal nou (<xliff:g id="COUNT">%d</xliff:g>)"</string>
-    <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Apelaţi <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
+    <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Apelați <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <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_power_off" msgid="2947938060513306698">"Pentru a apela, dezactivați modul Avion."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Pentru a apela, dezactivați modul Avion sau conectați-vă la o rețea wireless."</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_error_out_of_service" msgid="4100065333878929223">"Rețeaua mobilă nu este disponibilă"</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Rețeaua mobilă nu este disponibilă. Pentru a apela, conectați-vă la o rețea wireless."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Pentru a apela, introduceți un număr valid."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Nu se poate apela."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Se porneşte secvenţa MMI..."</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>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Apelul nu poate fi transferat."</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Serviciul nu este compatibil"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Apelurile nu pot fi comutate."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Apelul nu poate fi separat."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Nu se poate transfera."</string>
     <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Teleconferinţa nu se poate efectua."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Apelul nu poate fi respins."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Apelul (apelurile) nu poate (pot) fi eliberat (eliberate)."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Apel prin internet"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Apelul nu poate fi respins."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Apelurile nu pot fi eliberate."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Pentru a apela, conectați-vă la o rețea wireless."</string>
     <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="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="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Fără semnal. Se încearcă din nou..."</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Nu se poate apela. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nu este un număr de urgență."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Nu se poate apela. Formați un număr de urgență."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Utilizaţi tastatura pentru a forma"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Reţineţi"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Terminat"</string>
@@ -456,21 +490,22 @@
     <item msgid="899650777817315681">"Normală"</item>
     <item msgid="2883365539347850535">"Lung"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Mesaj de reţea"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Mesaj de rețea"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Mesaj de eroare"</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\nDupă ce apăsaţi „Activaţi”, ascultaţi instrucţiunile furnizate pentru a vă activa telefonul."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Se activează..."</string>
     <string name="ota_hfa_activation_dialog_message" msgid="8092479227918463415">"Serviciul de date mobile este în curs de activare pe telefonul dvs.\n\nAcest proces poate dura până la 5 minute."</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_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_activate" msgid="1368528132525626264">"Activaţi"</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_speaker" msgid="6904589278542719647">"Difuzor"</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_progress" msgid="460876637828044519">"Se programează telefonul…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Telefonul nu a putut fi programat"</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="8072141612635635357">"Telefonul dvs. nu s-a activat. \nVă recomandăm să găsiţi o zonă cu acoperire mai bună (lângă fereastră sau afară). \n\nPentru 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>
@@ -481,18 +516,21 @@
     <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>
     <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Conexiune de date dezactivată"</string>
-  <plurals name="phone_in_ecm_notification_time">
-    <item quantity="one" msgid="4866221796252472622">"Nicio conexiune de date pentru <xliff:g id="COUNT">%s</xliff:g> minut"</item>
-    <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="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="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>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="few">Nicio conexiune de date timp de <xliff:g id="COUNT_1">%s</xliff:g> minute</item>
+      <item quantity="other">Nicio conexiune de date timp de <xliff:g id="COUNT_1">%s</xliff:g> de minute</item>
+      <item quantity="one">Nicio conexiune de date timp de <xliff:g id="COUNT_0">%s</xliff:g> minut</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="few">Telefonul va fi în modul Apelare inversă de urgență pentru <xliff:g id="COUNT_1">%s</xliff:g> minute. Când telefonul este în acest mod, nu se poate folosi nicio aplicație care necesită o conexiune de date. Doriți să ieșiți acum?</item>
+      <item quantity="other">Telefonul va fi în modul Apelare inversă de urgență pentru <xliff:g id="COUNT_1">%s</xliff:g> de minute. Când telefonul este în acest mod, nu se poate folosi nicio aplicație care necesită o conexiune de date. Doriți să ieșiți acum?</item>
+      <item quantity="one">Telefonul va fi în modul Apelare inversă de urgență pentru <xliff:g id="COUNT_0">%s</xliff:g> minut. Când telefonul este în acest mod, nu se poate folosi nicio aplicație care necesită o conexiune de date. Doriți să ieșiți acum?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="few">Acțiunea selectată nu este disponibilă când telefonul este în modul Apelare inversă de urgență. Telefonul va fi în acest mod pentru <xliff:g id="COUNT_1">%s</xliff:g> minute. Doriți să ieșiți acum?</item>
+      <item quantity="other">Acțiunea selectată nu este disponibilă când telefonul este în modul Apelare inversă de urgență. Telefonul va fi în acest mod pentru <xliff:g id="COUNT_1">%s</xliff:g> de minute. Doriți să ieșiți acum?</item>
+      <item quantity="one">Acțiunea selectată nu este disponibilă când telefonul este în modul Apelare inversă de urgență. Telefonul va fi în acest mod pentru <xliff:g id="COUNT_0">%s</xliff:g> minut. Doriți să ieșiți acum?</item>
+    </plurals>
     <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>
@@ -506,110 +544,23 @@
     <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_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_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="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="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="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="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_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="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="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>
-    <string name="username_title" msgid="2479375923477682328">"Nume de utilizator"</string>
-    <string name="password_title" msgid="3323555249068171531">"Parolă"</string>
-    <string name="display_name_title" msgid="2459768196312249937">"Numele afişat"</string>
-    <string name="proxy_address_title" msgid="4828301345351614273">"Adresă proxy de ieşire"</string>
-    <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="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>
-    <string name="auth_username_title" msgid="851473016307947120">"Nume de utilizator pentru autentificare"</string>
-    <string name="auth_username_summary" msgid="6782012405225938629">"Numele de utilizator folosit pentru autentificare"</string>
-    <string name="default_preference_summary" msgid="868766740121667450">"&lt;Nesetat&gt;"</string>
-    <string name="display_name_summary" msgid="8636377460518225523">"&lt;Identic cu numele de utilizator&gt;"</string>
-    <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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"Apelarea vocală nu este acceptată"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Răspunsuri rapide"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"unu"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"doi"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"trei"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"patru"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"cinci"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"şase"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"şapte"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"opt"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"nouă"</string>
-    <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_dial_button" msgid="7459705245418435351">"apelare"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <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">"Vibraţii"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibraţii"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Sunet"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Sunet prestabilit (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <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 atingerea pt. apelare"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Completare automată tastatură numerică"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Ton de sonerie și vibrare"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Folosiți Wi-Fi pentru a efectua apelul?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Da"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"Nu"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Carduri SIM încorporate"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Apeluri pe Internet integrate"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Activați apelurile video"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Pentru a activa apelarea video, trebuie să activați Modul 4G LTE îmbunătățit în setările pentru rețea."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Setări de reţea"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Închideți"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Apeluri de urgență"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Numai apeluri de urgență"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"Cardul SIM, slotul: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Accesibilitate"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Apel prin Wi-Fi primit"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Apel prin Wi-Fi"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Atingeți din nou pentru a deschide"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"A apărut o eroare la decodificarea mesajului."</string>
 </resources>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
new file mode 100644
index 0000000..807c757
--- /dev/null
+++ b/res/values-ru/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Global"</item>
+    <item msgid="6753774959494729275">"LTE/CDMA"</item>
+    <item msgid="8658695584186942227">"LTE/GSM/UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-ru/config.xml b/res/values-ru/config.xml
deleted file mode 100644
index 0605cd7..0000000
--- a/res/values-ru/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"false"</string>
-</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 172abd2..ff68f11 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -16,14 +16,14 @@
 
 <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="tablet" msgid="1107073389495104784">"Мобильные данные"</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="payphone" msgid="4793877574636445118">"Телефон-автомат"</string>
     <string name="onHold" msgid="9035493194749959955">"Ждет ответа"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Код MMI запущен"</string>
     <string name="ussdRunning" msgid="485588686340541690">"Выполняется запрос USSD…"</string>
@@ -52,18 +52,41 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Запрос разблокировки сети..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Запрос на разблокировку сети не выполнен."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Разблокировка сети успешно завершена."</string>
-    <string name="mobile_network_settings_not_available" msgid="7355254462995117896">"Настройки мобильных сетей недоступны этому пользователю"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Настройки мобильных сетей недоступны этому пользователю."</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Настройки вызовов GSM"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"Настройки вызовов GSM (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Настройки вызовов CDMA"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"Настройки вызовов CDMA (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Точки доступа (APN)"</string>
     <string name="settings_label" msgid="3876743539816984008">"Настройки сети"</string>
-    <string name="connection_service" msgid="978745922583410219">"Служба подключения"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Аккаунты для звонков"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Выбрать аккаунт для звонков"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Выбрать аккаунт для звонков через SIP"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Сначала спрашивать"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Настройки"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Выбрать аккаунты"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Аккаунты для звонков"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Добавить SIP-аккаунт"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Задать настройки аккаунта"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Звонки по Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Не использовать Wi-Fi для звонков"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Не использовать ассистент"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Не использовать"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Ассистент для звонков"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Использовать ассистент"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Выбрать ассистент для звонков"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Настройка сети для звонков"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Разрешить приложениям или сервисам управлять сетями, которые используются для звонков"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Настроить"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Встроенная служба подключения"</string>
     <string name="voicemail" msgid="8693759337917898954">"Голосовая почта"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Голосовая почта (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"ГП:"</string>
     <string name="networks" msgid="8873030692174541976">"Операторы связи"</string>
-    <string name="call_settings" msgid="1630474923393095156">"Настройки вызовов"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Уведомления о чрезвычайных ситуациях"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Вызовы"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Дополнительные настройки"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Дополнительные настройки (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
@@ -72,34 +95,37 @@
     <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>
+    <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="call_forwarding_settings" msgid="3378927671091537173">"Переадресация"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Переадресация (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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_cfu_disabled" msgid="8384177689501334080">"Выкл."</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Если номер занят"</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="sum_cfb_disabled" msgid="4913145177320506827">"Выкл."</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Ваш оператор не позволяет отключать переадресацию вызовов, если телефон занят."</string>
-    <string name="labelCFNRy" msgid="3646316323834351390">"При отсутствии ответа"</string>
-    <string name="messageCFNRy" msgid="672317899884380374">"Номер для переадресации при отсутствии ответа"</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"Если нет ответа"</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="sum_cfnry_disabled" msgid="3884684060443538097">"Выкл."</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Ваш оператор не позволяет отключать переадресацию вызовов, если нет ответа."</string>
-    <string name="labelCFNRc" msgid="47183615370850000">"Если недоступен"</string>
-    <string name="messageCFNRc" msgid="6380695421020295119">"Номер для переадресации, если абонент недоступен"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"Если номер недоступен"</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="5646361343094064333">"Ваш оператор не позволяет отключать переадресацию вызовов, если телефон находится вне зоны доступа."</string>
     <string name="updating_title" msgid="6146755386174019046">"Настройки вызовов"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"Настройки вызовов может изменить только основной пользователь."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Настройки (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Ошибка настройки вызовов"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Чтение настроек…"</string>
     <string name="updating_settings" msgid="8171225533884883252">"Обновление настроек…"</string>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"Включить"</string>
+    <string name="disable" msgid="4678348128118573672">"Выключить"</string>
     <string name="change_num" msgid="239476305819844391">"Обновить"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Настройки сети по умолчанию"</item>
@@ -123,8 +149,8 @@
     <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="voicemail_default" msgid="2001233554889016880">"Ваш оператор связи"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Настройки мобильных сетей"</string>
     <string name="label_available" msgid="1181658289009300430">"Доступные сети"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Поиск…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Сети не найдены."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Предпочтительный режим: CDMA и LTE/EvDo"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Предпочтительный режим: весь мир"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Предпочтительный режим: LTE/WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Предпочтительный режим: LTE/GSM/UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Предпочтительная сеть: LTE или CDMA"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="7886739962255042385">"LTE/WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"Только GSM"</item>
     <item msgid="3817924849415716259">"GSM/WCDMA (предпочтительно)"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Режим 4G LTE"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Использовать сервисы LTE, чтобы улучшить качество связи (рекомендуется)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Передача данных"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Разрешить передачу данных по сети мобильной связи"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Разрешить использование данных"</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="8913735676127858115">"Мобильный Интернет в роуминге отключен. Вы можете включить интернет-роуминг в настройках."</string>
-    <string name="roaming_warning" msgid="7820963598559553967">"Разрешить интернет-роуминг? Возможны высокие расходы за использование роуминга."</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"Возможны значительные расходы."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Разрешить интернет-роуминг?"</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>
@@ -192,7 +223,7 @@
     <!-- no translation found for throttle_time_frame_subtext (7732763021560399960) -->
     <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="throttle_help_subtext" msgid="3633091498168446044">"Подробнее о политике передачи данных вашего оператора мобильной связи…"</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,15 +336,17 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Настроить передачу данных"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Настройки оператора"</string>
     <string name="fdn" msgid="7878832555095183202">"Разрешенные номера"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Разрешенные номера (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Разрешенные номера"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"Список разрешенных номеров (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="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="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>
@@ -323,6 +356,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Установить режим телетайпа"</string>
     <string name="auto_retry_mode_title" msgid="4073265511427813322">"Автодозвон"</string>
     <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Включить режим автодозвона"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"Режим телетайтпа нельзя изменить во время видеозвонка"</string>
     <string name="menu_add" msgid="1882023737425114762">"Добавить контакт"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Изменить контакт"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Удалить контакт"</string>
@@ -330,7 +364,7 @@
     <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="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>
@@ -346,7 +380,7 @@
     <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="1846161429087789936">"Чтобы перенести контакты с SIM-карты, отключите режим полета."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Чтобы импортировать контакты с 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>
@@ -356,42 +390,40 @@
     <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="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="1796577128488773946">"Неверный пароль. PIN-код заблокирован. Отправлен запрос на получение PUK-кода."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"Удаление PIN-кода SIM-карты"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"Настройка PIN-кода SIM-карты"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"Настройка PIN-кода…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN-код задан"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN-код удален"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"Неверный PIN-код"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN-код обновлен"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Неверный пароль. PIN-код заблокирован. Введите PUK-код."</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="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="1639666438836544393">"Код PIN2 изменен."</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"Введите код PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Неверный пароль. Код PIN2 заблокирован. Измените его и повторите попытку."</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"Неверный пароль, SIM-карта заблокирована. Введите код PUK2."</string>
+    <string name="badPuk2" msgid="7910064009531541708">"Неверный код PUK2. Повторите попытку."</string>
+    <string name="badPin2" msgid="6646896629970023109">"Предыдущий код PIN2 указан неверно. Повторите попытку."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"Неверный код PIN2. Повторите попытку."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Введите код PIN2 (4–8 цифр)."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Введите код PUK2 (8 цифр)."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"Код PIN2 обновлен"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Введите код PUK2"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Неверный пароль. Код PIN2 заблокирован. Смените его, чтобы продолжить работу."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Неверный пароль. SIM-карта заблокирована. Введите код PUK2."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"Код PUK2 заблокирован навсегда"</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Осталось попыток: <xliff:g id="NUMBER">%d</xliff:g>."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"Код PIN2 разблокирован"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"Осталось попыток: <xliff:g id="NUMBER">%d</xliff:g>."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"Код PIN2 разблокирован"</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_redialing" msgid="8253487008234167266">"Повторный набор"</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_dialing" msgid="2107666444937350731">"Набор номера"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Пропущенный вызов"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Пропущенные вызовы"</string>
@@ -402,32 +434,34 @@
     <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_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="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_power_off" msgid="2947938060513306698">"Чтобы позвонить, отключите режим полета."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Чтобы позвонить, отключите режим полета и подключитесь к Wi-Fi."</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_error_out_of_service" msgid="4100065333878929223">"Мобильная сеть недоступна."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Мобильная сеть недоступна. Чтобы позвонить, подключитесь к Wi-Fi."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Недействительный номер."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Не удалось позвонить."</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_unknown" msgid="655570339115407698">"Сервис не поддерживается"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Не удалось переключить вызов."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Не удалось разделить вызов."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Не удалось перенести."</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="incall_error_supp_service_reject" msgid="8998568661508655638">"Не удалось отклонить вызов."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Не удалось разъединить."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Чтобы позвонить, подключитесь к Wi-Fi."</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="7969515493359619960">"Вызов не выполнен. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> – не номер экстренной службы."</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Вызов не выполнен. Наберите номер."</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Нет сигнала. Повторная попытка…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Не удалось позвонить. Номер <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> не принадлежит экстренным службам."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Не удалось позвонить. Наберите номер экстренных служб."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Используйте клавиатуру для набора номера"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Удерживать"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Завершить"</string>
@@ -458,7 +492,8 @@
     <item msgid="899650777817315681">"Обычные"</item>
     <item msgid="2883365539347850535">"Длинные"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Сообщение сети"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Сообщение сети"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Ошибка"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Активировать телефон"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Необходим специальный звонок для активации службы телефона. \n\nПосле нажатия кнопки \"Активировать\" прослушайте инструкции по активации телефона."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Активация..."</string>
@@ -471,8 +506,8 @@
     <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="3420314892609254729">"Дождитесь завершения программирования."</string>
-    <string name="ota_failure" msgid="4311299546379674378">"Сбой при программировании"</string>
+    <string name="ota_progress" msgid="460876637828044519">"Программирование телефона…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Не удалось запрограммировать телефон"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Ваш телефон активирован. Включение службы может занять до 15 минут."</string>
     <string name="ota_unsuccessful" msgid="8072141612635635357">"Телефон не был активирован.\nВозможно, вам следует найти зону с более высоким уровнем сигнала (у окна или на улице).\n\nПовторите попытку или свяжитесь со службой поддержки."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"ПРЕВЫШЕНИЕ ЧИСЛА ОШИБОК SPC"</string>
@@ -483,18 +518,24 @@
     <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="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="2585506997024726599">"Выбранное действие невозможно при экстренных обратных вызовах. Телефон будет оставаться в этом режиме еще <xliff:g id="COUNT">%s</xliff:g> мин. Выйти?"</item>
-    <item quantity="other" msgid="6115622137771382224">"Выбранное действие невозможно при экстренных обратных вызовах. Телефон будет оставаться в этом режиме еще <xliff:g id="COUNT">%s</xliff:g> мин. Выйти?"</item>
-  </plurals>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="one">Подключение для передачи данных отсутствует <xliff:g id="COUNT_1">%s</xliff:g> минуту</item>
+      <item quantity="few">Подключение для передачи данных отсутствует <xliff:g id="COUNT_1">%s</xliff:g> минуты</item>
+      <item quantity="many">Подключение для передачи данных отсутствует <xliff:g id="COUNT_1">%s</xliff:g> минут</item>
+      <item quantity="other">Подключение для передачи данных отсутствует <xliff:g id="COUNT_1">%s</xliff:g> минуты</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="one">Режим экстренных обратных вызовов будет действовать ещё <xliff:g id="COUNT_1">%s</xliff:g> минуту. При этом будут недоступны приложения с поддержкой передачи данных. Выйти?</item>
+      <item quantity="few">Режим экстренных обратных вызовов будет действовать ещё <xliff:g id="COUNT_1">%s</xliff:g> минуты. При этом будут недоступны приложения с поддержкой передачи данных. Выйти?</item>
+      <item quantity="many">Режим экстренных обратных вызовов будет действовать ещё <xliff:g id="COUNT_1">%s</xliff:g> минут. При этом будут недоступны приложения с поддержкой передачи данных. Выйти?</item>
+      <item quantity="other">Режим экстренных обратных вызовов будет действовать ещё <xliff:g id="COUNT_1">%s</xliff:g> минуты. При этом будут недоступны приложения с поддержкой передачи данных. Выйти?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="one">Эта операция недоступна в режиме экстренных обратных вызовов. Телефон останется в этом режиме ещё на <xliff:g id="COUNT_1">%s</xliff:g> минуту. Выйти?</item>
+      <item quantity="few">Эта операция недоступна в режиме экстренных обратных вызовов. Телефон останется в этом режиме ещё <xliff:g id="COUNT_1">%s</xliff:g> минуты. Выйти?</item>
+      <item quantity="many">Эта операция недоступна в режиме экстренных обратных вызовов. Телефон останется в этом режиме ещё на <xliff:g id="COUNT_1">%s</xliff:g> минут. Выйти?</item>
+      <item quantity="other">Эта операция недоступна в режиме экстренных обратных вызовов. Телефон останется в этом режиме ещё на <xliff:g id="COUNT_1">%s</xliff:g> минуты. Выйти?</item>
+    </plurals>
     <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>
@@ -508,110 +549,23 @@
     <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="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="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="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_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="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="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>
-    <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">"Отправлять keep-alive"</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">"&lt;Не настроено&gt;"</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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"Голосовые вызовы не поддерживаются"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Быстрые ответы"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></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">"возврат"</string>
-    <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_ringtone_title" msgid="2609519527849101590">"Звук"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"По умолчанию (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</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="dial_pad_autocomplete" msgid="494525952035761075">"Автозаполнение номера"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Рингтон и вибросигнал"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Использовать Wi-Fi для звонка?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Да"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"Нет"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Встроенные SIM-карты"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Встроенный сервис интернет-вызовов"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Включить видеовстречи"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Чтобы включить видеовызовы, активируйте режим 4G LTE в настройках сети."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Настройки сети"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Закрыть"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Экстренные вызовы"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Только экстренные вызовы"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM-карта, разъем: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Специальные возможности"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Входящий Wi-Fi-звонок"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi-звонок"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Нажмите ещё раз, чтобы открыть"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"При расшифровке сообщения произошла ошибка."</string>
 </resources>
diff --git a/res/values-si-rLK/arrays.xml b/res/values-si-rLK/arrays.xml
new file mode 100644
index 0000000..e8299c2
--- /dev/null
+++ b/res/values-si-rLK/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"ගෝලීය"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-si-rLK/config.xml b/res/values-si-rLK/config.xml
deleted file mode 100644
index e654e35..0000000
--- a/res/values-si-rLK/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"අසත්‍ය"</string>
-</resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 33d9e73..e2d0f9c 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -16,14 +16,14 @@
 
 <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="tablet" msgid="1107073389495104784">"සෙල්‍යුලර් දත්ත"</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">"FDN ලැයිස්තුව"</string>
     <string name="unknown" msgid="6878797917991465859">"නොදනී"</string>
     <string name="private_num" msgid="6713286113000232309">"පුද්ගලික අංකය"</string>
-    <string name="payphone" msgid="1931775086311769314">"ගෙවුම් දුරකථනය"</string>
+    <string name="payphone" msgid="4793877574636445118">"පේෆෝනය"</string>
     <string name="onHold" msgid="9035493194749959955">"රඳවා ගනිමින්"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI කේතය ආරම්භ විය"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD කේතය ධාවනය වෙමින්…"</string>
@@ -52,18 +52,41 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"ජාල අඟුළු ඇරීමක් ඉල්ලුම් කරමින්…"</string>
     <string name="unlock_failed" msgid="6490531697031504225">"ජාලය අඟුළු හැරීමේ ඉල්ලීම අසාර්ථකයි."</string>
     <string name="unlock_success" msgid="6770085622238180152">"ජාලය අඟුළු හරිම සාර්ථකයි."</string>
-    <string name="mobile_network_settings_not_available" msgid="7355254462995117896">"මෙම පරිශීලකයා සඳහා ජංගම ජාල සැකසීම් නැත"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"මෙම පරිශීලකයා සඳහා සෙලියුලර් ජාල සැකසීම් නැත"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM ඇමතුම් සැකසුම්"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"GSM ඇමතුම් සැකසීම් (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA ඇමතුම් සැකසුම්"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"CDMA ඇමතුම් සැකසීම් (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"ප්‍රවේශ ලක්ෂ්‍ය නම්"</string>
     <string name="settings_label" msgid="3876743539816984008">"ජාල සැකසුම්"</string>
-    <string name="connection_service" msgid="978745922583410219">"භාවිතයට සම්බන්ධතා සේවාව"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"ගිණුම් ඇමතීම"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"සමඟ ඇමතුම් ගන්න"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"සමඟ SIP ඇමතුම් ගන්න"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"මුළින් අසන්න"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"සැකසීම්"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"ගිණුම් තෝරන්න"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"දුරකථන ගිණුම්"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"SIP ගිණුම් එකතු කරන්න"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"ගිණුමේ සැකසීම් වින්‍යාස කරන්න"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi ඇමතීම"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Wi-Fi ඇමතුම භාවිතා කරන්න එපා"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"ඇමතුම් සහායක භාවිතා කරන්න එපා"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"කිසිවක් නැත"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"ඇමතුම් සහායක"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"ඇමතුම් සහායක භාවිතා කරන්න"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"ඇමතුම් සහායක තෝරන්න"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"සමග ඇමතුම් සඳහා භාවිතා කළ ජාල කළමනාකරණය කරන්න"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"ඇමතුම් සඳහා භාවිතා කළ ජාල කළමනාකරණය කිරීමට යෙදුමකට හෝ සේවාවකට ඉඩ දෙන්න"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"වින්‍යාස කිරීම"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"තිළැලි සම්බන්ධතා සේවාව"</string>
     <string name="voicemail" msgid="8693759337917898954">"හඬ තැපෑල"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"හඬ තැපෑල (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
     <string name="networks" msgid="8873030692174541976">"ජාල ක්‍රියාකරුවන්"</string>
-    <string name="call_settings" msgid="1630474923393095156">"ඇමතුම් සැකසීම්"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"හදිසි විකාශන"</string>
+    <string name="call_settings" msgid="6112441768261754562">"ඇමතුම් සැකසුම්"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"අමතර සැකසීම්"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"අමතර සැකසීම් (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
@@ -77,29 +100,32 @@
     <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="call_forwarding_settings_with_label" msgid="8569489414006897127">"ඇමතුම් ඉදිරියට යැවීමේ සැකසීම් (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="sum_cfu_disabled" msgid="8384177689501334080">"අක්‍රියයි"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"කාර්යබහුල විට"</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="sum_cfb_disabled" msgid="4913145177320506827">"අක්‍රියයි"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"ඔබගේ ක්‍රියාකරු ඔබගේ දුරකථනය කාර්ය බහුල විට ඇමතුම් ඉදිරියට ගෙනයාම අබල කිරීමට සහාය නොදක්වයි."</string>
-    <string name="labelCFNRy" msgid="3646316323834351390">"පිළිතුරු නොදුන්විට ඉදිරියට ගෙන යන්න"</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"පිළිතුරු නොදෙන විට"</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="sum_cfnry_disabled" msgid="3884684060443538097">"අක්‍රියයි"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"ඔබගේ ක්‍රියාකරු ඔබගේ දුරකථනය පිළිතුරු නොදෙන විට ඇමතුම් ඉදිරියට ගෙනයාම අබල කිරීමට සහාය නොදක්වයි."</string>
-    <string name="labelCFNRc" msgid="47183615370850000">"ළඟා විය නොහැකි විට ඉදිරියට ගෙන යන්න"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"ළඟා වීමට නොහැකි විට"</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="5646361343094064333">"ඔබගේ වාහකය ඔබගේ දුරකථනය ළඟා විය නොහැකි විට ඇමතුම් ඉදිරියට ගෙනයාම අබල කිරීමට සහාය නොදක්වයි."</string>
     <string name="updating_title" msgid="6146755386174019046">"ඇමතුම් සැකසීම්"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"ඇමතුම් සැකසීම් වෙනස් කළ හැක්කේ ප්‍රධාන පරිශීලකයකු විසින් පමණි."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"ඇමතුම් සැකසීම් (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"ඇමතුම් සැකසුම් දෝෂය"</string>
     <string name="reading_settings" msgid="1920291699287055284">"සැකසුම් කියවමින්…"</string>
     <string name="updating_settings" msgid="8171225533884883252">"සැකසුම් යාවත් කාලින කරමින්…"</string>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"ක්‍රියාත්මක කරන්න"</string>
+    <string name="disable" msgid="4678348128118573672">"ක්‍රියා විරහිත කරන්න"</string>
     <string name="change_num" msgid="239476305819844391">"යාවත්කාලීන කරන්න"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"ජාල සුපුරුදු"</item>
@@ -123,8 +149,8 @@
     <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="voicemail_default" msgid="2001233554889016880">"ඔබගේ වාහකයා"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"සෙලියුලර් ජාල සැකසීම්"</string>
     <string name="label_available" msgid="1181658289009300430">"තිබෙන ජාල"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"සොයමින්..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"කිසිඳු ජාලයක් සොයාගත නොහැකි විය."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"ප්‍රිය ජාල ආකාරය: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"ප්‍රිය ජාල ආකාරය: ගෝලීය"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"ප්‍රිය ජාල ආකාරය: LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"කැමති ජාල ආකාරය: LTE / GSM / UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"ප්‍රිය ජාල ආකාරය: LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="7886739962255042385">"LTE / WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"GSM පමණි"</item>
     <item msgid="3817924849415716259">"GSM/WCDMA කැමතියි"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"දියුණු කරන ලද 4G LTE මෝඩය"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"හඬ සහ වෙනත් සන්නිවේදනයන් දියුණු කිරීමට LTE සේවාව භාවිතා කරන්න (නිර්දේශ කළ)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"දත්ත සබලයි"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"ජංගම ජාල ඔස්සේ දත්ත ප්‍රවේශය සබල කරන්න"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"දත්ත භාවිතයට ඉඩ දෙන්න"</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="8913735676127858115">"ඔබගේ නිවාස ජාලය ඔබ හැර ගිය විට දත්ත රෝමින් අක්‍රිය වන බැවින් දත්ත සම්බන්ධතාවය ඔබට නැති වෙයි"</string>
-    <string name="roaming_warning" msgid="7820963598559553967">"දත්ත රෝමිං වෙත අවසර දෙන්නද? ඔබට සැලකිය යුතු රෝමිං ගාස්තු දැරීමට සිදු වනු ඇත!"</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"ඔබ සැලකිය යුතු ගාස්තු ඇති විය හැකිය."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"දත්ත රෝමින් සඳහා අවසර දෙන්න ද"</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>
@@ -190,7 +221,7 @@
     <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="throttle_help_subtext" msgid="3633091498168446044">"ඔබගේ ක්‍රියාකරුගේ සෙලියුලර් ජාලය දත්ත භාවිත ප්‍රතිපත්තිය පිලිබඳ තවත් තොරතුරු"</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>
@@ -303,7 +334,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"දත්ත සේවාව සකසන්න"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"වාහකයේ සැකසීම්"</string>
     <string name="fdn" msgid="7878832555095183202">"ස්ථිර ඇමතුම් අංක"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"ස්ථාපිත ඇමතීමේ අංක (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FDN ලැයිස්තුව"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"FDN ලැයිස්තුව (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FDN සක්‍රිය කිරීම"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"ස්ථාවර ඇමතුම් අංක සබලයි"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"ස්ථාවර ඇමතුම් අංක අබලයි"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"TTY ආකාරය සකසන්න"</string>
     <string name="auto_retry_mode_title" msgid="4073265511427813322">"ස්වයංක්‍රීය නැවත උත්සාහ කිරීම"</string>
     <string name="auto_retry_mode_summary" msgid="4973886004067532288">"ස්වයංක්‍රීය නැවත උත්සාහ කිරීමේ ආකාරය සබල කරන්න"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"වීඩියෝ ඇමතුමක් අතරතුර TTY මෝඩය වෙනස් වීමකට අවසර නැත"</string>
     <string name="menu_add" msgid="1882023737425114762">"සම්බන්ධතාවය එක් කරන්න"</string>
     <string name="menu_edit" msgid="7143003705504672374">"සම්බන්ධතාව සංස්කරණය කරන්න"</string>
     <string name="menu_delete" msgid="3977150783449642851">"සම්බන්ධතාවය මකා දමන්න"</string>
@@ -344,7 +378,7 @@
     <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="1846161429087789936">"SIM කාඩ් පත වෙතින් සම්බන්ධතා ආයාත කිරීමට, මුලින්ම ගුවන්යානා ආකාරය අක්‍රිය කරන්න."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"සිම් කාඩ් සම්බන්ධතා ආනයනය කිරීමට ගුවන් යානා මෝඩය අක්‍රිය කරන්න."</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>
@@ -354,42 +388,40 @@
     <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="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="1796577128488773946">"මුරපදය වැරදියි, PIN අවහිරයි! PUK ඉල්ලන ලදී."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"SIM PIN හිස් කරන්න"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"SIM PIN එකතුව"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"PIN සැකසීම…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN එකතුව"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN හිස් කරන ලදි"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN වැරදි"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN යාවත්කාලීන කරන ලදි"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"මුරපදය වැරදිය. PIN දැන් අවහිර කර තිබේ. PUK ඉල්ලන ලදි."</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="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="1639666438836544393">"PIN2 සාර්ථකව වෙනස් කෙරුණි."</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"PUK2 කේතය ටයිප් කරන්න"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"මුරපදය වැරදියි, PIN2 අවහිරයි. කරුණාකර PIN2 වෙනස් කර යළි උත්සාහ කරන්න!"</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"මුරපදය වැරදියි, SIM එක අඟුළු වැටී ඇත. PUK2 ඉල්ලා ඇත."</string>
+    <string name="badPuk2" msgid="7910064009531541708">"PUK2 වැරදියි. නැවත උත්සාහ කරන්න."</string>
+    <string name="badPin2" msgid="6646896629970023109">"පරණ PIN2 වැරදියි. නැවත උත්සාහ කරන්න."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2 යන් ගැළපෙන්නේ නැත. නැවත උත්සාහ කරන්න."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"PIN2 ඇතුළු කරන්න, එය අංක 4 සිට 8 දක්වා වූ සංඛ්‍යාවකි."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"PUK2 ඇතුළු කරන්න, එය අංක 8 වූ සංඛ්‍යාවකි."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 යාවත්කාලින කරන ලදි"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"PUK2 කේතය ඇතුළු කරන්න"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"මුරපදය වැරදිය. PIN2 දැන් අවහිර කර තිබේ. නැවත උත්සාහ කිරීමට, PIN 2 වෙනස් කරන්න."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"මුරපදය වැරදිය. SIM දැන් අගුළු දමා තිබේ. PUK2 ඇතුළු කරන්න."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 සදාකාලිකවම අවහිරයි."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"තවත් උත්සාහයන් <xliff:g id="NUMBER">%d</xliff:g> ක් ඉතිරිව ඇත."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 අඟුළු හැරුණි!"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"ඔබට නැවත උත්සාහ කිරීම් <xliff:g id="NUMBER">%d</xliff:g> ක් තිබේ."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"තව දුරටත් PIN2 අවහිර කර නොතිබේ"</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_redialing" msgid="8253487008234167266">"නැවත අංකනය කරමින්"</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_dialing" msgid="2107666444937350731">"අමතමින්"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"මඟ හැරුණු ඇමතුම"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"මඟ හැරුණු ඇමතුම්"</string>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"ඇමතුමක් ගැනීමට ගුවන් යානා මාදිලිය අක්‍රිය කරන්න."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"ඇමතුමක් ලබා ගැනීමට ගුවන් යානා මෝඩය අක්‍රිය කරන්න හෝ රැහැන් රහිත ජාලයකට සම්බන්ධ වෙන්න."</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_error_out_of_service" msgid="4100065333878929223">"සෙලියුලර් ජාලය නොමැත"</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"සෙලියුලර් ජාලය ලබාගත නොහැක. ඇමතුමක් ගැනීමට රැහැන් රහිත ජාලයකට සම්බන්ධ වෙන්න."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"ඇමතුමක් ලබාගැනීමට, වලංගු අංකයක් ලබාගන්න."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"ඇමතුම් ගැනීමට නොහැක."</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_unknown" msgid="655570339115407698">"සේවාවට සහාය දක්වන්නේ නැත"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"ඇමතුම් මාරු කිරීම කළ නොහැක."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"ඇමතුම වෙන් කිරීම කළ නොහැක."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"මාරු කිරීමට නොහැක."</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="incall_error_supp_service_reject" msgid="8998568661508655638">"ඇමතුම ප්‍රතික්ෂේප කළ නොහැක."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"ඇමතුම(ම්) මුදාහැරීම කළ නොහැක."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"ඇමතුමක් ගැනීමට රැහැන් රහිත ජාලයක් වෙත සම්බන්ධ වෙන්න."</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="7969515493359619960">"ඇමතුම නොයැවිණි, <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> හදිසි අංකයක් නොවේ!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"ඇමතුම නොයැවිණි, හදිසි අංකයක් අමතන්න!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"සේවා නැත. නැවත උත්සාහ කරන්න…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"ඇමතුම් ලබාගැනීම කළ නොහැක. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> මෙය හදිස්සි ඇමතුම් අංකයක් නොවේ."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"ඇමතිය නොහැක. හදිසි අංකයක් අමතන්න."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"ඇමතීමට කිරීමට යතුරු පුවරුව භාවිතා කරන්න"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"රඳවා සිටින්න"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"අවසානයි"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"සාමාන්‍ය"</item>
     <item msgid="2883365539347850535">"දීර්ඝ"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"ජාල පණිවිඩය"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"ජාල පණිවිඩය"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"දෝෂ පණිවිඩය"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"ඔබගේ දුරකථනය සක්‍රිය කරන්න"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"ඔබගේ දුරකථන සේවාව සක්‍රිය කිරීමට විශේෂ ඇමතුමක් ලබා ගත යුතුවේ. \n\n“සක්‍රිය කරන්න” එබීමෙන් පසු, ඔබගේ දුරකථනය සක්‍රිය කිරීමට ලබා දෙන උපදෙස් පිළිපදින්න."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"සක්‍රිය කෙරේ..."</string>
@@ -469,8 +504,8 @@
     <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="3420314892609254729">"ඔබගේ දුරකථනය වැඩසටහන්කරණය වන අතරතුර රැඳී සිටින්න."</string>
-    <string name="ota_failure" msgid="4311299546379674378">"වැඩසටහන්කරණය අසාර්ථකයි"</string>
+    <string name="ota_progress" msgid="460876637828044519">"ඔබගේ දුරකථනය ක්‍රමලේඛන ගත කිරීම…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"ඔබගේ දුරකථනය ක්‍රමලේඛන ගත කළ නොහැක"</string>
     <string name="ota_successful" msgid="1880780692887077407">"ඔබගේ දුරකථනය දැන් සක්‍රිය කර ඇත. සේවාව ආරම්භ වීමට මිනිත්තු 15 පමණ ගතවනු ඇත."</string>
     <string name="ota_unsuccessful" msgid="8072141612635635357">"ඔබගේ දුරකතය සක්‍රිය නොවුණි. \nඔබට මිට වඩා හොඳ ආවරණයක් සහිත ප්‍රදේශයක් සොයාගත යුතු වේ (කවුළුවක් අසල, හෝ පිටත). \n\nයළි උත්සාහ කරන්න නැති නම් තවත් විකල්ප සඳහා පාරිභෝගික සේවා අමතන්න."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"අතිරික්ත SPC බිඳවැටීම්"</string>
@@ -481,18 +516,18 @@
     <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="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="2585506997024726599">"හදිසි පසු ඇමතුම් ආකාරයේ සිටින විට තෝරා ඇති ක්‍රියාව නොමැත. දුරකථනය මිනිත්තු <xliff:g id="COUNT">%s</xliff:g> කට මෙම ආකාරයට පත්වේ. ඔබ දැන් පිටවීමට අවශ්‍යද?"</item>
-    <item quantity="other" msgid="6115622137771382224">"හදිසි පසු ඇමතුම් ආකාරයේ සිටින විට තෝරා ඇති ක්‍රියාව නොමැත. දුරකථනය මිනිත්තු <xliff:g id="COUNT">%s</xliff:g> කට මෙම ආකාරයට පත්වේ. ඔබ දැන් පිටවීමට අවශ්‍යද?"</item>
-  </plurals>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="one">මිනිත්තු <xliff:g id="COUNT_1">%s</xliff:g> ක් දත්ත සම්බන්ධතාවයක් නැත</item>
+      <item quantity="other">මිනිත්තු <xliff:g id="COUNT_1">%s</xliff:g> ක් දත්ත සම්බන්ධතාවයක් නැත</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="one">දුරකථනය මිනිත්තු <xliff:g id="COUNT_1">%s</xliff:g> ක් හදිසි ආපසු ඇමතුම් ආකාරය තුළ වනු ඇත. මෙම ආකාරය තුළ සිටින අතරතුර දත්ත සම්බන්ධයක් භාවිත කරන යෙදුම් කිසිවක් භාවිත කළ නොහැකිය. ඔබට දැන් පිටවීමට අවශ්යද?</item>
+      <item quantity="other">දුරකථනය මිනිත්තු <xliff:g id="COUNT_1">%s</xliff:g> ක් හදිසි ආපසු ඇමතුම් ආකාරය තුළ වනු ඇත. මෙම ආකාරය තුළ සිටින අතරතුර දත්ත සම්බන්ධයක් භාවිත කරන යෙදුම් කිසිවක් භාවිත කළ නොහැකිය. ඔබට දැන් පිටවීමට අවශ්යද?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="one"> හදිසි ආපසු ඇමතුම් ආකාරය තුළ සිටියදී තෝරන ලද ක්‍රියාව ලබාගත නොහැක. දුරකථනය මිනිත්තු <xliff:g id="COUNT_1">%s</xliff:g> ක් හදිසි ආපසු ඇමතුම් ආකාරය තුළ වනු ඇත. ඔබට දැන් පිටවීමට අවශ්යද?</item>
+      <item quantity="other"> හදිසි ආපසු ඇමතුම් ආකාරය තුළ සිටියදී තෝරන ලද ක්‍රියාව ලබාගත නොහැක. දුරකථනය මිනිත්තු <xliff:g id="COUNT_1">%s</xliff:g> ක් හදිසි ආපසු ඇමතුම් ආකාරය තුළ වනු ඇත. ඔබට දැන් පිටවීමට අවශ්යද?</item>
+    </plurals>
     <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>
@@ -506,110 +541,23 @@
     <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="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="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="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_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="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="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>
-    <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">"&lt;පිහිටුවා නැත&gt;"</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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"හඬ ඇමතීම සඳහා සහාය නොදක්වයි"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"ක්ෂණික ප්‍රතිචාර"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></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">"ආපසුයවන යතුර"</string>
-    <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_ringtone_title" msgid="2609519527849101590">"ශබ්දය"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"සුපුරුදු ශබ්දය (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</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="dial_pad_autocomplete" msgid="494525952035761075">"ඩයල් පෑඩය ස්වයංපූර්ණය"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"රිගින් ටෝන් සහ කම්පනය කරන්න"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"ඇමතුමක් ලබාගැනීමට Wi-Fi භාවිතා කරන්න ද?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"ඔව්"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"නැත"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"තිළැලි SIM කාඩ් පත්"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"තිළැලි අන්තර්ජාල ඇමතීම"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"වීඩියෝ ඇමතීම සක්‍රිය කරමින්"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"වීඩියෝ ඇමතීම ක්‍රියාත්මක කිරීමට, ජාල සැකසීම තුළ  දියුණු කළ 4G LTE ආකාරය සබල කිරීමට ඔබට අවශ්‍යය."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"ජාල සැකසුම්"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"වසන්න"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"හදිස්සි ඇමතූම්"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"හදිස්සි ඇමතූම් පමණි"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM කාඩ්පත්, තව්ව: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"ප්‍රවේශ්‍යතාව"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"පැමිණෙන Wi-Fi ඇමතුම"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi ඇමතුම"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"විවෘත කිරීමට නැවත ස්පර්ශ කරන්න"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"පණිවිඩය විකේතනය කරන අතරතුර දෝෂයක් සිදු විය."</string>
 </resources>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
new file mode 100644
index 0000000..731bdc8
--- /dev/null
+++ b/res/values-sk/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Globálne"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-sk/config.xml b/res/values-sk/config.xml
deleted file mode 100644
index 7cefc32..0000000
--- a/res/values-sk/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"nepravda"</string>
-</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 58dae27..574d232 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -16,14 +16,14 @@
 
 <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">"Mobilné dáta"</string>
+    <string name="phoneAppLabel" product="tablet" msgid="1107073389495104784">"Mobilné dáta"</string>
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Telefón"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Tiesňové vytáčanie"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Telefón"</string>
     <string name="fdnListLabel" msgid="8630418672279521003">"Zoznam pevne určených čísiel (FDN)"</string>
     <string name="unknown" msgid="6878797917991465859">"Neznáme"</string>
     <string name="private_num" msgid="6713286113000232309">"Súkromné číslo"</string>
-    <string name="payphone" msgid="1931775086311769314">"Verejný telefón"</string>
+    <string name="payphone" msgid="4793877574636445118">"Telefónny automat"</string>
     <string name="onHold" msgid="9035493194749959955">"Podržaný hovor"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Kód MMI bol spustený"</string>
     <string name="ussdRunning" msgid="485588686340541690">"Kód USSD je spustený..."</string>
@@ -52,18 +52,41 @@
     <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="mobile_network_settings_not_available" msgid="7355254462995117896">"Nastavenia mobilnej siete nie sú pre tohto používateľa dostupné"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Nastavenia mobilnej siete nie sú pre tohto používateľa dostupné"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Nastavenia hovorov GSM"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"Nastavenia hovorov v sieti GSM (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Nastavenia hovorov CDMA"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"Nastavenia hovorov v sieti CDMA (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Názvy prístupových bodov"</string>
     <string name="settings_label" msgid="3876743539816984008">"Nastavenia siete"</string>
-    <string name="connection_service" msgid="978745922583410219">"Služba pripojenia, ktorá sa má použiť"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Telefónne účty"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Volať pomocou účtu"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Uskutočniť hovory SIP pomocou účtu"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Najprv sa opýtať"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Nastavenia"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Vybrať účty"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Telefónne účty"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Pridať účet SIP"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Konfigurácia nastavení účtu"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Volanie cez Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Nepoužívať volanie prostredníctvom siete Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Nepoužívať asistenta hovorov"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Žiadny"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Asistent hovorov"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Použiť asistenta hovorov"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Vybrať asistenta hovorov"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Správa sietí používaných na volanie pomocou"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Umožniť aplikáciám alebo službám spravovať siete používané na volania"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Konfigurovať"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Vstavaná služba pripojenia"</string>
     <string name="voicemail" msgid="8693759337917898954">"Hlasová schránka"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Hlasová schránka (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"HS:"</string>
     <string name="networks" msgid="8873030692174541976">"Sieťoví operátori"</string>
-    <string name="call_settings" msgid="1630474923393095156">"Nastavenia hovorov"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Núdzové vysielania"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Nastavenia hovorov"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Ďalšie nastavenia"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Ďalšie nastavenia (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Ďalšie nastavenia hovorov, iba GSM"</string>
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Ďalšie nastavenia hovorov CDMA"</string>
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Ďalšie nastavenia hovorov, iba CDMA"</string>
@@ -77,29 +100,32 @@
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Oznamuje prichádzajúce hovory aj pri prebiehajúcom hovore"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Oznamuje prichádzajúce hovory aj pri prebiehajúcom hovore"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Nastavenia presmerovania hovorov"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Nastavenia presmerovania hovorov (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Presmerovanie hovorov"</string>
-    <string name="labelCFU" msgid="8147177368148660600">"Vždy presmerovať"</string>
+    <string name="labelCFU" msgid="8147177368148660600">"Trvalé presmerovanie"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Vždy používať toto číslo"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Všetky hovory budú presmerované"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Presmerovanie všetkých hovorov na <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Číslo nie je k dispozícii"</string>
-    <string name="sum_cfu_disabled" msgid="3698472522160364904">"Zakázané"</string>
-    <string name="labelCFB" msgid="218938523102207587">"Presmerovať – obsadené"</string>
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Vypnuté"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Keď mám obsadené"</string>
     <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="sum_cfb_disabled" msgid="4913145177320506827">"Vypnuté"</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="labelCFNRy" msgid="1736067178393744351">"Keď neodpovedám"</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="sum_cfnry_disabled" msgid="3884684060443538097">"Vypnuté"</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="labelCFNRc" msgid="2614827454402079766">"Keď som nedostupný/-á"</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="sum_cfnrc_disabled" msgid="7222141261321276464">"Vypnuté"</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="call_settings_primary_user_only" msgid="5679923943740900965">"Nastavenia hovorov môže zmeniť iba hlavný používateľ."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Nastavenia hovorov (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Chyba nastavení hovorov"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Prebieha načítavanie nastavení..."</string>
     <string name="updating_settings" msgid="8171225533884883252">"Prebieha aktualizácia nastavení..."</string>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"Zapnúť"</string>
+    <string name="disable" msgid="4678348128118573672">"Vypnúť"</string>
     <string name="change_num" msgid="239476305819844391">"Aktualizovať"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Predvolené nastavenie siete"</item>
@@ -123,8 +149,8 @@
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Načítanie a uloženie aktuálnych nastavení čísla presmerovania zlyhalo.\nChcete 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>
-    <string name="voicemail_default" msgid="5902099213882352338">"Môj operátor"</string>
-    <string name="mobile_networks" msgid="5540397602919106177">"Nastavenia mobilnej siete"</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"Váš operátor"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Nastavenia mobilnej siete"</string>
     <string name="label_available" msgid="1181658289009300430">"Dostupné siete"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Prebieha vyhľadávanie…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Nebola nájdená žiadna sieť."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Preferovaný režim siete: CDMA + LTE / EvDo"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Preferovaný režim siete: Globálny"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Preferovaný režim siete: LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Uprednostňovaný režim siete: LTE / GSM / UMTS"</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="7886739962255042385">"LTE / WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"Iba GSM"</item>
     <item msgid="3817924849415716259">"GSM / WCDMA – preferované"</item>
   </string-array>
-    <string name="data_enabled" msgid="5972538663568715366">"Dátové prenosy aktivované"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Povolí dátový prístup prostredníctvom mobilnej siete"</string>
-    <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="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="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Zlepšený režim 4G LTE"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Použiť služby LTE na vylepšenie hlasu a ďalších komunikácií (odporúčané)"</string>
+    <string name="data_enabled" msgid="5972538663568715366">"Povoliť dát. prenosy"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Povoliť využívanie dát"</string>
+    <string name="roaming" msgid="8871412572928323707">"Dátový roaming"</string>
+    <string name="roaming_enable" msgid="7331106985174381987">"Pripájať sa k dátovým službám pri roamingu"</string>
+    <string name="roaming_disable" msgid="1843417228755568110">"Pripájať sa k dátovým službám pri roamingu"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Dátové pripojenie bolo prerušené, pretože ste opustili domovskú sieť a máte vypnutý dátový roaming."</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"Môžu sa vám účtovať vysoké poplatky."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Povoliť dátový roaming?"</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>
@@ -190,7 +221,7 @@
     <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"Bol prekročený limit <xliff:g id="USED_0">%1$s</xliff:g>\nPrenosová rýchlosť bola znížená na <xliff:g id="USED_1">%2$d</xliff:g> kB/s"</string>
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"Uplynulo <xliff:g id="USED_0">%1$d</xliff:g>٪ cyklu\nPoč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="throttle_help_subtext" msgid="3633091498168446044">"Ďalšie informácie o pravidlách využitia dát v mobilnej sieti vášho mobilného operátora"</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>
@@ -303,7 +334,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Nastaviť dátovú službu"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Nastavenia operátora"</string>
     <string name="fdn" msgid="7878832555095183202">"Pevne určené čísla"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Pevne určené čísla (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Zoznam pevne určených čísiel (FDN)"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"Zoznam pevne určených čísel (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Aktivácia pevne určených čísiel (FDN)"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Režim Pevne určené čísla je povolený"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Režim Pevne určené čísla je zakázaný"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Nastaviť režim TTY"</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="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"Zmena režimu TTY nie je povolená počas videohovoru"</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>
@@ -344,9 +378,9 @@
     <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="1846161429087789936">"Ak chcete importovať kontakty z karty SIM, vypnite režim V lietadle."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Ak chcete importovať kontakty zo SIM karty, 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="change_pin" msgid="9174186126330785343">"Zmeniť 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>
@@ -354,42 +388,40 @@
     <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="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="1796577128488773946">"Chybné heslo, kód PIN bol zablokovaný! Vyžaduje sa kód PUK."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"Vymazanie kódu PIN pre SIM kartu"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"Nastavenie kódu PIN pre SIM kartu"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"Nastavuje sa kód PIN…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"Kód PIN je nastavený"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"Kód PIN bol vymazaný"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"Kód PIN je nesprávny"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"Kód PIN bola aktualizovaný"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Heslo je nesprávne. Kód PIN je teraz blokovaný. Požaduje sa kód PUK."</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="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="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="3674058967950559397">"Chybné heslo, kód PIN2 bol zablokovaný. 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="badPuk2" msgid="7910064009531541708">"Kód PUK2 je nesprávny. Skúste to znova."</string>
+    <string name="badPin2" msgid="6646896629970023109">"Starý kód PIN2 je nesprávny. Skúste to znova."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"Kódy PIN2 sa nezhodujú. Skúste to znova."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Zadajte kód PIN2, ktorý má 4 až 8 čísel"</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Zadajte kód PUK2, ktorý má 8 čísel"</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"Kód PIN2 bol aktualizovaný"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Zadajte kód PUK2"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Heslo je nesprávne. Kód PIN2 bol zablokovaný. Ak to chcete skúsiť znova, zmeňte kód PIN 2."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Heslo je nesprávne. Karta SIM bola uzamknutá. Zadajte kód PUK2."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"Kód PUK2 je natrvalo blokovaný."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Počet zostávajúcich pokusov: <xliff:g id="NUMBER">%d</xliff:g>."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"Kód PIN2 bol odblokovaný!"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"Zostávajú vám pokusy (počet: <xliff:g id="NUMBER">%d</xliff:g>)"</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"Kód PIN2 už nie je blokovaný"</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="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_redialing" msgid="8253487008234167266">"Znova sa vytáča"</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_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>
     <string name="card_title_in_call" msgid="6346543933068225205">"Prebieha hovor"</string>
-    <string name="card_title_my_phone_number" msgid="112428362494434191">"Moje číslo je <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Vytáčanie"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Zmeškaný hovor"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Zmeškané hovory"</string>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"Ak chcete volať, vypnite režim v lietadle"</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Ak chcete volať, vypnite režim v lietadle alebo sa pripojte k bezdrôtovej sieti"</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_error_out_of_service" msgid="4100065333878929223">"Mobilná sieť nie je k dispozícii."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Mobilná sieť nie je k dispozícii. Ak chcete volať, pripojte sa k bezdrôtovej sieti."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Ak chcete volať, zadajte platné číslo"</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Hovor nie je možné uskutočniť"</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Prebieha spúšťanie sekvencie MMI..."</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>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Hovor nie je možné preniesť."</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Služba nie je podporovaná"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Nedajú sa prepínať hovory"</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Nedá sa rozdeliť hovor"</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Nedá sa preniesť"</string>
     <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Hovory nie je možné spojiť do konferenčného hovoru."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Hovor nie je možné odmietnuť."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Hovor nie je možné uvoľniť."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Internetový hovor"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Nedá sa odmietnuť hovor"</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Nedajú sa ukončiť hovory"</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Ak chcete volať, pripojte sa k bezdrôtovej sieti"</string>
     <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="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="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Žiadna služba. Prebieha opätovný pokus…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Hovor nie je možné uskutočniť. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nie je číslo tiesňového volania."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Hovor nie je možné uskutočniť. Vytočte číslo tiesňového volania."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Číslo vytočíte pomocou klávesnice."</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Podržať"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Koniec"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"Normálna"</item>
     <item msgid="2883365539347850535">"Dlhé"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Informácia siete"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Sieťová správa"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Chybové hlásenie"</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\nStlačte tlačidlo Aktivovať a aktivujte telefón podľa poskytnutých pokynov."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Prebieha aktivácia..."</string>
@@ -469,8 +504,8 @@
     <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_speaker" msgid="6904589278542719647">"Reproduktor"</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_progress" msgid="460876637828044519">"Váš telefón sa programuje…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Váš telefón sa nepodarilo naprogramovať"</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="8072141612635635357">"Váš telefón nebol aktivovaný. \nMožno bude treba vyhľadať oblasť s lepším pokrytím (blízko okna alebo vonku). \n\nSkú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>
@@ -481,18 +516,24 @@
     <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>
     <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Dátové pripojenie zakázané"</string>
-  <plurals name="phone_in_ecm_notification_time">
-    <item quantity="one" msgid="4866221796252472622">"Žiadne dátové pripojenie po dobu <xliff:g id="COUNT">%s</xliff:g> min"</item>
-    <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="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="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>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="few">Žiadne dátové pripojenie – <xliff:g id="COUNT_1">%s</xliff:g> min</item>
+      <item quantity="many">Žiadne dátové pripojenie – <xliff:g id="COUNT_1">%s</xliff:g> min</item>
+      <item quantity="other">Žiadne dátové pripojenie – <xliff:g id="COUNT_1">%s</xliff:g> min</item>
+      <item quantity="one">Žiadne dátové pripojenie – <xliff:g id="COUNT_0">%s</xliff:g> min</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="few">Telefón bude <xliff:g id="COUNT_1">%s</xliff:g> minúty v režime spätného tiesňového volania. Keď bude v tomto režime, nesmiete používať žiadne aplikácie využívajúce dátové pripojenie. Chcete ho ukončiť?</item>
+      <item quantity="many">Telefón bude <xliff:g id="COUNT_1">%s</xliff:g> minúty v režime spätného tiesňového volania. Keď bude v tomto režime, nesmiete používať žiadne aplikácie využívajúce dátové pripojenie. Chcete ho ukončiť?</item>
+      <item quantity="other">Telefón bude <xliff:g id="COUNT_1">%s</xliff:g> minút v režime spätného tiesňového volania. Keď bude v tomto režime, nesmiete používať žiadne aplikácie využívajúce dátové pripojenie. Chcete ho ukončiť?</item>
+      <item quantity="one">Telefón bude <xliff:g id="COUNT_0">%s</xliff:g> minútu v režime spätného tiesňového volania. Keď bude v tomto režime, nesmiete používať žiadne aplikácie využívajúce dátové pripojenie. Chcete ho ukončiť?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="few">Pri spustenom režime spätného tiesňového volania nie je vybraná akcia k dispozícii. Telefón bude v tomto režime <xliff:g id="COUNT_1">%s</xliff:g> minúty. Chcete ho ukončiť?</item>
+      <item quantity="many">Pri spustenom režime spätného tiesňového volania nie je vybraná akcia k dispozícii. Telefón bude v tomto režime <xliff:g id="COUNT_1">%s</xliff:g> minúty. Chcete ho ukončiť?</item>
+      <item quantity="other">Pri spustenom režime spätného tiesňového volania nie je vybraná akcia k dispozícii. Telefón bude v tomto režime <xliff:g id="COUNT_1">%s</xliff:g> minút. Chcete ho ukončiť?</item>
+      <item quantity="one">Pri spustenom režime spätného tiesňového volania nie je vybraná akcia k dispozícii. Telefón bude v tomto režime <xliff:g id="COUNT_0">%s</xliff:g> minútu. Chcete ho ukončiť?</item>
+    </plurals>
     <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>
@@ -506,110 +547,23 @@
     <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_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_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="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="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="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="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_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="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="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>
-    <string name="username_title" msgid="2479375923477682328">"Používateľské meno"</string>
-    <string name="password_title" msgid="3323555249068171531">"Heslo"</string>
-    <string name="display_name_title" msgid="2459768196312249937">"Zobrazované meno"</string>
-    <string name="proxy_address_title" msgid="4828301345351614273">"Adresa výstupného servera proxy"</string>
-    <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="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>
-    <string name="auth_username_title" msgid="851473016307947120">"Používateľské meno na overenie"</string>
-    <string name="auth_username_summary" msgid="6782012405225938629">"Používateľské meno použité na overenie"</string>
-    <string name="default_preference_summary" msgid="868766740121667450">"&lt;Nenastavené&gt;"</string>
-    <string name="display_name_summary" msgid="8636377460518225523">"&lt;Rovnaké ako používateľské meno&gt;"</string>
-    <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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"Hlasové volanie nie je podporované"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Rýchle odpovede"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"jeden"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"dva"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"tri"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"štyri"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"päť"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"šesť"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"sedem"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"osem"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"deväť"</string>
-    <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_dial_button" msgid="7459705245418435351">"vytáčanie"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <string name="description_target_answer" msgid="7205604197797472471">"Odpovedať"</string>
-    <string name="description_target_send_sms" msgid="2098326025587950144">"Odoslať SMS"</string>
-    <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="2609519527849101590">"Zvuk"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Predvolený zvuk (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <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 číselníku"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Automatické dokonč. číselnej klávesnice"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Tón zvonenia a vibrovanie"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Chcete volať prostredníctvom site Wi-Fi?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Áno"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"Nie"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Vstavané SIM karty"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Vstavané internetové volanie"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Zapnúť videohovory"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Ak chcete zapnúť videohovory, musíte povoliť v nastaveniach siete Zlepšený režim 4G LTE."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Nastavenia siete"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Zavrieť"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Tiesňové volania"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Tiesňové volania iba na čísla"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"Slot na SIM kartu: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Dostupnosť"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Prich. hovor cez Wi-Fi"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Hovor cez Wi-Fi"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Otvorte opätovným klepnutím"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"Pri dekódovaní správy sa vyskytla chyba"</string>
 </resources>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
new file mode 100644
index 0000000..ff6cd57
--- /dev/null
+++ b/res/values-sl/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Globalno"</item>
+    <item msgid="6753774959494729275">"LTE/CDMA"</item>
+    <item msgid="8658695584186942227">"LTE/GSM/UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-sl/config.xml b/res/values-sl/config.xml
deleted file mode 100644
index 0605cd7..0000000
--- a/res/values-sl/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"false"</string>
-</resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index e248349..0ef8d7e 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -16,14 +16,14 @@
 
 <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">"Mobilni podatki"</string>
+    <string name="phoneAppLabel" product="tablet" msgid="1107073389495104784">"Prenos podatkov v mobilnih omrežjih"</string>
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Telefon"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Klicalnik za nujne primere"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Telefon"</string>
     <string name="fdnListLabel" msgid="8630418672279521003">"Seznam FDN"</string>
     <string name="unknown" msgid="6878797917991465859">"Neznano"</string>
     <string name="private_num" msgid="6713286113000232309">"Zasebna številka"</string>
-    <string name="payphone" msgid="1931775086311769314">"Telefonska govorilnica"</string>
+    <string name="payphone" msgid="4793877574636445118">"Telefonska govorilnica"</string>
     <string name="onHold" msgid="9035493194749959955">"Zadržano"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Koda MMI zagnana"</string>
     <string name="ussdRunning" msgid="485588686340541690">"Koda USSD se izvaja ..."</string>
@@ -52,18 +52,41 @@
     <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="mobile_network_settings_not_available" msgid="7355254462995117896">"Nastavitve mobilnega omrežja niso na voljo za tega uporabnika"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Nastavitve mobilnega omrežja niso na voljo za tega uporabnika"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Nastavitve klicev GSM"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"Nastavitve klicanja za GSM (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Nastavitve klicev CDMA"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"Nastavitve klicanja za CDMA (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Imena dostopnih točk"</string>
     <string name="settings_label" msgid="3876743539816984008">"Omrežne nastavitve"</string>
-    <string name="connection_service" msgid="978745922583410219">"Storitev povezave za uporabo"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Računi za klicanje"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Izvajaj klice z računom"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Izvajaj klice SIP z računom"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Prej vprašaj"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Nastavitve"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Izbira računov"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Računi telefona"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Dodaj račun SIP"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Konfiguriranje nastavitev računa"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Klicanje prek Wi-Fi-ja"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Ne uporabljaj klicanja prek povezave Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Ne uporabljaj pomočnika za klicanje"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Brez"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Pomočnik za klicanje"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Uporabljaj pomočnika za klicanje"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Izbira pomočnika za klicanje"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Upravljanje omrežij za klice s tem:"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Omrežja za klicanje naj upravljajo aplikacije ali storitve"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Konfiguriranje"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Vgrajena storitev povezave"</string>
     <string name="voicemail" msgid="8693759337917898954">"Glasovna pošta"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Odzivnik (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
     <string name="networks" msgid="8873030692174541976">"Omrežni operaterji"</string>
-    <string name="call_settings" msgid="1630474923393095156">"Nastavitve klicanja"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Oddaje v sili"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Nastavitve klicev"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Dodatne nastavitve"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Dodatne nastavitve (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Dodatne nastavitve klicev samo za GSM"</string>
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Dodatne nastavitve klicev CDMA"</string>
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Dodatne nastavitve klicev samo za CDMA"</string>
@@ -77,29 +100,32 @@
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Med klicem me opozori na dohodne klice"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Med klicem me opozori na dohodne klice"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Nastavitve preusmerjanja klicev"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Nastavitve posredovanja klicev (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Preusmerjanje klicev"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Vedno preusmeri"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Vedno uporabi to številko"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Preusmeritev vseh klicev"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Preusmerjanje vseh klicev na <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Številka ni na voljo"</string>
-    <string name="sum_cfu_disabled" msgid="3698472522160364904">"Onemogočeno"</string>
-    <string name="labelCFB" msgid="218938523102207587">"Preusmeri, kadar je zasedeno"</string>
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Izklopljeno"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Pri zasedenosti"</string>
     <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="sum_cfb_disabled" msgid="4913145177320506827">"Izklopljeno"</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="labelCFNRy" msgid="1736067178393744351">"Pri neodgovorjenem klicu"</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="sum_cfnry_disabled" msgid="3884684060443538097">"Izklopljeno"</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="labelCFNRc" msgid="2614827454402079766">"Pri nedosegljivosti"</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="5646361343094064333">"Vaš operater ne podpira izklopa preusmeritve klicev, kadar je telefon nedosegljiv."</string>
     <string name="updating_title" msgid="6146755386174019046">"Nastavitve klicev"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"Nastavitve klicanja lahko spremeni samo primarni uporabnik."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Nastavitve klicanja (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Napaka nastavitev klicev"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Branje nastavitev …"</string>
     <string name="updating_settings" msgid="8171225533884883252">"Posodabljanje nastavitev …"</string>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"Vklopi"</string>
+    <string name="disable" msgid="4678348128118573672">"Izklopi"</string>
     <string name="change_num" msgid="239476305819844391">"Posodobi"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Privzeto omrežje"</item>
@@ -123,8 +149,8 @@
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Trenutnih nastavitev številke za posredovanje ni mogoče pridobiti in shraniti.\nAli ž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>
-    <string name="voicemail_default" msgid="5902099213882352338">"Moj operater"</string>
-    <string name="mobile_networks" msgid="5540397602919106177">"Nastavitve omrežja prenosnega telefona"</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"Vaš operater"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Nastavitve mobilnega omrežja"</string>
     <string name="label_available" msgid="1181658289009300430">"Razpoložljiva omrežja"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Iskanje ..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Najdeno ni bilo nobeno omrežje."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Prednostni način omrežja: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Prednostni način omrežja: globalno"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Prednostni način omrežja: LTE/WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Prednostni omrežni način: LTE/GSM/UMTS"</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="7886739962255042385">"LTE/WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"Samo GSM"</item>
     <item msgid="3817924849415716259">"Prednostno GSM/WCDMA"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Izboljšan način 4G LTE"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Uporaba storitev LTE za izboljšanje glas. in drugih komunikacij (priporočeno)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Podatki omogočeni"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Omogoči podatkovni dostop prek mobilnega omrežja"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Dovoli prenos podatkov"</string>
     <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="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="roaming_warning" msgid="1603164667540144353">"Stroški utegnejo biti veliki."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Želite dovoliti podatkovno gostovanje?"</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>
@@ -190,7 +221,7 @@
     <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"<xliff:g id="USED_0">%1$s</xliff:g> omejitev presežena\nPodatki omejeni na <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>٪ cikla potečenega\nNaslednje 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="throttle_help_subtext" msgid="3633091498168446044">"Več informacij o pravilniku o uporabi podatkov v mobilnem omrežju vašega operaterja"</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>
@@ -303,7 +334,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Nastavite podatkovni prenos"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Nastavitve operaterja"</string>
     <string name="fdn" msgid="7878832555095183202">"Zapore odhodnih klicev"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Številke za omejeno klicanje (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Seznam FDN"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"Seznam FDN (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Aktiviranje FDN"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Zapore odhodnih klicev so omogočene"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Zapore odhodnih klicev so onemogočene"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Nastavitev načina TTY"</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="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"Sprememba načina TTY ni dovoljena med videoklicem"</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>
@@ -344,7 +378,7 @@
     <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="1846161429087789936">"Če želite uvoziti stike s kartice SIM, najprej izklopite način za letalo."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Izklopite način za letalo, če želite uvoziti stike s kartice SIM."</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>
@@ -354,42 +388,40 @@
     <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="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="1796577128488773946">"Napačno geslo, koda PIN je blokirana. Vnesti morate kodo PUK."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"Brisanje kode PIN kartice SIM"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"Nastavljanje kode PIN kartice SIM"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"Nastavljanje kode PIN …"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"Koda PIN je nastavljena"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"Koda PIN je izbrisana"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"Koda PIN je napačna"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"Koda PIN je posodobljena"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Geslo je napačno. Koda PIN je blokirana. Zahtevana je koda PUK."</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="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="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="3674058967950559397">"Napačno geslo, koda PIN2 je blokirana. Spremenite kodo PIN2 in poskusite znova."</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"Nepravilno geslo, kartica SIM je zaklenjena. Vnesti morate kodo PUK2."</string>
+    <string name="badPuk2" msgid="7910064009531541708">"Koda PUK 2 je napačna. Poskusite znova."</string>
+    <string name="badPin2" msgid="6646896629970023109">"Stara koda PIN 2 je napačna. Poskusite znova."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"Koda PIN 2 se ne ujema. Poskusite znova."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Vnesite 4- do 8-mestno kodo PIN 2."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Vnesite 8-mestno kodo PUK 2."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"Koda PIN 2 je posodobljena"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Vnesite kodo PUK 2"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Geslo je napačno. Koda PIN 2 je blokirana. Če želite poskusiti znova, spremenite kodo PIN 2."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Geslo je napačno. Kartica SIM je zaklenjena. Vnesite kodo PUK 2."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"Koda PUK2 je trajno blokirana."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Poskusite lahko še <xliff:g id="NUMBER">%d</xliff:g>-krat."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"Koda PIN2 je odblokirana."</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"Imate še toliko poskusov: <xliff:g id="NUMBER">%d</xliff:g>."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"Koda PIN 2 ni več blokirana"</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="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_redialing" msgid="8253487008234167266">"Vnovično klicanje"</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_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>
     <string name="card_title_in_call" msgid="6346543933068225205">"Dohodni klic"</string>
-    <string name="card_title_my_phone_number" msgid="112428362494434191">"Moja številka je <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Klicanje"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Neodgovorjeni klic"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Neodgovorjeni klici"</string>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"Izklopite način za letalo, če želite opraviti klic."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Izklopite način za letalo ali se povežite v omrežje Wi-Fi, če želite opraviti klic."</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_error_out_of_service" msgid="4100065333878929223">"Mobilno omrežje ni na voljo."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Mobilno omrežje ni na voljo. Povežite se v omrežje Wi-Fi, če želite opraviti klic."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Če želite opraviti klic, vnesite veljavno številko."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Klicanje ni mogoče."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Začetek zaporedja MMI ..."</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>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Klica ni mogoče prenesti."</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Storitev ni podprta"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Preklop med klici ni mogoč."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Ločitev klica ni mogoča."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Prenos ni mogoč."</string>
     <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Konferenčni klici onemogočeni."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Klica ni mogoče zavrniti."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Klicev ni mogoče sprostiti."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Internetni klic"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Zavrnitev klica ni mogoča."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Prevzem klicev ni mogoč."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Povežite se v omrežje Wi-Fi, če želite opraviti klic."</string>
     <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="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="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Ni signala. Vnovičen poskus …"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Klicanje ni mogoče. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ni številka za klic v sili."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Klicanje ni mogoče. Opravite klic v sili."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Za klicanje uporabite tipkovnico"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Zadrži"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Konec"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"Navadno"</item>
     <item msgid="2883365539347850535">"Dolgo"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Sporočilo omrežja"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Sporočilo omrežja"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Sporočilo o napaki"</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\nPo pritisku »Aktiviranje« poslušajte navodila za aktiviranje telefona."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Aktiviranje ..."</string>
@@ -469,8 +504,8 @@
     <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_speaker" msgid="6904589278542719647">"Zvočnik"</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_progress" msgid="460876637828044519">"Programiranje telefona …"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Telefona ni bilo mogoče programirati"</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="8072141612635635357">"Telefon se ni aktiviral. \nMorda boste morali poiskati mesto z boljšo pokritostjo signala (v bližini okna ali zunaj). \n\nPoskusite 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>
@@ -481,18 +516,24 @@
     <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>
     <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Podatkovno povezovanje onemogočeno"</string>
-  <plurals name="phone_in_ecm_notification_time">
-    <item quantity="one" msgid="4866221796252472622">"Podatkovne povezave ni <xliff:g id="COUNT">%s</xliff:g> minut"</item>
-    <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="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="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>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="one">Podatkovne povezave ni <xliff:g id="COUNT_1">%s</xliff:g> minuto</item>
+      <item quantity="two">Podatkovne povezave ni <xliff:g id="COUNT_1">%s</xliff:g> minuti</item>
+      <item quantity="few">Podatkovne povezave ni <xliff:g id="COUNT_1">%s</xliff:g> minute</item>
+      <item quantity="other">Podatkovne povezave ni <xliff:g id="COUNT_1">%s</xliff:g> minut</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="one">Telefon bo v načinu povratnega klica v sili <xliff:g id="COUNT_1">%s</xliff:g> minuto. V tem načinu ni mogoče uporabljati aplikacij, ki uporabljajo podatkovno povezavo. Ali želite zapreti?</item>
+      <item quantity="two">Telefon bo v načinu povratnega klica v sili <xliff:g id="COUNT_1">%s</xliff:g> minuti. V tem načinu ni mogoče uporabljati aplikacij, ki uporabljajo podatkovno povezavo. Ali želite zapreti?</item>
+      <item quantity="few">Telefon bo v načinu povratnega klica v sili <xliff:g id="COUNT_1">%s</xliff:g> minute. V tem načinu ni mogoče uporabljati aplikacij, ki uporabljajo podatkovno povezavo. Ali želite zapreti?</item>
+      <item quantity="other">Telefon bo v načinu povratnega klica v sili <xliff:g id="COUNT_1">%s</xliff:g> minut. V tem načinu ni mogoče uporabljati aplikacij, ki uporabljajo podatkovno povezavo. Ali želite zapreti?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="one">Izbrano dejanje ni na voljo v načinu povratnega klica v sili. Telefon bo v tem načinu <xliff:g id="COUNT_1">%s</xliff:g> minuto. Ali želite zapreti?</item>
+      <item quantity="two">Izbrano dejanje ni na voljo v načinu povratnega klica v sili. Telefon bo v tem načinu <xliff:g id="COUNT_1">%s</xliff:g> minuti. Ali želite zapreti?</item>
+      <item quantity="few">Izbrano dejanje ni na voljo v načinu povratnega klica v sili. Telefon bo v tem načinu <xliff:g id="COUNT_1">%s</xliff:g> minute. Ali želite zapreti?</item>
+      <item quantity="other">Izbrano dejanje ni na voljo v načinu povratnega klica v sili. Telefon bo v tem načinu <xliff:g id="COUNT_1">%s</xliff:g> minut. Ali želite zapreti?</item>
+    </plurals>
     <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>
@@ -506,110 +547,23 @@
     <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_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_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="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="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="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="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_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="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="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>
-    <string name="username_title" msgid="2479375923477682328">"Uporabniško ime"</string>
-    <string name="password_title" msgid="3323555249068171531">"Geslo"</string>
-    <string name="display_name_title" msgid="2459768196312249937">"Prikazno ime"</string>
-    <string name="proxy_address_title" msgid="4828301345351614273">"Naslov strežnika proxy za odhodne klice"</string>
-    <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="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>
-    <string name="auth_username_title" msgid="851473016307947120">"Uporabniško ime za preverjanje pristnosti"</string>
-    <string name="auth_username_summary" msgid="6782012405225938629">"Uporabniško ime za preverjanje pristnosti"</string>
-    <string name="default_preference_summary" msgid="868766740121667450">"&lt;Ni nastavljeno&gt;"</string>
-    <string name="display_name_summary" msgid="8636377460518225523">"&lt;Enako kot uporabniško ime&gt;"</string>
-    <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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"Glasovno klicanje ni podprto"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Hitri odgovori"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"ena"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"dve"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"tri"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"štiri"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"pet"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"šest"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"sedem"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"osem"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"devet"</string>
-    <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_dial_button" msgid="7459705245418435351">"klicanje"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"vračalka"</string>
-    <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">"Vibriraj"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibriraj"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Zvok"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Privzeti zvok (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <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="dial_pad_autocomplete" msgid="494525952035761075">"Samodokončanje za tipkovnico"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Zvonjenje in vibriranje"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Želite klicati prek povezave Wi-Fi?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Da"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"Ne"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Vgrajene kartice SIM"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Vgrajeno internetno klicanje"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Vklop videoklicev"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Če želite vklopiti videoklicanje, morate v omrežnih nastavitvah omogočiti »Izboljšan način 4G LTE«."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Omrežne nastavitve"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Zapri"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Klici v sili"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Samo klicanje v sili"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"Kartica SIM, reža: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Funkcije za ljudi s posebnimi potrebami"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Dohodni klic Wi-Fi"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Klic Wi-Fi"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Dotaknite se znova, če želite odpreti"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"Napaka pri dekodiranju sporočila."</string>
 </resources>
diff --git a/res/values-sq-rAL/arrays.xml b/res/values-sq-rAL/arrays.xml
new file mode 100644
index 0000000..773739b
--- /dev/null
+++ b/res/values-sq-rAL/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Global"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
new file mode 100644
index 0000000..0492c93
--- /dev/null
+++ b/res/values-sr/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Глобално"</item>
+    <item msgid="6753774959494729275">"LTE/CDMA"</item>
+    <item msgid="8658695584186942227">"LTE/GSM/UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-sr/config.xml b/res/values-sr/config.xml
deleted file mode 100644
index bf10455..0000000
--- a/res/values-sr/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"нетачно"</string>
-</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 6661759..21fb465 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -16,14 +16,14 @@
 
 <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="tablet" msgid="1107073389495104784">"Подаци за мобилне уређаје"</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="payphone" msgid="4793877574636445118">"Телефонска говорница"</string>
     <string name="onHold" msgid="9035493194749959955">"На чекању"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Покренут је MMI кôд."</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD кôд је покренут…"</string>
@@ -52,18 +52,41 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Тражење откључавања мреже"</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Неуспешан захтев за закључавање мреже."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Успешно откључавање мреже"</string>
-    <string name="mobile_network_settings_not_available" msgid="7355254462995117896">"Подешавања мобилне мреже нису доступна за овог корисника"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Подешавања мобилне мреже нису доступна за овог корисника"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Подешавања GSM позива"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"Подешавања GSM позива (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA подешавања позива"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"Подешавања CDMA позива (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Називи приступних тачака"</string>
     <string name="settings_label" msgid="3876743539816984008">"Мрежна подешавања"</string>
-    <string name="connection_service" msgid="978745922583410219">"Услуга повезивања која ће се користити"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Налози за позивање"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Упућујте позиве помоћу"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Упућујте SIP позиве помоћу"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Прво питај"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Подешавања"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Изаберите налоге"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Налози на телефону"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Додај SIP налог"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Конфигурисање подешавања налога"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Позивање преко Wi-Fi-ја"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Не користи Wi-Fi позивање"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Не користи помоћника за позиве"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Ништа"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Помоћник за позиве"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Користи помоћника за позиве"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Изаберите помоћника за позиве"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Управљајте мрежама које се користе за позиве помоћу"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Омогућавање апликацијама или услугама да управљају мрежама које се користе за позиве"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Конфигуриши"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Уграђена услуга повезивања"</string>
     <string name="voicemail" msgid="8693759337917898954">"Говорна пошта"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Гласовна пошта (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
     <string name="networks" msgid="8873030692174541976">"Мрежни оператери"</string>
-    <string name="call_settings" msgid="1630474923393095156">"Подешавања позива"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Хитни преноси"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Подешавања позива"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Додатна подешавања"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Додатна подешавања (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
@@ -77,29 +100,32 @@
     <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="call_forwarding_settings_with_label" msgid="8569489414006897127">"Подешавања преусмеравања позива (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="sum_cfu_disabled" msgid="8384177689501334080">"Искључено"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Када је заузето"</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="sum_cfb_disabled" msgid="4913145177320506827">"Искључено"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Оператер не подржава онемогућавање преусмеравања позива када је телефон заузет."</string>
-    <string name="labelCFNRy" msgid="3646316323834351390">"Проследи када нема одговора"</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"Када се нисте јавили"</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="sum_cfnry_disabled" msgid="3884684060443538097">"Искључено"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Оператер не подржава онемогућавање преусмеравања позива када се на позив не одговори."</string>
-    <string name="labelCFNRc" msgid="47183615370850000">"Проследи када је недоступно"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"Када сте недоступни"</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="5646361343094064333">"Мобилни оператер не подржава онемогућавање преусмеравања позива када је телефон недоступан."</string>
     <string name="updating_title" msgid="6146755386174019046">"Подешавања позива"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"Само примарни корисник може да мења подешавања позива."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Подешавања позива (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Грешка у подешавањима позива"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Учитавање подешавања…"</string>
     <string name="updating_settings" msgid="8171225533884883252">"Ажурирање подешавања…"</string>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"Укључи"</string>
+    <string name="disable" msgid="4678348128118573672">"Искључи"</string>
     <string name="change_num" msgid="239476305819844391">"Ажурирај"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Подразумевано за мрежу"</item>
@@ -123,8 +149,8 @@
     <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="voicemail_default" msgid="2001233554889016880">"Мобилни оператер"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Подешавања мобилне мреже"</string>
     <string name="label_available" msgid="1181658289009300430">"Доступне мреже"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Претражује се…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Нису пронађене мреже."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Жељени режим мреже: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Жељени режим мреже: Глобално"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Жељени режим мреже: LTE/WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Жељени мрежни режим: LTE/GSM/UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Жељени режим мреже: LTE/CDMA"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="7886739962255042385">"LTE/WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"Само GSM"</item>
     <item msgid="3817924849415716259">"GSM/WCDMA има предност"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Побољшани 4G LTE режим"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Коришћење LTE услуга за побољшање гласовних и других комуникација (препоручено)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Подаци су омогућени"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Омогућава приступ подацима преко мобилне мреже"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Омогућавање потрошње података"</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="8913735676127858115">"Веза за пренос података је прекинута зато што сте напустили кућну мрежу са искљученим преносом података у ромингу."</string>
-    <string name="roaming_warning" msgid="7820963598559553967">"Желите ли да дозволите пренос података у ромингу? Могу да настану велики трошкови роминга!"</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"Могу да настану значајни трошкови."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Желите ли да дозволите пренос података у ромингу?"</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>
@@ -190,7 +221,7 @@
     <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="throttle_help_subtext" msgid="3633091498168446044">"Више информација о смерницама за коришћење података мобилне мреже оператера"</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>
@@ -303,7 +334,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Подесите усл. преноса података"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Подешавања оператера"</string>
     <string name="fdn" msgid="7878832555095183202">"Фиксни бирани бројеви"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Бројеви за фиксно бирање (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Листа бројева за фиксно бирање"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"Листа бројева за фиксно бирање (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FDN активација"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Омогућени су фиксни бирани бројеви"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Онемогућени су фиксни бирани бројеви"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Подеси TTY режим"</string>
     <string name="auto_retry_mode_title" msgid="4073265511427813322">"Аутоматски поновни покушај"</string>
     <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Омогућавање режима аутоматског поновног покушаја"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"Промена TTY режима није дозвољена током видео позива"</string>
     <string name="menu_add" msgid="1882023737425114762">"Додај контакт"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Измени контакт"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Избриши контакт"</string>
@@ -344,7 +378,7 @@
     <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="1846161429087789936">"Да бисте увезли контакте са SIM картице, прво искључите Режим рада у авиону."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Искључите режим рада у авиону да бисте увезли контакте са 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>
@@ -354,42 +388,40 @@
     <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="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="1796577128488773946">"Лозинка је нетачна. PIN је блокиран! Потребан је PUK."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"Брисање PIN-а за SIM"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"Подешавање PIN-а за SIM"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"PIN се подешава…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN је подешен"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN је обрисан"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN није тачан"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN је ажуриран"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Лозинка није тачна. PIN је сада блокиран. Потребан је PUK."</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="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="1639666438836544393">"PIN2 кôд је промењен."</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"Унесите PUK2 кôд"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Лозинка је нетачна. PIN2 је блокиран. Промените PIN2 и покушајте поново!"</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"Лозинка је нетачна, SIM картица је закључана. Потребан је PUK2 кôд."</string>
+    <string name="badPuk2" msgid="7910064009531541708">"PUK2 није тачан. Покушајте поново."</string>
+    <string name="badPin2" msgid="6646896629970023109">"Стари PIN2 није тачан. Покушајте поново."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2 кодови се не подударају. Покушајте поново."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Унесите PIN2 који садржи 4 до 8 цифара."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Унесите PUK2 који садржи 8 цифара."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 је ажуриран"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Унесите кôд PUK2"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Лозинка није тачна. PIN2 је сада блокиран. Да бисте покушали поново, промените PIN 2."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Лозинка није тачна. SIM је сада блокиран. Унесите PUK2."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 је трајно блокиран."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Имате још <xliff:g id="NUMBER">%d</xliff:g> покушаја."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 је деблокиран!"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"Имате још <xliff:g id="NUMBER">%d</xliff:g> покушаја."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 више није блокиран"</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_redialing" msgid="8253487008234167266">"Поновно бирање"</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_dialing" msgid="2107666444937350731">"Бирање"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Пропуштен позив"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Пропуштени позиви"</string>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"Искључите режим рада у авиону да бисте упутили позив."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Искључите режим рада у авиону или се повежите на бежичну мрежу да бисте упутили позив."</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_error_out_of_service" msgid="4100065333878929223">"Мобилна мрежа није доступна."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Мобилна мрежа није доступна. Повежите се на бежичну мрежу да бисте упутили позив."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Да бисте упутили позив, унесите важећи број."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Позив није успео."</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_unknown" msgid="655570339115407698">"Услуга није подржана"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Замена позива није успела."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Раздвајање позива није успело."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Пребацивање није успело."</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="incall_error_supp_service_reject" msgid="8998568661508655638">"Одбијање позива није успело."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Успостављање позива није успело."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Повежите се на бежичну мрежу да бисте упутили позив."</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="7969515493359619960">"Позив није послат. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> није број за хитне случајеве!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Позив није послат. Позовите број за хитне случајеве!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Нема мреже. Поновни покушај…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Позив није успео. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> није број за хитне случајеве."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Позив није успео. Позовите број за хитне случајеве."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Користите тастатуру за позивање"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Чекање"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Заврши"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"Нормалан"</item>
     <item msgid="2883365539347850535">"Дугачак"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Мрежна порука"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Мрежна порука"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Порука о грешци"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Активирајте телефон"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Потребно је да упутите посебан позив да бисте активирали услугу свој телефона. \n\nНакон што притиснете дугме „Активирај“, слушајте дата упутства да бисте да бисте активирали свој телефон."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Активирање..."</string>
@@ -469,8 +504,8 @@
     <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="3420314892609254729">"Сачекајте док се телефон програмира."</string>
-    <string name="ota_failure" msgid="4311299546379674378">"Програмирање је неуспешно"</string>
+    <string name="ota_progress" msgid="460876637828044519">"Телефон се програмира…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Програмирање телефона није успело"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Телефон је сада активиран. Можда ће бити потребно највише 15 минута да би се услуга покренула."</string>
     <string name="ota_unsuccessful" msgid="8072141612635635357">"Телефон се није активирао. \nМожда је потребно да пронађете област са бољом покривеношћу (близу прозора или напољу). \n\nПокушајте поново или позовите корисничку подршку за још опција."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"СЛУЧАЈНА SPC ГРЕШКА"</string>
@@ -481,18 +516,21 @@
     <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="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="2585506997024726599">"Изабрана радња није доступна док сте у Режиму хитног повратног позива. Телефон ће бити у овом режиму <xliff:g id="COUNT">%s</xliff:g> минут. Да ли желите сада да изађете?"</item>
-    <item quantity="other" msgid="6115622137771382224">"Изабрана радња није доступна док сте у Режиму хитног повратног позива. Телефон ће бити у овом режиму <xliff:g id="COUNT">%s</xliff:g> минутa. Да ли желите сада да изађете?"</item>
-  </plurals>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="one">Нема везе за пренос података <xliff:g id="COUNT_1">%s</xliff:g> минута</item>
+      <item quantity="few">Нема везе за пренос података <xliff:g id="COUNT_1">%s</xliff:g> минута</item>
+      <item quantity="other">Нема везе за пренос података <xliff:g id="COUNT_1">%s</xliff:g> минута</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="one">Телефон ће бити у Режиму хитног повратног позива <xliff:g id="COUNT_1">%s</xliff:g> минут. Док је у овом режиму не можете да користите апликације које користе везу за пренос података. Желите ли одмах да изађете из овог режима?</item>
+      <item quantity="few">Телефон ће бити у Режиму хитног повратног позива <xliff:g id="COUNT_1">%s</xliff:g> минута. Док је у овом режиму не можете да користите апликације које користе везу за пренос података. Желите ли одмах да изађете из овог режима?</item>
+      <item quantity="other">Телефон ће бити у Режиму хитног повратног позива <xliff:g id="COUNT_1">%s</xliff:g> минута. Док је у овом режиму не можете да користите апликације које користе везу за пренос података. Желите ли одмах да изађете из овог режима?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="one">Изабрана радња није доступна док сте у Режиму хитног повратног позива. Телефон ће бити у овом режиму <xliff:g id="COUNT_1">%s</xliff:g> минут. Желите ли одмах да изађете из овог режима?</item>
+      <item quantity="few">Изабрана радња није доступна док сте у Режиму хитног повратног позива. Телефон ће бити у овом режиму <xliff:g id="COUNT_1">%s</xliff:g> минута. Желите ли одмах да изађете из овог режима?</item>
+      <item quantity="other">Изабрана радња није доступна док сте у Режиму хитног повратног позива. Телефон ће бити у овом режиму <xliff:g id="COUNT_1">%s</xliff:g> минута. Желите ли одмах да изађете из овог режима?</item>
+    </plurals>
     <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>
@@ -506,110 +544,23 @@
     <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="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="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="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_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="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="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>
-    <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">"Пошаљи keep-alive поруку"</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">"&lt;Није подешено&gt;"</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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"Аудио позиви нису подржани"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Брзи одговори"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></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">"тастер за брисање"</string>
-    <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_ringtone_title" msgid="2609519527849101590">"Звук"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Подразумевани звук (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</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="dial_pad_autocomplete" msgid="494525952035761075">"Аутом. довршавање нумеричке тастатуре"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Мелодија звона и вибрација"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Желите ли да упутите Wi-Fi позив?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Да"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"Не"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Уграђене SIM картице"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Уграђено позивање преко интернета"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Укључи видео позиве"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Да бисте укључили видео позиве, треба да омогућите Побољшани 4G LTE режим у подешавањима мреже."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Подешавања мреже"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Затвори"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Хитни позиви"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Само за хитне позиве"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM картица, отвор: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Приступачност"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Долазни Wi-Fi позив"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi позив"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Додирните поново да бисте отворили"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"Дошло је до грешке при декодирању поруке."</string>
 </resources>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
new file mode 100644
index 0000000..b8c69ca
--- /dev/null
+++ b/res/values-sv/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Globalt"</item>
+    <item msgid="6753774959494729275">"LTE/CDMA"</item>
+    <item msgid="8658695584186942227">"LTE/GSM/UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-sv/config.xml b/res/values-sv/config.xml
deleted file mode 100644
index 0605cd7..0000000
--- a/res/values-sv/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"false"</string>
-</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 1f06fba..fa459f6 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -16,14 +16,14 @@
 
 <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">"Mobildata"</string>
+    <string name="phoneAppLabel" product="tablet" msgid="1107073389495104784">"Mobildata"</string>
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Telefon"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Nödsamtal"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Telefon"</string>
     <string name="fdnListLabel" msgid="8630418672279521003">"FDN-lista"</string>
     <string name="unknown" msgid="6878797917991465859">"Okänd"</string>
     <string name="private_num" msgid="6713286113000232309">"Privat nummer"</string>
-    <string name="payphone" msgid="1931775086311769314">"Telefonautomat"</string>
+    <string name="payphone" msgid="4793877574636445118">"Telefonautomat"</string>
     <string name="onHold" msgid="9035493194749959955">"Parkerat"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI-kod körs"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD-kod körs…"</string>
@@ -52,18 +52,41 @@
     <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="mobile_network_settings_not_available" msgid="7355254462995117896">"Inställningarna för mobilnätverk är inte tillgängliga för den här användaren"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Inställningarna för mobilnätverk är inte tillgängliga för den här användaren"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Samtalsinst. för GSM"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"Samtalsinställningar för GSM (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Samtalsinst. för CDMA"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"Samtalsinställningar för CDMA (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Åtkomstpunktens namn (APN)"</string>
     <string name="settings_label" msgid="3876743539816984008">"Nätverksinställningar"</string>
-    <string name="connection_service" msgid="978745922583410219">"Anslutningstjänst som ska användas"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Konton för samtal"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Ring med"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Ring SIP-samtal med"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Fråga först"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Inställningar"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Välj konton"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Konton på mobilen"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Lägg till SIP-konto"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Konfigurera kontoinställningar"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi-samtal"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Använd inte Wi-Fi-samtal"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Använd inte samtalsassistent"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Ingen"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Samtalsassistent"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Använd samtalsassistent"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Välj samtalsassistent"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Hantera nätverk som används för samtal med"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Tillåt att appar eller tjänster hanterar nätverken som används för samtal"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Konfigurera"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Inbyggd anslutningstjänst"</string>
     <string name="voicemail" msgid="8693759337917898954">"Röstbrevlåda"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Röstbrevlåda (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"RB:"</string>
     <string name="networks" msgid="8873030692174541976">"Nätverksoperatörer"</string>
-    <string name="call_settings" msgid="1630474923393095156">"Samtalsinställningar"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Nödsändningar"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Samtalsinställningar"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Ytterligare inställningar"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Ytterligare inställningar (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Ytterligare samtalsinställningar för endast GSM"</string>
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Övriga CDMA-samtalsinställningar"</string>
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Ytterligare samtalsinställningar för endast CDMA"</string>
@@ -77,29 +100,32 @@
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Meddela mig om inkommande samtal under samtal"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Meddela mig om inkommande samtal under samtal"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Inställningar för Vidarebefordra samtal"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Inställningar för vidarebefordran av samtal (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Vidarebefordra samtal"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Vidarebefordra alltid"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Använd alltid detta nummer"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Vidarebefordra alla samtal"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Vidarebefordrar alla samtal till <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Numret är inte tillgängligt"</string>
-    <string name="sum_cfu_disabled" msgid="3698472522160364904">"Inaktiverat"</string>
-    <string name="labelCFB" msgid="218938523102207587">"Vidarebefordra vid upptaget"</string>
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Av"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"När det är upptaget"</string>
     <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="sum_cfb_disabled" msgid="4913145177320506827">"Av"</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="labelCFNRy" msgid="1736067178393744351">"När jag inte svarar"</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="sum_cfnry_disabled" msgid="3884684060443538097">"Av"</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="labelCFNRc" msgid="2614827454402079766">"När jag inte kan nås"</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="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="call_settings_primary_user_only" msgid="5679923943740900965">"Det är bara den primära användaren som kan ändra samtalsinställningar."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Samtalsinställningar (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Felaktiga samtalsinställningar"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Läser inställningar…"</string>
     <string name="updating_settings" msgid="8171225533884883252">"Uppdaterar inställningar…"</string>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"Aktivera"</string>
+    <string name="disable" msgid="4678348128118573672">"Inaktivera"</string>
     <string name="change_num" msgid="239476305819844391">"Uppdatera"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Standardinställning för nätverk"</item>
@@ -123,8 +149,8 @@
     <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.\nVill 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>
-    <string name="voicemail_default" msgid="5902099213882352338">"Min operatör"</string>
-    <string name="mobile_networks" msgid="5540397602919106177">"Mobila nätverksinställningar"</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"Din operatör"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Inställningar för mobilnätverk"</string>
     <string name="label_available" msgid="1181658289009300430">"Tillgängliga nätverk"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Söker…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Hittade inga nätverk."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Föredraget nätverksläge: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Föredraget nätverksläge: globlat"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Föredraget nätverksläge: LTE/WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Föredraget nätverksläge: LTE/GSM/UMTS"</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="7886739962255042385">"LTE/WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"Endast GSM"</item>
     <item msgid="3817924849415716259">"Föredrar GSM/WCDMA"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Förbättrat 4G LTE-läge"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Använd LTE-tjänster för att förbättra bl.a. röstkommunikation (rekommenderas)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Data är aktiverat"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Aktivera dataåtkomst via mobilt nätverk"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Tillåt dataanvändning"</string>
     <string name="roaming" msgid="8871412572928323707">"Dataroaming"</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="8913735676127858115">"Du förlorade dataanslutningen eftersom du lämnade ditt hemnätverk utan att aktivera dataroaming."</string>
-    <string name="roaming_warning" msgid="7820963598559553967">"Tillåta dataroaming? Observera att detta kan leda till höga kostnader!"</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"Detta kan leda till höga kostnader."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Vill du tillåta dataroaming?"</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>
@@ -196,7 +227,7 @@
     <!-- no translation found for throttle_time_frame_subtext (7732763021560399960) -->
     <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="throttle_help_subtext" msgid="3633091498168446044">"Mer information om operatörens dataanvändningspolicy för mobilnätverket"</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>
@@ -309,7 +340,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Ställ in datatjänst"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Operatörsinställningar"</string>
     <string name="fdn" msgid="7878832555095183202">"Fasta nummer"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Fasta nummer (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FDN-lista"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"FDN-lista (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FDN-aktivering"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Fasta nummer är aktiverade"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Fasta nummer är inaktiverade"</string>
@@ -327,6 +360,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Ange TTY-läge"</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="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"Det går inte att ändra till texttelefonläge under ett videosamtal"</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>
@@ -350,7 +384,7 @@
     <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="1846161429087789936">"Om du vill importera kontakter från SIM-kortet måste du inaktivera flygplansläget."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Inaktivera flygplansläget om du vill importera kontakter från SIM-kortet."</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>
@@ -360,42 +394,40 @@
     <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="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="1796577128488773946">"Felaktigt lösenord, pinkoden har blockerats. PUK-kod krävs."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"Ta bort SIM-kortets pinkod"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"Aktivera pinkod för SIM-kortet"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"Aktiverar pinkod …"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"Pinkoden har aktiverats"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"Pinkoden har tagits bort"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"Pinkoden är felaktig"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"Pinkoden har uppdaterats"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Felaktigt lösenord. Pinkoden har blockerats. PUK-kod 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="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="1639666438836544393">"PIN2 har ändrats."</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"Ange PUK2-kod"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Lösenordet är felaktigt. Pinkod 2 har blockerats. Ange en annan pinkod 2 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="badPuk2" msgid="7910064009531541708">"Felaktig PUK2. Försök igen."</string>
+    <string name="badPin2" msgid="6646896629970023109">"Den gamla PIN2 är felaktig. Försök igen."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"Du har angett olika PIN2. Försök igen."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Ange en PIN2 som består av 4–8 siffror."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Ange en PUK2 som består av 8 siffror."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 har uppdaterats"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Ange PUK2"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Fel lösenord. PIN2 har nu blockerats. Ändra PIN2 och försök igen."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Felaktigt lösenord. SIM-kortet är nu låst. Ange PUK2."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK-kod 2 har blockerats permanent."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Du har <xliff:g id="NUMBER">%d</xliff:g> försök kvar."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"Pinkod 2 har återaktiverats."</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"Du har <xliff:g id="NUMBER">%d</xliff:g> försök kvar."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 är inte längre blockerad"</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="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_redialing" msgid="8253487008234167266">"Ringer upp 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_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>
     <string name="card_title_in_call" msgid="6346543933068225205">"I samtal"</string>
-    <string name="card_title_my_phone_number" msgid="112428362494434191">"Mitt nummer är <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Ringer"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Missat samtal"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Missade samtal"</string>
@@ -404,8 +436,8 @@
     <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>
-    <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Ny röstbrevlåda (<xliff:g id="COUNT">%d</xliff:g>)"</string>
+    <string name="notification_voicemail_title" msgid="8933468752045550523">"Nytt röstmeddelande"</string>
+    <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Nytt röstmeddelande (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Ring <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <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>
@@ -413,25 +445,27 @@
     <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_power_off" msgid="2947938060513306698">"Inaktivera flygplansläget om du vill ringa."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Inaktivera flygplansläget eller anslut till ett trådlöst nätverk om du vill ringa."</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_error_out_of_service" msgid="4100065333878929223">"Det finns inget mobilnät tillgängligt."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Det finns inga tillgängliga mobilnätverk. Anslut till ett trådlöst nätverk om du vill ringa."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Ange ett giltigt nummer om du vill ringa ett samtal."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Det gick inte att ringa."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Startar sekvens för MMI-kod…"</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>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Det gick inte överföra samtal."</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Tjänsten stöds inte"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Det gick inte att växla mellan samtal."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Det gick inte att koppla isär samtalen."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Det gick inte att överföra."</string>
     <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Det gick inte att ringa konferenssamtal."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Det gick inte att avvisa samtal."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Det gick inte att släppa samtal."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Internetsamtal"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Det gick inte att avvisa samtalet."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Det gick inte att släppa samtal."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Anslut till ett trådlöst nätverk om du vill ringa."</string>
     <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="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="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Ingen tjänst. Försök igen …"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Det gick inte att ringa. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> är inget nödnummer."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Det gick inte att ringa. Slå ett nödnummer."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Använd tangentbordet om du vill ringa"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Parkera"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Avsluta"</string>
@@ -462,7 +496,8 @@
     <item msgid="899650777817315681">"Normal"</item>
     <item msgid="2883365539347850535">"Lång"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Nätverksmeddelande"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Nätverksmeddelande"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Felmeddelande"</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_hfa_activation_title" msgid="2234246934160473981">"Aktiveras ..."</string>
@@ -475,8 +510,8 @@
     <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_speaker" msgid="6904589278542719647">"Högtalare"</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_progress" msgid="460876637828044519">"Mobilen programmeras …"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Det gick inte att programmera mobilen"</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="8072141612635635357">"Telefonen har inte aktiverats. \nDu kanske måste hitta en plats med bättre täckning (nära ett fönster eller utomhus). \n\nFö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>
@@ -487,18 +522,18 @@
     <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>
     <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Dataanslutning inaktiverad"</string>
-  <plurals name="phone_in_ecm_notification_time">
-    <item quantity="one" msgid="4866221796252472622">"Inga dataanslutningar på <xliff:g id="COUNT">%s</xliff:g> minut"</item>
-    <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="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="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>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other">Ingen dataanslutning i <xliff:g id="COUNT_1">%s</xliff:g> minuter</item>
+      <item quantity="one">Ingen dataanslutning i <xliff:g id="COUNT_0">%s</xliff:g> minut</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other">Mobilen försätts i nödsamtalsläge i <xliff:g id="COUNT_1">%s</xliff:g> minuter. I det här läget går det inte att använda några appar där en dataanslutning används. Vill du avsluta nu?</item>
+      <item quantity="one">Mobilen försätts i nödsamtalsläge i <xliff:g id="COUNT_0">%s</xliff:g> minut. I det här läget går det inte att använda några appar där en dataanslutning används. Vill du avsluta nu?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other">Den valda åtgärden är inte tillgänglig i nödsamtalsläget. Mobilen försätts i det här läget i <xliff:g id="COUNT_1">%s</xliff:g> minuter. Vill du avsluta nu?</item>
+      <item quantity="one">Den valda åtgärden är inte tillgänglig i nödsamtalsläget. Mobilen försätts i det här läget i <xliff:g id="COUNT_0">%s</xliff:g> minut. Vill du avsluta nu?</item>
+    </plurals>
     <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>
@@ -512,110 +547,23 @@
     <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_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_title" msgid="27433718808839672">"Använd Internetsamtal"</string>
-    <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Använd Internetsamtal (endast Wi-Fi)"</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="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="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="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="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_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="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="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>
-    <string name="username_title" msgid="2479375923477682328">"Användarnamn"</string>
-    <string name="password_title" msgid="3323555249068171531">"Lösenord"</string>
-    <string name="display_name_title" msgid="2459768196312249937">"Visningsnamn"</string>
-    <string name="proxy_address_title" msgid="4828301345351614273">"Utgående proxyadress"</string>
-    <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="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>
-    <string name="auth_username_title" msgid="851473016307947120">"Användarnamn vid autentisering"</string>
-    <string name="auth_username_summary" msgid="6782012405225938629">"Användarnamn som används vid autentisering"</string>
-    <string name="default_preference_summary" msgid="868766740121667450">"&lt;Har inte angetts&gt;"</string>
-    <string name="display_name_summary" msgid="8636377460518225523">"&lt;Samma som användarnamn&gt;"</string>
-    <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="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 Wi-Fi-anslutning"</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>
     <string name="not_voice_capable" msgid="2739898841461577811">"Röstsamtal stöds inte"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Snabbsvar"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"ett"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"två"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"tre"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"fyra"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"fem"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"sex"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"sju"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"åtta"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"nio"</string>
-    <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_dial_button" msgid="7459705245418435351">"ring upp"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"backsteg"</string>
-    <string name="description_target_answer" msgid="7205604197797472471">"Svara"</string>
-    <string name="description_target_send_sms" msgid="2098326025587950144">"Skicka SMS"</string>
-    <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="2609519527849101590">"Ljud"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Standardsignal (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <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="dial_pad_autocomplete" msgid="494525952035761075">"Föreslå nummer vid inmatning"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Ringsignal och vibrera"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Vill du ringa samtal via Wi-Fi?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Ja"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"Nej"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Inbyggda SIM-kort"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Inbyggd internettelefoni"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Aktivera videosamtal"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Om du vill aktivera videosamtal måste du först aktivera alternativet Förbättrat 4G LTE-läge i nätverksinställningarna."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Nätverksinställningar"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Stäng"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Nödsamtal"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Endast nödsamtal"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM-kortsplats: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Tillgänglighet"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Inkommande Wi-Fi-samtal"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi-samtal"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Tryck igen för att öppna"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"Ett fel inträffade när meddelandet avkodades."</string>
 </resources>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
new file mode 100644
index 0000000..5c357bc
--- /dev/null
+++ b/res/values-sw/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Ulimwenguni Kote"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-sw/config.xml b/res/values-sw/config.xml
deleted file mode 100644
index 08a3d1d..0000000
--- a/res/values-sw/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"uongo"</string>
-</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 76f2561..8cbbcb9 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -16,14 +16,14 @@
 
 <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">"Data ya Simu"</string>
+    <string name="phoneAppLabel" product="tablet" msgid="1107073389495104784">"Data ya Simu za Mkononi"</string>
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Simu"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Kipigaji cha Dhararu"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Simu"</string>
     <string name="fdnListLabel" msgid="8630418672279521003">"Orodha ya FDN"</string>
     <string name="unknown" msgid="6878797917991465859">"Haijulikani"</string>
     <string name="private_num" msgid="6713286113000232309">" Number isiyojulikana"</string>
-    <string name="payphone" msgid="1931775086311769314">"Simu ya kulipia"</string>
+    <string name="payphone" msgid="4793877574636445118">"Simu ya kulipia"</string>
     <string name="onHold" msgid="9035493194749959955">"Inangoja"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Msimbo wa MMI  umeanza"</string>
     <string name="ussdRunning" msgid="485588686340541690">"Msimbo wa USSD unafungua"</string>
@@ -48,22 +48,45 @@
     <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>
-    <string name="sim_ndp_dismiss_text" msgid="1604823375752456947">"Kataa"</string>
+    <string name="sim_ndp_dismiss_text" msgid="1604823375752456947">"Ondoa"</string>
     <string name="requesting_unlock" msgid="6412629401033249351">"Inaomba mtandao ufunguliwe…."</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="mobile_network_settings_not_available" msgid="7355254462995117896">"Mipangilio ya mtandao wa simu za mkononi haipatikani kwa mtumiaji huyu"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Mipangilio ya mitandao ya simu za mkononi haipatikani kwa mtumiaji huyu"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Mipangilio ya simu ya GSM"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"Mipangilio ya simu ya GSM (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Mipangilio ya simu ya CDMA"</string>
-    <string name="apn_settings" msgid="9043423184895642077">"Majina ya Milango ya Kufikia"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"Mipangilio ya simu ya CDMA (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="apn_settings" msgid="9043423184895642077">"Majina ya Lango la Mtandao"</string>
     <string name="settings_label" msgid="3876743539816984008">"Mipangilio ya mtandao"</string>
-    <string name="connection_service" msgid="978745922583410219">"Huduma ya muunganisho wa kutumia"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Akaunti za simu"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Piga simu kutumia"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Piga simu za SIP kwa"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Uliza kwanza"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Mipangilio"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Chagua akaunti"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Akaunti za simu"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Ongeza akaunti ya SIP"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Sanidi mipangilio ya akaunti"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Upigaji simu kwa Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Usitumie upigaji simu kwa Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Usitumie kisaidizi cha simu"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Kisitumike"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Kisaidizi cha simu"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Tumia kisaidizi cha simu"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Chagua kisaidizi cha simu"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Dhibiti mitandao inayotumika kwa kupiga simu kwa"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Ruhusu programu au huduma zisimamie mitandao inayotumika kupiga simu"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Sanidi"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Huduma ya muunganisho iliyojengewa ndani"</string>
     <string name="voicemail" msgid="8693759337917898954">"Barua ya sauti"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Ujumbe wa sauti (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
     <string name="networks" msgid="8873030692174541976">"Kampuni zinazotoa huduma"</string>
-    <string name="call_settings" msgid="1630474923393095156">"Mipangilio ya Simu"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Matangazo ya dharura"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Mipangilio ya simu"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Mipangilio ya ziada"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Mipangilio ya ziada (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Mipangilio ya ziada ya simu ya GSM tu"</string>
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Mipangilio ya ziada ya simu ya CDMA"</string>
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Mipangilio ya ziada ya simu ya CDMA tu"</string>
@@ -77,29 +100,32 @@
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Wakati wa simu, niarifu juu ya simu zinazoingia"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Wakati wa simu, niarifu kuhusu simu zinazoingia"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Mipangilio ya kusambaza simu"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Mipangilio ya kusambaza simu (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Kusambaza simu"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Sambaza kila wakati"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Kila wakati tumia nambari hii"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Inasambaza  simu zote"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Inasambaza simu zote kwa <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Nambari haipatikani"</string>
-    <string name="sum_cfu_disabled" msgid="3698472522160364904">"Imelemazwa"</string>
-    <string name="labelCFB" msgid="218938523102207587">"Sambaza wakati unashughulika"</string>
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Umezimwa"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Wakati nina shughuli"</string>
     <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="sum_cfb_disabled" msgid="4913145177320506827">"Umezimwa"</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="labelCFNRy" msgid="1736067178393744351">"Nisipojibu"</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="sum_cfnry_disabled" msgid="3884684060443538097">"Umezimwa"</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="labelCFNRc" msgid="2614827454402079766">"Ikiwa sipatikani"</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="sum_cfnrc_disabled" msgid="7222141261321276464">"Kimezimwa"</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="call_settings_primary_user_only" msgid="5679923943740900965">"Mipangilio ya simu inaweza kubadilishwa na mtumiaji wa msingi pekee."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Mipangilio ya simu (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Hitlafu ya mipangilio ya kupiga simu"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Inasoma mipangilio…."</string>
     <string name="updating_settings" msgid="8171225533884883252">"Inaboresha mipangilio…"</string>
@@ -109,8 +135,8 @@
     <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">"Washa"</string>
-    <string name="disable" msgid="7274240979164762320">"Zima"</string>
+    <string name="enable" msgid="7248657275000173526">"Washa"</string>
+    <string name="disable" msgid="4678348128118573672">"Zima"</string>
     <string name="change_num" msgid="239476305819844391">"Sasisha"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Chaguo-msingi la mtandao"</item>
@@ -123,8 +149,8 @@
     <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>
-    <string name="voicemail_default" msgid="5902099213882352338">"Mtoa huduma wangu"</string>
-    <string name="mobile_networks" msgid="5540397602919106177">"Mipangilio ya mtandao wa simu"</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"Mtoa huduma wako"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Mipangilio ya mitandao ya simu za mkononi"</string>
     <string name="label_available" msgid="1181658289009300430">"Mitandao inayopatikana"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Inatafuta…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Hakuna mitandao iliyopatikana."</string>
@@ -139,9 +165,9 @@
     <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="2336624679902659306">"Aina ya mtandao unaopendekezwa"</string>
+    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Aina ya mtandao unaopendelewa"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Badilisha gumzo ya utendaji wa mtandao"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Aina ya mtandao unaopendekezwa"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Aina ya mtandao unaopendelewa"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Modi pendekezwa ya mtandao: WCDMA pendekezwa"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Modi pendekezwa ya mtandao: GSM  pekee"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Modi pendekezwa ya mtandao: WCDMA pekee"</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Hali ya mtandao inayopendelewa: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Hali ya mtandao inayopendelewa: Ulimwenguni Kote"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Hali ya mtandao inayopendelewa: LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Hali ya mtandao inayopendelewa: LTE / GSM / UMTS"</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="7886739962255042385">"LTE / WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"GSM pekee"</item>
     <item msgid="3817924849415716259">"GSM/WCDMA inapendelewa"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Hali Iliyoimarishwa ya 4G LTE"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Tumia huduma za LTE ili uboreshe sauti na mawasiliano mengine (inapendekezwa)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Data imewashwa"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Wezesha data ifikiwe kupitia mtandao wa Simu"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Ruhusu matumizi ya data"</string>
     <string name="roaming" msgid="8871412572928323707">"Utumiaji data nje ya mtandao wako wa kawaida"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Unganisha huduma ya data wakati niko nje ya mtandao wangu wa kawaida"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Unganisha huduma ya data wakati niko nje ya mtandao wangu wa kawaida"</string>
     <string name="roaming_reenable_message" msgid="8913735676127858115">"Umepoteza muunganisho wa data kwa sababu uliondoka kwenye mtandao wako wa kawaida ukiwa umezima utumiaji data nje ya mtandao wa kawaida."</string>
-    <string name="roaming_warning" msgid="7820963598559553967">"Ungependa kuruhusu matumizi ya data nje ya mtandao wako wa kawaida? Huenda ukatozwa ada iliyo juu!"</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"Unaweza kutozwa gharama kubwa."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Je, ungependa kuruhusu matumizi ya intaneti ukiwa nje ya mtandao wako wa kawaida?"</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>
@@ -190,7 +221,7 @@
     <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"Upeo wa <xliff:g id="USED_0">%1$s</xliff:g> umepitwa\nKasi ya data imepunguzwa hadi kilobaiti <xliff:g id="USED_1">%2$d</xliff:g> kwa sekunde"</string>
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"<xliff:g id="USED_0">%1$d</xliff:g>٪ ya mzunguko imekamilika\nMuda 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="throttle_help_subtext" msgid="3633091498168446044">"Maelezo zaidi kuhusu sera ya matumizi ya data ya mtandao wa simu za mkononi ya mtoa huduma wako"</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>
@@ -303,7 +334,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Sanidi huduma ya data"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Mipangilio ya mtoa huduma"</string>
     <string name="fdn" msgid="7878832555095183202">"Nambari za kupiga zisizobadilishwa"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Nambari za Kupiga Simu Zisizobadilika (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Orodha ya FDN"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"Orodha ya Nambari za Kupiga Simu Zisizobadilika (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Uwezeshaji wa FDN"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Nambari za upigaji simu zilizobanwa zimelemazwa"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Nambari za upigaji simu zilizobanwa zimelemazwa"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Weka hali ya TTY"</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="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"Kubadilisha Hali ya TTY hakuruhusiwi wakati wa hangout ya video"</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>
@@ -344,7 +378,7 @@
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Inasoma kutoka kwa SIM kadi…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Hakuna anwani kwenye SIM kadi yako."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Chagua anwani za kuingiza"</string>
-    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"Ili kuleta anwani kutoka kwa SIM kadi, kwanza zima hali ya Ndege."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Zima hali ya ndegeni ili uingize anwani kutoka kadi ya SIM"</string>
     <string name="enable_pin" msgid="5422767284133234860">"Wezesha/zima 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>
@@ -354,42 +388,40 @@
     <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="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="1796577128488773946">"Nenosiri lisilo sahihi, PIN Imezuiwa! PUK imeombwa."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"Ondoa PIN ya SIM"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"Weka PIN ya SIM"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"Inaweka PIN…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN imewekwa"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN imeondolewa"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN si sahihi"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN imesasishwa"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Nenosiri si sahihi. PIN sasa imezuiwa. PUK 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="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="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="3674058967950559397">"Nenosiri lisilo sahihi, PIN2 Imezuiwa. Tafadhali badilisha PIN2 na ujaribu tena!"</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"Nenosiri sio sahihi, SIM imefungwa. PUK2 imeombwa."</string>
+    <string name="badPuk2" msgid="7910064009531541708">"PUK2 si sahihi. Jaribu tena."</string>
+    <string name="badPin2" msgid="6646896629970023109">"PIN2 ya zamani si sahihi. Jaribu tena."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2 hazilingani. Jaribu tena."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Weka PIN2 iliyo na kati ya nambari 4 hadi 8."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Weka PUK2 yenye nambari 8."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 imesasishwa"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Weka msimbo wa PUK2"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Nenosiri si sahihi. PIN2 sasa Imezuiwa. Ili ujaribu tena, badilisha PIN 2."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Nenosiri si sahihi. SIM sasa imefungwa. Weka PUK2."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 Imezuiwa kabisa."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Kuna majaribio <xliff:g id="NUMBER">%d</xliff:g> yaliyosalia."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 Imeondolewa kizuizi!"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"Una majaribio <xliff:g id="NUMBER">%d</xliff:g> yaliyobaki."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 sasa haijazuiwa"</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="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_redialing" msgid="8253487008234167266">"Inapiga simu 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_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>
     <string name="card_title_in_call" msgid="6346543933068225205">"Katika simu"</string>
-    <string name="card_title_my_phone_number" msgid="112428362494434191">"Nambari yangu ni <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Inapiga"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Simu isiyojibiwa"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Simu zisizojibiwa"</string>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"Zima hali ya ndegeni ili upige simu."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Zima hali ya ndegeni au uunganishe kwenye mtandao pasiwaya ili upige simu."</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_error_out_of_service" msgid="4100065333878929223">"Mitandao ya simu za mkononi haipatikani"</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Huduma ya mtandao wa simu za mkononi haupatikani. Unganisha kwenye mtandao pasiwaya ili upige simu."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Ili upige simu, weka nambari sahihi."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Haiwezi kupiga simu."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Inaanzisha msururu wa MMI…"</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>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Imeshindwa kutuma simu"</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Huduma haiwezi kutumika."</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Haiwezi kubadili simu."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Haiwezi kutenganisha simu."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Haiwezi kuhamisha."</string>
     <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Imeshindwa kupigia watu wengi."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Imeshindwa kukataa simu."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Imeshindwa kuachilia simu."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">" Simu ya wavuti"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Haiwezi kukataa simu."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Haiwezi kutoa simu."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Unganisha kwenye mtandao pasiwaya ili upige simu."</string>
     <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="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="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Hakuna huduma. Inajaribu tena..."</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Haiwezi kupiga simu. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> si nambari ya dharura."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Haiwezi kupiga simu. Piga simu nambari ya dharura."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Tumia kibodi kubonyeza"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Shikilia"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Mwisho"</string>
@@ -456,11 +490,12 @@
     <item msgid="899650777817315681">"Kawaida"</item>
     <item msgid="2883365539347850535">"Ndefu"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Ujumbe wa mtandao"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Ujumbe wa mtandao"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Ujumbe wa hitilafu"</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_hfa_activation_title" msgid="2234246934160473981">"Inawasha..."</string>
-    <string name="ota_hfa_activation_dialog_message" msgid="8092479227918463415">"Simu inawasha huduma yako ya data kwa vifaa vya mkononi.\n \n Hii inaweza kuchukua hadi dakika 5."</string>
+    <string name="ota_hfa_activation_dialog_message" msgid="8092479227918463415">"Simu inawasha huduma yako ya data kwa vifaa vya mkononi.\n \n Hatua hii inaweza kuchukua hadi dakika 5."</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>
@@ -469,8 +504,8 @@
     <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_speaker" msgid="6904589278542719647">"Spika"</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_progress" msgid="460876637828044519">"Inasanidi simu yako..."</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Haikuweza kusanidi simu yako"</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="8072141612635635357">"Simu yako haikuamilishwa. \n Huenda ukahitaji kupata eneo lenye mtandao bora (karibu na dirisha, au nje). \n\nJaribu tena au piga simu kwa huduma ya wateja kwa chaguo zaidi."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"USHINDE ZAIDI WA SPC"</string>
@@ -481,23 +516,23 @@
     <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>
     <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Muunganisho wa data umelemazwa"</string>
-  <plurals name="phone_in_ecm_notification_time">
-    <item quantity="one" msgid="4866221796252472622">"Hakuna muunganisho wa data kwa dakika <xliff:g id="COUNT">%s</xliff:g>"</item>
-    <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="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="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>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other">Hakuna muunganisho wa data kwa dakika <xliff:g id="COUNT_1">%s</xliff:g></item>
+      <item quantity="one">Hakuna muunganisho wa data kwa dakika <xliff:g id="COUNT_0">%s</xliff:g> </item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other">Simu itakuwa katika hali ya Simu ya Dharura kwa dakika <xliff:g id="COUNT_1">%s</xliff:g>. Ukiwa katika hali hii hakuna programu zinazotumia muunganisho wa data zinazoweza kutumiwa. Je, unataka kuondoka sasa?</item>
+      <item quantity="one">Simu itakuwa katika hali ya Simu ya Dharura kwa dakika <xliff:g id="COUNT_0">%s</xliff:g>. Ukiwa katika hali hii hakuna programu zinazotumia muunganisho wa data zinazoweza kutumiwa. Je, unataka kuondoka sasa?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other">Kitendo kilichochaguliwa hakipatikani ikiwa katika Simu ya Dharura. Simu itakuwa katika hali ya Simu ya Dharura kwa dakika <xliff:g id="COUNT_1">%s</xliff:g>. Je, unataka kuondoka sasa?</item>
+      <item quantity="one">Kitendo kilichochaguliwa hakipatikani ikiwa katika Simu ya Dharura. Simu itakuwa katika hali ya Simu ya Dharura kwa dakika <xliff:g id="COUNT_0">%s</xliff:g>. Je, unataka kuondoka sasa?</item>
+    </plurals>
     <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="alert_dialog_dismiss" msgid="2491494287075907171">"Ondoa"</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>
@@ -506,110 +541,23 @@
     <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_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_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="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="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="724325811961769997">"Hakuna akaunti za kupiga simu za mtandao kwenye simu hii. Je, ungependa kuongeza akaunti 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="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 wasifu"</string>
-    <string name="alert_dialog_ok" msgid="3580379406983564080">"Sawa"</string>
-    <string name="close_profile" msgid="6886968271423155284">"Funga"</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="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="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>
-    <string name="username_title" msgid="2479375923477682328">"Jina la mtumiaji"</string>
-    <string name="password_title" msgid="3323555249068171531">"Nenosiri"</string>
-    <string name="display_name_title" msgid="2459768196312249937">"Jina la Uonyesho"</string>
-    <string name="proxy_address_title" msgid="4828301345351614273">"Anwani ya seva mbadala ya kutoka"</string>
-    <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="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>
-    <string name="auth_username_title" msgid="851473016307947120">"Jina la mtumiaji la uthibitishaji"</string>
-    <string name="auth_username_summary" msgid="6782012405225938629">"Jina la mtumiaji hutumika kwa uthibitishaji"</string>
-    <string name="default_preference_summary" msgid="868766740121667450">"&lt;Haijawekwa&gt;"</string>
-    <string name="display_name_summary" msgid="8636377460518225523">"&lt;Sawa na jina la mtumiaji&gt;"</string>
-    <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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"Upigaji simu za sauti hauhimiliwi"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Majibu ya haraka"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"moja"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"mbili"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"tatu"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"nne"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"tano"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"sita"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"saba"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"nane"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"tisa"</string>
-    <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_dial_button" msgid="7459705245418435351">"piga simu"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"nafasi ya nyuma"</string>
-    <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">"Mtetemo"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Mtetemo"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Sauti"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Sauti chaguo-msingi (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_title" msgid="6374978286202084684">"Mlio wa simu"</string>
-    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Tetema wakati wa kulia"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Toa sauti vitufe vya kupiga vinapoguswa"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Jaza nambari kiotomatiki"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Mlio wa simu na Mtetemo"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Ungependa kutumia Wi-Fi kupiga simu?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Ndiyo"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"La"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"SIM kadi zilizojengewa ndani"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Upigaji simu kupitia Intaneti uliojengewa ndani"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Washa Hangout ya video"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Ili uwashe kutumia Hangout ya Video, inabidi uwashe Hali Iliyoimarishwa ya 4G LTE katika mipangilio ya mtandao."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Mipangilio ya mtandao"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Funga"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Simu za dharura"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Simu za dharula pekee"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM kadi, nafasi: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Zana za walio na matatizo ya kuona au kusikia"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Simu ya Wi-Fi inayoingia"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Simu ya Wi-Fi"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Gusa tena ili ufungue"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"Hitilafu imetokea wakati wa usimbuaji wa ujumbe."</string>
 </resources>
diff --git a/res/values-ta-rIN/arrays.xml b/res/values-ta-rIN/arrays.xml
new file mode 100644
index 0000000..773739b
--- /dev/null
+++ b/res/values-ta-rIN/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Global"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-ta-rIN/config.xml b/res/values-ta-rIN/config.xml
deleted file mode 100644
index c0f0942..0000000
--- a/res/values-ta-rIN/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"தவறு"</string>
-</resources>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index 8d03722..1076a6d 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -16,14 +16,14 @@
 
 <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="phoneAppLabel" product="tablet" msgid="1107073389495104784">"செல்லுலார் தரவு"</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">"FDN பட்டியல்"</string>
     <string name="unknown" msgid="6878797917991465859">"தெரியாதவர்"</string>
     <string name="private_num" msgid="6713286113000232309">"தனிப்பட்ட எண்"</string>
-    <string name="payphone" msgid="1931775086311769314">"கட்டண மொபைல்"</string>
+    <string name="payphone" msgid="4793877574636445118">"கட்டணத் தொலைபேசி"</string>
     <string name="onHold" msgid="9035493194749959955">"காத்திருப்பில்"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI குறியீடு தொடங்கியது"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD குறியீடு இயங்குகிறது…"</string>
@@ -35,7 +35,7 @@
     <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">"Bluetooth"</string>
+    <string name="audio_mode_bluetooth" msgid="3047641300848211128">"புளூடூத்"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"பின்வரும் டோன்களை அனுப்பவா?\n"</string>
     <string name="pause_prompt_str" msgid="1789964702154314806">"டோன்களை அனுப்புகிறது\n"</string>
     <string name="send_button" msgid="4106860097497818751">"அனுப்பு"</string>
@@ -43,31 +43,54 @@
     <string name="pause_prompt_no" msgid="6686238803236884877">"வேண்டாம்"</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="no_vm_number_msg" msgid="1300729501030053828">"சிம் கார்டில் குரலஞ்சலுக்கான எண் எதுவும் சேமிக்கப்படவில்லை."</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="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="requesting_unlock" msgid="6412629401033249351">"நெட்வொர்க் தடைநீக்கத்தைக் கோருகிறது…"</string>
     <string name="unlock_failed" msgid="6490531697031504225">"நெட்வொர்க் தடைநீக்கத்திற்கான கோரிக்கை தோல்வி."</string>
     <string name="unlock_success" msgid="6770085622238180152">"நெட்வொர்க்கின் தடைநீக்கப்பட்டது."</string>
-    <string name="mobile_network_settings_not_available" msgid="7355254462995117896">"இவரால் மொபைல் நெட்வொர்க் அமைப்புகளை மாற்ற முடியாது"</string>
-    <string name="labelGSMMore" msgid="5930842194056092106">"GSM அழைப்பு அமைப்புகள்"</string>
-    <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA அழைப்பு அமைப்புகள்"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"இவரால் செல்லுலார் நெட்வொர்க் அமைப்புகளை மாற்ற முடியாது"</string>
+    <string name="labelGSMMore" msgid="5930842194056092106">"GSM அழைப்பு அமைப்பு"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"GSM அழைப்பு அமைப்புகள் (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA அழைப்பு அமைப்பு"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"CDMA அழைப்பு அமைப்புகள் (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"ஆக்சஸ் பாயிண்ட் நேம்கள்"</string>
-    <string name="settings_label" msgid="3876743539816984008">"நெட்வொர்க் அமைப்புகள்"</string>
-    <string name="connection_service" msgid="978745922583410219">"பயன்படுத்துவதற்கான இணைப்பு சேவை"</string>
+    <string name="settings_label" msgid="3876743539816984008">"நெட்வொர்க் அமைப்பு"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"அழைப்பு கணக்குகள்"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"இதன் மூலம் அழை"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"இதன் மூலம் SIP அழைப்புகளைச் செய்"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"முதலில் கேள்"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"அமைப்புகள்"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"கணக்குகளைத் தேர்வுசெய்க"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"ஃபோன் கணக்குகள்"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"SIP கணக்கைச் சேர்"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"கணக்கு அமைப்புகளை உள்ளமைக்கவும்"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"வைஃபை அழைப்பு"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"வைஃபை அழைப்பைப் பயன்படுத்தாதே"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"அழைப்பு உதவியைப் பயன்படுத்தாதே"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"ஏதுமில்லை"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"அழைப்பு உதவி"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"அழைப்பு உதவியைப் பயன்படுத்து"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"அழைப்பு உதவியைத் தேர்வுசெய்க"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"அழைப்புகளுக்காகப் பயன்படுத்தப்படும் நெட்வொர்க்குகளை நிர்வகிக்கும்"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"அழைப்புகளுக்குப் பயன்படுத்தப்படும் நெட்வொர்க்குகளை நிர்வகிக்க, பயன்பாடுகள் அல்லது சேவைகளை அனுமதிக்கும்"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"உள்ளமை"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"உள்ளமைக்கப்பட்ட இணைப்பு சேவை"</string>
     <string name="voicemail" msgid="8693759337917898954">"குரலஞ்சல்"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"குரலஞ்சல் (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
     <string name="networks" msgid="8873030692174541976">"நெட்வொர்க் ஆபரேட்டர்கள்"</string>
-    <string name="call_settings" msgid="1630474923393095156">"அழைப்பு அமைப்புகள்"</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="cell_broadcast_settings" msgid="8740238216690502563">"அவசரகால அலைபரப்புகள்"</string>
+    <string name="call_settings" msgid="6112441768261754562">"அழைப்பு அமைப்பு"</string>
+    <string name="additional_gsm_call_settings" msgid="1391795981938800617">"கூடுதல் அமைப்பு"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"கூடுதல் அமைப்புகள் (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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_loading_settings" msgid="1826692909391168620">"அமைப்புகளை ஏற்றுகிறது..."</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"வெளிச்செல்லும் அழைப்புகளில் எண் மறைக்கப்பட்டுள்ளது"</string>
@@ -76,41 +99,44 @@
     <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="call_forwarding_settings" msgid="3378927671091537173">"அழைப்பு பகிர்தலுக்கான அமைப்பு"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"அழைப்பு பகிர்விற்கான அமைப்புகள் (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="sum_cfu_disabled" msgid="8384177689501334080">"முடக்கு"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"பிஸியாக இருக்கும்போது"</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="sum_cfb_disabled" msgid="4913145177320506827">"முடக்கு"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"மொபைல் பிஸியாக இருக்கும்போது, அழைப்பு பகிர்தலை முடக்குவதை ஆபரேட்டர் ஆதரிக்கவில்லை."</string>
-    <string name="labelCFNRy" msgid="3646316323834351390">"பதிலளிக்காமல் இருக்கும்போது பகிர்"</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"பதிலளிக்காமல் இருக்கும்போது"</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="sum_cfnry_disabled" msgid="3884684060443538097">"முடக்கு"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"பதிலளிக்காமல் இருக்கும்போது, அழைப்பு பகிர்தலை முடக்குவதை ஆபரேட்டர் ஆதரிக்கவில்லை."</string>
-    <string name="labelCFNRc" msgid="47183615370850000">"தொடர்புகொள்ள முடியாமல் இருக்கும்போது பகிர்"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"தொடர்புகொள்ள முடியாமல் இருக்கும்போது"</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="5646361343094064333">"மொபைல் தொடர்புகொள்ள முடியாத இடத்தில் இருக்கும்போது, அழைப்பு பகிர்தலை முடக்குவதை ஆபரேட்டர் ஆதரிக்கவில்லை."</string>
-    <string name="updating_title" msgid="6146755386174019046">"அழைப்பு அமைப்புகள்"</string>
+    <string name="updating_title" msgid="6146755386174019046">"அழைப்பு அமைப்பு"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"முதன்மை பயனர் மட்டுமே அழைப்பிற்கான அமைப்புகளை மாற்ற முடியும்."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"அழைப்பு அமைப்புகள் (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="exception_error" msgid="7027667130619518211">"நெட்வொர்க் அல்லது சிம் கார்டு பிழை."</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>
+    <string name="enable" msgid="7248657275000173526">"இயக்கு"</string>
+    <string name="disable" msgid="4678348128118573672">"முடக்கு"</string>
     <string name="change_num" msgid="239476305819844391">"புதுப்பி"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"இயல்பு நெட்வொர்க்"</item>
@@ -123,15 +149,15 @@
     <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="voicemail_default" msgid="2001233554889016880">"உங்கள் மொபைல் நிறுவனம்"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"செல்லுலார் நெட்வொர்க் அமைப்பு"</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="5613353860205691579">"SIM கார்டு, நெட்வொர்க்கில் இணைப்பதை அனுமதிக்கவில்லை."</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="3494252551249882718">"நெட்வொர்க் ஆபரேட்டரைத் தேர்வுசெய்யவும்"</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"தேர்ந்தெடுத்த நெர்வொர்க் பயன்முறை: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"தேர்ந்தெடுத்த நெட்வொர்க் பயன்முறை: Global"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"தேர்ந்தெடுத்த நெட்வொர்க் பயன்முறை: LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"விருப்பமான நெட்வொர்க் முறை: LTE / GSM / UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"பரிந்துரைக்கப்பட்ட நெட்வொர்க் பயன்முறை: LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="7886739962255042385">"LTE / WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"GSM மட்டும்"</item>
     <item msgid="3817924849415716259">"GSM/WCDMA பரிந்துரைக்கப்பட்டது"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"மேம்பட்ட 4G LTE பயன்முறை"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"குரல் மற்றும் பிற தொடர்புமுறைகளை மேம்படுத்த, LTE சேவைகளைப் பயன்படுத்தவும் (பரிந்துரைக்கப்பட்டது)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"தரவு இயக்கப்பட்டது"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"மொபைல் நெட்வொர்க் வழியாகத் தரவு அணுகலை இயக்கு"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"தரவுப் பயன்பாட்டை அனுமதி"</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="8913735676127858115">"உள்ளூர் நெட்வொர்க்கில் தரவு ரோமிங்கை முடக்கிய நிலையில் வெளியேறியுள்ளதால், தரவு இணைப்பை இழந்துவிட்டீர்கள்."</string>
-    <string name="roaming_warning" msgid="7820963598559553967">"தரவு ரோமிங்கை அனுமதிக்கவா? குறிப்பிடத்தக்க ரோமிங் கட்டணங்கள் உங்களுக்கு விதிக்கப்படலாம்!"</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"குறிப்பிடத்தக்க கட்டணங்கள் இருக்கலாம்."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"தரவு ரோமிங்கை அனுமதிக்கவா?"</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>
@@ -190,12 +221,12 @@
     <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="throttle_help_subtext" msgid="3633091498168446044">"மொபைல் நிறுவனத்தின் செல்லுலார் நெட்வொர்க் தரவு பயன்பாட்டிற்கான கொள்கை குறித்த கூடுதல் தகவல்"</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>
     <string name="cell_bc_sms_disable" msgid="3398365088309408749">"மொபைல் அலைபரப்பு SMS முடக்கப்பட்டது"</string>
-    <string name="cb_sms_settings" msgid="651715019785107312">"மொபைல் அலைபரப்பு SMS அமைப்புகள்"</string>
+    <string name="cb_sms_settings" msgid="651715019785107312">"மொபைல் அலைபரப்பு SMS அமைப்பு"</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>
@@ -301,9 +332,11 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"சாதனத்தைச் செயல்படுத்தவும்"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"தரவு சேவையை அமை"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"மொபைல் நிறுவன அமைப்புகள்"</string>
+    <string name="carrier_settings_title" msgid="9028166176523012300">"மொபைல் நிறுவன அமைப்பு"</string>
     <string name="fdn" msgid="7878832555095183202">"நிலையான அழைப்பிற்கான எண்கள்"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"நிலையான அழைப்பு எண்கள் (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FDN பட்டியல்"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"FDN பட்டியல் (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FDN ஐச் செயல்படுத்து"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"நிலையான அழைப்பு எண்கள் இயக்கப்பட்டன"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"நிலையான அழைப்பு எண்கள் முடக்கப்பட்டன"</string>
@@ -313,7 +346,7 @@
     <string name="enable_fdn_ok" msgid="7215588870329688132">"FDN ஐ முடக்கு"</string>
     <string name="disable_fdn_ok" msgid="5727046928930740173">"FDN ஐ இயக்கு"</string>
     <string name="sum_fdn" msgid="1959399454900272878">"நிலையான அழைப்பு எண்களை நிர்வகி"</string>
-    <string name="sum_fdn_change_pin" msgid="6666549734792827932">"FDN அணுகலுக்கான PIN ஐ மாற்று"</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="3776841382844614716">"குரல் தனிப்பட்ட முறை"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"மேம்பட்ட தனிப்பட்ட முறையை இயக்கு"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"TTY பயன்முறையை அமை"</string>
     <string name="auto_retry_mode_title" msgid="4073265511427813322">"தானாக மீண்டும் அழைக்க முயற்சித்தல்"</string>
     <string name="auto_retry_mode_summary" msgid="4973886004067532288">"தானாக மீண்டும் அழைக்க முயற்சிக்கும் பயன்முறையை இயக்கு"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"வீடியோ அழைப்பின்போது TTY பயன்முறை மாற்றம் அனுமதிக்கப்படாது"</string>
     <string name="menu_add" msgid="1882023737425114762">"தொடர்பைச் சேர்"</string>
     <string name="menu_edit" msgid="7143003705504672374">"தொடர்பை மாற்று"</string>
     <string name="menu_delete" msgid="3977150783449642851">"தொடர்பை நீக்கு"</string>
@@ -337,59 +371,57 @@
     <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="5470854099230755944">"தவறான PIN ஐ உள்ளிட்டுள்ளதால், FDN புதுப்பிக்கப்படவில்லை."</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 புதுப்பிக்கப்படவில்லை. PIN2 தவறானது அல்லது மொபைல் எண் நிராகரிக்கப்பட்டது."</string>
     <string name="fdn_failed" msgid="540018079008319747">"FDN செயல்பாடு தோல்வி."</string>
-    <string name="simContacts_emptyLoading" msgid="2203331234764498011">"SIM கார்டில் இருப்பதைப் படிக்கிறது…"</string>
-    <string name="simContacts_empty" msgid="5270660846489561932">"SIM கார்டில் தொடர்புகள் இல்லை."</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="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="8955102849303984935">"உள்ளிட்ட பழைய PIN தவறானது. மீண்டும் முயற்சிக்கவும்."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"SIM கார்டிலிருந்து தொடர்புகளை இறக்க, விமானப் பயன்முறையை முடக்கவும்."</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="8955102849303984935">"உள்ளிட்ட பழைய பின் தவறானது. மீண்டும் முயற்சிக்கவும்."</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="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="1796577128488773946">"கடவுச்சொல் தவறு, PIN தடுக்கப்பட்டது. PUK தேவை."</string>
+    <string name="invalidPin" msgid="5981171102258684792">"4 இலிருந்து 8 எண்கள் வரையுள்ள பின்னை உள்ளிடவும்."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"சிம் பின்னை அழி"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"சிம் பின்னை அமை"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"பின்னை அமைக்கிறது…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"பின் அமைக்கப்பட்டது"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"பின் அழிக்கப்பட்டது"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"பின் தவறானது"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"பின் புதுப்பிக்கப்பட்டது"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"கடவுச்சொல் தவறானது. பின் இப்போது தடைசெய்யப்பட்டுள்ளது. PUK கோரப்பட்டது."</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="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="1639666438836544393">"PIN2 வெற்றிகரமாக மாற்றப்பட்டது."</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"PUK2 குறியீட்டை உள்ளிடவும்"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"கடவுச்சொல் தவறானது, PIN2 தடுக்கப்பட்டுள்ளது. PIN2 ஐ மாற்றி மீண்டும் முயற்சிக்கவும்!"</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"கடவுச்சொல் தவறு, SIM பூட்டப்பட்டது. PUK2 தேவை."</string>
+    <string name="badPuk2" msgid="7910064009531541708">"PUK2 தவறானது. மீண்டும் முயலவும்."</string>
+    <string name="badPin2" msgid="6646896629970023109">"பழைய பின்2 தவறானது. மீண்டும் முயலவும்."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2கள் பொருந்தவில்லை. மீண்டும் முயலவும்"</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"4 முதல் 8 வரையிலான எண்களைக் கொண்ட பின்2ஐ உள்ளிடவும்."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"8 எண்களைக் கொண்ட பின்2ஐ உள்ளிடவும்."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"பின்2 புதுப்பிக்கப்பட்டது"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"PUK2 குறியீட்டை உள்ளிடவும்"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"கடவுச்சொல் தவறானது. பின்2 தடைசெய்யப்பட்டது. மீண்டும் முயல, பின்2ஐ மாற்றவும்."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"கடவுச்சொல் தவறானது. சிம் இப்போது பூட்டப்பட்டது. PUK2ஐ உள்ளிடவும்."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 தற்காலிகமாகத் தடுக்கப்பட்டது."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"இன்னும் <xliff:g id="NUMBER">%d</xliff:g> முயற்சிகள் உள்ளன."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 இன் தடுப்பு நீக்கப்பட்டது!"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"நீங்கள் <xliff:g id="NUMBER">%d</xliff:g> முறை முயற்சிக்கலாம்."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 இனி தடுக்கப்படாது"</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_redialing" msgid="8253487008234167266">"மீண்டும் டயல் செய்கிறது"</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_dialing" msgid="2107666444937350731">"அழைக்கிறது"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"தவறிய அழைப்பு"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"தவறிய அழைப்புகள்"</string>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"அழைக்க, விமானப் பயன்முறையை முடக்கவும்."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"அழைக்க, விமானப் பயன்முறையை முடக்கவும் அல்லது வயர்லெஸ் நெட்வொர்க்குடன் இணைக்கவும்."</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_error_out_of_service" msgid="4100065333878929223">"செல்லுலார் நெட்வொர்க் கிடைக்கவில்லை."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"செல்லுலார் நெட்வொர்க் கிடைக்கவில்லை. அழைக்க, வயர்லெஸ் நெட்வொர்க்குடன் இணைக்கவும்."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"அழைக்க, சரியான எண்ணை உள்ளிடவும்."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"அழைக்க முடியாது."</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_unknown" msgid="655570339115407698">"சேவை ஆதரிக்கப்படவில்லை"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"அழைப்புகளில் மாற முடியாது."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"அழைப்பைப் பிரிக்க முடியாது."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"மாற்ற முடியாது."</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="incall_error_supp_service_reject" msgid="8998568661508655638">"அழைப்பை நிராகரிக்க முடியாது."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"அழைப்பை(அழைப்புகளை) விடுவிக்க முடியாது."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"அழைக்க, வயர்லெஸ் நெட்வொர்க்குடன் இணைக்கவும்."</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="7969515493359619960">"அழைக்க முடியவில்லை, <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ஆனது அவசரகால எண் அல்ல!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"அழைக்க முடியாது. அவசரகால எண்ணை டயல் செய்யவும்!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"சேவை இல்லை. மீண்டும் முயற்சிக்கிறது…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"<xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> அவசர அழைப்பு எண் இல்லை என்பதால் அழைக்க முடியாது."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"அழைக்க முடியாது. அவசர அழைப்பு எண்ணை அழைக்கவும்."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"டயல் செய்வதற்கு விசைப்பலகையைப் பயன்படுத்துக"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"காத்திரு"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"முடி"</string>
@@ -440,7 +474,7 @@
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"வீடியோ அழைப்பு"</string>
     <string name="importSimEntry" msgid="6614358325359736031">"இறக்குமதி செய்"</string>
     <string name="importAllSimEntries" msgid="1503181169636198673">"எல்லாவற்றையும் இறக்குமதி செய்"</string>
-    <string name="importingSimContacts" msgid="7374056215462575769">"SIM தொடர்புகளிலிருந்து இறக்குமதி செய்கிறது"</string>
+    <string name="importingSimContacts" msgid="7374056215462575769">"சிம் தொடர்புகளிலிருந்து இறக்குமதி செய்கிறது"</string>
     <string name="importToFDNfromContacts" msgid="2130620207013368580">"தொடர்புகளிலிருந்து இறக்குமதி செய்"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"கேட்பதற்கான சாதனங்கள்"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"கேட்கும் சாதனத்தின் இணக்கத்தன்மையை இயக்கு"</string>
@@ -456,21 +490,22 @@
     <item msgid="899650777817315681">"இயல்பானது"</item>
     <item msgid="2883365539347850535">"நீளமானது"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"நெட்வொர்க் செய்தி"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"நெட்வொர்க் செய்தி"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"பிழைச் செய்தி"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"மொபைலைச் செயல்படுத்தவும்"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"மொபைல் சேவையைச் செயல்படுத்துவதற்கு, சிறப்பு அழைப்பானது இயக்கப்பட்டிருக்க வேண்டும். \n\n\"செயல்படுத்து\" என்பதை அழுத்திய பிறகு, மொபைலைச் செயல்படுத்துவதற்கு வழங்கப்படும் வழிமுறைகளைக் கவனிக்கவும்."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"செயல்படுத்துகிறது..."</string>
     <string name="ota_hfa_activation_dialog_message" msgid="8092479227918463415">"மொபைலில் மொபைல் தரவு சேவை செயல்படுத்தப்படுகிறது.\n\nஇதற்கு 5 நிமிடம் வரை எடுக்கலாம்."</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">"இதைத் தவிர்த்தால், அழைப்புகளை மேற்கொள்ள முடியாது அல்லது மொபைல் தரவு நெட்வொர்க்குகளுடன் இணைக்க முடியாது (எனினும் வைஃபை நெட்வொர்க்குகளுடன் இணைக்கலாம்). மொபைலைச் செயல்படுத்தும்வரை, அதை இயக்கும் ஒவ்வொரு முறையும் இதைச் செயல்படுத்துமாறு தெரிவிக்கப்படும்."</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="6570240212263372046">"மொபைல் செயல்படுத்தப்பட்டது."</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="3420314892609254729">"மொபைல் புரோகிராம் செய்யப்படுகிறது, காத்திருக்கவும்."</string>
-    <string name="ota_failure" msgid="4311299546379674378">"புரோகிராமிங் தோல்வி"</string>
+    <string name="ota_progress" msgid="460876637828044519">"மொபைலை அமைக்கிறது…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"மொபைலை அமைக்க முடியவில்லை"</string>
     <string name="ota_successful" msgid="1880780692887077407">"இப்போது மொபைல் செயல்படுத்தப்பட்டது. சேவை தொடங்க, 15 நிமிடங்கள் ஆகலாம்."</string>
     <string name="ota_unsuccessful" msgid="8072141612635635357">"மொபைலைச் செயல்படுத்த முடியவில்லை. \nசிறந்த கவரேஜ் உள்ள பகுதியை நீங்கள் கண்டறிய வேண்டியிருக்கலாம் (ஜன்னலுக்கு அருகில் அல்லது வெளியே). \n\nமீண்டும் முயற்சிக்கவும் அல்லது மேலும் விருப்பங்களுக்கு வாடிக்கையாளர் சேவையை அழைக்கவும்."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"அதிகமான SPC தோல்விகள்"</string>
@@ -481,18 +516,18 @@
     <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="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="2585506997024726599">"அவசரகால திரும்ப அழைக்கும் பயன்முறை செயலில் இருக்கும்போது, தேர்ந்தெடுத்த செயல்பாடு கிடைக்காது. <xliff:g id="COUNT">%s</xliff:g> நிமிடத்தில் இந்தப் பயன்முறையில் மொபைல் மாறிவிடும். இப்போது வெளியேற விருப்பமா?"</item>
-    <item quantity="other" msgid="6115622137771382224">"அவசரநிலை திரும்ப அழைக்கும் பயன்முறை செயலில் இருக்கும்போது, தேர்ந்தெடுத்த செயல்பாடு கிடைக்காது. <xliff:g id="COUNT">%s</xliff:g> நிமிடத்தில் மொபைல் இந்தப் பயன்முறையில் மாறிவிடும். இப்போது வெளியேற விருப்பமா?"</item>
-  </plurals>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> நிமிடங்களுக்குத் தரவு இணைப்பு இருக்காது</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> நிமிடத்திற்குத் தரவு இணைப்பு இருக்காது</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> நிமிடங்களுக்கு மொபைல் அவசரகால திரும்ப அழைக்கும் பயன்முறையில் இருக்கும். இந்தப் பயன்முறையில், தரவு இணைப்பைப் பயன்படுத்தாத பயன்பாடுகளைப் பயன்படுத்தலாம். இப்போது வெளியேற விரும்புகிறீர்களா?</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> நிமிடத்திற்கு மொபைல் அவசரகால திரும்ப அழைக்கும் பயன்முறையில் இருக்கும். இந்தப் பயன்முறையில், தரவு இணைப்பைப் பயன்படுத்தாத பயன்பாடுகளைப் பயன்படுத்தலாம். இப்போது வெளியேற விரும்புகிறீர்களா?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other">அவசரகால திரும்ப அழைக்கும் பயன்முறை செயலில் இருக்கும்போது, தேர்ந்தெடுத்த செயல் கிடைக்காது. <xliff:g id="COUNT_1">%s</xliff:g> நிமிடங்களுக்கு மொபைல் இந்தப் பயன்முறையில் இருக்கும். இப்போது வெளியேற விரும்புகிறீர்களா?</item>
+      <item quantity="one">அவசரகால திரும்ப அழைக்கும் பயன்முறை செயலில் இருக்கும்போது, தேர்ந்தெடுத்த செயல் கிடைக்காது. <xliff:g id="COUNT_0">%s</xliff:g> நிமிடத்திற்கு மொபைல் இந்தப் பயன்முறையில் இருக்கும். இப்போது வெளியேற விரும்புகிறீர்களா?</item>
+    </plurals>
     <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>
@@ -501,115 +536,28 @@
     <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="other_settings" msgid="3672912580359716394">"பிற அழைப்பு அமைப்பு"</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_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="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="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="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_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="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="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>
-    <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">"&lt;அமைக்கப்படவில்லை&gt;"</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="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="7877142631803238549">"இணைய அழைப்பிற்கு, முதலில் இணைய இணைப்பைச் சரிபார்க்கவும்."</string>
-    <string name="no_wifi_available" msgid="1225073547318465713">"இணைய அழைப்புகளுக்கு Wi-Fi நெட்வொர்க்குடன் இணைக்கப்பட வேண்டும் (வயர்லெஸ் &amp; நெட்வொர்க் அமைப்புகளைப் பயன்படுத்தவும்)."</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_setting_title" msgid="3754000371039709383">"விரைவு பதில்கள்"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></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="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_ringtone_title" msgid="2609519527849101590">"ஒலி"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"இயல்பு ஒலி (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</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="dial_pad_autocomplete" msgid="494525952035761075">"டயல்பேடு தானாக முடித்தல்"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"ரிங்டோன் &amp; அதிர்வு"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"அழைக்க Wi-Fi ஐப் பயன்படுத்தவா?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"ஆம்"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"இல்லை"</string>
-    <string name="pstn_connection_service_label" msgid="1743245930577325900">"உள்ளமைந்த SIM கார்டுகள்"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"உள்ளிணைந்த இணைய அழைப்பு"</string>
+    <string name="pstn_connection_service_label" msgid="1743245930577325900">"உள்ளமைந்த சிம் கார்டுகள்"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"வீடியோ அழைப்பை இயக்கு"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"வீடியோ அழைப்பை இயக்க, நெட்வொர்க் அமைப்புகளில் மேம்பட்ட 4G LTE பயன்முறையை இயக்க வேண்டும்."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"நெட்வொர்க் அமைப்பு"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"மூடு"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"அவசர அழைப்புகள்"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"அவசர அழைப்பு மட்டுமே"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"சிம் கார்டு, ஸ்லாட்: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"அணுகல் தன்மை"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"உள்வரும் வைஃபை அழைப்பு"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"வைஃபை அழைப்பு"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"திறக்க, மீண்டும் தட்டவும்"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"செய்தியைக் குறிவிலக்கும்போது பிழை ஏற்பட்டது."</string>
 </resources>
diff --git a/res/values-te-rIN/arrays.xml b/res/values-te-rIN/arrays.xml
new file mode 100644
index 0000000..2ae9e26
--- /dev/null
+++ b/res/values-te-rIN/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"గ్లోబల్"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-te-rIN/config.xml b/res/values-te-rIN/config.xml
deleted file mode 100644
index 132587e..0000000
--- a/res/values-te-rIN/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"తప్పు"</string>
-</resources>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index 4781e49..d050923 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -16,14 +16,14 @@
 
 <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="tablet" msgid="1107073389495104784">"సెల్యులార్ డేటా"</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">"FDN జాబితా"</string>
     <string name="unknown" msgid="6878797917991465859">"తెలియదు"</string>
     <string name="private_num" msgid="6713286113000232309">"ప్రైవేట్ నంబర్"</string>
-    <string name="payphone" msgid="1931775086311769314">"పే ఫోన్"</string>
+    <string name="payphone" msgid="4793877574636445118">"పే ఫోన్"</string>
     <string name="onHold" msgid="9035493194749959955">"హోల్డ్‌లో ఉంది"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI కోడ్ ప్రారంభించబడింది"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD కోడ్ అమలు చేయబడుతోంది…"</string>
@@ -43,27 +43,50 @@
     <string name="pause_prompt_no" msgid="6686238803236884877">"లేదు"</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="no_vm_number_msg" msgid="1300729501030053828">"సిమ్ కార్డులో వాయిస్ మెయిల్ నంబర్ ఏదీ నిల్వ చేయబడలేదు."</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="label_ndp" msgid="780479633159517250">"SIM నెట్‌వర్క్ అన్‌లాక్ పిన్‌"</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="mobile_network_settings_not_available" msgid="7355254462995117896">"ఈ వినియోగదారుకు మొబైల్ నెట్‌వర్క్ సెట్టింగ్‌లు అందుబాటులో లేవు"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"ఈ వినియోగదారుకి సెల్యులార్ నెట్‌వర్క్ సెట్టింగ్‌లు అందుబాటులో లేవు"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM కాల్ సెట్టింగ్‌లు"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"GSM కాల్ సెట్టింగ్‌లు (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA కాల్ సెట్టింగ్‌లు"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"CDMA కాల్ సెట్టింగ్‌లు (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"ప్రాప్యత స్థానం పేర్లు"</string>
     <string name="settings_label" msgid="3876743539816984008">"నెట్‌వర్క్ సెట్టింగ్‌లు"</string>
-    <string name="connection_service" msgid="978745922583410219">"ఉపయోగించాల్సిన కనెక్షన్ సేవ"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"కాల్ చేయగల ఖాతాలు"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"దీనితో కాల్‌లు చేయి"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"దీనితో SIP కాల్‌లను చేయి"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"ముందుగానే అడుగు"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"సెట్టింగ్‌లు"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"ఖాతాలను ఎంచుకోండి"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"ఫోన్ ఖాతాలు"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"SIP ఖాతాను జోడించు"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"ఖాతా సెట్టింగ్‌లను కాన్ఫిగర్ చేయి"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi కాలింగ్"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Wi-Fi కాలింగ్‌ను ఉపయోగించవద్దు"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"కాల్ సహాయకాన్ని ఉపయోగించవద్దు"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"ఏదీ వద్దు"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"కాల్ సహాయకం"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"కాల్ సహాయకాన్ని ఉపయోగించు"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"కాల్ సహాయకాన్ని ఎంచుకోండి"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"కాల్‌ల కోసం ఉపయోగించే నెట్‌వర్క్‌లను నిర్వహించండి"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"కాల్‌ల కోసం ఉపయోగించే నెట్‌వర్క్‌లను నిర్వహించడానికి అనువర్తనాలు లేదా సేవలను అనుమతించండి"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"కాన్ఫిగర్ చేయి"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"అంతర్నిర్మిత కనెక్షన్ సేవ"</string>
     <string name="voicemail" msgid="8693759337917898954">"వాయిస్ మెయిల్"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"వాయిస్ మెయిల్ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
     <string name="networks" msgid="8873030692174541976">"నెట్‌వర్క్ ఆపరేటర్‌లు"</string>
-    <string name="call_settings" msgid="1630474923393095156">"కాల్ సెట్టింగ్‌లు"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"అత్యవసర ప్రసారాలు"</string>
+    <string name="call_settings" msgid="6112441768261754562">"కాల్ సెట్టింగ్‌లు"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"అదనపు సెట్టింగ్‌లు"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"అదనపు సెట్టింగ్‌లు (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
@@ -72,34 +95,37 @@
     <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>
+    <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="call_forwarding_settings_with_label" msgid="8569489414006897127">"కాల్ ఫార్వార్డింగ్ సెట్టింగ్‌లు (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="sum_cfu_disabled" msgid="8384177689501334080">"ఆఫ్‌లో ఉంది"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"బిజీగా ఉన్నప్పుడు"</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="sum_cfb_disabled" msgid="4913145177320506827">"ఆఫ్‌లో ఉంది"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"మీ ఫోన్ బిజీగా ఉన్నప్పుడు కాల్ ఫార్వర్డింగ్‌ను నిలిపివేయడానికి మీ ఆపరేటర్ మద్దతు ఇవ్వరు."</string>
-    <string name="labelCFNRy" msgid="3646316323834351390">"సమాధానం ఇవ్వనప్పుడు ఫార్వార్డ్ చేయి"</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"సమాధానం ఇవ్వనప్పుడు"</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="sum_cfnry_disabled" msgid="3884684060443538097">"ఆఫ్‌లో ఉంది"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"మీ ఫోన్ సమాధానం ఇవ్వలేనప్పుడు కాల్ ఫార్వర్డింగ్‌ను నిలిపివేయడానికి మీ ఆపరేటర్ మద్దతు ఇవ్వరు."</string>
-    <string name="labelCFNRc" msgid="47183615370850000">"చేరుకోవడం సాధ్యపడనప్పుడు ఫార్వార్డ్ చేయి"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"చేరుకోలేనప్పుడు"</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="5646361343094064333">"మీ ఫోన్‌ను చేరుకోవడం సాధ్యపడనప్పుడు కాల్ ఫార్వర్డింగ్‌ను నిలిపివేయడానికి మీ క్యారియర్ మద్దతు ఇవ్వదు."</string>
     <string name="updating_title" msgid="6146755386174019046">"కాల్ సెట్టింగ్‌లు"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"కాల్ సెట్టింగ్‌లను ప్రాథమిక వినియోగదారు మాత్రమే మార్చగలరు."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"కాల్ సెట్టింగ్‌లు (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"కాల్ సెట్టింగ్‌ల లోపం"</string>
     <string name="reading_settings" msgid="1920291699287055284">"సెట్టింగ్‌లను చదువుతోంది…"</string>
     <string name="updating_settings" msgid="8171225533884883252">"సెట్టింగ్‌లను నవీకరిస్తోంది…"</string>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"ఆన్ చేయి"</string>
+    <string name="disable" msgid="4678348128118573672">"ఆఫ్ చేయి"</string>
     <string name="change_num" msgid="239476305819844391">"నవీకరించు"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"నెట్‌వర్క్ డిఫాల్ట్"</item>
@@ -123,8 +149,8 @@
     <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="voicemail_default" msgid="2001233554889016880">"మీ క్యారియర్"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"సెల్యులార్ నెట్‌వర్క్ సెట్టింగ్‌లు"</string>
     <string name="label_available" msgid="1181658289009300430">"అందుబాటులో ఉన్న నెట్‌వర్క్‌లు"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"శోధిస్తోంది..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"నెట్‌వర్క్‌లు కనుగొనబడలేదు."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"ప్రాధాన్య నెట్‌వర్క్ మోడ్: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"ప్రాధాన్య నెట్‌వర్క్ మోడ్: గ్లోబల్"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"ప్రాధాన్య నెట్‌వర్క్ మోడ్: LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"ప్రాధాన్య నెట్‌వర్క్ మోడ్: LTE / GSM / UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"ప్రాధాన్య నెట్‌వర్క్ మోడ్: LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="7886739962255042385">"LTE / WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"GSM మాత్రమే"</item>
     <item msgid="3817924849415716259">"GSM/WCDMAకు ప్రాధాన్యత"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"మెరుగుపరిచిన 4G LTE మోడ్"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"వాయిస్, ఇతర కమ్యూనికే. మెరుగుపరచడానికి LTE సేవలను ఉపయోగించు (సిఫార్సు చేయబడింది)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"డేటా ప్రారంభించబడింది"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"మొబైల్ నెట్‌వర్క్ ద్వారా డేటా ప్రాప్యతను ప్రారంభించండి"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"డేటా వినియోగాన్ని అనుమతించు"</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="8913735676127858115">"మీరు డేటా రోమింగ్ ఆపివేసి, మీ హోమ్ నెట్‌వర్క్ నుండి నిష్క్రమించినందున మీరు డేటా కనెక్టివిటీని కోల్పోయారు."</string>
-    <string name="roaming_warning" msgid="7820963598559553967">"డేటా రోమింగ్‌ను అనుమతించాలా? మీకు గణనీయ రోమింగ్ ఛార్జీలు విధించబడవచ్చు!"</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"మీకు గణనీయ ఛార్జీలు విధించబడవచ్చు."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"డేటా రోమింగ్‌ను అనుమతించాలా?"</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>
@@ -190,7 +221,7 @@
     <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="throttle_help_subtext" msgid="3633091498168446044">"మీ క్యారియర్ యొక్క సెల్యులార్ నెట్‌వర్క్ డేటా వినియోగ విధానం గురించి మరింత సమాచారం"</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>
@@ -303,7 +334,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"డేటా సేవను సెటప్ చేయండి"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"క్యారియర్ సెట్టింగ్‌లు"</string>
     <string name="fdn" msgid="7878832555095183202">"ఫిక్స్‌డ్ డయలింగ్ నంబర్‌లు"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"ఫిక్స్‌డ్ డయలింగ్ నంబర్‌లు (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FDN జాబితా"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"FDN జాబితా (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FDN సక్రియం"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"ఫిక్స్‌డ్ డయలింగ్ నంబర్‌లు ప్రారంభించబడ్డాయి"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"ఫిక్స్‌డ్ డయలింగ్ నంబర్‌లు నిలిపివేయబడ్డాయి"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"TTY మోడ్‌ను సెట్ చేయండి"</string>
     <string name="auto_retry_mode_title" msgid="4073265511427813322">"స్వీయ-పునఃప్రయత్నం"</string>
     <string name="auto_retry_mode_summary" msgid="4973886004067532288">"స్వీయ-పునఃప్రయత్నం మోడ్‌ను ప్రారంభించండి"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"వీడియో కాల్ సమయంలో TTY మోడ్ మార్పు అనుమతించబడదు"</string>
     <string name="menu_add" msgid="1882023737425114762">"పరిచయాన్ని జోడించు"</string>
     <string name="menu_edit" msgid="7143003705504672374">"పరిచయాన్ని సవరించు"</string>
     <string name="menu_delete" msgid="3977150783449642851">"పరిచయాన్ని తొలగించు"</string>
@@ -344,52 +378,50 @@
     <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="1846161429087789936">"SIM కార్డు నుండి పరిచయాలను దిగుమతి చేయడానికి, మొదట ఎయిర్‌ప్లైన్ మోడ్‌ను ఆపివేయండి."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"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="enter_pin_text" msgid="8532615714751931951">"SIM పిన్‌:"</string>
+    <string name="oldPinLabel" msgid="5287773661246368314">"పాత పిన్‌"</string>
+    <string name="newPinLabel" msgid="207488227285336897">"కొత్త పిన్‌"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"కొత్త PINని నిర్ధారించండి"</string>
-    <string name="badPin" msgid="8955102849303984935">"మీరు టైప్ చేసిన పాత PIN చెల్లదు. మళ్లీ ప్రయత్నించండి."</string>
+    <string name="badPin" msgid="8955102849303984935">"మీరు టైప్ చేసిన పాత పిన్‌ చెల్లదు. మళ్లీ ప్రయత్నించండి."</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="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="1796577128488773946">"పాస్‌వర్డ్ చెల్లదు, PIN బ్లాక్ చేయబడింది! PUK అభ్యర్థించబడింది."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"SIM PINను తీసివేయండి"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"SIM PINను సెట్ చేయండి"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"PINను సెట్ చేస్తోంది…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN సెట్ చేయబడింది"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN తీసివేయబడింది"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN చెల్లదు"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN నవీకరించబడింది"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"పాస్‌వర్డ్ చెల్లదు. PIN ఇప్పుడు బ్లాక్ చేయబడింది. PUK అభ్యర్థించబడింది."</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="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="1639666438836544393">"PIN2 విజయవంతంగా మార్చబడింది."</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"PUK2 కోడ్‌ను టైప్ చేయండి"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"పాస్‌వర్డ్ చెల్లదు, PIN2 బ్లాక్ చేయబడింది. దయచేసి PIN2ని మార్చి మళ్లీ ప్రయత్నించండి!"</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"పాస్‌వర్డ్ చెల్లదు, SIM లాక్ చేయబడింది. PUK2 అభ్యర్థించబడింది."</string>
+    <string name="badPuk2" msgid="7910064009531541708">"PUK2 చెల్లదు. మళ్లీ ప్రయత్నించండి."</string>
+    <string name="badPin2" msgid="6646896629970023109">"పాత PIN2 చెల్లదు. మళ్లీ ప్రయత్నించండి."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2లు సరిపోలలేదు. మళ్లీ ప్రయత్నించండి."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"4 నుండి 8 సంఖ్యలు ఉండే PIN2ని నమోదు చేయండి."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"8 సంఖ్యలు ఉండే PUK2ను నమోదు చేయండి."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 నవీకరించబడింది"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"PUK2 కోడ్‌ను నమోదు చేయండి"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"పాస్‌వర్డ్ చెల్లదు. PIN2 ఇప్పుడు బ్లాక్ చేయబడింది. మళ్లీ ప్రయత్నించడానికి, PIN 2ను మార్చండి."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"పాస్‌వర్డ్ చెల్లదు. SIM ఇప్పుడు లాక్ చేయబడింది. PUK2ని నమోదు చేయండి."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 శాశ్వతంగా బ్లాక్ చేయబడింది."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"<xliff:g id="NUMBER">%d</xliff:g> ప్రయత్నాలు మిగిలి ఉన్నాయి."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 అన్‌బ్లాక్ చేయబడింది!"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"మీకు <xliff:g id="NUMBER">%d</xliff:g> ప్రయత్నాలు మిగిలి ఉన్నాయి."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 ఇప్పుడు బ్లాక్ అయ్యి లేదు"</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_redialing" msgid="8253487008234167266">"మళ్లీ డయల్ చేస్తోంది"</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_dialing" msgid="2107666444937350731">"డయల్ చేస్తోంది"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"సమాధానం ఇవ్వని కాల్"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"సమాధానం ఇవ్వని కాల్‌లు"</string>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"కాల్ చేయడానికి ఎయిర్‌ప్లైన్ మోడ్‌ను ఆఫ్ చేయండి."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"కాల్ చేయడానికి ఎయిర్‌ప్లైన్ మోడ్‌ను ఆఫ్ చేయండి లేదా వైర్‌లెస్ నెట్‌వర్క్‌కు కనెక్ట్ చేయండి."</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_error_out_of_service" msgid="4100065333878929223">"సెల్యులార్ నెట్‌వర్క్ అందుబాటులో లేదు."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"సెల్యులార్ నెట్‌వర్క్ అందుబాటులో లేదు. కాల్ చేయడానికి వైర్‌లెస్ నెట్‌వర్క్‌కి కనెక్ట్ చేయండి."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"కాల్ చేయడానికి, చెల్లుబాటు అయ్యే నంబర్‌ను నమోదు చేయండి."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"కాల్ చేయలేరు."</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_unknown" msgid="655570339115407698">"సేవకు మద్దతు లేదు"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"కాల్‌లను మార్చలేరు."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"కాల్‌ను వేరు చేయలేరు."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"బదిలీ చేయలేరు."</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="incall_error_supp_service_reject" msgid="8998568661508655638">"కాల్‌ను తిరస్కరించలేరు."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"కాల్(ల)ను విడిచిపెట్టలేరు."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"కాల్ చేయడానికి వైర్‌లెస్ నెట్‌వర్క్‌కు కనెక్ట్ చేయండి."</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="7969515493359619960">"కాల్ వెళ్లలేదు. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> అత్యవసర నంబర్ కాదు!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"కాల్ వెళ్లలేదు. అత్యవసర నంబర్‌కు డయల్ చేయండి!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"సేవ లేదు. మళ్లీ ప్రయత్నిస్తోంది…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"కాల్ చేయలేరు. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> అత్యవసర నంబర్ కాదు."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"కాల్ చేయలేరు. అత్యవసర నంబర్‌ను డయల్ చేయండి."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"డయల్ చేయడానికి కీబోర్డ్‌ను ఉపయోగించండి"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"హోల్డ్ చేయి"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"ముగించు"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"సాధారణం"</item>
     <item msgid="2883365539347850535">"ఎక్కువ నిడివి"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"నెట్‌వర్క్ సందేశం"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"నెట్‌వర్క్ సందేశం"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"లోప సందేశం"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"మీ ఫోన్‌ను సక్రియం చేయండి"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"మీ ఫోన్ సేవను సక్రియం చేయడానికి ప్రత్యేక కాల్ చేయాల్సి ఉంటుంది. \n\n“సక్రియం చేయి” నొక్కిన తర్వాత, మీ ఫోన్‌ను సక్రియం చేయడానికి అందించబడే సూచనలను వినండి."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"సక్రియం చేస్తోంది..."</string>
@@ -469,8 +504,8 @@
     <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="3420314892609254729">"మీ ఫోన్ ప్రోగ్రామ్ చేయబడుతున్నప్పుడు వేచి ఉండండి."</string>
-    <string name="ota_failure" msgid="4311299546379674378">"ప్రోగ్రామింగ్ విఫలమైంది"</string>
+    <string name="ota_progress" msgid="460876637828044519">"మీ ఫోన్ ప్రోగ్రామ్ చేయబడుతోంది…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"మీ ఫోన్‌ను ప్రోగ్రామ్ చేయడం సాధ్యపడలేదు"</string>
     <string name="ota_successful" msgid="1880780692887077407">"మీ ఫోన్ ఇప్పుడు సక్రియం అయ్యింది. సేవ ప్రారంభం కావడానికి గరిష్టంగా 15 నిమిషాలు పట్టవచ్చు."</string>
     <string name="ota_unsuccessful" msgid="8072141612635635357">"మీ ఫోన్ సక్రియం చేయబడలేదు. \nమీరు మెరుగైన కవరేజీ గల ప్రాంతాన్ని (కిటికీ దగ్గర లేదా వెలుపల) కనుగొనాల్సి ఉంటుంది. \n\nమళ్లీ ప్రయత్నించండి లేదా మరిన్ని ఎంపికల కోసం కస్టమర్ సేవకు కాల్ చేయండి."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"అత్యధిక SPC వైఫల్యాలు"</string>
@@ -481,18 +516,18 @@
     <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="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="2585506997024726599">"ఎంచుకున్న చర్య అత్యవసర కాల్‌బ్యాక్ మోడ్‌లో ఉన్నప్పుడు అందుబాటులో ఉండదు. ఫోన్ ఈ మోడ్‌లో <xliff:g id="COUNT">%s</xliff:g> నిమిషం పాటు ఉంటుంది. మీరు ఇప్పుడు నిష్క్రమించాలనుకుంటున్నారా?"</item>
-    <item quantity="other" msgid="6115622137771382224">"ఎంచుకున్న చర్య అత్యవసర కాల్‌బ్యాక్ మోడ్‌లో ఉన్నప్పుడు అందుబాటులో ఉండదు. ఫోన్ ఈ మోడ్‌లో <xliff:g id="COUNT">%s</xliff:g> నిమిషాల పాటు ఉంటుంది. మీరు ఇప్పుడు నిష్క్రమించాలనుకుంటున్నారా?"</item>
-  </plurals>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> నిమిషాల పాటు డేటా కనెక్షన్ ఉండదు</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> నిమిషం పాటు డేటా కనెక్షన్ ఉండదు</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other">ఫోన్ <xliff:g id="COUNT_1">%s</xliff:g> నిమిషాల పాటు అత్యవసర కాల్‌బ్యాక్ మోడ్‌లో ఉంటుంది. ఈ మోడ్‌లో ఉన్నప్పుడు, డేటా కనెక్షన్‌ను ఉపయోగించే అనువర్తనాలు ఏవీ ఉపయోగించబడవు. మీరు ఇప్పుడు నిష్క్రమించాలనుకుంటున్నారా?</item>
+      <item quantity="one">ఫోన్ <xliff:g id="COUNT_0">%s</xliff:g> నిమిషం పాటు అత్యవసర కాల్‌బ్యాక్ మోడ్‌లో ఉంటుంది. ఈ మోడ్‌లో ఉన్నప్పుడు, డేటా కనెక్షన్‌ను ఉపయోగించే అనువర్తనాలు ఏవీ ఉపయోగించబడవు. మీరు ఇప్పుడు నిష్క్రమించాలనుకుంటున్నారా?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other">అత్యవసర కాల్‌బ్యాక్ మోడ్‌లో ఉన్నప్పుడు, ఎంచుకున్న చర్య అందుబాటులో లేదు. ఫోన్ <xliff:g id="COUNT_1">%s</xliff:g> నిమిషాల పాటు ఈ మోడ్‌లో ఉంటుంది. మీరు ఇప్పుడు నిష్క్రమించాలనుకుంటున్నారా?</item>
+      <item quantity="one">అత్యవసర కాల్‌బ్యాక్ మోడ్‌లో ఉన్నప్పుడు, ఎంచుకున్న చర్య అందుబాటులో లేదు. ఫోన్ <xliff:g id="COUNT_0">%s</xliff:g> నిమిషం పాటు ఈ మోడ్‌లో ఉంటుంది. మీరు ఇప్పుడు నిష్క్రమించాలనుకుంటున్నారా?</item>
+    </plurals>
     <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>
@@ -506,110 +541,23 @@
     <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="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="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="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_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="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="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>
-    <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">"&lt;సెట్ చేయలేదు&gt;"</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="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="7877142631803238549">"ఇంటర్నెట్ కాల్ చేయడానికి, మొదట మీ ఇంటర్నెట్ కనెక్షన్‌ను తనిఖీ చేయండి."</string>
-    <string name="no_wifi_available" msgid="1225073547318465713">"ఇంటర్నెట్ కాల్‌ల కోసం మీరు Wi-Fi నెట్‌వర్క్‌కు కనెక్ట్ అయ్యి ఉండటం అవసరం (వైర్‌లెస్ &amp; నెట్‌వర్క్ సెట్టింగ్‌లను ఉపయోగించండి)."</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_setting_title" msgid="3754000371039709383">"శీఘ్ర ప్రతిస్పందనలు"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></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="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_ringtone_title" msgid="2609519527849101590">"ధ్వని"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"డిఫాల్ట్ ధ్వని (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</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="dial_pad_autocomplete" msgid="494525952035761075">"డయల్ ప్యాడ్ స్వీయ పూర్తి"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"రింగ్‌టోన్ &amp; వైబ్రేట్"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"కాల్ చేయడానికి Wi-Fiని ఉపయోగించాలా?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"అవును"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"వద్దు"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"అంతర్నిర్మిత SIM కార్డులు"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"అంతర్నిర్మిత ఇంటర్నెట్ కాలింగ్"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"వీడియో కాలింగ్‌ని ఆన్ చేయండి"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"వీడియో కాలింగ్‌ను ఆన్ చేయడానికి, మీరు నెట్‌వర్క్ సెట్టింగ్‌ల్లో మెరుగుపరిచిన 4G LTE మోడ్‌ను ప్రారంభించాలి."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"నెట్‌వర్క్ సెట్టింగ్‌లు"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"మూసివేయి"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"అత్యవసర కాల్‌లు"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"అత్యవసర కాలింగ్ మాత్రమే"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM కార్డ్, స్లాట్: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"ప్రాప్యత సామర్థ్యం"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"ఇన్‌కమింగ్ Wi-Fi కాల్"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi కాల్"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"తెరవడానికి మళ్లీ తాకండి"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"సందేశాన్ని డీకోడ్ చేస్తున్నప్పుడు లోపం సంభవించింది."</string>
 </resources>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
new file mode 100644
index 0000000..eaa70b2
--- /dev/null
+++ b/res/values-th/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"ทั่วโลก"</item>
+    <item msgid="6753774959494729275">"LTE/CDMA"</item>
+    <item msgid="8658695584186942227">"LTE/GSM/UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-th/config.xml b/res/values-th/config.xml
deleted file mode 100644
index fe8f338..0000000
--- a/res/values-th/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"เท็จ"</string>
-</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index f5ad470..fad1666 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -16,14 +16,14 @@
 
 <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="tablet" msgid="1107073389495104784">"ข้อมูลมือถือ"</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">"รายการ FDN"</string>
     <string name="unknown" msgid="6878797917991465859">"ไม่ทราบ"</string>
     <string name="private_num" msgid="6713286113000232309">"หมายเลขส่วนตัว"</string>
-    <string name="payphone" msgid="1931775086311769314">"โทรศัพท์สาธารณะ"</string>
+    <string name="payphone" msgid="4793877574636445118">"โทรศัพท์สาธารณะ"</string>
     <string name="onHold" msgid="9035493194749959955">"พักสาย"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"เริ่มรหัส MMI แล้ว"</string>
     <string name="ussdRunning" msgid="485588686340541690">"กำลังรันรหัส USSD..."</string>
@@ -52,18 +52,41 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"กำลังขอปลดล็อกเครือข่าย..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"คำขอปลดล็อกเครือข่ายไม่สำเร็จ"</string>
     <string name="unlock_success" msgid="6770085622238180152">"ปลดล็อกเครือข่ายไม่สำเร็จ"</string>
-    <string name="mobile_network_settings_not_available" msgid="7355254462995117896">"การตั้งค่าเครือข่ายมือถือไม่พร้อมใช้งานสำหรับผู้ใช้รายนี้"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"การตั้งค่าเครือข่ายมือถือไม่พร้อมใช้งานสำหรับผู้ใช้รายนี้"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"การตั้งค่าการโทร GSM"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"การตั้งค่าการโทร GSM (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"การตั้งค่าการโทร CDMA"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"การตั้งค่าการโทร CDMA (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"ชื่อจุดเข้าใช้งาน"</string>
     <string name="settings_label" msgid="3876743539816984008">"การตั้งค่าเครือข่าย"</string>
-    <string name="connection_service" msgid="978745922583410219">"บริการเชื่อมต่อที่สามารถใช้ได้"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"บัญชีการโทร"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"โทรด้วย"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"โทรผ่าน SIP ด้วย"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"ถามก่อน"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"การตั้งค่า"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"เลือกบัญชี"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"บัญชีโทรศัพท์"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"เพิ่มบัญชี SIP"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"กำหนดการตั้งค่าบัญชี"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"การโทรผ่าน Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"ไม่ใช้การโทรผ่าน Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"ไม่ใช้ผู้ช่วยโทร"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"ไม่มี"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"ผู้ช่วยโทร"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"ใช้ผู้ช่วยโทร"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"เลือกผู้ช่วยโทร"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"จัดการเครือข่ายที่ใช้สำหรับการโทรด้วย"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"ให้แอปหรือบริการจัดการเครือข่ายที่ใช้สำหรับการโทร"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"กำหนดค่า"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"บริการเชื่อมต่อในตัว"</string>
     <string name="voicemail" msgid="8693759337917898954">"ข้อความเสียง"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"ข้อความเสียง (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
     <string name="networks" msgid="8873030692174541976">"ผู้ให้บริการเครือข่าย"</string>
-    <string name="call_settings" msgid="1630474923393095156">"การตั้งค่าการโทร"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"การเผยแพร่ข้อมูลฉุกเฉิน"</string>
+    <string name="call_settings" msgid="6112441768261754562">"การตั้งค่าการโทร"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"การตั้งค่าเพิ่มเติม"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"การตั้งค่าเพิ่มเติม (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
@@ -77,29 +100,32 @@
     <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="call_forwarding_settings_with_label" msgid="8569489414006897127">"การตั้งค่าการโอนสาย (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="sum_cfu_disabled" msgid="8384177689501334080">"ปิด"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"เมื่อสายไม่ว่าง"</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="sum_cfb_disabled" msgid="4913145177320506827">"ปิด"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"ผู้ให้บริการของคุณไม่สนับสนุนการปิดใช้งานการโอนสายเมื่อสายไม่ว่าง"</string>
-    <string name="labelCFNRy" msgid="3646316323834351390">"โอนสายเมื่อไม่มีผู้รับ"</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"เมื่อไม่รับสาย"</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="sum_cfnry_disabled" msgid="3884684060443538097">"ปิด"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"ผู้ให้บริการของคุณไม่สนับสนุนการปิดใช้งานการโอนสายเมื่อไม่มีผู้รับสาย"</string>
-    <string name="labelCFNRc" msgid="47183615370850000">"โอนสายเมื่อติดต่อไม่ได้"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"เมื่อติดต่อไม่ได้"</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="5646361343094064333">"ผู้ให้บริการของคุณไม่สนับสนุนการปิดใช้งานการโอนสายเมื่อติดต่อไม่ได้"</string>
     <string name="updating_title" msgid="6146755386174019046">"การตั้งค่าการโทร"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"มีเพียงผู้ใช้หลักเท่านั้นที่สามารถเปลี่ยนการตั้งค่าการโทรได้"</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"การตั้งค่าการโทร (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"ข้อผิดพลาดในการตั้งค่าการโทร"</string>
     <string name="reading_settings" msgid="1920291699287055284">"กำลังอ่านการตั้งค่า…"</string>
     <string name="updating_settings" msgid="8171225533884883252">"กำลังอัปเดตการตั้งค่า..."</string>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"เปิด"</string>
+    <string name="disable" msgid="4678348128118573672">"ปิด"</string>
     <string name="change_num" msgid="239476305819844391">"อัปเดต"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"ค่าเริ่มต้นของเครือข่าย"</item>
@@ -123,8 +149,8 @@
     <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="voicemail_default" msgid="2001233554889016880">"ผู้ให้บริการของคุณ"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"การตั้งค่าเครือข่ายมือถือ"</string>
     <string name="label_available" msgid="1181658289009300430">"เครือข่ายที่ใช้งานได้"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"กำลังค้นหา…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"ไม่พบเครือข่าย"</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"โหมดเครือข่ายที่ต้องการ: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"โหมดเครือข่ายที่ต้องการ: ทั่วโลก"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"โหมดเครือข่ายที่ต้องการ: LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"โหมดเครือข่ายที่ต้องการ: LTE/GSM/UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"โหมดเครือข่ายที่ต้องการ: LTE/CDMA"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="7886739962255042385">"LTE / WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"GSM เท่านั้น"</item>
     <item msgid="3817924849415716259">"ต้องการ GSM/WCDMA"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"โหมด 4G LTE ที่ปรับปรุงแล้ว"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"ใช้บริการ LTE เพื่อปรับปรุงเสียงและการติดต่อสื่อสารด้วยวิธีอื่นๆ (แนะนำ)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"เปิดใช้งานข้อมูลแล้ว"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"เปิดใช้งานการเข้าถึงข้อมูลบนเครือข่ายมือถือ"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"อนุญาตการใช้ข้อมูล"</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="8913735676127858115">"การเชื่อมต่อข้อมูลของคุณหายไปเนื่องจากคุณออกจากเครือข่ายที่บ้านโดยปิดการโรมมิ่งข้อมูลไว้"</string>
-    <string name="roaming_warning" msgid="7820963598559553967">"การเปิดโรมมิ่งข้อมูลอาจทำให้คุณเสียค่าใช้จ่ายมาก!"</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"คุณอาจต้องเสียค่าใช้จ่ายมาก"</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"อนุญาตการโรมมิ่งอินเทอร์เน็ตไหม"</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>
@@ -190,7 +221,7 @@
     <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="throttle_help_subtext" msgid="3633091498168446044">"ข้อมูลเพิ่มเติมเกี่ยวกับนโยบายการใช้ข้อมูลผ่านเครือข่ายมือถือของผู้ให้บริการ"</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>
@@ -303,7 +334,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"ตั้งค่าบริการข้อมูล"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"การตั้งค่าของผู้ให้บริการ"</string>
     <string name="fdn" msgid="7878832555095183202">"การจำกัดหมายเลขโทรออก"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"โหมดจำกัดการโทร (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"รายการ FDN"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"รายการ FDN (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"การเปิดใช้งาน FDN"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"เปิดใช้งานการจำกัดหมายเลขโทรออกไว้"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"ปิดใช้งานการจำกัดหมายเลขโทรออกไว้"</string>
@@ -321,9 +354,10 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"ตั้งค่าโหมด TTY"</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="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"ไม่อนุญาตการเปลี่ยนโหมด TTY ในระหว่างแฮงเอาท์วิดีโอ"</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="8204677063922225311">"พิมพ์ PIN2"</string>
     <string name="name" msgid="7329028332786872378">"ชื่อ"</string>
     <string name="number" msgid="7905950798349903858">"หมายเลข"</string>
@@ -334,17 +368,17 @@
     <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="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="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="fdn_failed" msgid="540018079008319747">"การปลดล็อกด้วย FDN ล้มเหลว"</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"กำลังอ่านจากซิมการ์ด…"</string>
-    <string name="simContacts_empty" msgid="5270660846489561932">"ไม่มีที่อยู่ติดต่อบนซิมการ์ดของคุณ"</string>
+    <string name="simContacts_empty" msgid="5270660846489561932">"ไม่มีรายชื่อติดต่อบนซิมการ์ดของคุณ"</string>
     <string name="simContacts_title" msgid="1861472842524839921">"เลือกสมุดโทรศัพท์ที่จะนำเข้า"</string>
-    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"ในการนำเข้าผู้ติดต่อจากซิมการ์ด ให้ปิดโหมดบนเครื่องบินก่อน"</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"ปิดโหมดบนเครื่องบินเพื่อนำเข้ารายชื่อติดต่อจากซิมการ์ด"</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>
@@ -354,42 +388,40 @@
     <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="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="1796577128488773946">"รหัสผ่านไม่ถูกต้อง PIN ถูกบล็อก! ส่งคำขอ PUK แล้ว"</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"ล้าง PIN ของซิม"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"ตั้งค่า PIN ของซิม"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"กำลังตั้งค่า PIN…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"ชุด PIN"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"ล้าง PIN แล้ว"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN ไม่ถูกต้อง"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"อัปเดต PIN แล้ว"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"รหัสผ่านไม่ถูกต้อง ระบบบล็อก PIN และส่งคำขอ PUK แล้ว"</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="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="1639666438836544393">"เปลี่ยน PIN2 เรียบร้อยแล้ว"</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"พิมพ์รหัส PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"รหัสผ่านไม่ถูกต้อง PIN2 ถูกบล็อก โปรดเปลี่ยน PIN2 แล้วลองอีกครั้ง!"</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"รหัสผ่านไม่ถูกต้อง ซิมถูกล็อก ขอ PUK2"</string>
+    <string name="badPuk2" msgid="7910064009531541708">"PUK2 ไม่ถูกต้อง ลองอีกครั้ง"</string>
+    <string name="badPin2" msgid="6646896629970023109">"PIN2 เก่าไม่ถูกต้อง ลองอีกครั้ง"</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2 ไม่ตรงกัน โปรดลองอีกครั้ง"</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"ป้อน PIN2 ที่มีตัวเลข 4 ถึง 8 หลัก"</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"ป้อน PUK2 ที่มีตัวเลข 8 หลัก"</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"อัปเดต PIN2 แล้ว"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"ป้อนรหัส PUK2"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"รหัสผ่านไม่ถูกต้อง ระบบบล็อก PIN2 แล้ว โปรดเปลี่ยน PIN 2 เพื่อลองอีกครั้ง"</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"รหัสผ่านไม่ถูกต้อง ระบบล็อกซิมแล้ว โปรดป้อน PUK2"</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 ถูกบล็อกอย่างถาวร"</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"พยายามได้อีก <xliff:g id="NUMBER">%d</xliff:g> ครั้ง"</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"เลิกบล็อก PIN2 แล้ว!"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"คุณพยายามได้อีก <xliff:g id="NUMBER">%d</xliff:g> ครั้ง"</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"ไม่มีการบล็อก PIN2 อีกต่อไป"</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_redialing" msgid="8253487008234167266">"โทรใหม่"</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_dialing" msgid="2107666444937350731">"กำลังโทรออก"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"สายที่ไม่ได้รับ"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"สายที่ไม่ได้รับ"</string>
@@ -403,29 +435,31 @@
     <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="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_power_off" msgid="2947938060513306698">"ปิดโหมดบนเครื่องบินเพื่อโทรออก"</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"ปิดโหมดบนเครื่องบินหรือเชื่อมต่อเครือข่ายไร้สายเพื่อโทรออก"</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_error_out_of_service" msgid="4100065333878929223">"เครือข่ายมือถือใช้งานไม่ได้"</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"เครือข่ายมือถือไม่พร้อมใช้งาน โปรดเชื่อมต่อเครือข่ายไร้สายเพื่อโทรออก"</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"หากต้องการโทรออก โปรดป้อนหมายเลขที่ถูกต้อง"</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"ไม่สามารถโทรได้"</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_unknown" msgid="655570339115407698">"บริการนี้ไม่ได้รับการสนับสนุน"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"ไม่สามารถสลับสายได้"</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"ไม่สามารถแยกสายได้"</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"ไม่สามารถโอนได้"</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="incall_error_supp_service_reject" msgid="8998568661508655638">"ไม่สามารถปฏิเสธสายได้"</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"ไม่สามารถเริ่มการโทรได้"</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"เชื่อมต่อเครือข่ายไร้สายเพื่อโทรออก"</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="7969515493359619960">"ไม่ได้โทรออก <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ไม่ใช่หมายเลขฉุกเฉิน!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"ไม่ได้โทรออก หมุนหมายเลขฉุกเฉิน!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"ไม่มีบริการ โปรดลองอีกครั้ง…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"ไม่สามารถโทรได้ <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ไม่ใช่หมายเลขฉุกเฉิน"</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"ไม่สามารถโทรออก โทรหมายเลขฉุกเฉิน"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"ใช้แป้นพิมพ์กดหมายเลขโทรศัพท์"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"พักสาย"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"สิ้นสุด"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"ปกติ"</item>
     <item msgid="2883365539347850535">"ยาว"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"ข้อความจากเครือข่าย"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"ข้อความจากเครือข่าย"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"ข้อความแสดงข้อผิดพลาด"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"เปิดการใช้งานโทรศัพท์ของคุณ"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"ต้องทำการโทรพิเศษเพื่อเปิดใช้บริการโทรศัพท์ของคุณ \n\nหลังจากกด “เปิดการใช้งาน” ให้ฟังคำแนะนำเพื่อเปิดใช้บริการโทรศัพท์ของคุณ"</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"กำลังเปิดใช้งาน..."</string>
@@ -469,8 +504,8 @@
     <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="3420314892609254729">"รอสักครู่ขณะที่กำลังตั้งโปรแกรมโทรศัพท์ของคุณ"</string>
-    <string name="ota_failure" msgid="4311299546379674378">"ตั้งโปรแกรมไม่สำเร็จ"</string>
+    <string name="ota_progress" msgid="460876637828044519">"กำลังเขียนโปรแกรมสำหรับโทรศัพท์…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"ไม่สามารถเขียนโปรแกรมสำหรับโทรศัพท์ได้"</string>
     <string name="ota_successful" msgid="1880780692887077407">"เปิดการใช้งานโทรศัพท์ของคุณแล้ว คุณอาจต้องรอไม่เกิน 15 นาทีเพื่อให้บริการเริ่มทำงาน"</string>
     <string name="ota_unsuccessful" msgid="8072141612635635357">"โทรศัพท์ของคุณไม่เปิดใช้งาน\nคุณอาจต้องหาพื้นที่ที่มีสัญญาณดีกว่านี้ (ใกล้หน้าต่างหรือออกไปข้างนอก)\n\nลองใหม่อีกครั้งหรือติดต่อศูนย์บริการลูกค้าเพื่อรับฟังตัวเลือกเพิ่มเติม"</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"SPC ส่วนเกินล้มเหลว"</string>
@@ -481,18 +516,18 @@
     <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="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="2585506997024726599">"การทำงานที่เลือกจะไม่สามารถใช้ได้เมื่ออยู่ในโหมดติดต่อกลับฉุกเฉิน โทรศัพท์จะอยู่ในโหมดนี้เป็นเวลา <xliff:g id="COUNT">%s</xliff:g> นาที คุณต้องการจะออกเดี๋ยวนี้หรือไม่"</item>
-    <item quantity="other" msgid="6115622137771382224">"การทำงานที่เลือกจะไม่สามารถใช้ได้เมื่ออยู่ในโหมดติดต่อกลับฉุกเฉิน โทรศัพท์จะอยู่ในโหมดนี้เป็นเวลา <xliff:g id="COUNT">%s</xliff:g> นาที คุณต้องการจะออกเดี๋ยวนี้หรือไม่"</item>
-  </plurals>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other">ไม่มีการเชื่อมต่อข้อมูลนาน <xliff:g id="COUNT_1">%s</xliff:g> นาที</item>
+      <item quantity="one">ไม่มีการเชื่อมต่อข้อมูลนาน <xliff:g id="COUNT_0">%s</xliff:g> นาที</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other">โทรศัพท์จะเข้าโหมดติดต่อกลับฉุกเฉินเป็นเวลา <xliff:g id="COUNT_1">%s</xliff:g> นาที ขณะใช้โหมดนี้ จะไม่สามารถใช้แอปพลิเคชันที่ใช้การเชื่อมต่อข้อมูลได้ คุณต้องการออกตอนนี้ไหม</item>
+      <item quantity="one">โทรศัพท์จะเข้าโหมดติดต่อกลับฉุกเฉินเป็นเวลา <xliff:g id="COUNT_0">%s</xliff:g> นาที ขณะใช้โหมดนี้ จะไม่สามารถใช้แอปที่ใช้การเชื่อมต่อข้อมูลได้ คุณต้องการออกตอนนี้ไหม</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other">ไม่สามารถทำงานที่เลือกนี้ได้ขณะอยู่ในโหมดติดต่อกลับฉุกเฉิน โทรศัพท์จะใช้โหมดนี้เป็นเวลา <xliff:g id="COUNT_1">%s</xliff:g> นาที คุณต้องการออกตอนนี้ไหม</item>
+      <item quantity="one">ไม่สามารถทำงานที่เลือกนี้ได้ขณะอยู่ในโหมดติดต่อกลับฉุกเฉิน โทรศัพท์จะใช้โหมดนี้เป็นเวลา <xliff:g id="COUNT_0">%s</xliff:g> นาที คุณต้องการออกตอนนี้ไหม</item>
+    </plurals>
     <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>
@@ -506,110 +541,23 @@
     <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">"ใช้การโทรทางอินเทอร์เน็ต (WiFi เท่านั้น)"</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="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="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="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_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="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="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>
-    <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">"ส่งแบบ keep-alive"</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">"&lt;ไม่ได้ตั้งค่า&gt;"</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="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">"ไม่มีการเชื่อมต่อ WiFi"</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>
     <string name="not_voice_capable" msgid="2739898841461577811">"ไม่สนับสนุนการโทรออกด้วยเสียง"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"คำตอบด่วน"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></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">"ถอยหลัง"</string>
-    <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_ringtone_title" msgid="2609519527849101590">"เสียง"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"เสียงเริ่มต้น (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</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="dial_pad_autocomplete" msgid="494525952035761075">"ช่วยเติมอัตโนมัติในแป้นหมายเลข"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"เสียงเรียกเข้าและสั่น"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"ต้องการใช้ Wi-Fi ในการโทรใช่ไหม"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"ใช่"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"ไม่ใช่"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"ซิมการ์ดในตัว"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"การโทรทางอินเทอร์เน็ตในตัว"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"เปิดแฮงเอาท์วิดีโอ"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"หากต้องการเปิดแฮงเอาท์วิดีโอ คุณจะต้องเปิดใช้โหมด 4G LTE ที่ปรับปรุงแล้วในการตั้งค่าเครือข่าย"</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"การตั้งค่าเครือข่าย"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"ปิด"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"หมายเลขฉุกเฉิน"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"เฉพาะหมายเลขฉุกเฉินเท่านั้น"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"ซิมการ์ด ช่อง: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"การเข้าถึง"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"สายโทรเข้าผ่าน Wi-Fi"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"การโทรผ่าน Wi-Fi"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"แตะอีกครั้งเพื่อเปิด"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"เกิดข้อผิดพลาดขณะถอดรหัสข้อความ"</string>
 </resources>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
new file mode 100644
index 0000000..1b84c55
--- /dev/null
+++ b/res/values-tl/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Pandaigdigan"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-tl/config.xml b/res/values-tl/config.xml
deleted file mode 100644
index 0605cd7..0000000
--- a/res/values-tl/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"false"</string>
-</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 09a8af2..b9b0f07 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -16,14 +16,14 @@
 
 <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">"Data sa Mobile"</string>
+    <string name="phoneAppLabel" product="tablet" msgid="1107073389495104784">"Cellular Data"</string>
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Telepono"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Pang-emergency na Dialer"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Telepono"</string>
     <string name="fdnListLabel" msgid="8630418672279521003">"Listahan ng FDN"</string>
     <string name="unknown" msgid="6878797917991465859">"Di-kilala"</string>
     <string name="private_num" msgid="6713286113000232309">"Pribadong numero"</string>
-    <string name="payphone" msgid="1931775086311769314">"Pay phone"</string>
+    <string name="payphone" msgid="4793877574636445118">"Payphone"</string>
     <string name="onHold" msgid="9035493194749959955">"Naka-hold"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Sinimulan ang MMI code"</string>
     <string name="ussdRunning" msgid="485588686340541690">"Tumatakbo ang USSD code…"</string>
@@ -52,18 +52,41 @@
     <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="mobile_network_settings_not_available" msgid="7355254462995117896">"Hindi available ang mga setting ng mobile network para sa user na ito"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Hindi available ang mga setting ng cellular network para sa user na ito"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Mga setting ng tawag ng GSM"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"Mga setting ng tawag gamit ang GSM (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"Mga setting ng tawag gamit ang CDMA (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="apn_settings" msgid="9043423184895642077">"Access Point Names"</string>
     <string name="settings_label" msgid="3876743539816984008">"Mga Setting ng Network"</string>
-    <string name="connection_service" msgid="978745922583410219">"Serbisyo ng koneksyon na gagamitin"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Mga account sa pagtawag"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Tumawag gamit ang"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Tumawag sa pamamagitan ng SIP gamit ang"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Itanong muna"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Mga Setting"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Pumili ng mga account"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Mga account ng telepono"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Magdagdag ng SIP account"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"I-configure ang mga setting ng account"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Pagtawag sa pamamagitan ng Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Huwag gumamit ng pagtawag sa pamamagitan ng Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Huwag gumamit ng assistant sa pagtawag"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Wala"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Assistant sa pagtawag"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Gumamit ng assistant sa pagtawag"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Pumili ng assistant sa pagtawag"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Pamahalaan ang mga network na ginagamit para sa mga tawag sa"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Hayaan ang mga app o serbisyo na pamahalaan ang mga network na ginamit para sa mga tawag"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"I-configure"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Built-in na serbisyo ng koneksyon"</string>
     <string name="voicemail" msgid="8693759337917898954">"Voicemail"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Voicemail (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
     <string name="networks" msgid="8873030692174541976">"Mga network operator"</string>
-    <string name="call_settings" msgid="1630474923393095156">"Mga Setting ng Tawag"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Mga pang-emergency na broadcast"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Mga setting ng tawag"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Mga karagdagang setting"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Mga karagdagang setting (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Mga karagdagang setting ng tawag na GSM lang"</string>
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Mga karagdagang setting ng pagtawag sa CDMA"</string>
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Mga karagdagang setting ng tawag na CDMA lang"</string>
@@ -77,29 +100,32 @@
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Habang nasa isang tawag, i-notify ako ng mga papasok na tawag"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Habang nasa isang tawag, i-notify ako ng mga papasok na tawag"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Mga setting ng pagpapasa ng tawag"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Mga setting ng pagpapasa ng tawag (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Pagpapasa ng Tawag"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Palaging ipasa"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Palaging gamitin ang numerong ito"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Ipinapasa ang lahat ng mga tawag"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Pinapasa ang lahat ng mga tawag sa <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Hindi available ang numero"</string>
-    <string name="sum_cfu_disabled" msgid="3698472522160364904">"Hindi pinagana"</string>
-    <string name="labelCFB" msgid="218938523102207587">"Ipasa kapag abala"</string>
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Naka-off"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Kapag abala"</string>
     <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="sum_cfb_disabled" msgid="4913145177320506827">"Naka-off"</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="labelCFNRy" msgid="1736067178393744351">"Kapag hindi sinagot"</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="sum_cfnry_disabled" msgid="3884684060443538097">"Naka-off"</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="labelCFNRc" msgid="2614827454402079766">"Kapag hindi makontak"</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="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="call_settings_primary_user_only" msgid="5679923943740900965">"Ang pangunahing user lang ang makakapagbago ng mga setting ng tawag."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Mga setting ng tawag (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
     <string name="updating_settings" msgid="8171225533884883252">"Ina-update ang mga setting…"</string>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"I-on"</string>
+    <string name="disable" msgid="4678348128118573672">"I-off"</string>
     <string name="change_num" msgid="239476305819844391">"I-update"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Default ng network"</item>
@@ -123,8 +149,8 @@
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Hindi mabawi at ma-save ang mga setting ng kasalukuyang numero sa pagpapasa.\nLumipat 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>
-    <string name="voicemail_default" msgid="5902099213882352338">"Aking carrier"</string>
-    <string name="mobile_networks" msgid="5540397602919106177">"Mga setting ng mobile network"</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"Ang iyong carrier"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Mga setting ng cellular network"</string>
     <string name="label_available" msgid="1181658289009300430">"Mga available na network"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Naghahanap…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Walang nakitang mga network."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Gustong mode ng network: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Gustong mode ng network: Pangkalahatan"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Gustong mode ng network: LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Mas gustong network mode: LTE / GSM / UMTS"</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="7886739962255042385">"LTE / WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"GSM lang"</item>
     <item msgid="3817924849415716259">"Ninanais ang GSM/WCDMA"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Enhanced 4G LTE Mode"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Gamitin ang LTE upang pahusayin ang voice at ibang komunikasyon (inirerekomenda)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Pinagana ang data"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Paganahin ang access sa data sa Mobile network"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Payagan ang paggamit ng data"</string>
     <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="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="roaming_warning" msgid="1603164667540144353">"Maaari kang magkaroon ng malalaking singil."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Payagan ang roaming ng data?"</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>
@@ -190,7 +221,7 @@
     <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"Ang <xliff:g id="USED_0">%1$s</xliff:g> na maximum ay lumagpas sa\nBinabaan ang rate ng data sa <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>٪ ng cycle ay lumagpas sa\nMagsisimula 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="throttle_help_subtext" msgid="3633091498168446044">"Higit pang impormasyon tungkol sa patakaran sa paggamit ng data sa cellular network ng iyong carrier"</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>
@@ -303,7 +334,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"I-set up ang serbisyo ng data"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Mga setting ng carrier"</string>
     <string name="fdn" msgid="7878832555095183202">"Mga Fixed Dialing Number"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Mga Fixed Dialing Number (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Listahan ng FDN"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"Listahan ng FDN (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Pag-activate ng FDN"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Pinagana ang Mga Fixed Dialing Number"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Hindi pinagana ang Mga Fixed Dialing Number"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Itakda ang TTY 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="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"Hindi pinapayagan ang pagbago sa TTY Mode habang nagvi-video call"</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>
@@ -344,7 +378,7 @@
     <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="1846161429087789936">"Upang mag-import ng mga contact mula sa SIM card, i-turn off muna ang mode ng Airplane."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"I-off ang airplane mode upang mag-import ng mga contact mula sa SIM card."</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>
@@ -354,42 +388,40 @@
     <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="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="1796577128488773946">"Maling password, Na-block ang PIN! Hiniling ang PUK."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"I-clear ang PIN ng SIM"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"Itakda ang PIN ng SIM"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"Itinatakda ang PIN…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"Naitakda na ang PIN"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"Na-clear na ang PIN"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"Mali ang PIN"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"Na-update na ang PIN"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Mali ang password. Naka-block na ngayon ang PIN. Hiniling ang PUK."</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="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="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="3674058967950559397">"Maling password, Na-block ang PIN2. 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="badPuk2" msgid="7910064009531541708">"Mali ang PUK2. Subukang muli."</string>
+    <string name="badPin2" msgid="6646896629970023109">"Mali ang lumang PIN2. Subukang muli."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"Hindi tumutugma ang mga PIN2. Subukang muli."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Maglagay ng PIN2 na 4 hanggang 8 numero."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Maglagay ng PUK2 na 8 numero."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"Na-update na ang PIN2"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Ilagay ang PUK2 code"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Mali ang password. Naka-block na ngayon ang PIN2. Upang subukang muli, baguhin ang PIN 2."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Mali ang password. Naka-lock na ngayon ang SIM. Ilagay ang PUK2."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"Permanenteng na-block ang PUK2."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Mayroong <xliff:g id="NUMBER">%d</xliff:g> (na) natitirang pagsubok."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"Na-unblock ang PIN2!"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"Mayroon ka na lang <xliff:g id="NUMBER">%d</xliff:g> (na) natitirang pagsubok."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"Hindi na naka-block ang PIN2"</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="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_redialing" msgid="8253487008234167266">"Muling dina-dial"</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_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>
     <string name="card_title_in_call" msgid="6346543933068225205">"Nasa tawag"</string>
-    <string name="card_title_my_phone_number" msgid="112428362494434191">"Ang aking numero ay <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Dina-dial"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Hindi nasagot na tawag"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Mga hindi nasagot na tawag"</string>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"I-off ang airplane mode upang makatawag."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"I-off ang airplane mode o kumonekta sa isang wireless network upang makatawag."</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_error_out_of_service" msgid="4100065333878929223">"Hindi available ang cellular network"</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Hindi available ang cellular network. Kumonekta sa isang wireless network upang makatawag."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Upang tumawag, maglagay ng wastong numero."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Hindi makatawag."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Sinisimulan ang pagkakasunud-sunod ng MMI…"</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>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Hindi nagawang ilipat ang tawag."</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Hindi sinusuportahan ang serbisyo"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Hindi mailipat ang mga tawag."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Hindi mapaghiwalay ang tawag"</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Hindi mailipat."</string>
     <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Hindi nagawang i-conference ang mga tawag."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Hindi nagawang tanggihan ang tawag."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Hindi nagawang mapalabas ang (mga) tawag."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Tawag sa internet"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Hindi matanggihan ang tawag."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Hindi mailabas ang (mga) tawag."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Kumonekta sa isang wireless network upang makatawag."</string>
     <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="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="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Walang serbisyo. Sinusubukang muli…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Hindi makatawag. Ang <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ay hindi isang emergency na numero."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Hindi makatawag. Mag-dial ng emergency na numero."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Gamitin ang keyboard upang mag-dial"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"I-hold"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Wakasan"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"Normal"</item>
     <item msgid="2883365539347850535">"Mahaba"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Mensahe ng network"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Mensahe ng network"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Mensahe ng error"</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\nPagkatapos pindutin ang “I-activate”, makinig sa mga ibinigay na tagubilin upang i-activate ang iyong telepono."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Ina-activate..."</string>
@@ -469,8 +504,8 @@
     <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_speaker" msgid="6904589278542719647">"Speaker"</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_progress" msgid="460876637828044519">"Pino-program ang iyong telepono…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Hindi ma-program ang iyong telepono"</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="8072141612635635357">"Hindi na-activate ang iyong telepono. \nMaaaring kailanganin mong maghanap ng lugar na may mas mahusay na sakop (malapit sa bintana, o sa labas). \n\nSubukang 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>
@@ -481,18 +516,18 @@
     <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>
     <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Hindi pinagana ang koneksyon ng data"</string>
-  <plurals name="phone_in_ecm_notification_time">
-    <item quantity="one" msgid="4866221796252472622">"Walang koneksyon ng data sa loob ng <xliff:g id="COUNT">%s</xliff:g> (na) minuto"</item>
-    <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="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="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>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="one">Walang koneksyon ng data sa loob ng <xliff:g id="COUNT_1">%s</xliff:g> minuto</item>
+      <item quantity="other">Walang koneksyon ng data sa loob ng <xliff:g id="COUNT_1">%s</xliff:g> na minuto</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="one">Mapupunta sa Emergency Callback mode ang telepono sa loob ng <xliff:g id="COUNT_1">%s</xliff:g> minuto. Habang nasa mode na ito, walang magagamit na mga application na gumagamit ng koneksyon ng data. Gusto mo bang lumabas ngayon?</item>
+      <item quantity="other">Mapupunta sa Emergency Callback mode ang telepono sa loob ng <xliff:g id="COUNT_1">%s</xliff:g> na minuto. Habang nasa mode na ito, walang magagamit na mga application na gumagamit ng koneksyon ng data. Gusto mo bang lumabas ngayon?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="one">Hindi available ang napiling pagkilos habang nasa Emergency Callback mode. Mananatili ang telepono sa mode na ito sa loob ng <xliff:g id="COUNT_1">%s</xliff:g> minuto. Gusto mo bang lumabas ngayon?</item>
+      <item quantity="other">Hindi available ang napiling pagkilos habang nasa Emergency Callback mode. Mananatili ang telepono sa mode na ito sa loob ng <xliff:g id="COUNT_1">%s</xliff:g> na minuto. Gusto mo bang lumabas ngayon?</item>
+    </plurals>
     <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>
@@ -506,110 +541,23 @@
     <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_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_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="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="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="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="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_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="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="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>
-    <string name="username_title" msgid="2479375923477682328">"Username"</string>
-    <string name="password_title" msgid="3323555249068171531">"Password"</string>
-    <string name="display_name_title" msgid="2459768196312249937">"Display name"</string>
-    <string name="proxy_address_title" msgid="4828301345351614273">"Address ng papalabas na proxy"</string>
-    <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="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>
-    <string name="auth_username_title" msgid="851473016307947120">"Username sa pagpapatunay"</string>
-    <string name="auth_username_summary" msgid="6782012405225938629">"Ginamit ang username para sa pagpapatunay"</string>
-    <string name="default_preference_summary" msgid="868766740121667450">"&lt;Hindi nakatakda&gt;"</string>
-    <string name="display_name_summary" msgid="8636377460518225523">"&lt;Katulad ng username&gt;"</string>
-    <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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"Hindi suportado ang voice calling"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Mga mabilisang tugon"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"isa"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"dalawa"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"tatlo"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"apat"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"lima"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"anim"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"pito"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"walo"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"siyam"</string>
-    <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_dial_button" msgid="7459705245418435351">"Mag-dial"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
-    <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">"Mag-vibrate"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Mag-vibrate"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Tunog"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Default na tunog (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <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="dial_pad_autocomplete" msgid="494525952035761075">"Pag-autocomplete ng dial pad"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Ringtone at Pag-vibrate"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Gamitin ang Wi-Fi upang tumawag?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Oo"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"Huwag"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Mga built-in na SIM card"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Built-in na pagtawag sa Internet"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"I-on ang video calling"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Upang ma-on ang pagvi-video call, kailangan mong i-enable ang Enhanced 4G LTE Mode sa mga network setting."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Mga Setting ng Network"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Isara"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Mga emergency na tawag"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Emergency na pagtawag lang"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM card, slot: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Pagiging Naa-access"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Papasok na tawag sa Wi-Fi"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Tawag sa Wi-Fi"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Pinduting muli upang buksan"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"Nagkaroon ng error habang dine-decode ang mensahe."</string>
 </resources>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
new file mode 100644
index 0000000..fcd9705
--- /dev/null
+++ b/res/values-tr/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Küresel"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-tr/config.xml b/res/values-tr/config.xml
deleted file mode 100644
index 2d3dbf8..0000000
--- a/res/values-tr/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"yanlış"</string>
-</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index e071f79..cbec82f 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -16,14 +16,14 @@
 
 <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">"Mobil Veriler"</string>
+    <string name="phoneAppLabel" product="tablet" msgid="1107073389495104784">"Hücresel Veriler"</string>
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Telefon"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Acil Durum Çeviricisi"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Telefon"</string>
     <string name="fdnListLabel" msgid="8630418672279521003">"SAN listesi"</string>
     <string name="unknown" msgid="6878797917991465859">"Bilinmiyor"</string>
     <string name="private_num" msgid="6713286113000232309">"Özel numara"</string>
-    <string name="payphone" msgid="1931775086311769314">"Ankesörlü telefon"</string>
+    <string name="payphone" msgid="4793877574636445118">"Ankesörlü telefon"</string>
     <string name="onHold" msgid="9035493194749959955">"Beklemede"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI kodu başlatıldı"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD kodu çalışıyor…"</string>
@@ -52,18 +52,41 @@
     <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="mobile_network_settings_not_available" msgid="7355254462995117896">"Bu kullanıcı için mobil ağ ayarları kullanılamıyor"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Bu kullanıcı için hücresel ağ ayarları kullanılamıyor"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM çağrı ayarları"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"GSM çağrı ayarları (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA çağrı ayarları"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"CDMA çağrı ayarları (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Erişim Noktası Adları"</string>
     <string name="settings_label" msgid="3876743539816984008">"Ağ ayarları"</string>
-    <string name="connection_service" msgid="978745922583410219">"Kullanılacak bağlantı hizmeti"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Arama hesapları"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Aramaları şu hesapla yap:"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"SIP aramalarını şu hesapla yap:"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Önce sor"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Ayarlar"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Hesapları seç"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Telefon hesapları"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"SIP hesabı ekle"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Hesap ayarlarını yapılandır"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Kablosuz çağrı"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Kablosuz çağrıyı kullanma"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Çağrı asistanını kullanma"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Yok"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Çağrı asistanı"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Çağrı asistanını kullan"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Çağrı asistanını seç"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Çağrılar için kullanılan ağları yönet"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Uygulama veya hizmetlerin çağrılar için kullanılan ağları yönetmesine izin ver"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Yapılandır"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Yerleşik bağlantı hizmeti"</string>
     <string name="voicemail" msgid="8693759337917898954">"Sesli mesaj"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Sesli mesaj (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
     <string name="networks" msgid="8873030692174541976">"Ağ operatörleri"</string>
-    <string name="call_settings" msgid="1630474923393095156">"Çağrı Ayarları"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Acil durum yayınları"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Çağrı ayarları"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Ek ayarlar"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Ek ayarlar (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Yalnızca GSM çağrısı ek ayarları"</string>
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Ek CDMA çağrı ayarları"</string>
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Yalnızca CDMA çağrısı ek ayarları"</string>
@@ -77,29 +100,32 @@
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Bir çağrı sırasında, gelen çağrıları bana bildir"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Bir çağrı sırasında, gelen çağrıları bana bildir"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Çağrı yönlendirme ayarları"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Çağrı yönlendirme ayarları (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Çağrı yönlendirme"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Her zaman yönlendir"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Daima bu numarayı kullan"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Tüm çağrılar yönlendiriliyor"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Tüm çağrılar şuraya yönlendiriliyor: <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Numara kullanılamıyor"</string>
-    <string name="sum_cfu_disabled" msgid="3698472522160364904">"Devre dışı"</string>
-    <string name="labelCFB" msgid="218938523102207587">"Meşgul olduğunda yönlendir"</string>
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Kapalı"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Meşgul olduğunda"</string>
     <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="sum_cfb_disabled" msgid="4913145177320506827">"Kapalı"</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="labelCFNRy" msgid="1736067178393744351">"Yanıtlanmadığında"</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="sum_cfnry_disabled" msgid="3884684060443538097">"Kapalı"</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="labelCFNRc" msgid="2614827454402079766">"Ulaşılamadığında"</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="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="call_settings_primary_user_only" msgid="5679923943740900965">"Çağrı ayarları sadece birincil kullanıcı tarafından değiştirilebilir."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Çağrı ayarları (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Çağrı ayarları hatası"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Ayarlar okunuyor..."</string>
     <string name="updating_settings" msgid="8171225533884883252">"Ayarlar güncelleniyor..."</string>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"Aç"</string>
+    <string name="disable" msgid="4678348128118573672">"Kapat"</string>
     <string name="change_num" msgid="239476305819844391">"Güncelle"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Ağ varsayılanı"</item>
@@ -123,8 +149,8 @@
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Mevcut yönlendirme numarası ayarları alınıp kaydedilemedi.\nYine 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>
-    <string name="voicemail_default" msgid="5902099213882352338">"Operatörüm"</string>
-    <string name="mobile_networks" msgid="5540397602919106177">"Mobil ağ ayarları"</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"Operatörünüz"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Hücresel ağ ayarları"</string>
     <string name="label_available" msgid="1181658289009300430">"Kullanılabilir ağlar"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Aranıyor..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Hiçbir ağ bulunamadı."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Tercih edilen ağ modu: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Tercih edilen ağ modu: Dünya Genelinde"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Tercih edilen ağ modu: LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Tercih edilen ağ modu: LTE / GSM / UMTS"</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="7886739962255042385">"LTE / WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"Yalnızca GSM"</item>
     <item msgid="3817924849415716259">"GSM/WCDMA tercih edilen"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Geliştirilmiş 4G LTE Modu"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Sesi ve diğer iletişimleri iyileştirmek için LTE hizmetlerini kullanın (önerilir)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Veri etkin"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Mobil ağ üzerinden veri erişimini etkinleştir"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Veri kullanımına izin ver"</string>
     <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_enable" msgid="7331106985174381987">"Dolaşımdayken veri hizmetlerine bağlan"</string>
+    <string name="roaming_disable" msgid="1843417228755568110">"Dolaşımdayken veri hizmetlerine bağlan"</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="roaming_warning" msgid="1603164667540144353">"Kayda değer ücretler ödeyebilirsiniz."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Veri dolaşımına izin verilsin mi?"</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>
@@ -190,7 +221,7 @@
     <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"Maksimum değer <xliff:g id="USED_0">%1$s</xliff:g> aşıldı\nVeri hızı <xliff:g id="USED_1">%2$d</xliff:g> Kb/s\'ye düşürüldü"</string>
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"Dönemin tamamlanan bölümü:٪ <xliff:g id="USED_0">%1$d</xliff:g>\nBir 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="throttle_help_subtext" msgid="3633091498168446044">"Operatörünüzün hücresel ağ üzerinden veri kullanımı politikası hakkında daha fazla bilgi edinin"</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>
@@ -303,7 +334,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Veri hizmetini ayarla"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Operatör ayarları"</string>
     <string name="fdn" msgid="7878832555095183202">"Sabit Arama Numaraları"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Sabit Arama Numaraları (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"SAN listesi"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"FDN listesi (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"SAN etkinleştirme"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Sabit Arama Numaraları etkin"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Sabit Arama Numaraları devre dışı"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"TTY modunu ayarla"</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="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"Video görüşmesi sırasında TTY Mod değişikliğine izin verilmiyor"</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>
@@ -328,7 +362,7 @@
     <string name="name" msgid="7329028332786872378">"Ad"</string>
     <string name="number" msgid="7905950798349903858">"Numara"</string>
     <string name="save" msgid="4094274636321939086">"Kaydet"</string>
-    <string name="add_fdn_contact" msgid="2481915899633353976">"Sabit arama numarası ekle"</string>
+    <string name="add_fdn_contact" msgid="2481915899633353976">"SAN ekle"</string>
     <string name="adding_fdn_contact" msgid="7627379633721940991">"Sabit arama numarası ekleniyor..."</string>
     <string name="fdn_contact_added" msgid="7458335758501736665">"Sabit arama numarası eklendi."</string>
     <string name="edit_fdn_contact" msgid="7976936035587081480">"Sabit arama numarasını düzenle"</string>
@@ -342,9 +376,9 @@
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN güncellenmedi. PIN2 doğru değildi veya telefon numarası reddedildi."</string>
     <string name="fdn_failed" msgid="540018079008319747">"FDN işlemi başarısız oldu."</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_empty" msgid="5270660846489561932">"SIM kartınızda kişi yok."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"İçe aktarılacak kişileri seçin"</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="simContacts_airplaneMode" msgid="5254946758982621072">"SIM karttaki kişileri içe aktarmak için 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>
@@ -354,42 +388,40 @@
     <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="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="1796577128488773946">"Şifre yanlış. PIN engellendi! PUK istendi."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"SIM PIN\'ini temizle"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"SIM PIN\'ini ayarla"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"PIN ayarlanıyor…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN ayarlandı"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN temizlendi"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN hatalı"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN güncellendi"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Şifre hatalı. PIN kilitlendi. PUK istendi."</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="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="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="3674058967950559397">"Şifre yanlış. PIN2 Engellendi. Lütfen PIN2\'yi değiştirin ve yeniden deneyin!"</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"Şifre hatalı, SIM kilitlendi! PUK2 isteniyor."</string>
+    <string name="badPuk2" msgid="7910064009531541708">"PUK2 hatalı. Tekrar deneyin."</string>
+    <string name="badPin2" msgid="6646896629970023109">"Eski PIN2 hatalı. Tekrar deneyin."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2\'ler eşleşmiyor. Tekrar deneyin."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"4-8 arası rakam içeren bir PIN2 girin."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"8 rakam içeren bir PUK2 girin."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 güncellendi"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"PUK2 kodunu girin"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Şifre hatalı. PIN2 Engellendi. Tekrar denemek için PIN2\'yi değiştirin."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Şifre hatalı. SIM kilitlendi. PUK2\'yi girin."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 kalıcı olarak engellendi."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"<xliff:g id="NUMBER">%d</xliff:g> deneme hakkınız kaldı."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2\'nin Engellemesi Kaldırıldı!"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"<xliff:g id="NUMBER">%d</xliff:g> deneme hakkınız kaldı."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 artık engellenmiş durumda değil"</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="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_redialing" msgid="8253487008234167266">"Yeniden aranıyor"</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_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>
     <string name="card_title_in_call" msgid="6346543933068225205">"Çağrı halinde"</string>
-    <string name="card_title_my_phone_number" msgid="112428362494434191">"Numaram: <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Çevriliyor"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Cevapsız çağrı"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Cevapsız çağrılar"</string>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"Telefon etmek için uçak modunu kapatın."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Telefon etmek için uçak modunu kapatın veya kablosuz ağa bağlanı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_error_out_of_service" msgid="4100065333878929223">"Hücresel ağ kullanılamıyor."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Hücresel ağ kullanılamıyor. Telefon etmek için kablosuz ağa bağlanın."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Arama yapmak için geçerli bir numara girin."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Arama yapılamıyor."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI 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>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Çağrı aktarılamıyor."</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Hizmet desteklenmiyor"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Çağrı geçişi yapılamıyor."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Çağrı ayrılamıyor."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Aktarılamıyor."</string>
     <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Çağrılar konferans görüşmesi olarak birleştirilemiyor."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Çağrı reddedilemiyor."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Çağrılar serbest bırakılamıyor."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"İnternet çağrısı"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Çağrı reddedilemiyor."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Çağrılar bırakılamıyor."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Telefon etmek için kablosuz ağa bağlanın."</string>
     <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="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="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Servis yok. Tekrar deneniyor…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Aranamıyor. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> bir acil durum numarası değil."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Aranamıyor. Bir acil durum numarasını arayın."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Çevirmek için klavyeyi kullan"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Beklet"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Sonlandır"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"Normal"</item>
     <item msgid="2883365539347850535">"Uzun"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Ağ mesajı"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Ağ iletisi"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Hata iletisi"</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_hfa_activation_title" msgid="2234246934160473981">"Etkinleştiriliyor..."</string>
@@ -469,8 +504,8 @@
     <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_speaker" msgid="6904589278542719647">"Hoparlör"</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_progress" msgid="460876637828044519">"Telefonunuz programlanıyor…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Telefonunuz programlanamadı"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Telefonunuz şimdi aktive edildi. Hizmetin başlaması 15 dakika sürebilir."</string>
     <string name="ota_unsuccessful" msgid="8072141612635635357">"Telefonunuz etkinleştirilemedi. \nDaha iyi çeken bir yer (pencere kenarı veya dış mekan) bulmanız gerekebilir. \n\nTekrar 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>
@@ -481,18 +516,18 @@
     <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>
     <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Veri bağlantısı devre dışı bırakıldı"</string>
-  <plurals name="phone_in_ecm_notification_time">
-    <item quantity="one" msgid="4866221796252472622">"<xliff:g id="COUNT">%s</xliff:g> dakika boyunca veri bağlantısı yok"</item>
-    <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="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="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>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> dakika boyunca veri bağlantısı yok</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> dakika boyunca veri bağlantısı yok</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other">Telefon <xliff:g id="COUNT_1">%s</xliff:g> dakika boyunca bu modda olacak. Bu moddayken veri bağlantısı kullanan hiçbir uygulama kullanılamaz. Şimdi çıkmak istiyor musunuz?</item>
+      <item quantity="one">Telefon <xliff:g id="COUNT_0">%s</xliff:g> dakika boyunca bu modda olacak. Bu moddayken veri bağlantısı kullanan hiçbir uygulama kullanılamaz. Şimdi çıkmak istiyor musunuz?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other">Seçilen işlem Acil Durum Çağrısı modunda kullanılamaz. Telefon <xliff:g id="COUNT_1">%s</xliff:g> dakika boyunca bu modda olacak. Şimdi çıkmak istiyor musunuz?</item>
+      <item quantity="one">Seçilen işlem Acil Durum Çağrısı modunda kullanılamaz. Telefon <xliff:g id="COUNT_0">%s</xliff:g> dakika boyunca bu modda olacak. Şimdi çıkmak istiyor musunuz?</item>
+    </plurals>
     <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>
@@ -506,110 +541,23 @@
     <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_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_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="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="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="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="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_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="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="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>
-    <string name="username_title" msgid="2479375923477682328">"Kullanıcı adı"</string>
-    <string name="password_title" msgid="3323555249068171531">"Şifre"</string>
-    <string name="display_name_title" msgid="2459768196312249937">"Görüntülenen ad"</string>
-    <string name="proxy_address_title" msgid="4828301345351614273">"Giden proxy adresi"</string>
-    <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="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>
-    <string name="auth_username_title" msgid="851473016307947120">"Kimlik doğrulama kullanıcı adı"</string>
-    <string name="auth_username_summary" msgid="6782012405225938629">"Kimlik doğrulama için kullanılan kullanıcı adı"</string>
-    <string name="default_preference_summary" msgid="868766740121667450">"&lt;Ayarlanmadı&gt;"</string>
-    <string name="display_name_summary" msgid="8636377460518225523">"&lt;Kullanıcı adıyla aynı&gt;"</string>
-    <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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"Sesli arama desteklenmiyor"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Hızlı yanıtlar"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"bir"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"iki"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"üç"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"dört"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"beş"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"altı"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"yedi"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"sekiz"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"dokuz"</string>
-    <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_dial_button" msgid="7459705245418435351">"çevir"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"geri tuşu"</string>
-    <string name="description_target_answer" msgid="7205604197797472471">"Yanıtla"</string>
-    <string name="description_target_send_sms" msgid="2098326025587950144">"SMS gönder"</string>
-    <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="2609519527849101590">"Ses"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Varsayılan ses (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <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şlara basınca ses çıksın"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Tuş takımı otomatik tamamlama"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Zil Sesi ve Titreşim"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Telefon etmek için Kablosuz bağlantı kullanılsın mı?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Evet"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"Hayır"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Yerleşik SIM kartlar"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Yerleşik İnternet çağrısı"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Video görüşmesini aç"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Video görüşmesini açmak için ağ ayarlarında Geliştirilmiş 4G LTE Modu\'nu etkinleştirmeniz gerekir."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Ağ ayarları"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Kapat"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Acil durum çağrıları"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Yalnızca acil durum çağrısı"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM kart, yuva: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Erişilebilirlik"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Gelen kablosuz çağrı"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Kablosuz çağrı"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Açmak için tekrar dokunun"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"İletinin kodu çözülürken bir hata oluştu."</string>
 </resources>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
new file mode 100644
index 0000000..faa0ff2
--- /dev/null
+++ b/res/values-uk/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Усі"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-uk/config.xml b/res/values-uk/config.xml
deleted file mode 100644
index 9cddb08..0000000
--- a/res/values-uk/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"неправильно"</string>
-</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 5d3f5ae..3ebd186 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -16,14 +16,14 @@
 
 <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="tablet" msgid="1107073389495104784">"Мобільні дані"</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">"Список FDN"</string>
     <string name="unknown" msgid="6878797917991465859">"Невідомий"</string>
     <string name="private_num" msgid="6713286113000232309">"Приватний номер"</string>
-    <string name="payphone" msgid="1931775086311769314">"Таксофон"</string>
+    <string name="payphone" msgid="4793877574636445118">"Таксофон"</string>
     <string name="onHold" msgid="9035493194749959955">"Очікує"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Код MMI запущено"</string>
     <string name="ussdRunning" msgid="485588686340541690">"Запуск. код USSD..."</string>
@@ -52,18 +52,41 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Запитув. розблок. мережі..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Не здійсн. запит розблокування мережі"</string>
     <string name="unlock_success" msgid="6770085622238180152">"Мережу успішно розблоковано."</string>
-    <string name="mobile_network_settings_not_available" msgid="7355254462995117896">"Налаштування мобільної мережі недоступні для цього користувача"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Налаштування мобільної мережі недоступні для цього користувача"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Налаштування викликів GSM"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"Налаштування викликів GSM (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Налашт. викл. в CDMA"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"Налаштування викликів CDMA (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Назва точки доступу"</string>
     <string name="settings_label" msgid="3876743539816984008">"Налашт-ння мережі"</string>
-    <string name="connection_service" msgid="978745922583410219">"Вибрана служба під’єднання"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Обл. записи для дзвінків"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Здійснювати дзвінки за допомогою"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Здійснювати дзвінки SIP за допомогою"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Спершу запитувати"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Налаштування"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Вибрати облікові записи"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Облікові записи на телефоні"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Додати обліковий запис SIP"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Налаштування параметрів облікового запису"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Дзвінки через Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Не використовувати дзвінки через Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Не використовувати помічника викликів"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Немає"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Помічник викликів"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Використовувати помічника викликів"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Вибрати помічника викликів"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Керування мережами для дзвінків"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Дозволити додаткам або службам керувати мережами, які використовуються для викликів"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Налаштувати"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Вбудована служба під’єднання"</string>
     <string name="voicemail" msgid="8693759337917898954">"Голос. пошта"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Голосова пошта (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"ГП:"</string>
     <string name="networks" msgid="8873030692174541976">"Оператори мережі"</string>
-    <string name="call_settings" msgid="1630474923393095156">"Налаштування дзвінків"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Повідомлення екстрених служб"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Виклики"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Додаткові налаштування"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Додаткові налаштування (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
@@ -72,34 +95,37 @@
     <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>
+    <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="call_forwarding_settings_with_label" msgid="8569489414006897127">"Налаштування переадресації виклику (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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_cfu_disabled" msgid="8384177689501334080">"Вимкнено"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Коли зайнято"</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="sum_cfb_disabled" msgid="4913145177320506827">"Вимкнено"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Ваш оператор не підтримує вимкнення переадресації викликів, коли телефон зайнятий."</string>
-    <string name="labelCFNRy" msgid="3646316323834351390">"Пересилати, якщо не відпов."</string>
-    <string name="messageCFNRy" msgid="672317899884380374">"Номер., якщо не відпов."</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"Коли немає відповіді"</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="sum_cfnry_disabled" msgid="3884684060443538097">"Вимкнено"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Ваш оператор не підтримує вимкнення переадресації викликів, коли телефон не відповідає."</string>
-    <string name="labelCFNRc" msgid="47183615370850000">"Пересилати, коли недоступ."</string>
-    <string name="messageCFNRc" msgid="6380695421020295119">"Номер., якщо недосяжн."</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"Коли недоступно"</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="5646361343094064333">"Ваш оператор не підтримує вимкнення переадресації викликів, коли телефон недосяжний."</string>
     <string name="updating_title" msgid="6146755386174019046">"Налаштування викликів"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"Налаштування виклику може змінити лише основний користувач."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Налаштування виклику (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Помилка налаштування викликів"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Читання налаштувань…"</string>
     <string name="updating_settings" msgid="8171225533884883252">"Оновлення налаштувань…"</string>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"Увімкнути"</string>
+    <string name="disable" msgid="4678348128118573672">"Вимкнути"</string>
     <string name="change_num" msgid="239476305819844391">"Оновити"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Налаштування мережі за умовчанням"</item>
@@ -123,8 +149,8 @@
     <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="voicemail_default" msgid="2001233554889016880">"Ваш оператор"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Налаштування мобільної мережі"</string>
     <string name="label_available" msgid="1181658289009300430">"Доступні мережі"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Пошук…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Не знайд. жодних мереж."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Рекомендований режим мережі: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Рекомендований режим мережі: загальний"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Рекомендований режим мережі: LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Рекомендований режим мережі: LTE / GSM / UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Рекомендований режим мереж: LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="7886739962255042385">"LTE / WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"Лише GSM"</item>
     <item msgid="3817924849415716259">"Рекомендовано GSM/WCDMA"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Розширений режим 4G LTE"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Використ. служби LTE для покращення голосового й інших типів зв’язку (рекоменд.)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Передавання даних"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Дозволити передавання даних через мобільну мережу"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Дозволити використання даних"</string>
     <string name="roaming" msgid="8871412572928323707">"Роумінг даних"</string>
-    <string name="roaming_enable" msgid="7331106985174381987">"Підключ. до служб даних під час роумінгу"</string>
-    <string name="roaming_disable" msgid="1843417228755568110">"Підключ. до служб даних під час роумінгу"</string>
+    <string name="roaming_enable" msgid="7331106985174381987">"Підключатися до служб передавання даних у роумінгу"</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="roaming_warning" msgid="1603164667540144353">"Може стягуватися значна плата."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Дозволити роумінг даних?"</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>
@@ -190,7 +221,7 @@
     <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> КБ/сек"</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> КБ/сек, якщо перев. ліміт викор. даних"</string>
-    <string name="throttle_help_subtext" msgid="5217706521499010816">"Докладніше про політику викор. даних мобільної мережі вашого оператора"</string>
+    <string name="throttle_help_subtext" msgid="3633091498168446044">"Докладніше про політику використання мобільних даних вашого оператора"</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>
@@ -303,7 +334,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Налашт. службу пересил. даних"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Налаштування оператора"</string>
     <string name="fdn" msgid="7878832555095183202">"Номери фіксованого набору"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Фіксовані номери (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Список FDN"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"Список фіксованих номерів (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Активація FDN"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Номери фіксованого набору увімкнено"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Номери фіксованого набору вимкнено"</string>
@@ -314,13 +347,14 @@
     <string name="disable_fdn_ok" msgid="5727046928930740173">"Увімк. FDN"</string>
     <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="sum_fdn_manage_list" msgid="8431088265332628316">"Керувати списком номерів"</string>
     <string name="voice_privacy" msgid="3776841382844614716">"Конфіденційність Voice"</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="4073265511427813322">"Автоповтор"</string>
     <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Увімкнути режим автоповтору"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"Під час відеодзвінка заборонено змінювати режим TTY"</string>
     <string name="menu_add" msgid="1882023737425114762">"Додати контакт"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Змінити контакт"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Видалити контакт"</string>
@@ -344,9 +378,9 @@
     <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="1846161429087789936">"Щоб імпортувати контакти із SIM-карти, спершу вимкніть режим польоту."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Щоб імпортувати контакти із SIM-карти, вимкніть режим польоту."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Увімк./вимк. PIN-код SIM"</string>
-    <string name="change_pin" msgid="9174186126330785343">"Змін. 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>
@@ -354,42 +388,40 @@
     <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="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="1796577128488773946">"Неправильний пароль. PIN-код заблоковано. Введіть PUK-код."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"Видалити PIN-код SIM-карти"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"Установити PIN-код SIM-карти"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"Встановлення PIN-коду…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN-код установлено"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN-код видалено"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"Неправильний PIN-код"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN-код змінено"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Неправильний пароль. PIN-код заблоковано. Введіть PUK-код."</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="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="1639666438836544393">"PIN2-код змінено."</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"Введіть PUK2-код"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Неправильний пароль. PIN2-код заблоковано. Змініть PIN2-код і повторіть спробу."</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"Пароль не правильний. SIM-карту заблоковано. Потрібен PUK2."</string>
+    <string name="badPuk2" msgid="7910064009531541708">"Неправильний PUK2-код. Повторіть спробу."</string>
+    <string name="badPin2" msgid="6646896629970023109">"Неправильний старий PIN2-код. Повторіть спробу."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2-коди не збігаються. Повторіть спробу."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Введіть PIN2-код із 4–8 цифр."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Введіть PUK2-код із 8 цифр."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2-код змінено"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Введіть PUK2-код"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Неправильний пароль. PIN2-код заблоковано. Щоб повторити спробу, змініть PIN2-код."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Неправильний пароль. SIM-карту заблоковано. Введіть PUK2-код."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2-код назавжди заблоковано."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Залишилося стільки спроб: <xliff:g id="NUMBER">%d</xliff:g>."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2-код розблоковано."</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"У вас залишилося стільки спроб: <xliff:g id="NUMBER">%d</xliff:g>."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2-код більше не заблоковано"</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_redialing" msgid="8253487008234167266">"Повторний набір"</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_dialing" msgid="2107666444937350731">"Набір"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Пропущ. виклик"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Пропущ. дзвінки"</string>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"Щоб зателефонувати, вимкніть режим польоту."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Щоб зателефонувати, вимкніть режим польоту або під’єднайтеся до бездротової мережі."</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_error_out_of_service" msgid="4100065333878929223">"Мобільна мережа недоступна."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Мобільна мережа недоступна. Щоб зателефонувати, під’єднайтеся до бездротової мережі."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Щоб зателефонувати, введіть дійсний номер."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Неможливо зателефонувати."</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_unknown" msgid="655570339115407698">"Служба не підтримується"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Неможливо переключитися між викликами."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Неможливо розділити виклик."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Неможливо перенести."</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="incall_error_supp_service_reject" msgid="8998568661508655638">"Неможливо відхилити виклик."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Неможливо телефонувати."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Щоб зателефонувати, під’єднайтеся до бездротової мережі."</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="7969515493359619960">"Виклик не надіслано. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> не є екстреним номером!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Виклик не надіслано. Наберіть екстрений номер!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Зв’язку немає. Повторна спроба…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Неможливо зателефонувати. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> – не є екстреним номером."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Неможливо зателефонувати. Наберіть екстрений номер."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Викор. клав. для набору"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Утрим."</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Закінч."</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"Звичайний"</item>
     <item msgid="2883365539347850535">"Довгий"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Повідомлення мережі"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Повідомлення мережі"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Повідомлення про помилку"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Активуйте свій телефон"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Щоб активувати службу вашого тел., треба зробити спеціальний дзвінок. \n\nНатиснувши \"Активувати\", прослухайте інструкції, надані для активації телефону."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Активація…"</string>
@@ -469,8 +504,8 @@
     <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="3420314892609254729">"Зачекайте, поки ваш телефон програмується."</string>
-    <string name="ota_failure" msgid="4311299546379674378">"Помилка програмування"</string>
+    <string name="ota_progress" msgid="460876637828044519">"Програмування вашого телефона…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Не вдалося запрограмувати ваш телефон"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Телефон тепер активовано. Для запуску сервісу може знадобитися до 15 хвилин."</string>
     <string name="ota_unsuccessful" msgid="8072141612635635357">"Ваш телефон не активовано. \nМожливо, потрібно знайти місце з кращим покриттям (біля вікна чи надворі). \n\nПовторіть спробу чи подзвоніть у службу обслуговування, щоб дізнатися про інші варіанти."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"ПОМИЛКИ НАДЛИШКУ SPC"</string>
@@ -481,18 +516,24 @@
     <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="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="2585506997024726599">"Вибрана дія не доступна в режимі екстреного зворотного виклику. Телефон буде в цьому режимі <xliff:g id="COUNT">%s</xliff:g> хв. Вийти зараз?"</item>
-    <item quantity="other" msgid="6115622137771382224">"Вибрана дія не доступна в режимі екстреного зворотного виклику. Телефон буде у цьому режимі <xliff:g id="COUNT">%s</xliff:g> хв. Вийти зараз?"</item>
-  </plurals>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="one">Передавання даних недоступне протягом <xliff:g id="COUNT_1">%s</xliff:g> хвилини</item>
+      <item quantity="few">Передавання даних недоступне протягом <xliff:g id="COUNT_1">%s</xliff:g> хвилин</item>
+      <item quantity="many">Передавання даних недоступне протягом <xliff:g id="COUNT_1">%s</xliff:g> хвилин</item>
+      <item quantity="other">Передавання даних недоступне протягом <xliff:g id="COUNT_1">%s</xliff:g> хвилин</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="one">Телефон перебуватиме в режимі екстреного виклику протягом <xliff:g id="COUNT_1">%s</xliff:g> хвилини. У цьому режимі не працюватимуть додатки, які передають дані. Вийти?</item>
+      <item quantity="few">Телефон перебуватиме в режимі екстреного виклику протягом <xliff:g id="COUNT_1">%s</xliff:g> хвилин. У цьому режимі не працюватимуть додатки, які передають дані. Вийти?</item>
+      <item quantity="many">Телефон перебуватиме в режимі екстреного виклику протягом <xliff:g id="COUNT_1">%s</xliff:g> хвилин. У цьому режимі не працюватимуть додатки, які передають дані. Вийти?</item>
+      <item quantity="other">Телефон перебуватиме в режимі екстреного виклику протягом <xliff:g id="COUNT_1">%s</xliff:g> хвилин. У цьому режимі не працюватимуть додатки, які передають дані. Вийти?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="one">Вибрана дія недоступна в режимі екстреного виклику. Телефон перебуватиме в цьому режимі протягом <xliff:g id="COUNT_1">%s</xliff:g> хвилини. Вийти?</item>
+      <item quantity="few">Вибрана дія недоступна в режимі екстреного виклику. Телефон перебуватиме в цьому режимі протягом <xliff:g id="COUNT_1">%s</xliff:g> хвилин. Вийти?</item>
+      <item quantity="many">Вибрана дія недоступна в режимі екстреного виклику. Телефон перебуватиме в цьому режимі протягом <xliff:g id="COUNT_1">%s</xliff:g> хвилин. Вийти?</item>
+      <item quantity="other">Вибрана дія недоступна в режимі екстреного виклику. Телефон перебуватиме в цьому режимі протягом <xliff:g id="COUNT_1">%s</xliff:g> хвилин. Вийти?</item>
+    </plurals>
     <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>
@@ -506,110 +547,23 @@
     <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="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="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="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_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="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="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>
-    <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">"&lt;Не налаштовано&gt;"</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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"Голосові дзвінки не підтримуються"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Швидкі відповіді"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></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="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_ringtone_title" msgid="2609519527849101590">"Звук"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Звук за умовчанням (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</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="dial_pad_autocomplete" msgid="494525952035761075">"Автозавершення для цифрової клавіатури"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Сигнал дзвінка та вібросигнал"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Телефонувати через Wi-Fi?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Так"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"Ні"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Вбудовані SIM-карти"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Вбудована функція інтернет-дзвінків"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Увімкнути відеодзвінки"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Щоб увімкнути відеодзвінки, увімкніть \"Розширений режим 4G LTE\" в налаштуваннях мережі."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Налаштування мережі"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Закрити"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Екстрені виклики"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Лише екстрені виклики"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM-карта, роз’єм: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Спеціальні можливості"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Вхід. дзвінок через Wi-Fi"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Дзвінок через Wi-Fi"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Торкніться знову, щоб відкрити"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"Під час розшифрування повідомлення сталася помилка."</string>
 </resources>
diff --git a/res/values-ur-rPK/arrays.xml b/res/values-ur-rPK/arrays.xml
new file mode 100644
index 0000000..1b05d18
--- /dev/null
+++ b/res/values-ur-rPK/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"عالمی"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-ur-rPK/config.xml b/res/values-ur-rPK/config.xml
deleted file mode 100644
index e2838a4..0000000
--- a/res/values-ur-rPK/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"غلط"</string>
-</resources>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index fcd6d20..3a0a1b2 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -16,14 +16,14 @@
 
 <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="tablet" msgid="1107073389495104784">"سیلولر ڈیٹا"</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">"‏FDN کی فہرست"</string>
     <string name="unknown" msgid="6878797917991465859">"نامعلوم"</string>
     <string name="private_num" msgid="6713286113000232309">"نجی نمبر"</string>
-    <string name="payphone" msgid="1931775086311769314">"پے فون"</string>
+    <string name="payphone" msgid="4793877574636445118">"پے فون"</string>
     <string name="onHold" msgid="9035493194749959955">"ہولڈ پر"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"‏MMI کوڈ شروع ہوگیا"</string>
     <string name="ussdRunning" msgid="485588686340541690">"‏USSD کوڈ چل رہا ہے…"</string>
@@ -52,18 +52,41 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"نیٹ ورک غیر مقفل کرنے کی درخواست کر رہا ہے…"</string>
     <string name="unlock_failed" msgid="6490531697031504225">"نیٹ ورک غیر مقفل کرنے کی درخواست ناکام ہوگئی۔"</string>
     <string name="unlock_success" msgid="6770085622238180152">"نیٹ ورک غیر مقفل کرنا کامیاب رہا۔"</string>
-    <string name="mobile_network_settings_not_available" msgid="7355254462995117896">"اس صارف کیلئے موبائل نیٹ ورک کی ترتیبات دستیاب نہیں ہیں"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"اس صارف کیلئے سیلولر نیٹ ورک کی ترتیبات دستیاب نہیں ہیں"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"‏GSM کال کی ترتیبات"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"‏GSM کال کی ترتیبات (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"‏CDMA کال کی ترتیبات"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"‏CDMA کال کی ترتیبات (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"رسائی پوائنٹ کے نام"</string>
     <string name="settings_label" msgid="3876743539816984008">"نیٹ ورک کی ترتیبات"</string>
-    <string name="connection_service" msgid="978745922583410219">"استعمال کیلئے کنکشن سروس"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"کالنگ اکاؤنٹس"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"کالز کریں مع"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"‏SIP کالز کریں مع"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"پہلے پوچھیں"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"ترتیبات"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"اکاؤنٹس منتخب کریں"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"فون اکاؤنٹس"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"‏SIP اکاؤنٹ شامل کریں"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"اکاؤنٹ کی ترتیبات کنفیگر کریں"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"‏Wi-Fi کالنگ"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"‏Wi-Fi کالنگ کا استعمال نہ کریں"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"کال اسسٹنٹ کا استعمال نہ کریں"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"کوئی نہیں"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"کال اسسٹنٹ"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"کال اسسٹنٹ استعمال کریں"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"کال اسسٹنٹ کو منتخب کریں"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"ان کے ساتھ کالز کیلئے استعمال کردہ نیٹ ورکس کا نظم کریں"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"ایپس یا سروسز کو کالز کیلئے استعمال کردہ نیٹ ورکس کا نظم کرنے دیں"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"کنفیگر کریں"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"پہلے سے شامل کنکشن سروس"</string>
     <string name="voicemail" msgid="8693759337917898954">"صوتی میل"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"صوتی میل (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
     <string name="networks" msgid="8873030692174541976">"نیٹ ورک آپریٹرز"</string>
-    <string name="call_settings" msgid="1630474923393095156">"کال کی ترتیبات"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"ہنگامی براڈکاسٹس"</string>
+    <string name="call_settings" msgid="6112441768261754562">"کال کی ترتیبات"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"اضافی ترتیبات"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"اضافی ترتیبات (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
@@ -77,29 +100,32 @@
     <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="call_forwarding_settings_with_label" msgid="8569489414006897127">"کال فارورڈنگ ترتیبات (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="sum_cfu_disabled" msgid="8384177689501334080">"آف"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"مصروف ہونے پر"</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="sum_cfb_disabled" msgid="4913145177320506827">"آف"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"آپ کا آپریٹر آپ کا فون مصروف ہونے پر کال آگے منتقل کرنے کو غیر فعال کرنے کا تعاون نہیں کرتا ہے۔"</string>
-    <string name="labelCFNRy" msgid="3646316323834351390">"جواب نہ ملنے پر آگے منتقل کریں"</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"جواب نہ دیے جانے پر"</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="sum_cfnry_disabled" msgid="3884684060443538097">"آف"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"آپ کا آپریٹر آپ کے فون سے جواب نہ ملنے پر کال آگے منتقل کرنے کو غیر فعال کرنے کا تعاون نہیں کرتا ہے۔"</string>
-    <string name="labelCFNRc" msgid="47183615370850000">"ناقابل رسائی ہونے پر آگے منتقل کریں"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"ناقابل رسائی ہونے پر"</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="5646361343094064333">"آپ کا کیریئر آپ کا فون ناقابل رسائی ہونے پر کال آگے منتقل کرنے کو غیر فعال کرنے کا تعاون نہیں کرتا ہے۔"</string>
     <string name="updating_title" msgid="6146755386174019046">"کال کی ترتیبات"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"صرف بنیادی صارف ہی کال کی ترتیبات تبدیل کر سکتا ہے۔"</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"کال کی ترتیبات (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"کال کی ترتیبات کی خرابی"</string>
     <string name="reading_settings" msgid="1920291699287055284">"ترتیبات کو پڑھ رہا ہے…"</string>
     <string name="updating_settings" msgid="8171225533884883252">"ترتیبات کو اپ ڈیٹ کر رہا ہے…"</string>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"آن کریں"</string>
+    <string name="disable" msgid="4678348128118573672">"آف کریں"</string>
     <string name="change_num" msgid="239476305819844391">"اپ ڈیٹ کریں"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"نیٹ ورک ڈیفالٹ"</item>
@@ -123,8 +149,8 @@
     <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="voicemail_default" msgid="2001233554889016880">"آپ کا کیریئر"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"سیلولر نیٹ ورک کی ترتیبات"</string>
     <string name="label_available" msgid="1181658289009300430">"دستیاب نیٹ ورکس"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"تلاش کر رہا ہے…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"کوئی نیٹ ورکس نہیں ملے۔"</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"‏ترجیحی نیٹ ورک طرز: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"ترجیحی نیٹ ورک طرز: عالمی"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"‏ترجیحی نیٹ ورک طرز: LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"‏ترجیحی نیٹ ورک وضع: LTE / GSM / UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"‏ترجیحی نیٹ ورک وضع: LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="7886739962255042385">"LTE / WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"‏صرف GSM"</item>
     <item msgid="3817924849415716259">"‏GSM/WCDMA ترجیحی"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"‏Enhanced 4G LTE وضع"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"‏صوتی اور دیگر مواصلات کو بہتر بنانے کیلئے LTE سروسز استعمال کریں (تجویز کردہ)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"ڈیٹا فعال ہوگیا"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"موبائل نیٹ ورک پر ڈیٹا تک رسائی فعال کریں"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"ڈیٹا کے استعمال کی اجازت دیں"</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="8913735676127858115">"آپ ڈیٹا کی حالت رسائی سے محروم ہوگئے کیونکہ آپ نے ڈیٹا رومنگ آف ہونے کے ساتھ اپنا ہوم نیٹ ورک چھوڑ دیا۔"</string>
-    <string name="roaming_warning" msgid="7820963598559553967">"ڈیٹا رومنگ کی اجازت دیں؟ آپ پر نمایاں رومنگ چارجز لگ سکتے ہیں!"</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"آپ پر خاطر خواہ چارجز لگ سکتے ہیں۔"</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"ڈیٹا رومنگ کی اجازت دیں؟"</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>
@@ -190,7 +221,7 @@
     <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="throttle_help_subtext" msgid="3633091498168446044">"آپ کے کیریئر کے سیلولر نیٹ ورک کے ڈیٹا کے استعمال کی پالیسی کے بارے میں مزید معلومات"</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>
@@ -303,7 +334,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"ڈیٹا سروس تشکیل دیں"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"کیریئر کی ترتیبات"</string>
     <string name="fdn" msgid="7878832555095183202">"فکسڈ ڈائلنگ نمبرز"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"فکسڈ ڈائلنگ نمبرز (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"‏FDN کی فہرست"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"‏FDN فہرست (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"‏FDN کو فعال کرنا"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"فکسڈ ڈائلنگ نمبرز فعال ہیں"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"فکسڈ ڈائلنگ نمبرز غیر فعال ہوگئے ہیں"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"‏TTY طرز متعین کریں"</string>
     <string name="auto_retry_mode_title" msgid="4073265511427813322">"از خود دوبارہ کوشش کریں"</string>
     <string name="auto_retry_mode_summary" msgid="4973886004067532288">"از خود دوبارہ کوشش کریں کا طرز فعال کریں"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"‏ویڈیو کال کے دوران TTY وضع تبدیل کرنے کی اجازت نہیں ہے"</string>
     <string name="menu_add" msgid="1882023737425114762">"رابطہ شامل کریں"</string>
     <string name="menu_edit" msgid="7143003705504672374">"رابطہ میں ترمیم کریں"</string>
     <string name="menu_delete" msgid="3977150783449642851">"رابطہ حذف کریں"</string>
@@ -344,7 +378,7 @@
     <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="1846161429087789936">"‏SIM کارڈ سے رابطے درآمد کرنے کیلئے، پہلے ہوائی جہاز طرز آف کریں۔"</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"‏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>
@@ -354,42 +388,40 @@
     <string name="badPin" msgid="8955102849303984935">"‏آپ کا ٹائپ کردہ پرانا PIN درست نہیں ہے۔ دوبارہ کوشش کریں۔"</string>
     <string name="mismatchPin" msgid="5923253370683071889">"‏آپ کے ٹائپ کردہ PINs مماثل نہیں ہیں۔ دوبارہ کوشش کریں۔"</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="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="1796577128488773946">"‏پاس ورڈ غلط ہے، PIN مسدود ہے! PUK کی درخواست کی گئی۔"</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"‏SIM PIN صاف کریں"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"‏SIM PIN سیٹ کریں"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"‏PIN سیٹ کی جا رہی ہے…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"‏PIN سیٹ ہوگئی"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"‏PIN صاف کر دی گئی"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"‏PIN غلط ہے"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"‏PIN کو اپ ڈیٹ کر دیا گیا"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"‏پاس ورڈ غلط ہے۔ PIN اب مسدود ہے۔ PUK کی درخواست کی گئی۔"</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="4851734468010000418">"‏آپ کا ٹائپ کردہ PUK2 درست نہیں ہے۔ دوبارہ کوشش کریں۔"</string>
-    <string name="badPin2" msgid="1041576234483629991">"‏آپ کا ٹائپ کردہ پرانا PIN2 درست نہیں ہے۔ دوبارہ کوشش کریں۔"</string>
-    <string name="mismatchPin2" msgid="523029155918113440">"‏آپ کے ٹائپ کردہ PIN2s مماثل نہیں ہیں۔ دوبارہ کوشش کریں۔"</string>
-    <string name="invalidPin2" msgid="8237110107480395938">"‏ایسا PIN2 ٹائپ کریں جو 4 تا 8 نمبروں کا ہو۔"</string>
-    <string name="invalidPuk2" msgid="1290977391033057871">"‏ایسا PUK2 ٹائپ کریں جو 8 نمبروں کا ہو۔"</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="3674058967950559397">"‏پاس ورڈ غلط ہے، PIN2 مسدود ہے۔ براہ کرم PIN2 تبدیل کریں اور دوبارہ کوشش کریں!"</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"‏پاس ورڈ غلط ہے، SIM مقفل ہے۔ PUK2 کی درخواست کی گئی۔"</string>
+    <string name="badPuk2" msgid="7910064009531541708">"‏PUK2 غلط ہے۔ دوبارہ کوشش کریں۔"</string>
+    <string name="badPin2" msgid="6646896629970023109">"‏پرانا PIN2 غلط ہے۔ دوبارہ کوشش کریں۔"</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"‏PIN2 مماثل نہیں ہیں۔ دربارہ کوشش کریں۔"</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"‏ایک PIN2 درج کریں جو 4 سے 8 نمبرز تک کی ہو۔"</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"‏ایک PUK2 درج کریں جو 8 نمبرز کا ہو۔"</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"‏PIN2 کو اپ ڈیٹ کر دیا گیا"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"‏PUK2 کوڈ درج کریں"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"‏پاس ورڈ غلط ہے۔ PIN2 اب مسدود ہوگئی۔ دوبارہ کوشش کرنے کیلئے، PIN 2 تبدیل کریں۔"</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"‏پاس ورڈ غلط ہے۔ SIM اب مقفل ہے۔ PUK2 درج کریں۔"</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"‏PUK2 مستقل طور پر مسدود ہے۔"</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"<xliff:g id="NUMBER">%d</xliff:g> کوششیں باقی بچی ہیں۔"</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"‏PIN2 غیر مسدود ہوگیا!"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"آپ کے پاس <xliff:g id="NUMBER">%d</xliff:g> کوششیں بچی ہیں۔"</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"‏PIN2 اب مسدود نہیں ہے"</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_redialing" msgid="8253487008234167266">"دوبارہ ڈائل ہو رہا ہے"</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_dialing" msgid="2107666444937350731">"ڈائل ہو رہا ہے"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"چھوٹی ہوئی کال"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"چھوٹی ہوئی کالیں"</string>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"کال کرنے کیلئے ہوائی جہاز وضع آف کریں۔"</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"کال کرنے کیلئے ہوائی جہاز وضع آف کریں یا کسی وائرلیس نیٹ ورک سے منسلک ہوں۔"</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_error_out_of_service" msgid="4100065333878929223">"سیلولر نیٹ ورک دستیاب نہیں ہے۔"</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"سیلولر نیٹ ورک دستیاب نہیں ہے۔ کال کرنے کیلئے کسی وائرلیس نیٹ ورک سے منسلک ہوں۔"</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"کال کرنے کیلئے، ایک درست نمبر درج کریں۔"</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"کال نہیں کر سکتے۔"</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_unknown" msgid="655570339115407698">"سروس تعاون یافتہ نہیں ہے"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"کالز سوئچ نہیں کر سکتے۔"</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"کال کو الگ نہیں کر سکتے۔"</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"منتقل نہیں کر سکتے۔"</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="incall_error_supp_service_reject" msgid="8998568661508655638">"کال مسترد نہیں کی جا سکتی۔"</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"کال(ز) ریلیز نہیں کر سکتے۔"</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"کال کرنے کیلئے کسی وائرلیس نیٹ ورک سے منسلک ہوں۔"</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="7969515493359619960">"کال نہیں بھیجی گئی۔ <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ایک ہنگامی نمبر نہیں ہے!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"کال نہیں بھیجی گئی۔ ایک ہنگامی نمبر ڈائل کریں!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"کوئی سروس نہیں ہے۔ دوبارہ کوشش کی جا رہی ہے…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"کال نہیں کی جا سکتی۔ <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ایک ہنگامی نمبر نہیں ہے۔"</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"کال نہیں کی جا سکتی۔ ایک ہنگامی نمبر ڈائل کریں۔"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"ڈائل کرنے کیلئے کی بورڈ استعمال کریں"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"ہولڈ کریں"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"ختم کریں"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"حسب معمول"</item>
     <item msgid="2883365539347850535">"طویل"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"نیٹ ورک کا پیغام"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"نیٹ ورک کا پیغام"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"خرابی کا پیغام"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"اپنا فون فعال کریں"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"آپ کی فون سروس فعال ہونے کیلئے ایک خصوصی کال کرنے کی ضرورت ہے۔ \n\n\"فعال کریں\" کو دبانے کے بعد اپنا فون فعال کرنے کیلئے فراہم کردہ ہدایات سنیں۔"</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"فعال ہو رہا ہے…"</string>
@@ -469,8 +504,8 @@
     <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="3420314892609254729">"آپ کے فون کی پروگرامنگ کیے جانے تک انتطار کریں۔"</string>
-    <string name="ota_failure" msgid="4311299546379674378">"پروگرامنگ ناکام رہی"</string>
+    <string name="ota_progress" msgid="460876637828044519">"آپ کے فون کی پروگرامنگ کی جا رہی ہے…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"آپ کے فون کی پروگرامنگ نہیں ہوسکی"</string>
     <string name="ota_successful" msgid="1880780692887077407">"آپ کا فون اب فعال ہوگیا ہے۔ سروس شروع ہونے میں 15 منٹ تک لگ سکتے ہیں۔"</string>
     <string name="ota_unsuccessful" msgid="8072141612635635357">"آپ کا فون فعال نہیں ہوا۔ \nآپ کو بہتر کوریج والی ایک جگہ (کھڑکی کے قریب یا باہر) تلاش کرنی پڑسکتی ہے۔ \n\nدوبارہ کوشش کریں یا مزید اختیارات کیلئے کسٹمر سروس کو کال کریں۔"</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"‏زائد SPC کی ناکامیاں"</string>
@@ -481,18 +516,18 @@
     <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="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="2585506997024726599">"منتخب کردہ کارروائی ہنگامی کال بیک طرز میں دستیاب نہیں ہے۔ فون <xliff:g id="COUNT">%s</xliff:g> منٹ تک اس طرز میں رہے گا۔ کیا آپ ابھی خارج ہونا چاہتے ہیں؟"</item>
-    <item quantity="other" msgid="6115622137771382224">"منتخب کردہ کارروائی ہنگامی کال بیک طرز میں دستیاب نہیں ہے۔ فون <xliff:g id="COUNT">%s</xliff:g> منٹوں تک اس طرز میں رہے گا۔ کیا آپ ابھی خارج ہونا چاہتے ہیں؟"</item>
-  </plurals>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> منٹ تک کوئی ڈیٹا کنکشن نہیں ہے</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> منٹ تک کوئی ڈیٹا کنکشن نہیں ہے</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other">فون <xliff:g id="COUNT_1">%s</xliff:g> منٹ تک ہنگامی کال بیک وضع میں رہے گا۔ اس وضع میں رہتے ہوئے ڈیٹا کنکشن کا استعمال کرنے والی کسی بھی ایپلیکیشنز کا استعمال نہیں کیا جا سکتا ہے۔ کیا آپ ابھی باہر نکلنا چاہتے ہیں؟</item>
+      <item quantity="one">فون <xliff:g id="COUNT_0">%s</xliff:g> منٹ تک ہنگامی کال بیک وضع میں رہے گا۔ اس وضع میں رہتے ہوئے ڈیٹا کنکشن کا استعمال کرنے والی کسی بھی ایپس کا استعمال نہیں کیا جا سکتا ہے۔ کیا آپ ابھی باہر نکلنا چاہتے ہیں؟</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other">منتخب کردہ کارروائی ایک ہنگامی کال بیک وضع میں رہتے ہوئے دستیاب نہیں ہے۔ فون <xliff:g id="COUNT_1">%s</xliff:g> منٹ تک اس وضع میں رہے گا۔ کیا آپ ابھی باہر نکلنا چاہتے ہیں؟</item>
+      <item quantity="one">منتخب کردہ کارروائی ایک ہنگامی کال بیک وضع میں رہتے ہوئے دستیاب نہیں ہے۔ فون <xliff:g id="COUNT_0">%s</xliff:g> منٹ تک اس وضع میں رہے گا۔ کیا آپ ابھی باہر نکلنا چاہتے ہیں؟</item>
+    </plurals>
     <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>
@@ -506,110 +541,23 @@
     <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="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="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="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_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="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="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>
-    <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">"‏keep-alive بھیجیں"</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">"‏&lt;متعین نہیں ہے&gt;"</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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"صوتی کالنگ تعاون یافتہ نہیں ہے"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"فوری جوابات"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></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">"بیک اسپیس"</string>
-    <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_ringtone_title" msgid="2609519527849101590">"آواز"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"ڈیفالٹ آواز (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</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="dial_pad_autocomplete" msgid="494525952035761075">"ڈائل پیڈ خود کار تکمیل"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"رنگ ٹون اور وائبریٹ"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"‏کال کرنے کیلئے Wi-Fi کا استعمال کریں؟"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"ہاں"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"نہیں"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"‏پہلے سے شامل SIM کارڈز"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"پہلے سے شامل انٹرنیٹ کالنگ"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"ویڈیو کالنگ کو آن کریں"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"‏ویڈیو کالنگ کو آن کرنے کیلئے، آپ کیلئے نیٹ ورک ترتیبات میں Enhanced 4G LTE وضع فعال کرنا ضروری ہے۔"</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"نیٹ ورک کی ترتیبات"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"بند کریں"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"ہنگامی کالز"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"صرف ہنگامی کالنگ"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"‏SIM کارڈ، سلاٹ: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Accessibility"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"‏آنے والی Wi-Fi کال"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"‏Wi-Fi کال"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"کھولنے کیلئے دوبارہ ٹچ کریں"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"پیغام کو ڈیکوڈ کرتے وقت ایک خرابی پیش آ گئی۔"</string>
 </resources>
diff --git a/res/values-uz-rUZ/arrays.xml b/res/values-uz-rUZ/arrays.xml
new file mode 100644
index 0000000..773739b
--- /dev/null
+++ b/res/values-uz-rUZ/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Global"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-uz-rUZ/config.xml b/res/values-uz-rUZ/config.xml
deleted file mode 100644
index 97cd933..0000000
--- a/res/values-uz-rUZ/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"noto‘g‘ri"</string>
-</resources>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
new file mode 100644
index 0000000..024f4e4
--- /dev/null
+++ b/res/values-uz-rUZ/strings.xml
@@ -0,0 +1,563 @@
+<?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="1107073389495104784">"Mobil internet"</string>
+    <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Telefon"</string>
+    <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Favqulodda tergich"</string>
+    <string name="phoneIconLabel" msgid="2331230813161304895">"Telefon"</string>
+    <string name="fdnListLabel" msgid="8630418672279521003">"FDN ro‘yxati"</string>
+    <string name="unknown" msgid="6878797917991465859">"Noma’lum"</string>
+    <string name="private_num" msgid="6713286113000232309">"Shaxsiy raqam"</string>
+    <string name="payphone" msgid="4793877574636445118">"Taksofon"</string>
+    <string name="onHold" msgid="9035493194749959955">"Kutmoqda"</string>
+    <string name="mmiStarted" msgid="6347869857061147003">"MMI kodi ishga tushirildi"</string>
+    <string name="ussdRunning" msgid="485588686340541690">"USSD kod bajarilmoqda…"</string>
+    <string name="mmiCancelled" msgid="2771923949751842276">"MMI kodi bekor qilindi"</string>
+    <string name="cancel" msgid="5044513931633602634">"Bekor qilish"</string>
+    <string name="enter_input" msgid="1810529547726803893">"USSD xabari <xliff:g id="MIN_LEN">%d</xliff:g>dan <xliff:g id="MAX_LEN">%d</xliff:g>tagacha belgi bo‘lishi kerak. Yana urinib ko‘ring."</string>
+    <string name="manageConferenceLabel" msgid="4691922394301969053">"Konferensiya qo‘ng‘irog‘ini boshqarish"</string>
+    <string name="ok" msgid="3811371167865772377">"OK"</string>
+    <string name="audio_mode_speaker" msgid="27649582100085266">"Karnay"</string>
+    <string name="audio_mode_earpiece" msgid="4156527186373869107">"Telefon quloq eshitgichlari"</string>
+    <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Simli garnitura"</string>
+    <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
+    <string name="wait_prompt_str" msgid="7601815427707856238">"Ushbu tovushlar jo‘natilsinmi?\n"</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Tovushlar jo‘natilmoqda\n"</string>
+    <string name="send_button" msgid="4106860097497818751">"Jo‘natish"</string>
+    <string name="pause_prompt_yes" msgid="3564467212025151797">"Ha"</string>
+    <string name="pause_prompt_no" msgid="6686238803236884877">"Yo‘q"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Belgilarni quyidagilar bilan almashtiring:"</string>
+    <string name="no_vm_number" msgid="4164780423805688336">"Javobsiz ovozli xabar raqami"</string>
+    <string name="no_vm_number_msg" msgid="1300729501030053828">"SIM kartada birorta ham ovozli xabar saqlanmagan."</string>
+    <string name="add_vm_number_str" msgid="4676479471644687453">"Raqam qo‘shish"</string>
+    <string name="puk_unlocked" msgid="2284912838477558454">"To‘sib qo‘yilgan SIM kartangiz ochildi. Telefoningiz qulfdan chiqarilmoqda…"</string>
+    <string name="label_ndp" msgid="780479633159517250">"SIM kartani tarmoqdagi qulfidan chiqarish PIN kodi"</string>
+    <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Qulfdan chiqarish"</string>
+    <string name="sim_ndp_dismiss_text" msgid="1604823375752456947">"Rad qilish"</string>
+    <string name="requesting_unlock" msgid="6412629401033249351">"Tarmoqni qulfdan chiqarish so‘ralmoqda…"</string>
+    <string name="unlock_failed" msgid="6490531697031504225">"Tarmoqni qulfdan chiqarish so‘rovi muvaffaqiyatli amalga oshmadi."</string>
+    <string name="unlock_success" msgid="6770085622238180152">"Tarmoqni qulfdan chiqarish muvaffaqiyatli amalga oshdi."</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Ushbu foydalanuvchi uchun mobil tarmoq sozlamalari mavjud emas"</string>
+    <string name="labelGSMMore" msgid="5930842194056092106">"GSM tarmog‘i qo‘ng‘iroq sozlamalari"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"GSM qo‘ng‘iroq sozlamalari (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA qo‘ng‘iroq sozlamalari"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"CDMA qo‘ng‘iroq sozlamalari (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="apn_settings" msgid="9043423184895642077">"Ulanish nuqtasi nomlari"</string>
+    <string name="settings_label" msgid="3876743539816984008">"Tarmoq sozlamalari"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Qo‘ng‘iroq uchun hisoblar"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Qo‘ng‘iroqlar uchun hisob"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"SIP qo‘ng‘iroqlari uchun hisob"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Avval so‘ralsin"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Sozlamalar"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Hisoblarni tanlang"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Telefon hisoblari"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"SIP hisobini qo‘shish"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Hisob sozlamalarini shakllantirish"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi qo‘ng‘iroq"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Wi-Fi qo‘ng‘iroqlardan foydalanilmasin"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Qo‘ng‘iroq yordamchisidan foydalanilmasin"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Hech biri"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Qo‘ng‘iroq yordamchisi"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Qo‘ng‘iroq yordamchisidan foydalanish"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Qo‘ng‘iroq yordamchisini tanlang"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Qo‘ng‘iroqlar uchun ishlatiladigan tarmoqlarni boshqarish"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Ilova yoki xizmatlarga qo‘ng‘iroqlarni amalga oshirish uchun ishlatiladigan tarmoqlarni boshqarishga ruxsat bering"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Sozlash"</string>
+    <string name="connection_service_default_label" msgid="1498481943805913754">"Ichki o‘rnatilgan ulanish xizmati"</string>
+    <string name="voicemail" msgid="8693759337917898954">"Ovozli xabar"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"(<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>) audio xabari"</string>
+    <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
+    <string name="networks" msgid="8873030692174541976">"Tarmoq operatorlari"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Favqulodda tarqatma xabarlar"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Qo‘n‘giroq sozlamalari"</string>
+    <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Qo‘shimcha sozlamalar"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Qo‘shimcha sozlamalar (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Qo‘shimcha qo‘ng‘iroq sozlamalari uchun faqat GSM"</string>
+    <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Qo‘shimcha CDMA qo‘ng‘iroq sozlamalari"</string>
+    <string name="sum_cdma_call_settings" msgid="284753265979035549">"Qo‘shimcha qo‘ng‘iroq sozlamalari uchun faqat CDMA"</string>
+    <string name="labelNwService" msgid="4699970172021870983">"Tarmoq xizmati sozlamalari"</string>
+    <string name="labelCallerId" msgid="3888899447379069198">"Qo‘ng‘iroq qiluvchining nomi"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"Sozlamalar yuklanmoqda…"</string>
+    <string name="sum_hide_caller_id" msgid="1071407020290873782">"Chiquvchi qo‘ng‘iroqlarda raqam ko‘rsatilmasin"</string>
+    <string name="sum_show_caller_id" msgid="6768534125447290401">"Raqam chiquvchi qo‘ng‘iroqlarda ko‘rsatilsin"</string>
+    <string name="sum_default_caller_id" msgid="1954518825510901365">"Mening raqamimni chiquvchi qo‘ng‘iroqlarda ko‘rsatish uchun standart tarmoq operatori sozlamalaridan foydalanilsin"</string>
+    <string name="labelCW" msgid="6120513814915920200">"Kutish qo‘ng‘irog‘i"</string>
+    <string name="sum_cw_enabled" msgid="8083061901633671397">"Qo‘ng‘iroq davomida kiruvchi qo‘ng‘iroqlar bo‘lsa, meni ogohlantir"</string>
+    <string name="sum_cw_disabled" msgid="3648693907300104575">"Qo‘ng‘iroq davomida kiruvchi qo‘ng‘iroqlar bo‘lsa, meni ogohlantir"</string>
+    <string name="call_forwarding_settings" msgid="3378927671091537173">"Qo‘ng‘iroqni yo‘naltirish sozlamalari"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Qo‘ng‘iroqni yo‘naltirish sozlamalari (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="labelCF" msgid="2574386948026924737">"Qo‘ng‘iroqni yo‘naltirish"</string>
+    <string name="labelCFU" msgid="8147177368148660600">"Doimo yo‘naltirish"</string>
+    <string name="messageCFU" msgid="3560082430662923687">"Ushbu raqamdan doimo foydalanish"</string>
+    <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Barcha qo‘ng‘iroqlar yo‘naltirilmoqda"</string>
+    <string name="sum_cfu_enabled" msgid="2450052502198827927">"Barcha qo‘ng‘iroqlar <xliff:g id="PHONENUMBER">{0}</xliff:g>ga yo‘naltirilmoqda"</string>
+    <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Raqam mavjud emas"</string>
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"O‘chirilgan"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Band bo‘lsam"</string>
+    <string name="messageCFB" msgid="3711089705936187129">"Band bo‘lganda raqam"</string>
+    <string name="sum_cfb_enabled" msgid="5984198104833116690">"<xliff:g id="PHONENUMBER">{0}</xliff:g>ga yo‘naltirilmoqda"</string>
+    <string name="sum_cfb_disabled" msgid="4913145177320506827">"O‘chirilgan"</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Telefoningiz band bo‘lganda qo‘ng‘iroqlarni boshqa raqamga yo‘naltirishni o‘chirish xususiyati tarmoq operatoringizda yo‘q."</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"Javob bermasam"</string>
+    <string name="messageCFNRy" msgid="672317899884380374">"Javob berilmaganda raqam"</string>
+    <string name="sum_cfnry_enabled" msgid="6955775691317662910">"<xliff:g id="PHONENUMBER">{0}</xliff:g>ga yo‘naltirilmoqda"</string>
+    <string name="sum_cfnry_disabled" msgid="3884684060443538097">"O‘chirilgan"</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Telefoningiz javob bermayotganda qo‘ng‘iroqlarni boshqa raqamga yo‘naltirishni o‘chirish xususiyati operatoringizda yo‘q."</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"Menga tushib bo‘lmasa"</string>
+    <string name="messageCFNRc" msgid="6380695421020295119">"O‘chirilganda raqam"</string>
+    <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"<xliff:g id="PHONENUMBER">{0}</xliff:g>ga yo‘naltirilmoqda"</string>
+    <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"O‘chirilgan"</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Telefoningiz o‘chiq bo‘lganida qo‘ng‘iroqlarni boshqa raqamga yo‘naltirishni o‘chirish xususiyati tarmoq operatoringizda yo‘q."</string>
+    <string name="updating_title" msgid="6146755386174019046">"Qo‘ng‘iroq sozlamalari"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"Faqat asosiy foydalanuvchi qo‘ng‘iroq sozlamalarini o‘zgartirishi mumkin."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Qo‘ng‘iroq sozlamalari (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="error_updating_title" msgid="7970259216988931777">"Qo‘ng‘iroq sozlamalarida xato"</string>
+    <string name="reading_settings" msgid="1920291699287055284">"Sozlamalar o‘qilmoqda…"</string>
+    <string name="updating_settings" msgid="8171225533884883252">"Sozlamalar yangilanmoqda…"</string>
+    <string name="reverting_settings" msgid="4752151682666912828">"Sozlamalar tiklanmoqda…"</string>
+    <string name="response_error" msgid="6674110501330139405">"Tarmoqdan kutilmagan javob."</string>
+    <string name="exception_error" msgid="7027667130619518211">"Tarmoq yoki SIM kartada xato."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"Telefoningiz ilovasining ruxsat berilgan raqamlar sozlamalari yoqildi. Natijada, ba’zi qo‘ng‘iroq qilish tegishli xususiyatlar ishlamaydi."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"Ushbu sozlamalarni ko‘rishdan oldin radioni yoqing."</string>
+    <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
+    <string name="enable" msgid="7248657275000173526">"Yoqish"</string>
+    <string name="disable" msgid="4678348128118573672">"O‘chirib qo‘yish"</string>
+    <string name="change_num" msgid="239476305819844391">"Yangilash"</string>
+  <string-array name="clir_display_values">
+    <item msgid="5560134294467334594">"Standart tarmoq"</item>
+    <item msgid="7876195870037833661">"Raqamni yashirish"</item>
+    <item msgid="1108394741608734023">"Raqamni ko‘rsatish"</item>
+  </string-array>
+    <string name="vm_changed" msgid="380744030726254139">"Ovozli xabar raqami o‘zgartirildi."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"Ovozli xabar raqami o‘zgartirimaldi.\nUshbu muammoni hal qila olmasangiz, operatoringiz bilan bog‘laning."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"Yo‘naltirish raqamini o‘zgartirib bo‘lmadi.\nAgar ushbu muammoni hal qilib bo‘lmasa, operator bilan bog‘laning."</string>
+    <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Joriy raqamlarni yo‘naltirish sozlamalarini olib va saqlab bo‘lmadi.\nYangi operatorga o‘tilaverilsinmi?"</string>
+    <string name="no_change" msgid="3186040086622435212">"O‘zgarishlar qilinmadi."</string>
+    <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Ovozli xabar xizmatini tanlash"</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"Aloqa operatoringiz"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Mobil tarmoq sozlamalari"</string>
+    <string name="label_available" msgid="1181658289009300430">"Mavjud tarmoqlar"</string>
+    <string name="load_networks_progress" msgid="5230707536168902952">"Qidirmoqda…"</string>
+    <string name="empty_networks_list" msgid="4249426905018815316">"Birorta ham tarmoq topilmadi."</string>
+    <string name="search_networks" msgid="1601136049300882441">"Tarmoqlarni izlash"</string>
+    <string name="network_query_error" msgid="6828516148953325006">"Tarmoqlar izlanayotganda xato."</string>
+    <string name="register_on_network" msgid="9055203954040805084">"<xliff:g id="NETWORK">%s</xliff:g>da ro‘yxatdan o‘tmoqda…"</string>
+    <string name="not_allowed" msgid="5613353860205691579">"SIM kartangiz ushbu tarmoqqa ulanishga ruxsat bermaydi."</string>
+    <string name="connect_later" msgid="2308119155752343975">"Ushbu tarmoqqa hozirgi vaqtda ulanib bo‘lmaydi. Keyinroq urinib ko‘ring."</string>
+    <string name="registration_done" msgid="495135664535876612">"Tarmoqda ro‘yxatdan o‘tgan."</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Tarmoq operatorini tanlang"</string>
+    <string name="sum_search_networks" msgid="2921092249873272715">"Barcha mavjud tarmoqlarni izlash"</string>
+    <string name="select_automatically" msgid="5628402124471810174">"Avtomatik tanlash"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"Siz xohlagan tarmoqni avtomatik tanlash"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"Avtomatik ro‘yxatdan o‘tish…"</string>
+    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Tanlangan tarmoq turi"</string>
+    <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Tarmoq rejimini o‘zgartiring"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Tanlangan tarmoq turi"</string>
+    <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Tanlangan tarmoq rejimi: WCDMA tanlangan"</string>
+    <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Tanlangan tarmoq rejimi: faqat GSM"</string>
+    <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Tanlangan tarmoq rejimi: faqat WCDMA"</string>
+    <string name="preferred_network_mode_gsm_wcdma_summary" msgid="3161255745326408587">"Tanlangan tarmoq rejimi: GSM / WCDMA"</string>
+    <string name="preferred_network_mode_cdma_summary" msgid="3175690187294334241">"Tanlangan tarmoq rejimi: CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Tanlangan tarmoq rejimi: CDMA / EvDo"</string>
+    <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Tanlangan tarmoq rejimi: CDMA only"</string>
+    <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Tanlangan tarmoq rejimi: faqat EvDo"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Tanlangan tarmoq rejimi: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Tanlangan tarmoq rejimi: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Tanlangan tarmoq rejimi: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Tanlangan tarmoq rejimi: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Tanlangan tarmoq rejimi: Global"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Tanlangan tarmoq rejimi: LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Ma’qul tarmoq rejimi: LTE / GSM / UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Ma’qul tarmoq rejimi: LTE / CDMA"</string>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="7886739962255042385">"LTE / WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"Global"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"Faqat EvDo"</item>
+    <item msgid="1508557726283094448">"CDMA tarmog‘i EvDo’siz"</item>
+    <item msgid="4341433122263841224">"CDMA/EvDo avto"</item>
+    <item msgid="5958053792390386668">"GSM/WCDMA avto"</item>
+    <item msgid="7913148405605373434">"Faqat WCDMA"</item>
+    <item msgid="1524224863879435516">"Faqat GSM"</item>
+    <item msgid="3817924849415716259">"GSM/WCDMA xohishingiz bo‘yicha"</item>
+  </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Kuchaytirilgan 4G LTE rejimi"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Ovozli va boshqa aloqalarni yaxshilash uchun LTE xizmatlaridan foydalaning"</string>
+    <string name="data_enabled" msgid="5972538663568715366">"Internet yoqildi"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Mobil internetdan foydalanishga ruxsat"</string>
+    <string name="roaming" msgid="8871412572928323707">"Ma’lumotlar roumingi"</string>
+    <string name="roaming_enable" msgid="7331106985174381987">"Rouming holatda ma’lumot uzatish xizmatlariga ulanish"</string>
+    <string name="roaming_disable" msgid="1843417228755568110">"Rouming holatda ma’lumot uzatish xizmatlariga ulanish"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Internetga ulanish uzildi, chunki uy tarmog‘ingizni rouming internetini o\'chirgan holatda tark etdingiz."</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"Roumingdan foydalanish xarajati ancha yuqori bo‘lishi mumkin."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Internet-roumingga ruxsat berilsinmi?"</string>
+    <string name="gsm_umts_options" msgid="6538311689850981686">"GSM/UMTS sozlamalari"</string>
+    <string name="cdma_options" msgid="4016822858172249884">"CDMA sozlamalari"</string>
+    <string name="throttle_data_usage" msgid="3715677828160555808">"Trafik sarfi"</string>
+    <string name="throttle_current_usage" msgid="8762280193043815361">"Joriy muddatda foydalanilgan Internet"</string>
+    <string name="throttle_time_frame" msgid="1915198770363734685">"Ma‘lumotdan foydalanish muddati"</string>
+    <string name="throttle_rate" msgid="4710388992676803508">"Ma‘lumotlar uzatish tezligi siyosati"</string>
+    <string name="throttle_help" msgid="243651091785169900">"Ko‘proq o‘rganish"</string>
+    <string name="throttle_status_subtext" msgid="1657318943142085170">"Maksimal daraja muddati <xliff:g id="USED_2">%3$s</xliff:g>dan <xliff:g id="USED_0">%1$s</xliff:g> (<xliff:g id="USED_1">%2$d</xliff:g>٪) \nKeyingi muddat <xliff:g id="USED_3">%4$d</xliff:g> kunda (<xliff:g id="USED_4">%5$s</xliff:g>) boshlanadi."</string>
+    <string name="throttle_data_usage_subtext" msgid="6029276011123694701">"Maksimal daraja muddati <xliff:g id="USED_2">%3$s</xliff:g>dan <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> maksimal darajadan oshib ketdi\nTrafik tezligi <xliff:g id="USED_1">%2$d</xliff:g> Kb/s’ga pasaydi"</string>
+    <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"<xliff:g id="USED_0">%1$d</xliff:g>٪ o‘tgan bosqichdan\nKeyingi bosqich <xliff:g id="USED_1">%2$d</xliff:g> kunda boshlanadi (<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
+    <string name="throttle_rate_subtext" msgid="2149102656120726855">"Agar trafik sarfi cheklovdan oshsa, ma’lumot uzatish tezligi <xliff:g id="USED">%1$d</xliff:g> Kb/s’ga pasayadi"</string>
+    <string name="throttle_help_subtext" msgid="3633091498168446044">"Aloqa operatoringizning mobil internetidan foydalanish qoidalari haqida batafsil ma’lumot"</string>
+    <string name="cell_broadcast_sms" msgid="5584192824053625842">"Uyali tarmoqdagi SMS"</string>
+    <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"Uyali tarmoqdagi SMS"</string>
+    <string name="cell_bc_sms_enable" msgid="6441688565738921084">"Uyali tarmoqdagi SMS yoqilb qo‘yilgan"</string>
+    <string name="cell_bc_sms_disable" msgid="3398365088309408749">"Uyali tarmoqdagi SMS o‘chirib qo‘yilgan"</string>
+    <string name="cb_sms_settings" msgid="651715019785107312">"Uyali tarmoqdagi SMS sozlamalari"</string>
+    <string name="enable_disable_emergency_broadcast" msgid="2157014609041245335">"Favqulodda signal uzatish"</string>
+    <string name="emergency_broadcast_enable" msgid="2645980025414010211">"Favqulodda signal uzatish yoqilgan"</string>
+    <string name="emergency_broadcast_disable" msgid="3665199821267569426">"Favqulodda signal uzatish o‘chirilgan"</string>
+    <string name="enable_disable_administrative" msgid="6501582322182059412">"Ma’muriy"</string>
+    <string name="administrative_enable" msgid="1750086122962032235">"Nazorat yoqildi"</string>
+    <string name="administrative_disable" msgid="8433273857248698539">"Nazorat o‘chirildi"</string>
+    <string name="enable_disable_maintenance" msgid="1819693083025106678">"Ta’minot"</string>
+    <string name="maintenance_enable" msgid="8566636458770971189">"Ta’minot yoqildi"</string>
+    <string name="maintenance_disable" msgid="7340189100885066077">"Ta’minot o‘chirildi"</string>
+    <string name="general_news_settings" msgid="4968779723948432978">"Umumiy yangiliklar"</string>
+    <string name="bf_news_settings" msgid="3935593091894685267">"Biznes va iqtisod yangiliklari"</string>
+    <string name="sports_news_settings" msgid="7649399631270052835">"Sport yangiliklari"</string>
+    <string name="entertainment_news_settings" msgid="5051153952959405035">"Qiziqarli yangiliklar"</string>
+    <string name="enable_disable_local" msgid="7890281063123416120">"Mahalliy"</string>
+    <string name="local_enable" msgid="6370463247609136359">"Mahalliy yangiliklar yoqildi"</string>
+    <string name="local_disable" msgid="4405691986943795798">"Mahalliy yangiliklar o‘chirildi"</string>
+    <string name="enable_disable_regional" msgid="4905652414535565872">"Hududiy"</string>
+    <string name="regional_enable" msgid="4434680415437834759">"Hududiy yangiliklar yoqildi"</string>
+    <string name="regional_disable" msgid="5359325527213850077">"Hududiy yangiliklar o‘chirildi"</string>
+    <string name="enable_disable_national" msgid="236278090206880734">"Milliy"</string>
+    <string name="national_enable" msgid="1172443648912246952">"Milliy yangiliklar yoqib qo‘yildi"</string>
+    <string name="national_disable" msgid="326018148178601166">"Milliy yangiliklar o‘chirib qo‘yildi"</string>
+    <string name="enable_disable_international" msgid="7535348799604565592">"Xalqaro"</string>
+    <string name="international_enable" msgid="5855356769925044927">"Xalqaro xabarlar yoqib qo‘yildi"</string>
+    <string name="international_disable" msgid="2850648591041088931">"Xalqaro xabarlar o‘chirib qo‘yildi"</string>
+    <string name="list_language_title" msgid="2841683501919760043">"Til"</string>
+    <string name="list_language_summary" msgid="8109546531071241601">"Yangiliklar tilini tanlang"</string>
+  <string-array name="list_language_entries">
+    <item msgid="6137851079727305485">"Ingliz tili"</item>
+    <item msgid="1151988412809572526">"Fransuzcha"</item>
+    <item msgid="577840534704312665">"Ispancha"</item>
+    <item msgid="8385712091143148180">"Yaponcha"</item>
+    <item msgid="1858401628368130638">"Koreyscha"</item>
+    <item msgid="1933212028684529632">"Xitoycha"</item>
+    <item msgid="1908428006803639064">"Yahudiycha"</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">"Tillar"</string>
+    <string name="enable_disable_local_weather" msgid="986967454867219114">"Mahalliy ob-havo"</string>
+    <string name="local_weather_enable" msgid="6199315114382448922">"Mahalliy ob-havo yoqildi"</string>
+    <string name="local_weather_disable" msgid="2510158089142626480">"Mahalliy ob-havo o‘chirildi"</string>
+    <string name="enable_disable_atr" msgid="8339572391278872343">"Hudud trafigi ma’lumotlari"</string>
+    <string name="atr_enable" msgid="5541757457789181799">"Hudud trafik ma’lumotlari yoqib qo‘yildi"</string>
+    <string name="atr_disable" msgid="7085558154727596455">"Hudud trafik ma’lumotlari o‘chirib qo‘yildi"</string>
+    <string name="enable_disable_lafs" msgid="668189073721277199">"Mahalliy parvozlar jadvallari"</string>
+    <string name="lafs_enable" msgid="2791978667205137052">"Mahalliy aeroport parvozlari jadvallari yoqildi"</string>
+    <string name="lafs_disable" msgid="2391212397725495350">"Mahalliy aeroport parvozlari jadvallari o‘chirildi"</string>
+    <string name="enable_disable_restaurants" msgid="6240381945336814024">"Restoranlar"</string>
+    <string name="restaurants_enable" msgid="5137657479469118847">"Restoranlar yoqildi"</string>
+    <string name="restaurants_disable" msgid="3678480270938424092">"Restoranlar o‘chirildi"</string>
+    <string name="enable_disable_lodgings" msgid="1822029172658551202">"Turar joy"</string>
+    <string name="lodgings_enable" msgid="3230042508992850322">"Turar joylar yoqildi"</string>
+    <string name="lodgings_disable" msgid="3387879742320682391">"Turar joylar o‘chirildi"</string>
+    <string name="enable_disable_retail_directory" msgid="1357809784475660303">"Chakana savdo ma’lumotnomasi"</string>
+    <string name="retail_directory_enable" msgid="3280626290436111496">"Chakana savdo ma’lumotnomasi yoqildi"</string>
+    <string name="retail_directory_disable" msgid="6479739816662879027">"Chakana savdo ma’lumotnomasi o‘chirildi"</string>
+    <string name="enable_disable_advertisements" msgid="5999495926176182128">"Reklama"</string>
+    <string name="advertisements_enable" msgid="2050305021264683786">"Reklama yoqib qo‘yildi"</string>
+    <string name="advertisements_disable" msgid="8350985908788707935">"Reklama o‘chirib qo‘yildi"</string>
+    <string name="enable_disable_stock_quotes" msgid="6397810445293533603">"Aksiya qiymatlari"</string>
+    <string name="stock_quotes_enable" msgid="4384802470887170543">"Aksiyalar bahosi yoqib qo‘yildi"</string>
+    <string name="stock_quotes_disable" msgid="4781450084565594998">"Aksiyalar bahosi o‘chirib qo‘yildi"</string>
+    <string name="enable_disable_eo" msgid="4863043263443942494">"Mehnat imkoniyatlari"</string>
+    <string name="eo_enable" msgid="8623559062015685813">"Ish bilan bandlik imkoniyatlari yoqildi"</string>
+    <string name="eo_disable" msgid="3863812478090907609">"Ish bilan bandlik imkoniyatlari o‘chirildi"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"Tibbiyot, sog‘lik va shifoxona"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"Tibbiyot, sog‘lik va shifoxona yoqildi"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"Tibbiyot, sog‘lik va shifoxona o‘chirildi"</string>
+    <string name="enable_disable_technology_news" msgid="3517184627114999149">"Texnologiya yangiliklari"</string>
+    <string name="technology_news_enable" msgid="7995209394210455181">"Texnologiya yangiliklari yo‘qib qo‘yildi"</string>
+    <string name="technology_news_disable" msgid="5483490380561851946">"Texnologiya yangiliklari o‘chirib qo‘yildi"</string>
+    <string name="enable_disable_multi_category" msgid="626771003122899280">"Ko‘p darajali"</string>
+    <string name="multi_category_enable" msgid="1179299804641721768">"Ko‘p daraja yoqildi"</string>
+    <string name="multi_category_disable" msgid="880104702904139505">"Ko‘p daraja o‘chirildi"</string>
+    <string name="network_lte" msgid="7702681952521375754">"LTE (tavsiya qilinadi)"</string>
+    <string name="network_4G" msgid="2723512640529983138">"4G (tavsiya qilinadi)"</string>
+    <string name="network_global" msgid="1323190488685355309">"Global"</string>
+    <string name="cdma_system_select_title" msgid="5757657769327732833">"Tizimni tanlash"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"CDMA tarmog‘i rouming rejimini o‘zgartirish"</string>
+    <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Tizimni tanlash"</string>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="176474317493999285">"Faqat Uy"</item>
+    <item msgid="1205664026446156265">"Avtomatik"</item>
+  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"CDMA tarmog‘iga obuna"</string>
+    <string name="cdma_subscription_summary" msgid="2530890766115781140">"RUIM/SIM va NV o‘rtasida o‘zaro almashish"</string>
+    <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"obuna"</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">"Qurilmani faollashtirish"</string>
+    <string name="cdma_lte_data_service" msgid="4255018217292548962">"Ma’lumot xizmatini o‘rnatish"</string>
+    <string name="carrier_settings_title" msgid="9028166176523012300">"Tarmoq operatori sozlamalari"</string>
+    <string name="fdn" msgid="7878832555095183202">"Ruxsat berilgan raqamlar"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"O‘zgarmas chaqiruv raqamlari (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="manage_fdn_list" msgid="8777755791892122369">"FDN ro‘yxati"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"O‘zgarmas chaqiruv raqamlari ro‘yxati (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="fdn_activation" msgid="2156479741307463576">"FDN’ni faollashtirish"</string>
+    <string name="fdn_enabled" msgid="5238109009915521240">"Ruxsat berilgan raqamlar yoqib qo‘yildi"</string>
+    <string name="fdn_disabled" msgid="4700049736675368279">"Ruxsat berilgan raqamlar o‘chirib qo‘yildi"</string>
+    <string name="enable_fdn" msgid="3740191529180493851">"FDN’ni yoqish"</string>
+    <string name="disable_fdn" msgid="7944020890722540616">"FDN’ni o‘chirish"</string>
+    <string name="change_pin2" msgid="2153563695382176676">"PIN2 kodni o‘zgartiring"</string>
+    <string name="enable_fdn_ok" msgid="7215588870329688132">"FDN’ni o‘chirish"</string>
+    <string name="disable_fdn_ok" msgid="5727046928930740173">"FDN’ni yoqish"</string>
+    <string name="sum_fdn" msgid="1959399454900272878">"Ruxsat berilgan raqamlarni boshqarish"</string>
+    <string name="sum_fdn_change_pin" msgid="6666549734792827932">"FDN’ga kirish uchun PIN kodni almashtiring"</string>
+    <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Telefon raqamlari ro‘yxatini boshqarish"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"Shaxsiy ovoz"</string>
+    <string name="voice_privacy_summary" msgid="3159383389833516214">"Maxfiylikni kuchaytirish rejimini yoqish"</string>
+    <string name="tty_mode_option_title" msgid="9033098925144434669">"TTY rejimi"</string>
+    <string name="tty_mode_option_summary" msgid="1073835131534808732">"TTY rejimini o‘rnatish"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"Avto-qayta urinish"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Avto-qayta urinish rejimini yoqish"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"Video qo‘ng‘iroq davomida TTY rejimini o‘zgartirish taqiqlangan"</string>
+    <string name="menu_add" msgid="1882023737425114762">"Kontakt qo‘shish"</string>
+    <string name="menu_edit" msgid="7143003705504672374">"Kontaktni tahrirlash"</string>
+    <string name="menu_delete" msgid="3977150783449642851">"Kontaktni o‘chirish"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"PIN2 kodni kiriting"</string>
+    <string name="name" msgid="7329028332786872378">"Nomi"</string>
+    <string name="number" msgid="7905950798349903858">"Raqam"</string>
+    <string name="save" msgid="4094274636321939086">"Saqlash"</string>
+    <string name="add_fdn_contact" msgid="2481915899633353976">"Ruxsat berilgan raqamni qo‘shish"</string>
+    <string name="adding_fdn_contact" msgid="7627379633721940991">"Ruxsat berilgan raqam qo‘shilmoqda…"</string>
+    <string name="fdn_contact_added" msgid="7458335758501736665">"Ruxsat berilgan raqamlar qo‘shildi."</string>
+    <string name="edit_fdn_contact" msgid="7976936035587081480">"Ruxsat berilgan raqamlarni tahrirlash"</string>
+    <string name="updating_fdn_contact" msgid="8370929876849803600">"Ruxsat berilgan raqamlarni yangilamoqda…"</string>
+    <string name="fdn_contact_updated" msgid="5497828782609005017">"Ruxsat berilgan raqamlar yangilandi."</string>
+    <string name="delete_fdn_contact" msgid="6668958073074151717">"Ruxsat berilgan raqamni o‘chirish"</string>
+    <string name="deleting_fdn_contact" msgid="5669163206349319969">"Ruxsat berilgan raqamlar o‘chirilmoqda…"</string>
+    <string name="fdn_contact_deleted" msgid="7154162327112259569">"Ruxsat berilgan raqamlar o‘chirildi."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"FDN yangilanmadi, chunki siz noto‘g‘ri PIN kod kiritdingiz."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN yangilanmadi, chunki raqam 20 tadan oshmasligi kerak."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN yangilanmadi. PIN2 kodi xato yoki telefon raqami rad qilingan."</string>
+    <string name="fdn_failed" msgid="540018079008319747">"FDN jarayoni amalga oshmadi."</string>
+    <string name="simContacts_emptyLoading" msgid="2203331234764498011">"SIM kartadan o‘qilmoqda…"</string>
+    <string name="simContacts_empty" msgid="5270660846489561932">"SIM kartangizda kontaktlar yo‘q."</string>
+    <string name="simContacts_title" msgid="1861472842524839921">"Import qilish uchun kontaktlarni tanlang"</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"SIM kartadan kontaktlarni import qilish uchun parvoz rejimini o‘chiring"</string>
+    <string name="enable_pin" msgid="5422767284133234860">"SIM karta PIN kodini yoqish/o‘chirish"</string>
+    <string name="change_pin" msgid="9174186126330785343">"SIM karta PIN kodini o‘zgartirish"</string>
+    <string name="enter_pin_text" msgid="8532615714751931951">"SIM karta PIN kodi:"</string>
+    <string name="oldPinLabel" msgid="5287773661246368314">"Yangi PIN kod"</string>
+    <string name="newPinLabel" msgid="207488227285336897">"Yangi PIN kod"</string>
+    <string name="confirmPinLabel" msgid="257597715098070206">"Yangi PIN kodni tasdiqlash"</string>
+    <string name="badPin" msgid="8955102849303984935">"Siz kiritgan eski PIN kod xato. Yana urinib ko‘ring."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"Siz yozgan PIN kodlar bir xil emas. Yana urinib ko‘ring."</string>
+    <string name="invalidPin" msgid="5981171102258684792">"PIN kod raqamini 4 tadan 8 tagacha bo‘lgan miqdorda kiriting."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"SIM karta PIN kodini o‘chirish"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"SIM kartaga PIN kod o‘rnatish"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"PIN kod o‘rnatilmoqda…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN kod o‘rnatildi"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN kod o‘chirildi"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN kod noto‘g‘ri"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN kod yangilandi"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Parol noto‘g‘ri. PIN kod bloklandi. PUK kodni kiriting."</string>
+    <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2 kodi"</string>
+    <string name="oldPin2Label" msgid="8559146795026261502">"Eski PIN2 kod"</string>
+    <string name="newPin2Label" msgid="4573956902204349054">"Yangi PIN2 kodi"</string>
+    <string name="confirmPin2Label" msgid="8100319484454787708">"Yangi PIN2 kodni tasdiqlash"</string>
+    <string name="badPuk2" msgid="7910064009531541708">"PUK2 kodi noto‘g‘ri. Qaytadan urining."</string>
+    <string name="badPin2" msgid="6646896629970023109">"Eski PIN2 kodi noto‘g‘ri. Qaytadan urining."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2 kodlari bir-biriga mos kelmadi. Qaytadan urining."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"4-8 ta raqamdan iborat PIN2 kodini kiriting."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"8 ta raqamdan iborat PUK2 kodini kiriting."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 kodi yangilandi"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"PUK2 kodini kiriting"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Parol noto‘g‘ri. PIN2 kodi bloklandi. Qaytadan urinish uchun PIN2 kodini o‘zgartiring."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Parol noto‘g‘ri. SIM karta qulflandi. PUK2 kodini kiriting."</string>
+    <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 kod butunlay to‘sib qo‘yildi."</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"Sizda <xliff:g id="NUMBER">%d</xliff:g> ta urinish qoldi."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 kodi blokdan chiqarildi"</string>
+    <string name="doneButton" msgid="2859593360997984240">"Tayyor"</string>
+    <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Ovozli xabar raqami"</string>
+    <string name="card_title_dialing" msgid="5769417478498348054">"Raqam terilmoqda"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Qayta terilmoqda"</string>
+    <string name="card_title_conf_call" msgid="1162980346189744501">"Konferensiya qo‘ng‘irog‘i"</string>
+    <string name="card_title_incoming_call" msgid="7364539451234646909">"Kiruvchi qo‘ng‘iroq"</string>
+    <string name="card_title_call_ended" msgid="5544730338889702298">"Qo‘ng‘iroq tugadi"</string>
+    <string name="card_title_on_hold" msgid="821463117892339942">"Kutish holatida"</string>
+    <string name="card_title_hanging_up" msgid="3999101620995182450">"Go‘shak qo‘yilmoqda"</string>
+    <string name="card_title_in_call" msgid="6346543933068225205">"Qo‘ng‘iroqda"</string>
+    <string name="notification_dialing" msgid="2107666444937350731">"Terilmoqda"</string>
+    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Javob berilmagan qo‘ng‘iroq"</string>
+    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Javobsiz qo‘ng‘iroqlar"</string>
+    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> ta javobsiz qo‘ng‘iroq"</string>
+    <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g>dan javobsiz qo‘ng‘iroq"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Joriy qo‘ng‘iroq"</string>
+    <string name="notification_on_hold" msgid="3480694969511790465">"Kutmoqda"</string>
+    <string name="notification_incoming_call" msgid="2820429205043529642">"Kiruvchi qo‘ng‘iroq"</string>
+    <string name="notification_voicemail_title" msgid="8933468752045550523">"Yangi ovozli xabar"</string>
+    <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Yangi ovozli xabar (<xliff:g id="COUNT">%d</xliff:g>)"</string>
+    <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>ni terish"</string>
+    <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Ovozli qo‘ng‘iroq raqami noma’lum"</string>
+    <string name="notification_network_selection_title" msgid="4224455487793492772">"Xizmat mavjud emas"</string>
+    <string name="notification_network_selection_text" msgid="2607085729661923269">"Tanlangan tarmoq (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) mavjud emas"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Go‘shakni qo‘yish"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Teskari qo‘ng‘iroq"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Xabar"</string>
+    <string name="incall_error_power_off" msgid="2947938060513306698">"Qo‘ng‘iroq qilish uchun parvoz rejimini o‘chiring"</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Qo‘ng‘iroq qilish uchun parvoz rejimini o‘chiring yoki simsiz tarmoqqa ulaning."</string>
+    <string name="incall_error_emergency_only" msgid="4678640422710818317">"Tarmoqda ro‘yxatdan o‘tmagan."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Mobil tarmoq mavjud emas."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Mobil tarmoq mavjud emas. Qo‘ng‘iroq qilish uchun simsiz tarmoqqa ulaning."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Qo‘ng‘iroq qilish uchun raqamni to‘g‘ri kiriting."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Qo‘ng‘iroq qilib bo‘lmadi."</string>
+    <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI tartibi ishga tushmoqda..."</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Bu xizmat qo‘llab-quvvatlanmaydi"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Qo‘ng‘iroqlarni almashtirib bo‘lmadi."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Qo‘ng‘iroqni ajratib bo‘lmadi."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"O‘tkazib bo‘lmadi."</string>
+    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Konferensiya qo‘ng‘iroqlarini amalga oshirib bo‘lmaydi."</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Qo‘ng‘iroqni rad qilib bo‘lmadi."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Qo‘ng‘iroq(lar)ni chiqarib bo‘lmadi."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Qo‘ng‘iroq qilish uchun simsiz tarmoqqa ulaning"</string>
+    <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Favqulodda qo‘ng‘iroq"</string>
+    <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Radio yoqilmoqda…"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Aloqa yo‘q. Qayta urinilmoqda…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Qo‘ng‘iroq qilib bo‘lmadi. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> favqulodda raqam emas."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Qo‘ng‘iroq qilib bo‘lmadi. Favqulodda raqamga tering."</string>
+    <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Terish uchun tugmatagdan foydalaning"</string>
+    <string name="onscreenHoldText" msgid="2285258239691145872">"Ushlab turish"</string>
+    <string name="onscreenEndCallText" msgid="4403855834875398585">"Tugatish"</string>
+    <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Terish paneli"</string>
+    <string name="onscreenMuteText" msgid="5011369181754261374">"Ovozni o‘chirish"</string>
+    <string name="onscreenAddCallText" msgid="5140385634712287403">"Qo‘ng‘iroq qo‘shish"</string>
+    <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Qo‘ng‘iroqlarni birlashtirish"</string>
+    <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Almashish"</string>
+    <string name="onscreenManageCallsText" msgid="5473231160123254154">"Qo‘ng‘iroqlarni boshqarish"</string>
+    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Konferensiyani boshqarish"</string>
+    <string name="onscreenAudioText" msgid="1710087112800041743">"Audio"</string>
+    <string name="onscreenVideoCallText" msgid="4800924186056115442">"Video qo‘ng‘iroq"</string>
+    <string name="importSimEntry" msgid="6614358325359736031">"Import qilish"</string>
+    <string name="importAllSimEntries" msgid="1503181169636198673">"Barchasini import qilish"</string>
+    <string name="importingSimContacts" msgid="7374056215462575769">"SIM karta kontaktlarini import qilish"</string>
+    <string name="importToFDNfromContacts" msgid="2130620207013368580">"Kontaktlardan import qilish"</string>
+    <string name="hac_mode_title" msgid="8740268574688743289">"Eshitish qurilmalari"</string>
+    <string name="hac_mode_summary" msgid="6833851160514929341">"Eshitish qurilmalari bilan ishlash xusisiyatini yoqish"</string>
+  <string-array name="tty_mode_entries">
+    <item msgid="512950011423868021">"TTY o‘chirilgan"</item>
+    <item msgid="3971695875449640648">"TTY to‘liq"</item>
+    <item msgid="1937509904407445684">"TTY HCO"</item>
+    <item msgid="5644925873488772224">"TTY VCO"</item>
+  </string-array>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"DTMF tovushlari"</string>
+    <string name="dtmf_tones_summary" msgid="3351820372864020331">"DTMF tovushlari uzunligini o‘rnatish"</string>
+  <string-array name="dtmf_tone_entries">
+    <item msgid="899650777817315681">"O‘rtacha"</item>
+    <item msgid="2883365539347850535">"Uzun"</item>
+  </string-array>
+    <string name="network_info_message" msgid="7738596060242881930">"Tarmoq xabari"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Xatolik xabari"</string>
+    <string name="ota_title_activate" msgid="8616918561356194398">"Telefoningizni faollashtirish"</string>
+    <string name="ota_touch_activate" msgid="6553212803262586244">"Telefoningizda xizmatni faollashtirish uchun maxsus qo‘ng‘iroq amalga oshirilishi kerak. \n\n“Faollashtirish” bosilgandan so‘ng, telefoningizni faollashtirish uchun  beriladigan ko‘rsatmalarga quloq soling."</string>
+    <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Faollashtirilmoqda..."</string>
+    <string name="ota_hfa_activation_dialog_message" msgid="8092479227918463415">"Telefoningiz internetga ulanish xizmatini faollashtirmoqda.\n\nBu 5 daqiqa vaqt olishi mumkin."</string>
+    <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Faollashtirish tashlab ketilsinmi?"</string>
+    <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Agar faollashtirishni tashlab ketsangiz, qo‘ng‘iroqlarni amalga oshira olmaysiz yoki internet tarmog‘iga ulana olmaysiz (biroq Wi-FI tarmog‘iga ulanish mumkin). Agar telefoningiz faollashtirilmasa, har safar yoqqaningizda, faollashtirishni so‘raydi."</string>
+    <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Tashlab ketish"</string>
+    <string name="ota_activate" msgid="1368528132525626264">"Faollashtirish"</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"Telefon faollashtirildi."</string>
+    <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Faollashtirish bilan muammo"</string>
+    <string name="ota_listen" msgid="162923839877584937">"Faollashtirish tugamaguncha og‘zaki ko‘rsatmalarni bajaring."</string>
+    <string name="ota_speaker" msgid="6904589278542719647">"Karnay"</string>
+    <string name="ota_progress" msgid="460876637828044519">"Telefoningiz dasturlanmoqda…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Telefoningizni dasturlab bo‘lmadi"</string>
+    <string name="ota_successful" msgid="1880780692887077407">"Telefoningiz hozir faollashtiriladi. U xizmat ishga tushishi uchun 15 daqiqa vaqtingizni oladi."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"Telefoningiz faollashtirilmadi. \nYaxshiroq antena chiqadigan joyni topishingiz lozim (masalan, oyna yaqini yoki tashqari). \n\nYana urinib ko‘ring yoki yordam olish uchun mijozlarga xizmat ko‘rsatish bo‘limiga qo‘ng‘iroq qiling."</string>
+    <string name="ota_spc_failure" msgid="3909983542575030796">"SPC XATOLARI KO‘PAYIB KETDI"</string>
+    <string name="ota_call_end" msgid="4537279738134612388">"Orqaga"</string>
+    <string name="ota_try_again" msgid="7685477206465902290">"Yana urinib ko‘ring"</string>
+    <string name="ota_next" msgid="3904945374358235910">"Navbatdagi"</string>
+    <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
+    <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Favqulodda teskari qo‘ng‘iroq rejimi kiritildi"</string>
+    <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Favqulodda teskari qo‘ng‘iroq rejimi"</string>
+    <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Internetga ulanish o‘chirildi"</string>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> daqiqa davomida internetga ulanib bo‘lmaydi</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> daqiqa davomida internetga ulanib bo‘lmaydi</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other">Telefon <xliff:g id="COUNT_1">%s</xliff:g> daqiqa davomida Favqulodda teskari qo‘ng‘iroq rejimida bo‘ladi. Ushbu rejimda internet bilan ishlaydigan hech qanday ilovadan foydalanib bo‘lmaydi. Bu rejimdan chiqishni xohlaysizmi?</item>
+      <item quantity="one">Telefon <xliff:g id="COUNT_0">%s</xliff:g> daqiqa davomida Favqulodda teskari qo‘ng‘iroq rejimida bo‘ladi. Ushbu rejimda internet bilan ishlaydigan hech qanday ilovadan foydalanib bo‘lmaydi. Bu rejimdan chiqishni xohlaysizmi?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other">Tanlangan amaldan Favqulodda teskari qo‘ng‘iroq rejimida foydalanib bo‘lmaydi. Telefon <xliff:g id="COUNT_1">%s</xliff:g> daqiqa davomida shu rejimda bo‘ladi. Bu rejimdan chiqishni xohlaysizmi?</item>
+      <item quantity="one">Tanlangan amaldan Favqulodda teskari qo‘ng‘iroq rejimida foydalanib bo‘lmaydi. Telefon <xliff:g id="COUNT_0">%s</xliff:g> daqiqa davomida shu rejimda bo‘ladi. Bu rejimdan chiqishni xohlaysizmi?</item>
+    </plurals>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"Favqulodda qo‘ng‘rioq rejimida tanlangan amalni bajarib bo‘lmaydi."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Favqulodda teskari qo‘ng‘iroq rejimidan chiqilmoqda"</string>
+    <string name="alert_dialog_yes" msgid="6674268047820703974">"Ha"</string>
+    <string name="alert_dialog_no" msgid="1476091437797628703">"Yo‘q"</string>
+    <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Rad qilish"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Xizmat"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Moslash"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;O‘rnatilmagan&gt;"</string>
+    <string name="other_settings" msgid="3672912580359716394">"Boshqa qo‘ng‘iroq sozlamalari"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> orqali qo‘ng‘rioq qilinmoqda"</string>
+    <string name="contactPhoto" msgid="4713193418046639466">"kontakt surati"</string>
+    <string name="goPrivate" msgid="865837794424530980">"alohidaga o‘tish"</string>
+    <string name="selectContact" msgid="781975788478987237">"kontaktni tanlash"</string>
+    <string name="not_voice_capable" msgid="2739898841461577811">"Ovozli qo‘ng‘iroq ishlamaydi"</string>
+    <string name="description_dial_button" msgid="7459705245418435351">"terish"</string>
+    <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Tebranish"</string>
+    <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Tebratish"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Ovoz"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Qo‘ng‘iroq ohangi &amp; tebranish"</string>
+    <string name="pstn_connection_service_label" msgid="1743245930577325900">"Ichki o‘rnatilgan SIM kartalar"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Video qo\'ng\'iroqni yoqib qo\'yish"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Video qo‘ng‘iroqni yoqish uchun tarmoq sozlamalaridan “Kuchaytirilgan 4G LTE rejimi” yoqilgan bo‘lishi lozim."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Tarmoq sozlamalari"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Yopish"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Favqulodda qo‘ng‘iroqlar"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Faqat favqulodda qo‘ng‘iroqlar"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM karta, teshik: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Maxsus imkoniyatlar"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Kiruvchi Wi-Fi qo‘ng‘irog‘i"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi qo‘ng‘irog‘i"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Ochish uchun yana bosing"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"Xabarni kodsizlashda xatolik yuz berdi."</string>
+</resources>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
new file mode 100644
index 0000000..ee1cd8e
--- /dev/null
+++ b/res/values-vi/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Toàn cầu"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-vi/config.xml b/res/values-vi/config.xml
deleted file mode 100644
index 850c494..0000000
--- a/res/values-vi/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"sai"</string>
-</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 5c5c75d..757517f 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -16,14 +16,14 @@
 
 <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">"Dữ liệu di động"</string>
+    <string name="phoneAppLabel" product="tablet" msgid="1107073389495104784">"Dữ liệu di động"</string>
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Điện thoại"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Trình quay số Khẩn cấp"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Điện thoại"</string>
     <string name="fdnListLabel" msgid="8630418672279521003">"Danh sách FDN"</string>
     <string name="unknown" msgid="6878797917991465859">"Không xác định"</string>
     <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="payphone" msgid="4793877574636445118">"Điện thoại công cộng"</string>
     <string name="onHold" msgid="9035493194749959955">"Đang chờ"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Đã bắt đầu mã MMI"</string>
     <string name="ussdRunning" msgid="485588686340541690">"Mã USSD đang chạy…"</string>
@@ -52,18 +52,41 @@
     <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="mobile_network_settings_not_available" msgid="7355254462995117896">"Cài đặt mạng di động không khả dụng cho người dùng này"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Không có cài đặt mạng di động cho người dùng này"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Cài đặt cuộc gọi GSM"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"Cài đặt cuộc gọi GSM (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Cài đặt cuộc gọi CDMA"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"Cài đặt cuộc gọi CDMA (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Tên Điểm Truy cập"</string>
     <string name="settings_label" msgid="3876743539816984008">"Cài đặt mạng"</string>
-    <string name="connection_service" msgid="978745922583410219">"Dịch vụ kết nối sẽ sử dụng"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Tài khoản gọi"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Thực hiện cuộc gọi bằng"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Thực hiện cuộc gọi SIP bằng"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Hỏi trước"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Cài đặt"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Chọn tài khoản"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Tài khoản điện thoại"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Thêm tài khoản SIP"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Định cấu hình cài đặt tài khoản"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Gọi qua Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Không sử dụng tính năng gọi qua Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Không sử dụng trợ lý cuộc gọi"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Không có"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Trợ lý cuộc gọi"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Sử dụng trợ lý cuộc gọi"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Chọn trợ lý cuộc gọi"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Quản lý mạng được sử dụng để gọi điện"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Cho phép các ứng dụng hoặc dịch vụ quản lý mạng dùng cho cuộc gọi"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Định cấu hình"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Dịch vụ kết nối được tích hợp"</string>
     <string name="voicemail" msgid="8693759337917898954">"Thư thoại"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Thư thoại (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"Thư thoại:"</string>
     <string name="networks" msgid="8873030692174541976">"Nhà cung cấp dịch vụ mạng"</string>
-    <string name="call_settings" msgid="1630474923393095156">"Cài đặt cuộc gọi"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Phát sóng trong tình huống khẩn cấp"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Cài đặt cuộc gọi"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Cài đặt bổ sung"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Cài đặt bổ sung (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Cài đặt cuộc gọi chỉ GSM bổ sung"</string>
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Cài đặt cuộc gọi CDMA bổ sung"</string>
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Cài đặt cuộc gọi chỉ CDMA bổ sung"</string>
@@ -77,29 +100,32 @@
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Trong suốt cuộc gọi, thông báo cho tôi về cuộc gọi đến"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Trong suốt cuộc gọi, thông báo cho tôi về cuộc gọi đến"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Cài đặt chuyển tiếp cuộc gọi"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Cài đặt chuyển tiếp cuộc gọi (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Chuyển tiếp cuộc gọi"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Luôn chuyển tiếp"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Luôn sử dụng số này"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Chuyển tiếp tất cả cuộc gọi"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Chuyển tiếp tất cả cuộc gọi tới <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Số không có"</string>
-    <string name="sum_cfu_disabled" msgid="3698472522160364904">"Đã tắt"</string>
-    <string name="labelCFB" msgid="218938523102207587">"Chuyển tiếp khi bận"</string>
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Tắt"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Khi bận"</string>
     <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="sum_cfb_disabled" msgid="4913145177320506827">"Tắt"</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="labelCFNRy" msgid="1736067178393744351">"Khi không được 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="sum_cfnry_disabled" msgid="3884684060443538097">"Tắt"</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="labelCFNRc" msgid="2614827454402079766">"Khi không liên lạc được"</string>
+    <string name="messageCFNRc" msgid="6380695421020295119">"Số khi không liên lạc đượ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="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="call_settings_primary_user_only" msgid="5679923943740900965">"Chỉ người dùng chính mới có thể thay đổi cài đặt cuộc gọi."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Cài đặt cuộc gọi (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
     <string name="updating_settings" msgid="8171225533884883252">"Đang cập nhật cài đặt..."</string>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"Bật"</string>
+    <string name="disable" msgid="4678348128118573672">"Tắt"</string>
     <string name="change_num" msgid="239476305819844391">"Cập nhật"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Mặc định mạng"</item>
@@ -123,8 +149,8 @@
     <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.\nBạ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>
-    <string name="voicemail_default" msgid="5902099213882352338">"Nhà cung cấp dịch vụ của tôi"</string>
-    <string name="mobile_networks" msgid="5540397602919106177">"Cài đặt mạng di động"</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"Nhà cung cấp dịch vụ của bạn"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Cài đặt mạng di động"</string>
     <string name="label_available" msgid="1181658289009300430">"Mạng khả dụng"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Đang tìm kiếm…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Không tìm thấy mạng nào."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Chế độ mạng được ưa thích: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Chế độ mạng được ưa thích: Toàn cầu"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Chế độ mạng được ưa thích: LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Chế độ mạng ưu tiên: LTE / GSM / UMTS"</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="7886739962255042385">"LTE / WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"Chỉ GSM"</item>
     <item msgid="3817924849415716259">"GSM/WCDMA được ưa thích"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Chế độ 4G LTE tăng cường"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Sử dụng dịch vụ LTE để cải tiến tính năng thoại và các phương thức giao tiếp khác (khuyến nghị)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Đã bật dữ liệu"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Bật truy cập dữ liệu qua mạng Di động"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Cho phép sử dụng dữ liệu"</string>
     <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="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="roaming_warning" msgid="1603164667540144353">"Bạn có thể phải chịu các khoản phí đáng kể."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Cho phép chuyển vùng dữ liệu?"</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>
@@ -190,7 +221,7 @@
     <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"Đã vượt quá tối đa <xliff:g id="USED_0">%1$s</xliff:g>\nTốc độ dữ liệu bị giảm xuống <xliff:g id="USED_1">%2$d</xliff:g> Kb/giây"</string>
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"<xliff:g id="USED_0">%1$d</xliff:g>٪ của chu kỳ đã qua\nThờ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="throttle_help_subtext" msgid="3633091498168446044">"Thông tin thêm về chính sách sử dụng dữ liệu mạng di động của nhà cung cấp dịch vụ của bạn"</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>
@@ -303,7 +334,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Thiết lập dịch vụ dữ liệu"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Cài đặt nhà cung cấp dịch vụ"</string>
     <string name="fdn" msgid="7878832555095183202">"Số Quay Định sẵn"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Số gọi cố định (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Danh sách FDN"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"Danh sách FDN (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Kích hoạt FDN"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Số Quay số Định sẵn đã được bật"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Số Quay Định sẵn bị vô hiệu hóa"</string>
@@ -321,6 +354,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Đặt chế độ TTY"</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="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"Không được phép thay đổi Chế độ TTY trong cuộc gọi điện video"</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>
@@ -344,7 +378,7 @@
     <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="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="simContacts_airplaneMode" msgid="5254946758982621072">"Tắt chế độ trên máy bay để nhập danh bạ từ thẻ SIM."</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>
@@ -354,42 +388,40 @@
     <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="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="1796577128488773946">"Mật khẩu không chính xác, mã PIN bị chặn! Yêu cầu mã PUK."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"Xóa mã PIN trên SIM"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"Đặt mã PIN trên SIM"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"Đang đặt mã PIN…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"Đã đặt mã PIN"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"Đã xóa mã PIN"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"Mã PIN không đúng"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"Đã cập nhật mã PIN"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Mật khẩu không đúng. Mã PIN hiện đã bị chặn. Yêu cầu PUK."</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="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="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="3674058967950559397">"Mật khẩu không chính xác, mã PIN2 bị chặn. Vui lòng 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="badPuk2" msgid="7910064009531541708">"PUK2 không đúng. Hãy thử lại."</string>
+    <string name="badPin2" msgid="6646896629970023109">"PIN2 cũ không đúng. Hãy thử lại."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"Các PIN2 không khớp với nhau. Hãy thử lại."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Nhập PIN2 dài  từ 4 tới 8 chữ số."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Nhập PUK2 dài 8 chữ số."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"Đã cập nhật PIN2"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Nhập mã PUK2"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Mật khẩu không đúng. PIN2 hiện đã bị chặn. Để thử lại, hãy thay đổi  PIN 2."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Mật khẩu không đúng. SIM hiện đã bị chặn. Hãy nhập PUK2."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 bị chặn vĩnh viễn."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Còn <xliff:g id="NUMBER">%d</xliff:g> lần thử."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"Đã bỏ chặn mã PIN2!"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"Bạn còn <xliff:g id="NUMBER">%d</xliff:g> lần thử."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 không còn bị chặn"</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="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_redialing" msgid="8253487008234167266">"Đang quay số 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_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>
     <string name="card_title_in_call" msgid="6346543933068225205">"Đang trong cuộc gọi"</string>
-    <string name="card_title_my_phone_number" msgid="112428362494434191">"Số điện thoại của tôi là <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Đang gọi"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Cuộc gọi nhỡ"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Cuộc gọi nhỡ"</string>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"Tắt chế độ trên máy bay để thực hiện cuộc gọi."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Tắt chế độ trên máy bay hoặc kết nối với mạng không dây để thực hiện cuộc gọi."</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_error_out_of_service" msgid="4100065333878929223">"Không có mạng di động."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Hiện không có mạng di động. Hãy kết nối với mạng không dây để thực hiện cuộc gọi."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Để thực hiện cuộc gọi, hãy nhập một số hợp lệ."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Không thực hiện được cuộc gọi."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Khởi động chuỗi MMI…"</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>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Không thể chuyển cuộc gọi."</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Dịch vụ không được hỗ trợ"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Không chuyển đổi được cuộc gọi."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Không tách được cuộc gọi."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Không chuyển được cuộc gọi."</string>
     <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Không thể thực hiện cuộc gọi hội nghị."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Không thể từ chối cuộc gọi."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Không thể thực hiện cuộc gọi."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Cuộc gọi qua internet"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Không từ chối được cuộc gọi."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Không thực hiện được cuộc gọi."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Kết nối với mạng không dây để thực hiện cuộc gọi."</string>
     <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="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="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Không có dịch vụ nào. Đang thử lại…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Không thực hiện được cuộc gọ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="9130194953830414638">"Không thực hiện được cuộc gọi. Hãy quay số khẩn cấp."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Sử dụng bàn phím để quay số"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Giữ"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Kết thúc"</string>
@@ -456,7 +490,8 @@
     <item msgid="899650777817315681">"Thường"</item>
     <item msgid="2883365539347850535">"Dài"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Thông báo của mạng"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Thông báo của mạng"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Thông báo lỗi"</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\nSau 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_hfa_activation_title" msgid="2234246934160473981">"Đang kích hoạt..."</string>
@@ -469,8 +504,8 @@
     <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_speaker" msgid="6904589278542719647">"Loa"</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_progress" msgid="460876637828044519">"Đang lập trình điện thoại của bạn…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Không thể lập trình điện thoại của bạn"</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="8072141612635635357">"Điện thoại của bạn chưa được kích hoạt. \nBạ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\nHã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>
@@ -481,18 +516,18 @@
     <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>
     <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Đã tắt kết nối mạng"</string>
-  <plurals name="phone_in_ecm_notification_time">
-    <item quantity="one" msgid="4866221796252472622">"Không có kết nối dữ liệu trong <xliff:g id="COUNT">%s</xliff:g> phút"</item>
-    <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="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="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>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other">Không có kết nối dữ liệu trong <xliff:g id="COUNT_1">%s</xliff:g> phút</item>
+      <item quantity="one">Không có kết nối dữ liệu trong <xliff:g id="COUNT_0">%s</xliff:g> phút</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other">Điện thoại sẽ ở chế độ Gọi lại khẩn cấp trong <xliff:g id="COUNT_1">%s</xliff:g> phút. Khi ở chế độ này, không thể dùng bất kỳ ứng dụng nào sử dụng kết nối dữ liệu. Bạn có muốn thoát chế độ này ngay bây giờ không?</item>
+      <item quantity="one">Điện thoại sẽ ở chế độ Gọi lại khẩn cấp trong <xliff:g id="COUNT_0">%s</xliff:g> phút. Khi ở chế độ này, không thể dùng bất kỳ ứng dụng nào sử dụng kết nối dữ liệu. Bạn có muốn thoát chế độ này ngay bây giờ không?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other">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_1">%s</xliff:g> phút. Bạn có muốn thoát chế độ này ngay bây giờ không?</item>
+      <item quantity="one">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_0">%s</xliff:g> phút. Bạn có muốn thoát chế độ này ngay bây giờ không?</item>
+    </plurals>
     <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>
@@ -506,110 +541,23 @@
     <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_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_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="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="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="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="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_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="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="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>
-    <string name="username_title" msgid="2479375923477682328">"Tên người dùng"</string>
-    <string name="password_title" msgid="3323555249068171531">"Mật khẩu"</string>
-    <string name="display_name_title" msgid="2459768196312249937">"Tên hiển thị"</string>
-    <string name="proxy_address_title" msgid="4828301345351614273">"Địa chỉ proxy đi"</string>
-    <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="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>
-    <string name="auth_username_title" msgid="851473016307947120">"Tên người dùng xác thực"</string>
-    <string name="auth_username_summary" msgid="6782012405225938629">"Tên người dùng được sử dụng để xác thực"</string>
-    <string name="default_preference_summary" msgid="868766740121667450">"&lt;Chưa được đặt&gt;"</string>
-    <string name="display_name_summary" msgid="8636377460518225523">"&lt;Giống như tên người dùng&gt;"</string>
-    <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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"Không hỗ trợ tính năng gọi thoại"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Trả lời nhanh"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"một"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"hai"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"ba"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"bốn"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"năm"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"sáu"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"bảy"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"tám"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"chín"</string>
-    <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_dial_button" msgid="7459705245418435351">"quay số"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"phím lùi"</string>
-    <string name="description_target_answer" msgid="7205604197797472471">"Trả lời"</string>
-    <string name="description_target_send_sms" msgid="2098326025587950144">"Gửi SMS"</string>
-    <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="2609519527849101590">"Âm thanh"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Âm thanh mặc định (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <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="dial_pad_autocomplete" msgid="494525952035761075">"Tự động hoàn thành bằng bàn phím số"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Nhạc chuông và rung"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Sử dụng Wi-Fi để thực hiện cuộc gọi?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Có"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"Không"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Thẻ SIM tích hợp sẵn"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Tích hợp sẵn gọi điện qua Internet"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Bật gọi điện video"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Để bật tính năng gọi điện video, bạn cần bật chế độ 4G LTE tăng cường trong cài đặt mạng."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Cài đặt mạng"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Đóng"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Cuộc gọi khẩn cấp"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Chỉ gọi điện khẩn cấp"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"Thẻ SIM, rãnh: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Trợ năng"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Cuộc gọi đến qua Wi-Fi"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Cuộc gọi qua Wi-Fi"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Chạm lại để mở"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"Đã xảy ra lỗi khi giải mã tin nhắn."</string>
 </resources>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
new file mode 100644
index 0000000..4a7c249
--- /dev/null
+++ b/res/values-zh-rCN/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"通用"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-zh-rCN/config.xml b/res/values-zh-rCN/config.xml
deleted file mode 100644
index 0605cd7..0000000
--- a/res/values-zh-rCN/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"false"</string>
-</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 3aafaa6..c7338c9 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -16,14 +16,14 @@
 
 <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="phoneAppLabel" product="tablet" msgid="1107073389495104784">"移动数据网络"</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="payphone" msgid="4793877574636445118">"公用电话"</string>
     <string name="onHold" msgid="9035493194749959955">"保持"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI 码已启动"</string>
     <string name="ussdRunning" msgid="485588686340541690">"正在运行 USSD 代码..."</string>
@@ -43,27 +43,50 @@
     <string name="pause_prompt_no" msgid="6686238803236884877">"否"</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="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="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="mobile_network_settings_not_available" msgid="7355254462995117896">"此用户无法修改移动网络设置"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"此用户无法修改移动网络设置"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM 通话设置"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"GSM 通话设置（<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>）"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA 通话设置"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"CDMA 通话设置（<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>）"</string>
     <string name="apn_settings" msgid="9043423184895642077">"接入点名称 (APN)"</string>
     <string name="settings_label" msgid="3876743539816984008">"网络设置"</string>
-    <string name="connection_service" msgid="978745922583410219">"要使用的网络连接服务"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"通话帐户"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"选择通话帐户"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"选择 SIP 通话帐户"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"先询问"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"设置"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"选择帐户"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"电话帐户"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"添加 SIP 帐户"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"配置帐户设置"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"WLAN 通话"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"不使用 WLAN 通话功能"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"不使用通话助手"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"无"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"通话助手"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"使用通话助手"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"选择通话助手"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"管理用于通话的网络"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"允许应用或服务管理用于通话的网络"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"配置"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"内置网络连接服务"</string>
     <string name="voicemail" msgid="8693759337917898954">"语音信箱"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"语音信箱（<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>）"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"语音信箱："</string>
     <string name="networks" msgid="8873030692174541976">"网络运营商"</string>
-    <string name="call_settings" msgid="1630474923393095156">"通话设置"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"紧急广播"</string>
+    <string name="call_settings" msgid="6112441768261754562">"通话设置"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"其他设置"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"其他设置 (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
@@ -77,40 +100,43 @@
     <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="call_forwarding_settings_with_label" msgid="8569489414006897127">"来电转接设置 (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="sum_cfu_disabled" msgid="8384177689501334080">"关闭"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"占线时"</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="sum_cfb_disabled" msgid="4913145177320506827">"关闭"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"您的运营商不支持在手机占线时停用来电转接功能。"</string>
-    <string name="labelCFNRy" msgid="3646316323834351390">"无人接听时转接"</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"无人接听时"</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="sum_cfnry_disabled" msgid="3884684060443538097">"关闭"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"您的运营商不支持在手机无人接听时停用来电转接功能。"</string>
-    <string name="labelCFNRc" msgid="47183615370850000">"无法接通时转接"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"无法接通时"</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="5646361343094064333">"您的运营商不支持在手机无法接通时停用来电转接功能。"</string>
     <string name="updating_title" msgid="6146755386174019046">"通话设置"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"只有主用户才能更改通话设置。"</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"通话设置 (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="exception_error" msgid="7027667130619518211">"网络或SIM卡出错。"</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>
+    <string name="enable" msgid="7248657275000173526">"开启"</string>
+    <string name="disable" msgid="4678348128118573672">"关闭"</string>
     <string name="change_num" msgid="239476305819844391">"更新"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"网络默认设置"</item>
@@ -123,15 +149,15 @@
     <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="voicemail_default" msgid="2001233554889016880">"您的运营商"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"移动网络设置"</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="5613353860205691579">"您的 SIM 卡不允许连接到此网络。"</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="3494252551249882718">"选择网络运营商"</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"首选网络模式：CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"首选网络模式：通用"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"首选网络模式：LTE/WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"首选网络模式：LTE / GSM / UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"首选网络模式：LTE/CDMA"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="7886739962255042385">"LTE/WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,16 +199,19 @@
     <item msgid="1524224863879435516">"仅 GSM"</item>
     <item msgid="3817924849415716259">"首选 GSM/WCDMA"</item>
   </string-array>
-    <string name="data_enabled" msgid="5972538663568715366">"启用数据网络"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"允许通过移动网络存取数据"</string>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"增强型 4G LTE 模式"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"使用 LTE 服务改进语音和其他通信功能（推荐）"</string>
+    <string name="data_enabled" msgid="5972538663568715366">"启用移动数据网络"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"允许使用数据流量"</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="8913735676127858115">"移动数据网络连接已断开，因为您已离开本地网络并关闭了移动数据网络漫游功能。"</string>
-    <string name="roaming_warning" msgid="7820963598559553967">"是否要允许移动数据网络漫游？这可能产生大量漫游费！"</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"这可能会产生高额费用。"</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"要允许数据网络漫游吗？"</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_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>
@@ -190,7 +221,7 @@
     <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="throttle_help_subtext" msgid="3633091498168446044">"您的运营商的移动网络数据使用政策详情"</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>
@@ -289,7 +320,7 @@
     <item msgid="1205664026446156265">"自动"</item>
   </string-array>
     <string name="cdma_subscription_title" msgid="1162564010076763284">"CDMA 订阅"</string>
-    <string name="cdma_subscription_summary" msgid="2530890766115781140">"在 RUIM/SIM 和 NV 之间进行切换"</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>
@@ -303,28 +334,31 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"设置数据服务"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"运营商设置"</string>
     <string name="fdn" msgid="7878832555095183202">"固定拨号"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"固定拨号 (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"固定拨号列表"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"固定拨号列表 (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="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="sum_fdn_manage_list" msgid="8431088265332628316">"管理号码列表"</string>
     <string name="voice_privacy" msgid="3776841382844614716">"语音隐私权"</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="4073265511427813322">"自动重拨"</string>
     <string name="auto_retry_mode_summary" msgid="4973886004067532288">"启用自动重拨模式"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"视频通话过程中不允许更改为 TTY 模式"</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="8204677063922225311">"键入 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>
@@ -337,59 +371,57 @@
     <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="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="fdn_failed" msgid="540018079008319747">"FDN 操作失败。"</string>
-    <string name="simContacts_emptyLoading" msgid="2203331234764498011">"正在从 SIM 卡读取..."</string>
-    <string name="simContacts_empty" msgid="5270660846489561932">"SIM 卡上无联系人。"</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="fdn_failed" msgid="540018079008319747">"固定拨号操作失败。"</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="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="simContacts_airplaneMode" msgid="5254946758982621072">"需关闭飞行模式才能导入 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="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="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="1796577128488773946">"密码不正确，PIN 码已被锁定！请提供 PUK 码。"</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="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="1639666438836544393">"已成功更改 PIN2。"</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"输入 PUK2 码"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"密码不正确，PIN2码已被锁定。请更改PIN2码并重试！"</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"密码有误，SIM 卡已锁定。需要 PUK2。"</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"清除 SIM 卡 PIN 码"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"设置 SIM 卡 PIN 码"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"正在设置 PIN 码…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN 码已设置"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN 码已清除"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN 码不正确"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN 码已更新"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"密码不正确。PIN 码已被锁定。已请求 PUK 码。"</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="7910064009531541708">"PUK2 码不正确，请重试。"</string>
+    <string name="badPin2" msgid="6646896629970023109">"旧的 PIN2 码不正确，请重试。"</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2 码不正确，请重试。"</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"请输入 4 到 8 位数字的 PIN2 码。"</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"请输入 8 位数字的 PUK2 码。"</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 码已更新"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"输入 PUK2 码"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"密码不正确。PIN2 码已被锁定。请更改 PIN2 码，然后重试。"</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"密码不正确。SIM 卡已锁定。请输入 PUK2 码。"</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2码已被永远锁定。"</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"还有<xliff:g id="NUMBER">%d</xliff:g>次尝试机会。"</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2码已解锁！"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"您还可以尝试输入 <xliff:g id="NUMBER">%d</xliff:g> 次。"</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 码已解除锁定"</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_redialing" msgid="8253487008234167266">"正在重拨"</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_dialing" msgid="2107666444937350731">"正在拨号"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"未接电话"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"未接电话"</string>
@@ -407,25 +439,27 @@
     <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_power_off" msgid="2947938060513306698">"需关闭飞行模式才能拨打电话。"</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"需关闭飞行模式或连接至无线网络才能拨打电话。"</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_error_out_of_service" msgid="4100065333878929223">"无法连接到移动网络。"</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"移动网络不可用。需连接至无线网络才能拨打电话。"</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"要拨打电话，请输入有效的电话号码。"</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"无法拨打该电话。"</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_unknown" msgid="655570339115407698">"服务不受支持"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"无法切换通话。"</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"无法单独通话。"</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"无法转移呼叫。"</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="incall_error_supp_service_reject" msgid="8998568661508655638">"无法拒接来电。"</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"无法挂断电话。"</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"需连接至无线网络才能拨打电话。"</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="7969515493359619960">"电话未拨出，<xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> 不是紧急呼救号码！"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"电话未拨出，请拨打紧急呼救电话！"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"无服务，正在重试…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"无法拨打该电话。<xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> 不是紧急呼救号码。"</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"无法拨打该电话。请拨打紧急呼救电话。"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"使用键盘拨号"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"等待"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"挂断"</string>
@@ -440,12 +474,12 @@
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"视频通话"</string>
     <string name="importSimEntry" msgid="6614358325359736031">"导入"</string>
     <string name="importAllSimEntries" msgid="1503181169636198673">"全部导入"</string>
-    <string name="importingSimContacts" msgid="7374056215462575769">"正在导入 SIM 联系人"</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="512950011423868021">"TTY 关闭"</item>
     <item msgid="3971695875449640648">"TTY 完整"</item>
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
@@ -456,21 +490,22 @@
     <item msgid="899650777817315681">"正常"</item>
     <item msgid="2883365539347850535">"长"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"网络讯息"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"网络消息"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"错误消息"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"激活您的手机"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"需要拨打特别号码才能激活您的手机服务。\n\n在按下“激活”后，按照语音提示激活您的手机。"</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"正在激活…"</string>
     <string name="ota_hfa_activation_dialog_message" msgid="8092479227918463415">"手机正在激活您的移动数据网络服务。\n\n此过程最多5分钟就能完成。"</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"略过激活步骤？"</string>
-    <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"如果您略过激活步骤，就无法拨打电话或连接到移动数据网络（不过您可以连接到 WLAN 网络）。如果您不激活手机，每次开机时都会收到激活提示。"</string>
+    <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"如果您略过激活步骤，就无法拨打电话或连接到移动数据网络（不过您可以连接到WLAN网络）。如果您不激活手机，每次开机时都会收到激活提示。"</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="6570240212263372046">"手机已激活。"</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="3420314892609254729">"正在向您的手机中写入程序，请稍候。"</string>
-    <string name="ota_failure" msgid="4311299546379674378">"写入程序失败"</string>
+    <string name="ota_progress" msgid="460876637828044519">"正在向您的手机推送…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"无法向您的手机推送"</string>
     <string name="ota_successful" msgid="1880780692887077407">"您的手机已激活。最多 15 分钟即可开始使用服务。"</string>
     <string name="ota_unsuccessful" msgid="8072141612635635357">"您的手机未激活。\n您可能需要找一个手机信号更好的位置（窗户附近或室外）。\n\n请重试或致电客户服务小组寻求更多解决方法。"</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"SPC 故障太多"</string>
@@ -481,18 +516,18 @@
     <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="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="2585506997024726599">"无法在紧急回拨模式下执行所选操作，而手机在 <xliff:g id="COUNT">%s</xliff:g> 分钟内都会处于此模式下。要立即退出吗？"</item>
-    <item quantity="other" msgid="6115622137771382224">"无法在紧急回拨模式下执行所选操作，而手机在 <xliff:g id="COUNT">%s</xliff:g> 分钟内都会处于此模式下。要立即退出吗？"</item>
-  </plurals>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other">持续 <xliff:g id="COUNT_1">%s</xliff:g> 分钟没有数据网络连接</item>
+      <item quantity="one">持续 <xliff:g id="COUNT_0">%s</xliff:g> 分钟没有数据网络连接</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other">手机在 <xliff:g id="COUNT_1">%s</xliff:g> 分钟内都会处于紧急回拨模式。此模式下无法使用任何需要连接数据网络的应用。要立即退出吗？</item>
+      <item quantity="one">手机在 <xliff:g id="COUNT_0">%s</xliff:g> 分钟内都会处于紧急回拨模式。此模式下无法使用任何需要连接数据网络的应用。要立即退出吗？</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other">在紧急回拨模式下无法执行所选操作。手机在 <xliff:g id="COUNT_1">%s</xliff:g> 分钟内都会处于此模式。要立即退出吗？</item>
+      <item quantity="one">在紧急回拨模式下无法执行所选操作。手机在 <xliff:g id="COUNT_0">%s</xliff:g> 分钟内都会处于此模式。要立即退出吗？</item>
+    </plurals>
     <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>
@@ -506,110 +541,23 @@
     <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">"使用互联网电话（仅限 WLAN）"</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="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="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="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_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="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">"由于未连接到 WLAN 网络，帐户注册已停止。"</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="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>
-    <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">"&lt;未设置&gt;"</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="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">"无 WLAN 连接"</string>
-    <string name="no_internet_available" msgid="7877142631803238549">"要拨打互联网电话，请先检查互联网连接情况。"</string>
-    <string name="no_wifi_available" msgid="1225073547318465713">"您需要连接到 WLAN 网络才能使用互联网电话（使用“无线与网络”设置）。"</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_setting_title" msgid="3754000371039709383">"快速回复"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></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="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 name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"提示音"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"默认提示音 (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</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="dial_pad_autocomplete" msgid="494525952035761075">"拨号键盘自动补全"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"铃声和振动"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"要使用WLAN通话吗？"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"是"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"否"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"内置SIM卡"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"内置互联网通话服务"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"开启视频通话功能"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"要开启视频通话功能，您需要在网络设置中启用增强型 4G LTE 模式。"</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"网络设置"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"关闭"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"紧急呼救"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"只能拨打紧急呼救电话"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM 卡，插槽：<xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"无障碍功能"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"WLAN 来电"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"WLAN 通话"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"再次触摸即可打开"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"对邮件解码时出错。"</string>
 </resources>
diff --git a/res/values-zh-rHK/arrays.xml b/res/values-zh-rHK/arrays.xml
new file mode 100644
index 0000000..4a7c249
--- /dev/null
+++ b/res/values-zh-rHK/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"通用"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-zh-rHK/config.xml b/res/values-zh-rHK/config.xml
deleted file mode 100644
index 631e1a5..0000000
--- a/res/values-zh-rHK/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"錯"</string>
-</resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 9afd67d..c869eb3 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -16,14 +16,14 @@
 
 <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="tablet" msgid="1107073389495104784">"流動數據"</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">"FDN 清單"</string>
     <string name="unknown" msgid="6878797917991465859">"未知"</string>
     <string name="private_num" msgid="6713286113000232309">"私人號碼"</string>
-    <string name="payphone" msgid="1931775086311769314">"公共電話"</string>
+    <string name="payphone" msgid="4793877574636445118">"公共電話"</string>
     <string name="onHold" msgid="9035493194749959955">"保留通話"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI 碼開始執行"</string>
     <string name="ussdRunning" msgid="485588686340541690">"正在執行 USSD 碼..."</string>
@@ -52,18 +52,41 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"正在要求解除網絡鎖定..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"無法完成解除網絡鎖定的要求"</string>
     <string name="unlock_success" msgid="6770085622238180152">"成功解除網絡鎖定。"</string>
-    <string name="mobile_network_settings_not_available" msgid="7355254462995117896">"此使用者無法修改流動網絡設定"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"這位使用者無法修改流動網絡設定"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM 通話設定"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"GSM 通話設定 (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA 通話設定"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"CDMA 通話設定 (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"接入點名稱"</string>
     <string name="settings_label" msgid="3876743539816984008">"網絡設定"</string>
-    <string name="connection_service" msgid="978745922583410219">"要使用的連線服務"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"通話帳戶"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"通話帳戶"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"SIP 通話帳戶"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"先詢問我"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"設定"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"選擇賬戶"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"手機帳戶"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"加入 SIP 帳戶"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"設定帳戶設定"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi 通話"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"不要使用 Wi-Fi 通話功能"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"不要使用通話小幫手"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"無"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"通話小幫手"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"使用通話小幫手"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"選擇通話小幫手"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"管理用於通話的網絡"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"讓應用程式或服務管理用於通話的網絡"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"設定"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"內置連線服務"</string>
     <string name="voicemail" msgid="8693759337917898954">"留言信箱"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"留言信箱 (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"留言信箱："</string>
-    <string name="networks" msgid="8873030692174541976">"電訊公司"</string>
-    <string name="call_settings" msgid="1630474923393095156">"通話設定"</string>
+    <string name="networks" msgid="8873030692174541976">"網絡供應商"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"緊急廣播"</string>
+    <string name="call_settings" msgid="6112441768261754562">"通話設定"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"其他設定"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"其他設定 (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
@@ -77,29 +100,32 @@
     <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="call_forwarding_settings_with_label" msgid="8569489414006897127">"來電轉駁設定 (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="sum_cfu_disabled" msgid="8384177689501334080">"關閉"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"忙線時"</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="sum_cfb_disabled" msgid="4913145177320506827">"關閉"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"您的流動網絡供應商不支援在手機通話時停用轉接功能。"</string>
-    <string name="labelCFNRy" msgid="3646316323834351390">"未接聽時轉接通話"</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"無人接聽時"</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="sum_cfnry_disabled" msgid="3884684060443538097">"關閉"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"您的流動網絡供應商不支援在手機未接聽時停用轉接功能。"</string>
-    <string name="labelCFNRc" msgid="47183615370850000">"無法接通時轉接"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"無法接通時"</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="5646361343094064333">"您的流動網絡供應商不支援在手機無法接通時停用轉接功能。"</string>
     <string name="updating_title" msgid="6146755386174019046">"通話設定"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"只有主要使用者可以變更通話設定。"</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"通話設定 (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"通話設定錯誤"</string>
     <string name="reading_settings" msgid="1920291699287055284">"正在讀取設定..."</string>
     <string name="updating_settings" msgid="8171225533884883252">"正在更新設定..."</string>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"開啟"</string>
+    <string name="disable" msgid="4678348128118573672">"關閉"</string>
     <string name="change_num" msgid="239476305819844391">"更新"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"網絡預設值"</item>
@@ -123,12 +149,12 @@
     <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="voicemail_default" msgid="2001233554889016880">"您的流動網絡供應商"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"流動網絡設定"</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="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="5613353860205691579">"您的 SIM 卡無法連接這個網絡。"</string>
@@ -137,7 +163,7 @@
     <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="sum_select_automatically" msgid="5614890115123292400">"自動選擇偏好網絡"</string>
     <string name="register_automatically" msgid="6017849844573519637">"自動註冊..."</string>
     <string name="preferred_network_mode_title" msgid="2336624679902659306">"偏好的網絡類型"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"更改網絡操作模式"</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"首選網絡模式：CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"首選網絡模式：全球"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"首選網絡模式：LTE/WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"首選網絡模式：LTE / GSM / UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"慣用網絡模式：LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="7886739962255042385">"LTE/WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"只限 GSM"</item>
     <item msgid="3817924849415716259">"首選 GSM/WCDMA"</item>
   </string-array>
-    <string name="data_enabled" msgid="5972538663568715366">"已啟用資料"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"啟用 Google 流動服務網絡的資料存取"</string>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"強化 4G LTE 模式"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"使用 LTE 服務改善語音及其他通訊 (建議)"</string>
+    <string name="data_enabled" msgid="5972538663568715366">"啟用流動數據"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"允許使用數據"</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="8913735676127858115">"您已離開主網絡覆蓋範圍，且已關閉數據漫遊服務，因此數據連線已中斷。"</string>
-    <string name="roaming_warning" msgid="7820963598559553967">"要允許漫遊服務嗎？您可能需要支付龐大的漫遊費用！"</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"您可能需要支付龐大的費用。"</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"要允許數據漫遊服務嗎？"</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>
@@ -196,7 +227,7 @@
     <!-- no translation found for throttle_time_frame_subtext (7732763021560399960) -->
     <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="throttle_help_subtext" msgid="3633091498168446044">"更多有關流動網絡供應商流動網絡數據使用政策的資料"</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>
@@ -309,7 +340,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"設定數據傳輸服務"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"流動網絡供應商設定"</string>
     <string name="fdn" msgid="7878832555095183202">"固定撥號號碼"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"固定撥號 (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FDN 清單"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"FDN 清單 (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FDN 啟用"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"已啟用固定撥號"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"已停用固定撥號"</string>
@@ -327,6 +360,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"設定 TTY 模式"</string>
     <string name="auto_retry_mode_title" msgid="4073265511427813322">"自動重試"</string>
     <string name="auto_retry_mode_summary" msgid="4973886004067532288">"啟用自動重試模式"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"視像通話過程中不允許變更 TTY 模式"</string>
     <string name="menu_add" msgid="1882023737425114762">"新增聯絡人"</string>
     <string name="menu_edit" msgid="7143003705504672374">"編輯聯絡人"</string>
     <string name="menu_delete" msgid="3977150783449642851">"刪除聯絡人"</string>
@@ -350,7 +384,7 @@
     <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="1846161429087789936">"如要從 SIM 卡匯入通訊錄，請先關閉飛行模式。"</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"關閉飛行模式，並從 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>
@@ -360,42 +394,40 @@
     <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="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="1796577128488773946">"密碼不正確，PIN 碼已被封鎖。請提供 PUK 碼。"</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"清除 SIM PIN"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"設定 SIM PIN"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"正在設定 PIN…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN 已設定"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN 已清除"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN 不正確"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN 已更新"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"密碼不正確。PIN 現在已被封鎖，需要 PUK。"</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="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="1639666438836544393">"已成功更改 PIN2 碼。"</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"輸入 PUK2 碼"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"密碼不正確，PIN2 碼已被封鎖。請變更 PIN2 碼後再重試！"</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"密碼不正確，SIM 卡已鎖定，需要輸入 PUK2 碼。"</string>
+    <string name="badPuk2" msgid="7910064009531541708">"PUK2 不正確，請再試一次。"</string>
+    <string name="badPin2" msgid="6646896629970023109">"舊的 PIN2 不正確，請再試一次。"</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2s 不符，請再試一次。"</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"輸入 4 至 8 位數的 PIN2。"</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"輸入 8 位數的 PUK2。"</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 已更新"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"輸入 PUK2 碼"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"密碼不正確。PIN2 現在已被封鎖。如要再試一次，請變更 PIN 2。"</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"密碼不正確。SIM 現在已被封鎖，請輸入 PUK2。"</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 碼已被永久封鎖。"</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"還剩下 <xliff:g id="NUMBER">%d</xliff:g> 次機會輸入。"</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 碼已解除封鎖！"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"您還有 <xliff:g id="NUMBER">%d</xliff:g> 次嘗試機會。"</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 目前沒有封鎖"</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_redialing" msgid="8253487008234167266">"重撥"</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_dialing" msgid="2107666444937350731">"撥號中"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"未接來電"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"未接來電"</string>
@@ -413,25 +445,27 @@
     <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_power_off" msgid="2947938060513306698">"關閉飛行模式以撥打電話。"</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"關閉飛行模式或連接無線網絡，以撥打電話。"</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_error_out_of_service" msgid="4100065333878929223">"無法連線至流動網絡。"</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"無法使用流動網絡。連接無線網絡，以撥打電話。"</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"要撥打電話，請輸入有效的號碼。"</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"無法通話。"</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_unknown" msgid="655570339115407698">"不支援的服務"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"無法切換通話。"</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"無法分開通話。"</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"無法轉移。"</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="incall_error_supp_service_reject" msgid="8998568661508655638">"無法拒絕來電。"</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"無法釋放通話。"</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"連接無線網絡，以撥打電話。"</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="7969515493359619960">"無法撥號，<xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> 不是緊急電話號碼！"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"無法撥號，請撥打緊急電話號碼！"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"沒有服務。請再試一次…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"無法通話。<xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> 不是緊急號碼。"</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"無法通話。撥打緊急號碼。"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"使用鍵盤撥號"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"按住"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"結束"</string>
@@ -462,7 +496,8 @@
     <item msgid="899650777817315681">"標準"</item>
     <item msgid="2883365539347850535">"長"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"網絡訊息"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"網絡訊息"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"錯誤訊息"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"啟用您的手機"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"如要啟用手機服務，您必須撥打一個特別電話。\n\n按「啟用」 後，請聽取手機啟用說明。"</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"正在啟用…"</string>
@@ -475,8 +510,8 @@
     <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="3420314892609254729">"手機正在進行程式化設定，請稍候。"</string>
-    <string name="ota_failure" msgid="4311299546379674378">"程式化失敗"</string>
+    <string name="ota_progress" msgid="460876637828044519">"正在為您的手機編程…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"無法為您的手機編程"</string>
     <string name="ota_successful" msgid="1880780692887077407">"您的手機已啟用，大概需要 15 分鐘才能開始提供服務。"</string>
     <string name="ota_unsuccessful" msgid="8072141612635635357">"您的手機未啟用。\n建議您移到接收較佳的地方 (例如窗邊或戶外)。\n\n請再試一次，或致電客戶服務中心查詢其他啟用方式。"</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"SPC 錯誤過多"</string>
@@ -487,18 +522,18 @@
     <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="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="2585506997024726599">"緊急回撥模式不支援您所選取的操作。手機在接下來的 <xliff:g id="COUNT">%s</xliff:g> 分鐘都將處於這個模式，您要立即退出嗎？"</item>
-    <item quantity="other" msgid="6115622137771382224">"緊急回撥模式不支援您所選取的操作。手機在接下來的 <xliff:g id="COUNT">%s</xliff:g> 分鐘都將處於這個模式，您要立即退出嗎？"</item>
-  </plurals>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other">在接下來的 <xliff:g id="COUNT_1">%s</xliff:g> 分鐘內沒有數據連線</item>
+      <item quantity="one">接下來的 <xliff:g id="COUNT_0">%s</xliff:g> 分鐘內沒有數據連線</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other">手機將在 <xliff:g id="COUNT_1">%s</xliff:g> 分鐘內處於緊急電話模式。在此模式中，無法使用需要數據連線的應用程式。您要退出嗎？</item>
+      <item quantity="one">手機將在 <xliff:g id="COUNT_0">%s</xliff:g> 分鐘內處於緊急電話模式。在此模式中，無法使用需要連接數據的應用程式。您要退出嗎？</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other">在緊急電話模式中，無法進行已選取的操作。手機將在 <xliff:g id="COUNT_1">%s</xliff:g> 分鐘內處於此模式。您要退出嗎？</item>
+      <item quantity="one">在緊急電話模式中，無法進行已選取的操作。手機將在 <xliff:g id="COUNT_0">%s</xliff:g> 分鐘內處於此模式。您要退出嗎？</item>
+    </plurals>
     <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>
@@ -512,110 +547,23 @@
     <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="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="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="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_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="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="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>
-    <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">"傳送 keep-alive"</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">"&lt;未設定&gt;"</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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"不支援語音通話"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"快速回應"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></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">"退格鍵"</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 name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"音效"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"預設音效 (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</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="dial_pad_autocomplete" msgid="494525952035761075">"撥號鍵盤自動完成"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"鈴聲與震動"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"使用 Wi-Fi 撥打電話嗎？"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"是"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"否"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"內置 SIM 卡"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"內置網絡通話服務"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"開啟視像通話"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"如要開啟視像通話，您需要在網絡設定中啟用強化 4G LTE 模式。"</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"網絡設定"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"關閉"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"緊急通話"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"只限緊急通話"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM 卡，插槽：<xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"無障礙功能"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Wi-Fi 來電"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi 通話"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"再次輕觸以開啟"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"為訊息解碼時發生錯誤。"</string>
 </resources>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
new file mode 100644
index 0000000..c927248
--- /dev/null
+++ b/res/values-zh-rTW/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"通用"</item>
+    <item msgid="6753774959494729275">"LTE/CDMA"</item>
+    <item msgid="8658695584186942227">"LTE/GSM/UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-zh-rTW/config.xml b/res/values-zh-rTW/config.xml
deleted file mode 100644
index 0605cd7..0000000
--- a/res/values-zh-rTW/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"false"</string>
-</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index e2dfd16..fb70643 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -16,14 +16,14 @@
 
 <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="tablet" msgid="1107073389495104784">"行動數據"</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="payphone" msgid="4793877574636445118">"公用電話"</string>
     <string name="onHold" msgid="9035493194749959955">"通話保留"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI 碼開始執行"</string>
     <string name="ussdRunning" msgid="485588686340541690">"正在執行 USSD 碼…"</string>
@@ -52,18 +52,41 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"正在要求解除網路鎖定…"</string>
     <string name="unlock_failed" msgid="6490531697031504225">"網路解鎖失敗。"</string>
     <string name="unlock_success" msgid="6770085622238180152">"網路解鎖成功。"</string>
-    <string name="mobile_network_settings_not_available" msgid="7355254462995117896">"這位使用者無法修改行動網路設定"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"這位使用者無法修改行動網路設定"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM 通話設定"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"GSM 通話設定 (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA 通話設定"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"CDMA 通話設定 (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"存取點名稱 (APN)"</string>
     <string name="settings_label" msgid="3876743539816984008">"網路設定"</string>
-    <string name="connection_service" msgid="978745922583410219">"要使用的連線服務"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"通話帳戶"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"選擇通話帳戶"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"選擇 SIP 通話帳戶"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"先詢問我"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"設定"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"選擇帳戶"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"手機帳戶"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"新增 SIP 帳戶"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"配置帳戶設定"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi 通話"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"不使用 Wi-Fi 通話功能"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"不使用通話小幫手"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"無"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"通話小幫手"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"使用通話小幫手"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"選擇通話小幫手"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"管理通話網路"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"允許應用程式或服務管理通話網路"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"設定"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"內建連線服務"</string>
     <string name="voicemail" msgid="8693759337917898954">"語音信箱"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"語音信箱 (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"語音信箱："</string>
     <string name="networks" msgid="8873030692174541976">"電信業者"</string>
-    <string name="call_settings" msgid="1630474923393095156">"通話設定"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"緊急廣播"</string>
+    <string name="call_settings" msgid="6112441768261754562">"通話設定"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"其他設定"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"其他設定 (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
@@ -77,29 +100,32 @@
     <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="call_forwarding_settings_with_label" msgid="8569489414006897127">"來電轉接設定 (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="sum_cfu_disabled" msgid="8384177689501334080">"關閉"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"忙碌時"</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="sum_cfb_disabled" msgid="4913145177320506827">"關閉"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"您的行動通訊業者不支援手機通話時停用轉接功能。"</string>
-    <string name="labelCFNRy" msgid="3646316323834351390">"未接聽時轉接"</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"未接聽時"</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="sum_cfnry_disabled" msgid="3884684060443538097">"關閉"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"您的行動通訊業者不支援手機未接聽時停用轉接功能。"</string>
-    <string name="labelCFNRc" msgid="47183615370850000">"未能接通時轉接"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"無法接通時"</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="5646361343094064333">"您的行動通訊業者不支援手機無收訊時停用轉接功能。"</string>
     <string name="updating_title" msgid="6146755386174019046">"通話設定"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"只有主要使用者可以變更通話設定。"</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"通話設定 (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"通話設定錯誤"</string>
     <string name="reading_settings" msgid="1920291699287055284">"正在讀取設定…"</string>
     <string name="updating_settings" msgid="8171225533884883252">"更新設定中…"</string>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"開啟"</string>
+    <string name="disable" msgid="4678348128118573672">"關閉"</string>
     <string name="change_num" msgid="239476305819844391">"更新"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"網路預設值"</item>
@@ -123,8 +149,8 @@
     <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="voicemail_default" msgid="2001233554889016880">"您的行動通訊業者"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"行動網路設定"</string>
     <string name="label_available" msgid="1181658289009300430">"可用的網路"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"搜尋中…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"找不到網路。"</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"慣用網路模式：CDMA + LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"慣用網路模式：通用"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"慣用網路模式：LTE/WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"偏好網路模式：LTE/GSM/UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"慣用網路模式：LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="7886739962255042385">"LTE/WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"僅限 GSM"</item>
     <item msgid="3817924849415716259">"GSM/WCDMA 優先"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"加強型 4G LTE 模式"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"使用 LTE 服務提升語音通訊和其他通訊的效能 (建議)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"啟用行動數據服務"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"啟用行動數據服務網路"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"允許使用行動數據"</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="8913735676127858115">"您已離開國內網路涵蓋範圍，且已關閉數據傳輸漫遊服務，因此數據連線已中斷。"</string>
-    <string name="roaming_warning" msgid="7820963598559553967">"要允許漫遊服務嗎？您可能會需要支付龐大漫遊費用！"</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"您可能需要支付可觀的費用。"</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"允許漫遊服務？"</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>
@@ -195,8 +226,8 @@
     <!-- String.format failed for translation -->
     <!-- no translation found for throttle_time_frame_subtext (7732763021560399960) -->
     <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="throttle_rate_subtext" msgid="2149102656120726855">"若已達數據用量上限，數據傳輸速率會降低至 <xliff:g id="USED">%1$d</xliff:g> Kb/秒"</string>
+    <string name="throttle_help_subtext" msgid="3633091498168446044">"更多有關行動業者行動網路數據使用政策的資訊"</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>
@@ -309,7 +340,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"設定數據傳輸服務"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"行動通訊業者設定"</string>
     <string name="fdn" msgid="7878832555095183202">"固定撥號"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"固定撥號號碼 (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"固定撥號清單"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"FDN 清單 (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"啟用固定撥號"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"已啟用 [固定撥號]"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"已停用固定撥號"</string>
@@ -327,6 +360,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"設定 TTY 模式"</string>
     <string name="auto_retry_mode_title" msgid="4073265511427813322">"自動重試"</string>
     <string name="auto_retry_mode_summary" msgid="4973886004067532288">"啟用自動重試模式"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"無法在視訊通話過程中變更 TTY 模式"</string>
     <string name="menu_add" msgid="1882023737425114762">"新增聯絡人"</string>
     <string name="menu_edit" msgid="7143003705504672374">"編輯聯絡人"</string>
     <string name="menu_delete" msgid="3977150783449642851">"刪除聯絡人"</string>
@@ -350,52 +384,50 @@
     <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="1846161429087789936">"如要從 SIM 卡匯入聯絡人，請先關閉「飛行」模式。"</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"關閉飛航模式即可從 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="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="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="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="1796577128488773946">"密碼錯誤，PIN 已被封鎖。請提供 PUK。"</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"清除 SIM 卡 PIN"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"設定 SIM 卡 PIN"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"正在設定 PIN…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN 已設定"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN 已清除"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN 不正確"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN 已更新"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"密碼不正確，PIN 現已遭到封鎖。請輸入 PUK。"</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="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="1639666438836544393">"已成功變更 PIN2。"</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"輸入 PUK2 碼"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"密碼不正確，PIN2 已被封鎖。請變更 PIN2 後再重試！"</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"密碼不正確，SIM 已鎖住！請輸入 PUK2。"</string>
+    <string name="badPuk2" msgid="7910064009531541708">"PUK2 不正確，請再試一次。"</string>
+    <string name="badPin2" msgid="6646896629970023109">"舊 PIN2 不正確，請再試一次。"</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2 不符，請再試一次。"</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"輸入 4 到 8 碼的 PIN2。"</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"輸入 8 碼的 PUK2。"</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 已更新"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"輸入 PUK2 碼"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"密碼不正確，PIN2 現已遭到封鎖。如要再試一次，請變更 PIN 2。"</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"密碼不正確，SIM 卡現已遭到封鎖。請輸入 PUK2。"</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 遭到永久封鎖。"</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"還可以再嘗 <xliff:g id="NUMBER">%d</xliff:g> 次。"</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 已解除封鎖！"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"您還可以嘗試 <xliff:g id="NUMBER">%d</xliff:g> 次。"</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 已解除封鎖"</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_redialing" msgid="8253487008234167266">"重撥中"</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_dialing" msgid="2107666444937350731">"撥號中"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"未接來電"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"未接來電"</string>
@@ -413,25 +445,27 @@
     <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_power_off" msgid="2947938060513306698">"關閉飛航模式即可撥打電話。"</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"關閉飛航模式或連上無線網路即可撥打電話。"</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_error_out_of_service" msgid="4100065333878929223">"無法連線到行動網路。"</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"無法使用行動通訊網路。但連上 Wi-Fi 網路即可撥打電話。"</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"如要撥打電話，請輸入有效的號碼。"</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"無法通話。"</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_unknown" msgid="655570339115407698">"不支援的服務"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"無法切換通話。"</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"無法分割通話。"</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"無法轉接。"</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="incall_error_supp_service_reject" msgid="8998568661508655638">"無法拒接來電。"</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"無法掛斷電話。"</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"連上無線網路即可撥打電話。"</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="7969515493359619960">"未送出通話要求，<xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> 不是緊急電話號碼！"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"未送出通話要求，請撥打緊急電話號碼！"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"找不到服務訊號，正在重試…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"無法通話。<xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> 不是緊急號碼。"</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"無法通話。只能撥打緊急號碼。"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"使用鍵盤撥號"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"保留"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"結束"</string>
@@ -462,7 +496,8 @@
     <item msgid="899650777817315681">"適中"</item>
     <item msgid="2883365539347850535">"長音"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"網路訊息"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"網路訊息"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"錯誤訊息"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"啟用您的手機"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"如要啟用手機服務，您必須撥打一通特殊電話。\n\n按下 [啟用] 後，請聽取手機啟用說明。"</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"啟用中..."</string>
@@ -475,8 +510,8 @@
     <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="3420314892609254729">"手機正在進行程式化設定，請稍候。"</string>
-    <string name="ota_failure" msgid="4311299546379674378">"程式化失敗"</string>
+    <string name="ota_progress" msgid="460876637828044519">"正在透過程式設定您的手機…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"無法透過程式設定您的手機"</string>
     <string name="ota_successful" msgid="1880780692887077407">"您的手機已啟用；系統最多可能需要 15 分鐘，才會開始提供服務。"</string>
     <string name="ota_unsuccessful" msgid="8072141612635635357">"您的手機未啟用。\n建議您移往收訊較佳處 (例如窗邊或戶外)。\n\n請再試一次，或向客戶服務中心洽詢其他啟用方式。"</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"過度調整 SPC 錯誤"</string>
@@ -487,18 +522,18 @@
     <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="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="2585506997024726599">"緊急回撥模式不支援您要執行的操作。手機在接下來的 <xliff:g id="COUNT">%s</xliff:g> 分鐘都將處於這個模式，您要立即退出嗎？"</item>
-    <item quantity="other" msgid="6115622137771382224">"緊急回撥模式不支援您要執行的操作。手機在接下來的 <xliff:g id="COUNT">%s</xliff:g> 分鐘都將處於這個模式，您要立即退出嗎？"</item>
-  </plurals>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other">接下來的 <xliff:g id="COUNT_1">%s</xliff:g> 分鐘內沒有數據連線</item>
+      <item quantity="one">接下來的 <xliff:g id="COUNT_0">%s</xliff:g> 分鐘內沒有數據連線</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other">接下來的 <xliff:g id="COUNT_1">%s</xliff:g> 分鐘內，手機會進入緊急回電模式。在此模式下，您將無法使用需要數據連線的應用程式。您要立即退出這個模式嗎？</item>
+      <item quantity="one">接下來的 <xliff:g id="COUNT_0">%s</xliff:g> 分鐘內，手機會進入緊急回電模式。在此模式下，您將無法使用需要數據連線的應用程式。您要立即退出這個模式嗎？</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other">緊急回電模式不支援您要執行的操作。接下來的 <xliff:g id="COUNT_1">%s</xliff:g> 分鐘內，手機會進入此模式。您要立即退出這個模式嗎？</item>
+      <item quantity="one">緊急回電模式不支援您要執行的操作。接下來的 <xliff:g id="COUNT_0">%s</xliff:g> 分鐘內，手機會進入此模式。您要立即退出這個模式嗎？</item>
+    </plurals>
     <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>
@@ -512,110 +547,23 @@
     <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="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="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="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_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="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="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>
-    <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">"連出 Proxy 位址"</string>
-    <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="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">"&lt;未設定&gt;"</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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"不支援語音通話"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"快速回應"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"1"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"2"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"3"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"4"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"5"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"6"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"7"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"8"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"9"</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="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 name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"音效"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"預設音效 (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</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="dial_pad_autocomplete" msgid="494525952035761075">"撥號鍵盤自動完成"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"鈴聲與震動"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"使用 Wi-Fi 網路撥打電話？"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"是"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"否"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"內建 SIM 卡"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"內建網路通話服務"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"開啟視訊通話"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"您必須在網路設定中啟用加強型 4G LTE 模式，才能開啟視訊通話功能。"</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"網路設定"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"關閉"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"緊急電話"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"僅限撥打緊急電話"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM 卡，插槽：<xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"協助工具"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Wi-Fi 來電"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi 通話"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"再次輕觸即可開啟"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"為郵件解碼時發生錯誤。"</string>
 </resources>
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
new file mode 100644
index 0000000..8aad877
--- /dev/null
+++ b/res/values-zu/arrays.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Emhlabeni jikelele"</item>
+    <item msgid="6753774959494729275">"I-LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"I-LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-zu/config.xml b/res/values-zu/config.xml
deleted file mode 100644
index af6224f..0000000
--- a/res/values-zu/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     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.
- -->
-
-<!--  Phone app resources that may need to be customized
-     for different hardware or product builds.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="config_disable_cdma_activation_code" msgid="2376168143147253073">"amanga"</string>
-</resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index cb34e20..11f394b 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -16,14 +16,14 @@
 
 <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">"Idatha Yeselula"</string>
+    <string name="phoneAppLabel" product="tablet" msgid="1107073389495104784">"Idatha yeselula"</string>
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Ifoni"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Ukudayela Okuphuthumayo"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Ifoni"</string>
     <string name="fdnListLabel" msgid="8630418672279521003">"Uhlu lwe-FDN"</string>
     <string name="unknown" msgid="6878797917991465859">"Akwaziwa"</string>
     <string name="private_num" msgid="6713286113000232309">"Inombolo eyimfihlo"</string>
-    <string name="payphone" msgid="1931775086311769314">"Ifoni ekhokhelwayo"</string>
+    <string name="payphone" msgid="4793877574636445118">"Ucingo olufakwa imali"</string>
     <string name="onHold" msgid="9035493194749959955">"Ibambile"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Ikhodi ye-MMI iqalile"</string>
     <string name="ussdRunning" msgid="485588686340541690">"Ikhodi ye-USSD iyasebenza..."</string>
@@ -52,18 +52,41 @@
     <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="mobile_network_settings_not_available" msgid="7355254462995117896">"Izilungiselelo zenethiwekhi yeselula azitholakaleli lo msebenzisi"</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Izilungiselelo zenethiwekhi yeselula azitholakaleli lo msebenzisi"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Izilungiselelo zekholi ze-GSM"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"Izilungiselelo zekholi ye-GSM (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Izilungiselelo zekholi ye-CDMA"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"Izilungiselelo zekholi ye-CDMA (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Ama-APN"</string>
     <string name="settings_label" msgid="3876743539816984008">"Izilungiselelo zenethiwekhi"</string>
-    <string name="connection_service" msgid="978745922583410219">"Ixhumeka isevisi ukuze isetshenziswe"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Ama-akhawunti wokushaya"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Yenza amakholi nge-"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Yenz"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Buza kuqala"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Izilungiselelo"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Khetha ama-akhawunti"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Ama-akhawunti wefoni"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Engeza i-akhawunti ye-SIP"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Lungiselela izilungiselelo ze-akhawunti"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Ukushaya kwe-Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Ungasebenzisi ukushaya nge-Wi-Fi"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Ungasebenzisi umsizi wokushaya"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Lutho"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Umsizi wekholi"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Sebenzisa umsizi wekholi"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Khetha umsizi wokushaya"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Phatha amanethiwekhi asetshenziselwa amakholi nge-"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Vumela izinhlelo zokusebenza noma amasevisi aphathe amanethiwekhi asetshenziselwa amakholi"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Lungiselela"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Isevisi yokuxhumeka eyakhelwe ngaphakathi"</string>
     <string name="voicemail" msgid="8693759337917898954">"Ivoyisimeyili"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Ivoyisimeyili (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
     <string name="networks" msgid="8873030692174541976">"Imisebenzi yenethiwekhi"</string>
-    <string name="call_settings" msgid="1630474923393095156">"Izilungiselelo zekholi"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Ukusakazwa okuphuthumayo"</string>
+    <string name="call_settings" msgid="6112441768261754562">"Izilungiselelo zekholi"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Izilungiselelo ezengeziwe"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Izilungiselelo ezingeziwe (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Izilungiselelo zekholi ezengeziwe ze-GSM kuphela"</string>
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Izilungiselelo zekholi Ezengeziwe ze-CDMA"</string>
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Izilungiselelo zekholi ezengeziwe ze-CDMA kuphela"</string>
@@ -77,29 +100,32 @@
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Phakathi nekholi, ngazise uma kunekholi engenayo"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Phakathi nekholi, ngazise uma kunamakholi angenayo"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Izilungiselelo zokudlulisa ikholi"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Izilungiselelo zokudlulisa ikholi (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Ukudlulisa ikholi"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Dlulisa njalo"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Njalo sebenzisa lenombolo"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Idlulisela wonke amakholi"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Idlulisela wonke amakholi ku- <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Inombolo ayitholakali"</string>
-    <string name="sum_cfu_disabled" msgid="3698472522160364904">"Khutshaziwe"</string>
-    <string name="labelCFB" msgid="218938523102207587">"Dlulisa uma imatasa"</string>
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Valiwe"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Uma umatasa"</string>
     <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="sum_cfb_disabled" msgid="4913145177320506827">"Valiwe"</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="labelCFNRy" msgid="1736067178393744351">"Uma kungaphendulwa"</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="sum_cfnry_disabled" msgid="3884684060443538097">"Valiwe"</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="labelCFNRc" msgid="2614827454402079766">"Uma ungafinyeleleki"</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="5646361343094064333">"Isiphathi sakho asisekeli ukuvimbela ukudlulisela ucingo lapho ifoni yakho ingafinyeleleki."</string>
     <string name="updating_title" msgid="6146755386174019046">"Izilungiselelo zekholi"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"Izilungiselelo zekholi zingaguqulwa kuphela ngumsebenzisi oyinhloko."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Izilungiselelo zekholi (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Iphutha lokulungiselela ikholi"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Ifunda izilungiselelo..."</string>
     <string name="updating_settings" msgid="8171225533884883252">"Ibuyekeza izilungiselelo..."</string>
@@ -109,8 +135,8 @@
     <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>
+    <string name="enable" msgid="7248657275000173526">"Vula"</string>
+    <string name="disable" msgid="4678348128118573672">"Vala"</string>
     <string name="change_num" msgid="239476305819844391">"Buyekeza"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Okuzenzakalelayo kwenethiwekhi"</item>
@@ -123,8 +149,8 @@
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Yehlulekile ukulanda kanye nokulondoloza izimiso zamanje zokuthumela.\nNoma 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>
-    <string name="voicemail_default" msgid="5902099213882352338">"Umsebenzi wami"</string>
-    <string name="mobile_networks" msgid="5540397602919106177">"Izilungiselelo zenethiwekhi yeselula."</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"Inkampani yakho yenethiwekhi"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Izilungiselelo zenethiwekhi yeselula"</string>
     <string name="label_available" msgid="1181658289009300430">"Amanethiwekhi atholakalayo"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Iyasesha..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Awekho amanethiwekhi atholakele."</string>
@@ -156,6 +182,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Imodi yenethiwekhi ekhethwayo: i-CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Imodi yenethiwekhi ekhethwayo: Umhlaba jikelele"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Imodi yenethiwekhi ekhethwayo: i-LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Imodi yenethiwekhi encanyelwayo: i-LTE / GSM / UMTS"</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="7886739962255042385">"I-LTE / WCDMA"</item>
     <item msgid="577652050447385699">"I-LTE"</item>
@@ -171,13 +199,16 @@
     <item msgid="1524224863879435516">"I-GSM kuphela"</item>
     <item msgid="3817924849415716259">"Okukhethwayo kwe-GSM / WCDMA"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Imodi ye-4G LTE ethuthukisiwe"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Sebenzisa amasevisi we-LTE ukuze uthuthukise izwi nokunye ukuxhumana (kunconyiwe)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Idatha ivunyelwe"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Vumela ukufinyelela idatha ngenethiwekhi yeselula"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Vumela ukusetshenziswa kwedatha"</string>
     <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="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="roaming_warning" msgid="1603164667540144353">"Ingahle uthole izindleko ezincane."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Vumela ukuhamba kwedatha?"</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>
@@ -194,7 +225,7 @@
     <!-- no translation found for throttle_time_frame_subtext (7732763021560399960) -->
     <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="throttle_help_subtext" msgid="3633091498168446044">"Ulwazi oluningi mayelana nenqubomgomo yokusebenzisa idatha yenethiwekhi yenkampani yakho yefoni."</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>
@@ -307,7 +338,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Setha isevisi yedatha"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Izilungiselelo zenkampini yenethiwekhi"</string>
     <string name="fdn" msgid="7878832555095183202">"Izinombolo Zokudayela Okungaguquki"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Izinombolo ezigxilisiwe zokudayela (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Uhlu lwe-FDN"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"Uhlu lwe-FDN (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Ukwenza kusebenze i-FDN"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Izinombolo Zokudayela Okungaguquki zivuliwe."</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Izinombolo Zokudayela Okungaguquki zivaliwe."</string>
@@ -325,6 +358,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Hlela imodi ye-TTY"</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="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"Ukuguqulwa kwemodi ye-TTY akuvunyelwe ngesikhathi sekholi yevidiyo"</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>
@@ -348,7 +382,7 @@
     <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="1846161429087789936">"Ukufaka oxhumana nabo kusuka ekhadini le-SIM, qala ngokucima imodi yeNdiza."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Vala imodi yendiza ukuze ungenise oxhumana nabo kusukela kukhadi le-SIM."</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>
@@ -358,42 +392,40 @@
     <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="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="1796577128488773946">"Iphasiwedi ayilungile, iphinikhodi ivinjiwe, i-PUK iceliwe."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"Sula i-PIN ye-SIM"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"Setha i-PIN ye-SIM"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"Isetha i-PIN…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"I-PIN isethiwe"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"I-PIN isuliwe"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"I-PIN ayilungile"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"I-PIN ibuyekeziwe"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Iphasiwedi ayilungile. I-PIN manje ikhiyiwe. I-PUK iceliwe."</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="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="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="3674058967950559397">"Iphasiwedi ayilungile, i-PIN2 ivinjiwe. 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="badPuk2" msgid="7910064009531541708">"I-PUK2 ayilungile. Zama futhi."</string>
+    <string name="badPin2" msgid="6646896629970023109">"I-PIN2 endala ayilungile. Zama futhi."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"Ama-PIN2 awafani. Zama futhi."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"Faka i-PIN2 eyizinombolo ezingu-4 ukuya kwezingu-8."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"Faka i-PUK2 eyizinombolo ezingu-8."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"I-PIN2 ibuyekeziwe"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"Faka ikhodi ye-PUK2"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Iphasiwedi ayilungile. I-PIN2 manje ivinjiwe. Ukuze uzame futhi, guqula i-PIN2."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Iphasiwedi ayilungile. I-SIM manje ikhiyiwe. Faka i-PUK2."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"I-PUK2 ivinjiwe unaphakade."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Kukhona imizamo engu-<xliff:g id="NUMBER">%d</xliff:g> esele."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"I-PIN2 ivulelwe!"</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"Unemizamo engu-<xliff:g id="NUMBER">%d</xliff:g> esele."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"I-PIN2 ayisavinjiwe"</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="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_redialing" msgid="8253487008234167266">"Iphinda iyashaya"</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_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>
     <string name="card_title_in_call" msgid="6346543933068225205">"Isecingweni"</string>
-    <string name="card_title_my_phone_number" msgid="112428362494434191">"Inombolo yami ngu <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
     <string name="notification_dialing" msgid="2107666444937350731">"Iyadayela"</string>
     <string name="notification_missedCallTitle" msgid="7554385905572364535">"Ikholi ekulahlekele"</string>
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Amakholi akuphuthele"</string>
@@ -411,25 +443,27 @@
     <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_power_off" msgid="2947938060513306698">"Vala imodi yendiza ukuze wenze ikholi."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Vala imodi yendiza noma xhumeka kunethiwekhi engenantambo ukuze wenze ikholi."</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_error_out_of_service" msgid="4100065333878929223">"Inethiwekhi yeselula ayitholakali."</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Inethiwekhi yeselula ayitholakali. Xhumeka kunethiwekhi engenantambo ukuze wenze ikholi."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Ukuze wenze ikholi, faka inombolo evumelekile."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Ayikwazi ukushaya."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Iqalisa ukulandelana kwe-MMI..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Isevisi engasekelwe."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Ayikwazi ukushintsha amakholi"</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>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Isevisi ayisekelwe"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Ayikwazi ukushintsha amakholi."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Ayikwazi ukuhlukanisa ikholi."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Ayikwazi ukudlulisela."</string>
     <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Ayikwazi ukwenza amakholi engqungquthela."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Ayikwazi ukwenqaba ikholi."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Ayikwazi ukuyeka ikholi (ama)."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Ikholi ye-Inthanethi"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Ayikwazi ukunqabela ikholi."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Ayikwazi ukukhipha amakholi."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Xhumeka kunethiwekhi engenantambo ukuze wenze ikholi."</string>
     <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="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="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Ayikho isevisi. Iyazama futhi…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Ayikwazi ukushaya. I-<xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> akuyona inombolo yesimo esiphuthumayo."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Ayikwazi ukushaya. Shayela inombolo yesimo esiphuthumayo."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Sebenzisa ikhibhodi ukudayela"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Bamba"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Qeda"</string>
@@ -460,7 +494,8 @@
     <item msgid="899650777817315681">"Jwayelekile"</item>
     <item msgid="2883365539347850535">"Kude"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Umlayezo Wenethiwekhi"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Umlayezo wenethiwekhi"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Umlayezo wephutha"</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 isevisi yefoni yakho isebenze.\n\nEmva kokucindezela \"Yenza kusebenze\", lalela iziqondiso ezinikeziwe ukwenza ifoni yakho isebenze."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Yenza kusebenze..."</string>
@@ -473,8 +508,8 @@
     <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_speaker" msgid="6904589278542719647">"Isipikha"</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_progress" msgid="460876637828044519">"Ihlela ifoni yakho…"</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Ayikwazanga ukuhlela ifoni yakho"</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. \nKungase kudingeke ukuba uthole indawo enenethiwekhi (eduze kwefasitela, noma ngaphandle).\n\nZama futhi noma shayela isevisi yekhasimende ukutholo okunye okukhethwayo."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"FINYELELA UKWEHLULEKA KWE-SPC"</string>
@@ -485,18 +520,18 @@
     <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>
     <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Uxhumano lwedatha luvimbelwe"</string>
-  <plurals name="phone_in_ecm_notification_time">
-    <item quantity="one" msgid="4866221796252472622">"Alukho uxhumano lwedatha lwamaminithi angu-<xliff:g id="COUNT">%s</xliff:g>"</item>
-    <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="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="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>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="one">Alukho uxhumo ledatha amaminthi angu-<xliff:g id="COUNT_1">%s</xliff:g></item>
+      <item quantity="other">Alukho uxhumo ledatha amaminthi angu-<xliff:g id="COUNT_1">%s</xliff:g></item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="one">Ifoni izoba kumodi yokushayela emuva yesimo esiphuthumayo amaminithi angu-<xliff:g id="COUNT_1">%s</xliff:g>. Ngenkathi ikule modi azikho izinhlelo zokusebenza ezisebenzisa uxhumo ledatha ezingasetshenziswa. Ufuna ukuphuma manje?</item>
+      <item quantity="other">Ifoni izoba kumodi yokushayela emuva yesimo esiphuthumayo amaminithi angu-<xliff:g id="COUNT_1">%s</xliff:g>. Ngenkathi ikule modi azikho izinhlelo zokusebenza ezisebenzisa uxhumo ledatha ezingasetshenziswa. Ufuna ukuphuma manje?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="one">Isenzo esikhethiwe asitholakali ngenkathi ikumodi yokushayela emuv ayesimo esiphuthumayo. Ifoni izoba kule modi amaminithi angu-<xliff:g id="COUNT_1">%s</xliff:g>. Ufuna ukuphuma manje?</item>
+      <item quantity="other">Isenzo esikhethiwe asitholakali ngenkathi ikumodi yokushayela emuv ayesimo esiphuthumayo. Ifoni izoba kule modi amaminithi angu-<xliff:g id="COUNT_1">%s</xliff:g>. Ufuna ukuphuma manje?</item>
+    </plurals>
     <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>
@@ -510,110 +545,23 @@
     <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_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_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="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 amakholi 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="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="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_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="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="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>
-    <string name="username_title" msgid="2479375923477682328">"Igama lomsebenzisi"</string>
-    <string name="password_title" msgid="3323555249068171531">"Iphasiwedi"</string>
-    <string name="display_name_title" msgid="2459768196312249937">"Bonisa igama"</string>
-    <string name="proxy_address_title" msgid="4828301345351614273">"Ikheli lommeleli ophumayo"</string>
-    <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="set_primary_title" msgid="5351892327447571451">"Misa njenge-akhawunti eyinhloko"</string>
-    <string name="set_primary_summary" msgid="2219064654523258577">"Setshenziselwa amakholi aphumayo"</string>
-    <string name="advanced_settings" msgid="8350631795335495338">"Izilungiselelo zokuzikhethela"</string>
-    <string name="auth_username_title" msgid="851473016307947120">"Igama lomsebenzisi lokufakazela ubuqiniso"</string>
-    <string name="auth_username_summary" msgid="6782012405225938629">"Igama lomsebenzisi elisetshenziselwa ukufakazela ubuqiniso"</string>
-    <string name="default_preference_summary" msgid="868766740121667450">"Ayisethiwe"</string>
-    <string name="display_name_summary" msgid="8636377460518225523">"&lt;Kufana njengegama lomsebenzisi&gt;"</string>
-    <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="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="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>
     <string name="not_voice_capable" msgid="2739898841461577811">"Ukushayela ngezwi akusekelwe"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Izimpendulo ezisheshayo"</string>
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <string name="description_image_button_one" msgid="5502718871331943463">"kunye"</string>
-    <string name="description_image_button_two" msgid="4903738528222924522">"okubili"</string>
-    <string name="description_image_button_three" msgid="5570985408463782329">"ntathu"</string>
-    <string name="description_image_button_four" msgid="1697520001239289074">"okune"</string>
-    <string name="description_image_button_five" msgid="3450276493026943454">"okuhlanu"</string>
-    <string name="description_image_button_six" msgid="2070376172268675300">"isithupha"</string>
-    <string name="description_image_button_seven" msgid="1757351311199993371">"isikhombisa"</string>
-    <string name="description_image_button_eight" msgid="4734693919020613227">"isishiyagalombili"</string>
-    <string name="description_image_button_nine" msgid="5568534122590597040">"isishiyagalolunye"</string>
-    <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_dial_button" msgid="7459705245418435351">"dayela"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"i-backspace"</string>
-    <string name="description_target_answer" msgid="7205604197797472471">"Phendula"</string>
-    <string name="description_target_send_sms" msgid="2098326025587950144">"Thumela i-SMS"</string>
-    <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="2609519527849101590">"Umsindo"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Umsindo ozenzakalelayo (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <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="dial_pad_autocomplete" msgid="494525952035761075">"Okokudayela kuqedwe ngokuzenzakalela"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Ithoni yokukhala nokudlidliza"</string>
-    <string name="choose_wifi_for_call_msg" msgid="193549297122949976">"Sebenzisa i-Wi-Fi ukwenza ikholi?"</string>
-    <string name="choose_wifi_for_call_yes" msgid="5312994368472630983">"Yebo"</string>
-    <string name="choose_wifi_for_call_no" msgid="7132239734287157307">"Cha"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Amakhadi we-SIM akhelwe ngaphakathi"</string>
-    <string name="sip_connection_service_label" msgid="3547998349299125294">"Ukushaya kwe-inthanethi okwakhelwe ngaphakathi"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Vula ukushaya kwevidiyo"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Ukuze uvale ukushaya kwevidiyo, kuzomele unike amandla imodi ethuthukisiwe ye-4G LTE kuzilungiselelo zenethiwekhi."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Izilungiselelo zenethiwekhi"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Vala"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Amakholi aphuthumayo"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Ikholi ephuthumayo kuphela"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"Ikhadi le-SIM, isilothi: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Ukufinyeleleka"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Ikholi ye-Wi-Fi engenayo"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Ikholi ye-Wi-Fi"</string>
+    <string name="emergency_action_launch_hint" msgid="5841511849007540970">"Thinta futhi ukuze uvule"</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"Kube nephutha ngenkathi kukhishwa ikhodi kumlayezo."</string>
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 45b984e..67572ed 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -58,4 +58,5 @@
     <color name="network_operators_color_primary">#ff263238</color>
     <color name="network_operators_color_primary_dark">#ff21272b</color>
 
+    <color name="emergency_dialer_background">#ff263238</color>
 </resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index 6f7784a..61af525 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -153,7 +153,14 @@
     <!-- After a CDMA conference call is merged, the swap button should be displayed. -->
     <bool name="support_swap_after_merge" translatable="false">true</bool>
 
+    <!-- Determine whether the voicemail notification is persistent in the notification bar.
+         If true, the voicemail notifications cannot be dismissed from the notification bar. -->
+    <bool name="voicemail_notification_persistent">false</bool>
+
+    <!-- For IMS video over LTE calls, determines whether video pause signalling is supported. -->
+    <bool name="support_pause_ims_video_calls" translatable="false">true</bool>
+
     <!-- Disables dialing "*228" (OTASP provisioning) on CDMA carriers where it is not supported or
          is potentially harmful by locking the SIM to 3G. -->
-    <string name="config_disable_cdma_activation_code">false</string>
+    <string name="config_disable_cdma_activation_code" translatable="false">false</string>
 </resources>
diff --git a/res/values/ids.xml b/res/values/ids.xml
new file mode 100644
index 0000000..82a6add
--- /dev/null
+++ b/res/values/ids.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2015 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<resources>
+    <item type="id" name="tag_intent" />
+</resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c47db4f..e707c4e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -116,10 +116,16 @@
 
     <!-- Error message for users that aren't allowed to modify Mobile Network settings [CHAR LIMIT=none] -->
     <string name="mobile_network_settings_not_available">Cellular network settings are not available for this user</string>
-    <!-- GSM Call settings screen, setting option name -->
+    <!-- GSM Call settings screen, setting option name. [CHAR LIMIT=40] -->
     <string name="labelGSMMore">GSM call settings</string>
-    <!-- CDM Call settings screen, setting option name -->
+    <!-- GSM Call settings screen, setting option name with label indicating the SIM the settings
+         are applied to. [CHAR LIMIT=40] -->
+    <string name="labelGsmMore_with_label">GSM call settings (<xliff:g id="subscriptionlabel" example="T-Mobile">%s</xliff:g>)</string>
+    <!-- CDMA Call settings screen, setting option name -->
     <string name="labelCDMAMore">CDMA call settings</string>
+    <!-- CDMA Call settings screen, setting option name with label indicating the SIM the settings
+         are applied to. [CHAR LIMIT=40] -->
+    <string name="labelCdmaMore_with_label">CDMA call settings (<xliff:g id="subscriptionlabel" example="Verizon">%s</xliff:g>)</string>
     <!-- Mobile network settings screen, setting option name -->
     <string name="apn_settings">Access Point Names</string>
     <!-- Label for the "Network settings" screen in the Settings UI -->
@@ -147,7 +153,7 @@
     <string name="phone_accounts_configure_account_settings">Configure account settings</string>
 
     <!-- Title for setting to select Wi-Fi call manager account -->
-    <string name="phone_account_wifi_calling">Wi-Fi calling</string>
+    <string name="wifi_calling">Wi-Fi calling</string>
     <!-- Indication for option to not use a Wi-Fi call manager -->
     <string name="wifi_calling_do_not_use">Do not use Wi-Fi calling</string>
     <!-- Indication for option to not use a call assistant. -->
@@ -171,6 +177,8 @@
     <string name="connection_service_default_label">Built-in connection service</string>
     <!-- Call settings screen, setting option name -->
     <string name="voicemail">Voicemail</string>
+    <!-- Title of the "Voicemail" settings screen, with a text label identifying which SIM the settings are for. -->
+    <string name="voicemail_settings_with_label">Voicemail (<xliff:g id="subscriptionlabel" example="Mock Carrier">%s</xliff:g>)</string>
     <!-- Call forwarding dialog box, voicemail number prefix -->
     <string name="voicemail_abbreviated">VM:</string>
     <!-- Mobile network settings screen, setting option name -->
@@ -427,6 +435,7 @@
     <string name="enhanced_4g_lte_mode_title">Enhanced 4G LTE Mode</string>
     <!-- Cellular network 4G summary [CHAR LIMIT=80] -->
     <string name="enhanced_4g_lte_mode_summary">Use LTE services to improve voice and other communications (recommended)</string>
+
     <!-- 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) [CHAR LIMITS=40] -->
@@ -442,7 +451,9 @@
          "data roaming" feature turned off. -->
     <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 usage when roaming? Significant charges may apply.</string>
+    <string name="roaming_warning">You may incur significant charges.</string>
+    <!-- Mobile network settings screen, dialog message title when user selects the Data roaming check box -->
+    <string name="roaming_alert_title">Allow data roaming?</string>
 
     <!-- USSD aggregation dialog box: separator strings between messages (new-lines will be added before and after) -->
     <string name="ussd_dialog_sep" translatable="false">----------</string>
@@ -752,7 +763,8 @@
     <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>
-
+    <!-- TTY Mode change is NOT allowed during a video call -->
+    <string name="tty_mode_not_allowed_video_call">TTY Mode change is not allowed during a video call</string>
     <!-- FDN list screen: menu item label -->
     <string name="menu_add">Add contact</string>
     <!-- FDN list screen: menu item label -->
@@ -807,9 +819,8 @@
     <string name="simContacts_empty">No contacts on your SIM card.</string>
     <!-- Call settings: title of the dialog that lets you select contacts from the SIM. -->
     <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 the SIM card, first turn off Airplane mode.</string>
+    <!-- Appears when user tries to import contacts in SIM during airplane mode [CHAR LIMIT=NONE] -->
+    <string name="simContacts_airplaneMode">Turn off airplane mode to import contacts from the SIM card.</string>
 
     <!-- SIM PIN strings -->
     <!-- Title of "Enable/disable SIM PIN" screen -->
@@ -962,14 +973,18 @@
          [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>
+    <!-- In-call screen: call failure message displayed in an error dialog. [CHAR_LIMIT=NONE] -->
+    <string name="incall_error_power_off">Turn off airplane mode to make a call.</string>
+    <!-- In-call screen: call failure message displayed in an error dialog when in airplane mode, WFC is enabled, not wifi-only, and not connected to wireless networks. [CHAR_LIMIT=NONE] -->
+    <string name="incall_error_power_off_wfc">Turn off airplane mode or connect to a wireless network to make a call.</string>
     <!-- In-call screen: call failure message displayed in an error dialog.
          This string is currently unused (see comments in InCallScreen.java.) -->
     <string name="incall_error_emergency_only">Not registered on network.</string>
     <!-- In-call screen: call failure message displayed in an error dialog -->
     <string name="incall_error_out_of_service">Cellular network not available.</string>
     <!-- In-call screen: call failure message displayed in an error dialog -->
+    <string name="incall_error_out_of_service_wfc">Cellular network is not available. Connect to a wireless network to make a call.</string>
+    <!-- In-call screen: call failure message displayed in an error dialog -->
     <string name="incall_error_no_phone_number_supplied">To place a call, enter a valid number.</string>
     <!-- In-call screen: call failure message displayed in an error dialog -->
     <string name="incall_error_call_failed">Can\'t call.</string>
@@ -989,6 +1004,8 @@
     <string name="incall_error_supp_service_reject">Can\'t reject call.</string>
     <!-- In-call screen: message displayed in an error dialog -->
     <string name="incall_error_supp_service_hangup">Can\'t release call(s).</string>
+    <!-- In-call screen: call failure message displayed in an error dialog when WFC is enabled, is wifi-only, and not connected to a wireless network. [CHAR_LIMIT=NONE] -->
+    <string name="incall_error_wfc_only_no_wireless_network">Connect to a wireless network to make a call.</string>
 
     <!-- Dialog title for the "radio enable" UI for emergency calls -->
     <string name="emergency_enable_radio_dialog_title">Emergency call</string>
@@ -1238,10 +1255,6 @@
         <item>never</item>
     </string-array>
 
-    <!--  Setting option name to enable or disable dialpad autocomplete functionality
-         [CHAR LIMIT=30] -->
-    <string name="dial_pad_autocomplete">Dialpad autocomplete</string>
-
     <!-- Title for the category "ringtone", which is shown above ringtone and vibration
          related settings.
          [CHAR LIMIT=30] -->
@@ -1274,13 +1287,36 @@
     <string name="sim_label_emergency_calls">Emergency calls</string>
     <string name="sim_description_emergency_calls">Emergency calling only</string>
     <string name="sim_description_default">SIM card, slot: <xliff:g id="slot_id">%s</xliff:g></string>
+
+    <!-- Title for activity to control accessibility settings such as TTY mode and hearing aid
+         compatability. [CHAR LIMIT=40] -->
+    <string name="accessibility_settings_activity_title">Accessibility</string>
+
     <!-- Configuration setting for world mode Format is <true;GID if any to be checked>-->
     <string translatable="false" name="config_world_mode"/>
 
+    <!-- Status hint label for an incoming call over a wifi network which has not been accepted yet.
+         [CHAR LIMIT=25] -->
+    <string name="status_hint_label_incoming_wifi_call">Incoming Wi-Fi call</string>
+    <!-- Status hint label for a call being made over a wifi network. [CHAR LIMIT=25] -->
+    <string name="status_hint_label_wifi_call">Wi-Fi call</string>
+
     <!-- DO NOT TRANSLATE. Internal key for a voicemail notification preference. -->
     <string name="voicemail_notification_ringtone_key">voicemail_notification_ringtone_key</string>
     <!-- DO NOT TRANSLATE. Internal key for a voicemail notification preference. -->
     <string name="voicemail_notification_vibrate_key">voicemail_notification_vibrate_key</string>
     <!-- DO NOT TRANSLATE. Internal key for tty mode preference. -->
     <string name="tty_mode_key">button_tty_mode_key</string>
+    <!-- DO NOT TRANSLATE. Internal key for a voicemail notification preference. -->
+    <string name="wifi_calling_settings_key">button_wifi_calling_settings_key</string>
+
+    <!-- Hint appearing below a selected action on the emergency dialer telling user to tap again to execute the action [CHAR LIMIT=NONE] -->
+    <string name="emergency_action_launch_hint">Touch again to open</string>
+
+    <!-- Strings for IMAP -->
+
+    <!-- String used in place of a message that could not be properly decoded (e.g. bad base64
+       data was received.) [CHAR LIMIT=none] -->
+    <string name="message_decode_error">There was an error while decoding the message.</string>
+
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 3d1b1ad..9d2d47f 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -256,11 +256,13 @@
         <item name="android:src">@drawable/overflow_menu</item>
     </style>
 
-    <style name="EmergencyDialerTheme" parent="@android:style/Theme.Material.Light">
-        <item name="dialpad_key_button_touch_tint">@color/dialer_dialpad_touch_tint</item>
-        <item name="android:actionBarStyle">@style/TelephonyActionBarStyle</item>
-        <item name="android:colorPrimary">@color/dialer_theme_color</item>
-        <item name="android:colorPrimaryDark">@color/dialer_theme_color_dark</item>
+    <style name="EmergencyDialerTheme" parent="@android:style/Theme.Material.NoActionBar">
+        <item name="android:colorPrimary">@color/emergency_dialer_background</item>
+        <item name="android:colorPrimaryDark">@color/emergency_dialer_background</item>
+        <item name="android:windowBackground">@color/emergency_dialer_background</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:homeAsUpIndicator">@drawable/ic_back_arrow</item>
     </style>
 
     <style name="SimImportTheme" parent="@android:style/Theme.Material.Light">
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
new file mode 100644
index 0000000..a67e2ad
--- /dev/null
+++ b/res/xml/accessibility_settings.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:phone="http://schemas.android.com/apk/res/com.android.phone"
+    android:title="@string/accessibility_settings_activity_title">
+
+    <com.android.phone.settings.TtyModeListPreference
+        android:key="@string/tty_mode_key"
+        android:title="@string/tty_mode_option_title"
+        android:summary="@string/tty_mode_option_summary"
+        android:persistent="false"
+        android:entries="@array/tty_mode_entries"
+        android:entryValues="@array/tty_mode_values"/>
+
+    <CheckBoxPreference
+        android:key="button_hac_key"
+        android:title="@string/hac_mode_title"
+        android:persistent="true"
+        android:summary="@string/hac_mode_summary"/>
+
+</PreferenceScreen>
diff --git a/res/xml/authenticator.xml b/res/xml/authenticator.xml
new file mode 100644
index 0000000..f035d3a
--- /dev/null
+++ b/res/xml/authenticator.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<account-authenticator
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:accountType="com.android.phone.vvm.omtp" />
\ No newline at end of file
diff --git a/res/xml/call_feature_setting.xml b/res/xml/call_feature_setting.xml
index 4ae0bf6..6471b16 100644
--- a/res/xml/call_feature_setting.xml
+++ b/res/xml/call_feature_setting.xml
@@ -29,59 +29,23 @@
 
     <PreferenceScreen
         android:key="button_voicemail_category_key"
-        android:title="@string/voicemail"
-        android:persistent="false">
-
-        <com.android.phone.settings.VoicemailProviderListPreference
-            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" />
-
-        </PreferenceScreen>
-
-        <com.android.phone.settings.VoicemailRingtonePreference
-            android:key="@string/voicemail_notification_ringtone_key"
-            android:title="@string/voicemail_notification_ringtone_title"
-            android:persistent="false"
-            android:ringtoneType="notification" />
-
-        <CheckBoxPreference
-            android:key="@string/voicemail_notification_vibrate_key"
-            android:title="@string/voicemail_notification_vibrate_when_title"
-            android:persistent="true" />
-
-    </PreferenceScreen>
+        android:title="@string/voicemail" />
 
     <PreferenceScreen
         android:key="button_fdn_key"
         android:title="@string/fdn"
         android:persistent="false" />
 
+    <PreferenceScreen
+        android:key="@string/wifi_calling_settings_key"
+        android:title="@string/wifi_calling">
+
+        <intent android:action="android.intent.action.MAIN"
+            android:targetPackage="com.android.settings"
+            android:targetClass="com.android.settings.Settings$WifiCallingSettingsActivity"/>
+
+    </PreferenceScreen>
+
     <CheckBoxPreference
         android:key="button_enable_video_calling"
         android:title="@string/enable_video_calling_title"
@@ -94,49 +58,16 @@
         android:persistent="false"
         android:summary="@string/auto_retry_mode_summary"/>
 
-    <com.android.phone.settings.TtyModeListPreference
-        android:key="@string/tty_mode_key"
-        android:title="@string/tty_mode_option_title"
-        android:summary="@string/tty_mode_option_summary"
-        android:persistent="false"
-        android:entries="@array/tty_mode_entries"
-        android:entryValues="@array/tty_mode_values"/>
-
-    <CheckBoxPreference
-        android:key="button_hac_key"
-        android:title="@string/hac_mode_title"
-        android:persistent="true"
-        android:summary="@string/hac_mode_summary"/>
-
-    <ListPreference
-        android:key="button_dtmf_settings"
-        android:title="@string/dtmf_tones_title"
-        android:summary="@string/dtmf_tones_summary"
-        android:entries="@array/dtmf_tone_entries"
-        android:entryValues="@array/dtmf_tone_values"/>
-
     <PreferenceScreen
         android:key="button_gsm_more_expand_key"
         android:title="@string/labelGSMMore"
         android:summary="@string/sum_gsm_call_settings"
-        android:persistent="false">
-
-        <intent android:action="android.intent.action.MAIN"
-            android:targetPackage="com.android.phone"
-            android:targetClass="com.android.phone.GsmUmtsCallOptions"/>
-
-    </PreferenceScreen>
+        android:persistent="false" />
 
     <PreferenceScreen
         android:key="button_cdma_more_expand_key"
         android:title="@string/labelCDMAMore"
         android:summary="@string/sum_cdma_call_settings"
-        android:persistent="false">
-
-        <intent android:action="android.intent.action.MAIN"
-            android:targetPackage="com.android.phone"
-            android:targetClass="com.android.phone.CdmaCallOptions"/>
-
-    </PreferenceScreen>
+        android:persistent="false" />
 
 </PreferenceScreen>
diff --git a/res/xml/network_setting.xml b/res/xml/network_setting.xml
index fcd4439..58c19f7 100644
--- a/res/xml/network_setting.xml
+++ b/res/xml/network_setting.xml
@@ -14,7 +14,6 @@
      limitations under the License.
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:phone="http://schemas.android.com/apk/res/com.android.phone"
         android:title="@string/mobile_networks">
 
     <PreferenceScreen
diff --git a/res/xml/phone_account_settings.xml b/res/xml/phone_account_settings.xml
index ff01d34..119accd 100644
--- a/res/xml/phone_account_settings.xml
+++ b/res/xml/phone_account_settings.xml
@@ -20,21 +20,15 @@
 
     <PreferenceCategory
         android:key="phone_accounts_accounts_list_category_key"
-        android:title="@string/phone_accounts_settings_header" />
+        android:title="@string/phone_accounts_settings_header">
 
-    <com.android.phone.settings.AccountSelectionPreference
-        android:key="default_outgoing_account"
-        android:title="@string/phone_accounts_make_calls_with"
-        android:defaultValue=""
-        android:persistent="false" />
+        <com.android.phone.settings.AccountSelectionPreference
+            android:key="default_outgoing_account"
+            android:title="@string/phone_accounts_make_calls_with"
+            android:defaultValue=""
+            android:persistent="false" />
 
-    <com.android.phone.settings.TtyModeListPreference
-        android:key="@string/tty_mode_key"
-        android:title="@string/tty_mode_option_title"
-        android:summary="@string/tty_mode_option_summary"
-        android:persistent="false"
-        android:entries="@array/tty_mode_entries"
-        android:entryValues="@array/tty_mode_values"/>
+    </PreferenceCategory>
 
     <PreferenceCategory
         android:key="phone_accounts_call_assistant_settings_category_key"
diff --git a/res/xml/syncadapter.xml b/res/xml/syncadapter.xml
new file mode 100644
index 0000000..b0484b1
--- /dev/null
+++ b/res/xml/syncadapter.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<sync-adapter
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:contentAuthority="com.android.voicemail"
+        android:accountType="com.android.phone.vvm.omtp"
+        android:userVisible="false"
+        android:supportsUploading="true"
+        android:allowParallelSyncs="false"
+        android:isAlwaysSyncable="true"/>
\ No newline at end of file
diff --git a/res/xml/voicemail_settings.xml b/res/xml/voicemail_settings.xml
index f4679e5..a7d5fb4 100644
--- a/res/xml/voicemail_settings.xml
+++ b/res/xml/voicemail_settings.xml
@@ -15,9 +15,50 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:phone="http://schemas.android.com/apk/res/com.android.phone"
     android:title="@string/voicemail">
 
-    <!-- Temporary placeholder until prefs are migrated from Call Settings. -->
-    <Preference android:title="@string/voicemail" />
+    <com.android.phone.settings.VoicemailProviderListPreference
+        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" />
+
+    </PreferenceScreen>
+
+    <com.android.phone.settings.VoicemailRingtonePreference
+        android:key="@string/voicemail_notification_ringtone_key"
+        android:title="@string/voicemail_notification_ringtone_title"
+        android:persistent="false"
+        android:ringtoneType="notification" />
+
+    <CheckBoxPreference
+        android:key="@string/voicemail_notification_vibrate_key"
+        android:title="@string/voicemail_notification_vibrate_when_title"
+        android:persistent="true" />
 
 </PreferenceScreen>
diff --git a/sip/res/values-af/strings.xml b/sip/res/values-af/strings.xml
new file mode 100644
index 0000000..0a3a023
--- /dev/null
+++ b/sip/res/values-af/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"SIP-instellings"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP-rekeninge"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Rekeninge"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Ontvang inkomende oproepe"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Gebruik meer batterykrag"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"Gebruik SIP-oproepe"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Gebruik SIP-oproepe (net Wi-Fi)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Vir alle oproepe wanneer datanetwerk beskikbaar is"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Net vir SIP-oproepe"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Vir alle oproepe"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Voeg rekening by"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Verwyder rekening"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP-rekeninge"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Stoor tans die rekening …"</string>
+    <string name="removing_account" msgid="5537351356808985756">"Verwyder tans die rekening …"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Stoor"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Gooi weg"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Sluit die profiel"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"Goed"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Maak toe"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Gaan tans status na …"</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Registreer tans …"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Probeer steeds …"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Ontvang nie tans oproepe nie."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Rekeningregistrasie het gestop omdat daar geen internetverbinding is nie."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Rekeningregistrasie het gestop omdat daar geen Wi-Fi-verbinding is nie."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Rekeningregistrasie het misluk."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Ontvang tans oproepe."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"Rekeningregistrasie het misluk: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); sal later probeer"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Rekeningregistrasie het misluk: Verkeerde gebruikernaam of wagwoord."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Rekeningregistrasie het misluk: Gaan die bedienernaam na."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"Hierdie rekening word tans deur die <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>-program gebruik."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"SIP-rekeningbesonderhede"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"SIP-rekeningbesonderhede"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Bediener"</string>
+    <string name="username_title" msgid="6770064611005663470">"Gebruikernaam"</string>
+    <string name="password_title" msgid="5289013731515564295">"Wagwoord"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Vertoonnaam"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Uitgaande instaanadres"</string>
+    <string name="port_title" msgid="6693965912656593862">"Poortnommer"</string>
+    <string name="transport_title" msgid="889155457465372527">"Vervoertipe"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Stuur hou lewendig"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Opsionele instellings"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Stawinggebruikernaam"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Gebruikernaam gebruik vir stawing"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Nie gestel nie&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Dieselfde as gebruikernaam&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Opsioneel&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Raak om almal te wys"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Raak om almal te versteek"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> word vereis en kan nie leeg wees nie."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"Poortnommer moet tussen 1000 en 65534 wees."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"Gaan eers jou internetverbinding na om \'n SIP-oproep te maak."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"Jy moet aan \'n Wi-Fi-netwerk gekoppel wees om SIP-oproepe te maak (gebruik die Draadlose en netwerkinstellings)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"SIP-oproepe word nie gesteun nie"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Outomaties"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Stuur altyd"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Ingeboude SIP-oproepe"</string>
+</resources>
diff --git a/sip/res/values-am/strings.xml b/sip/res/values-am/strings.xml
new file mode 100644
index 0000000..33afdda
--- /dev/null
+++ b/sip/res/values-am/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"SIP ቅንብሮች"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"የSIP መለያዎች"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"መለያዎች"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"ገቢ ጥሪዎች ተቀበል"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"ተጨማሪ የባትሪ ዕድሜን ይጠቀማል"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"የSIP መደወያን ተጠቀም"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"የSIP መደወያን ተጠቀም (Wi-Fi ብቻ)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"ለሁሉም ጥሪዎች የውሂብ አውታረመረብ ሲኖር"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"ለSIP ጥሪዎች ብቻ"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"ለሁሉም ጥሪዎች"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"መለያ ያክሉ"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"መለያ ያስወግዱ"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP መለያዎች"</string>
+    <string name="saving_account" msgid="5336529880235177448">"መለያውን በማስቀመጥ ላይ…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"መለያውን በማስወገድ ላይ…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"አስቀምጥ"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"ጣለው"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"መገለጫውን ይዝጉ"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"እሺ"</string>
+    <string name="close_profile" msgid="3122414058856309881">"ዝጋ"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"ሁኔታን በመመልከት ላይ..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"በመመዝገብ ላይ…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"አሁንም በመሞከር ላይ…"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"ጥሪዎች እየተቀበለ አይደለም።"</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"የበይነመረብ ግኑኝነት ስለሌለ የመለያ ምዝገባ ቆሟል።"</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"ምንም የWi-Fi ግንኙነት ስለሌለ የመለያ ምዝገባ ቆሟል።"</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"የመለያ ምዝገባ አልተሳካም።"</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"ጥሪዎች በመቀበል ላይ።"</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"የመለያ ምዝገባ አልተሳካም፦ <xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>፤ ኋላ ላይ እንደገና ይሞከራል"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"የመለያ ምዝገባ አልተሳካም፦ የተሳሳተ የተጠቃሚ ስም ወይም ይለፍ ቃል።"</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"የመለያ ምዝገባ አልተሳካም፦ የአገልጋዩን ስም ትክክለኛነት ያረጋግጡ።"</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"ይህ መለያ በአሁኑ ጊዜ በ<xliff:g id="ACCOUNT_OWNER">%s</xliff:g> መተግበሪያ ጥቅም ላይ ነው።"</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"SIP መለያ ዝርዝሮች"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"SIP መለያ ዝርዝሮች"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"አገልጋይ"</string>
+    <string name="username_title" msgid="6770064611005663470">"የተጠቃሚ ስም"</string>
+    <string name="password_title" msgid="5289013731515564295">"የይለፍ ቃል"</string>
+    <string name="display_name_title" msgid="579241787583079773">"የማሳያ ስም"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"የወደ ውጪ እጅ አዙር አድራሻ"</string>
+    <string name="port_title" msgid="6693965912656593862">"ወደብ ቁጥር"</string>
+    <string name="transport_title" msgid="889155457465372527">"የማጓጓዣ አይነት"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"keep-alive ላክ"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"አማራጭ ቅንብሮች"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"የማረጋገጫ  የተጠቃሚ ስም"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"ተጠቃሚ ስም ለማረጋገጫ ተጠቅሟል"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;አልተዘጋጀም&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;ከተጠቃሚ ስም ጋር አንድ አይነት&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;አስገዳጅ ያልሆነ&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"ሁሉን ለማሳየት ▷ ይንኩ"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"ሁሉንም ለመደበቅ ▽ ይንኩ"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> ይጠይቃል፣ ባዶ መተው አይቻልም።"</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"የወደብ ቁጥር በ1000 እና 65534 ውስጥ መሆን አለበት።"</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"የSIP ጥሪ ለማድረግ፣ በመጀመሪያ የበይነመረብ ግንኙነትዎን ይፈትሹ።"</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"SIP ጥሪዎችን ለማድረግ ወደ Wi-Fi አውታረ መረብ መገናኘት ያስፈልግዎታል (ሽቦ አልባ እና አውታረ መረብ ቅንብሮችን ይጠቀሙ)።"</string>
+    <string name="no_voip" msgid="3038021971231952704">"የSIP መደወያ አይደገፍም"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"ራስ ሰር"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"ሁልጊዜ ላክ"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"ውስጠ ግንቡ SIP መደወያ"</string>
+</resources>
diff --git a/sip/res/values-ar/strings.xml b/sip/res/values-ar/strings.xml
new file mode 100644
index 0000000..6c4be12
--- /dev/null
+++ b/sip/res/values-ar/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"‏إعدادات SIP"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"‏حسابات SIP"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"الحسابات"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"تلقي المكالمات الواردة"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"تستهلك المزيد من عمر البطارية"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"‏استخدام اتصالات SIP"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"‏استخدام اتصالات SIP ‏(Wi-Fi فقط)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"لكل المكالمات عند توفر شبكة البيانات"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"‏لاتصالات SIP فقط"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"لكل المكالمات"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"إضافة حساب"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"إزالة الحساب"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"‏حسابات SIP"</string>
+    <string name="saving_account" msgid="5336529880235177448">"جارٍ حفظ الحساب…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"جارٍ إزالة الحساب…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"حفظ"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"إلغاء"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"إغلاق الملف الشخصي"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"موافق"</string>
+    <string name="close_profile" msgid="3122414058856309881">"إغلاق"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"جارٍ فحص الحالة…"</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"جارٍ التسجيل…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"لا تزال المحاولة مستمرة…"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"لا يتم تلقي مكالمات."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"توقف تسجيل الحساب نظرًا لعدم توفر اتصال بالإنترنت."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"‏توقف تسجيل الحساب نظرًا لعدم توفر اتصال Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"لم يتم تسجيل الحساب بنجاح."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"جارٍ استلام مكالمات."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"لم يكتمل تسجيل الحساب بنجاح: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>)، وستتم المحاولة لاحقًا"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"لم يتم تسجيل الحساب بنجاح: اسم مستخدم غير صحيح أو كلمة مرور غير صحيحة."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"لم يتم تسجيل الحساب بنجاح: تحقق من اسم الخادم."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"هذا الحساب قيد الاستخدام حاليًا من خلال تطبيق <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"‏تفاصيل حساب SIP"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"‏تفاصيل حساب SIP"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"الخادم"</string>
+    <string name="username_title" msgid="6770064611005663470">"اسم المستخدم"</string>
+    <string name="password_title" msgid="5289013731515564295">"كلمة المرور"</string>
+    <string name="display_name_title" msgid="579241787583079773">"اسم العرض"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"عنوان وكيل صادر"</string>
+    <string name="port_title" msgid="6693965912656593862">"رقم المنفذ"</string>
+    <string name="transport_title" msgid="889155457465372527">"نوع النقل"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"إرسال رسالة للتحقق من الاتصال"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"الإعدادات الاختيارية"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"اسم المستخدِم للمصادقة"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"اسم المستخدِم المستخدَم للمصادقة"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"‏&lt;لم يتم التعيين&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"‏&lt;مثل اسم المستخدم&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"‏&lt;اختياري&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ المس لإظهار الكل"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ المس لإخفاء الكل"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> مطلوب ولا يمكن تركه فارغًا."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"يجب أن يكون رقم المنفذ ما بين 1000 و65534."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"‏لإجراء اتصال SIP، تحقق من الاتصال بالإنترنت أولاً."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"‏يجب عليك الاتصال بشبكة Wi-Fi لإجراء اتصالات SIP (استخدم إعدادات \"الشبكة واللاسلكي\")."</string>
+    <string name="no_voip" msgid="3038021971231952704">"‏اتصالات SIP غير متاحة"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"تلقائي"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"الإرسال دائمًا"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"‏اتصالات SIP مدمجة"</string>
+</resources>
diff --git a/sip/res/values-bg/strings.xml b/sip/res/values-bg/strings.xml
new file mode 100644
index 0000000..0b511c5
--- /dev/null
+++ b/sip/res/values-bg/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"Настройки за SIP"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"Профили за SIP"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Профили"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Получаване на входящи обаждания"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Изразходва повече от батерията"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"Използване на услуга за обаждане през SIP"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Използване на услуга за обаждане през SIP (само при Wi-Fi)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"За всички обаждания, когато е налице мрежа за данни"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Само за обаждания през SIP"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"За всички обаждания"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Добавяне на профил"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Премахване на профил"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"Профили за SIP"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Профилът се запазва…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"Профилът се премахва…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Запазване"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Отхвърляне"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Затваряне на потребителския профил"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"ОK"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Затваряне"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Състоянието се проверява..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Регистрира се…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Опитите продължават…"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Не се получават обаждания."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Регистрирането на профила спря, защото няма връзка с интернет."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Регистрирането на профила спря, защото няма връзка с Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Профилът не бе регистриран успешно."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Получават се обаждания."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"Профилът не бе регистриран успешно: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>). Ще се извърши нов опит по-късно"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Профилът не бе регистриран успешно: Неправилно потребителско име или парола."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Профилът не бе регистриран успешно: Проверете името на сървъра."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"Този профил понастоящем се използва от приложението <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"Подробности за профила за SIP"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"Подробности за профила за SIP"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Сървър"</string>
+    <string name="username_title" msgid="6770064611005663470">"Потребителско име"</string>
+    <string name="password_title" msgid="5289013731515564295">"Парола"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Екранно име"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Адрес на изходящ прокси сървър"</string>
+    <string name="port_title" msgid="6693965912656593862">"Номер на порта"</string>
+    <string name="transport_title" msgid="889155457465372527">"Тип транспорт"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Изпращане на съобщение за проверка на връзката"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Незадължителни настройки"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Потребителско име за удостоверяване"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Потребителско име, използвано за удостоверяване"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Не е зададено&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Същото като потребителското име&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;По избор&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Докоснете за показване на всички"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Докоснете за скриване на всички"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"Полето „<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g>“ е задължително и трябва да се попълни."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"Номерът на порта трябва да е между 1000 и 65534."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"За да осъществите обаждане през SIP, първо проверете връзката си с интернет."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"За да се обаждате през SIP, трябва да сте свързани с Wi-Fi мрежа (използвайте настройките „Кабелни и безжични мрежи“)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"Обажданията през SIP не се поддържат"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Автоматично"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Изпращане винаги"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Вградена услуга за обаждане през SIP"</string>
+</resources>
diff --git a/sip/res/values-bn-rBD/strings.xml b/sip/res/values-bn-rBD/strings.xml
new file mode 100644
index 0000000..3cc1e6e
--- /dev/null
+++ b/sip/res/values-bn-rBD/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"SIP সেটিংস"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP অ্যাকাউন্টগুলি"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"অ্যাকাউন্টগুলি"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"আগত কলগুলি গ্রহণ করুন"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"আরো বেশি ব্যাটারি লাইফ ব্যবহার করে"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"SIP কলিং ব্যবহার করুন"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"SIP কলিং ব্যবহার করুন (শুধুমাত্র Wi-Fi)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"যখন ডেটা নেটওয়ার্ক উপলব্ধ তখন সব কলের জন্য"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"শুধুমাত্র SIP কলগুলির জন্য"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"সব কলের জন্য"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"অ্যাকাউন্ট যোগ করুন"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"অ্যাকাউন্ট সরান"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP অ্যাকাউন্টগুলি"</string>
+    <string name="saving_account" msgid="5336529880235177448">"অ্যাকাউন্টটি সংরক্ষণ করা হচ্ছে ..."</string>
+    <string name="removing_account" msgid="5537351356808985756">"অ্যাকাউন্টটি সরানো হচ্ছে…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"সংরক্ষণ করুন"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"খারিজ করুন"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"প্রোফাইলটি বন্ধ করুন"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"ঠিক আছে"</string>
+    <string name="close_profile" msgid="3122414058856309881">"বন্ধ করুন"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"স্থিতি পরীক্ষা করা হচ্ছে ..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"নিবন্ধীকরণ চলছে..."</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"এখনও চেষ্টা করছে..."</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"কলগুলি গ্রহণ করা হচ্ছে না৷"</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"কোনো ইন্টারনেট সংযোগ না থাকায় অ্যাকাউন্ট নিবন্ধন করা বন্ধ হয়ে গেছে৷"</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"কোনো Wi-Fi সংযোগ না থাকায় অ্যাকাউন্ট নিবন্ধন করা বন্ধ হয়ে গেছে৷"</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"অ্যাকাউন্টের নিবন্ধন অসফল হয়েছে৷"</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"কলগুলি গ্রহণ করা হচ্ছে৷"</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"অ্যাকাউন্টের নিবন্ধন অসফল হয়েছে: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); পরে আবার চেষ্টা করা হবে"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"অ্যাকাউন্টের নিবন্ধন অসফল হয়েছে: ভুল ব্যবহারকারী নাম বা পাসওয়ার্ড৷"</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"অ্যাকাউন্টের নিবন্ধন অসফল হয়েছে: সার্ভারের নাম পরীক্ষা করুন৷"</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"এই অ্যাকাউন্টটি বর্তমানে <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> অ্যাপ্লিকেশানের দ্বারা ব্যবহৃত হচ্ছে৷"</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"SIP অ্যাকাউন্টের বিবরণ"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"SIP অ্যাকাউন্টের বিবরণ"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"সার্ভার"</string>
+    <string name="username_title" msgid="6770064611005663470">"ব্যবহারকারীর নাম"</string>
+    <string name="password_title" msgid="5289013731515564295">"পাসওয়ার্ড"</string>
+    <string name="display_name_title" msgid="579241787583079773">"প্রদর্শন নাম"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"বহির্গামী প্রক্সি ঠিকানা"</string>
+    <string name="port_title" msgid="6693965912656593862">"পোর্ট নম্বর"</string>
+    <string name="transport_title" msgid="889155457465372527">"পরিবহনের ধরন"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"সক্রিয়-রাখুন অনুরোধ পাঠান"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"ঐচ্ছিক সেটিংস"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"প্রমাণীকরণের ব্যবহারকারীর নাম"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"প্রমাণীকরণের জন্য ব্যবহৃত ব্যবহারকারী নাম"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;সেট করা নেই&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;ব্যবহারকারী নামের অনুরূপ&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;ঐচ্ছিক&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ সবকিছু দেখানোর জন্য স্পর্শ করুন"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ সবকিছু লুকানোর জন্য স্পর্শ করুন"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> প্রয়োজনীয় এবং এটিকে ফাঁকা রাখা যাবে না৷"</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"পোর্ট নম্বরটিকে ১০০০ ও ৬৫৫৩৪ এর মধ্যে হতে হবে৷"</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"একটি SIP কল করতে প্রথমে আপনার ইন্টারনেট সংযোগ পরীক্ষা করুন৷"</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"SIP কলগুলি করার জন্য আপনাকে একটি Wi-Fi নেটওয়ার্কের সাথে সংযুক্ত হতে হবে (ওয়ারলেস নেটওয়ার্ক সেটিংস ব্যবহার করুন)৷"</string>
+    <string name="no_voip" msgid="3038021971231952704">"SIP কলিং সমর্থিত নয়"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"স্বয়ংক্রিয়"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"সবসময় পাঠান"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"অন্তর্নির্মিত SIP কলিং"</string>
+</resources>
diff --git a/sip/res/values-ca/strings.xml b/sip/res/values-ca/strings.xml
new file mode 100644
index 0000000..a744ccb
--- /dev/null
+++ b/sip/res/values-ca/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"Configuració de SIP"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"Comptes SIP"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Comptes"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Rep trucades entrants"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Fa servir més bateria."</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"Ús de les trucades SIP"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Ús de les trucades SIP (només Wi-Fi)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Per a totes les trucades quan hi hagi xarxes de dades disponibles"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Només per a trucades SIP"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Per a totes les trucades"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Afegeix un compte"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Suprimeix el compte"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"Comptes SIP"</string>
+    <string name="saving_account" msgid="5336529880235177448">"S\'està desant el compte..."</string>
+    <string name="removing_account" msgid="5537351356808985756">"S\'està suprimint el compte..."</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Desa"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Descarta"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Tanca el perfil"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"D\'acord"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Tanca"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"S\'està comprovant l\'estat..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"S\'està registrant..."</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Encara s\'està provant..."</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"No s\'estan rebent trucades."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"S\'ha aturat el registre del compte perquè no hi ha connexió a Internet."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"S\'ha aturat el registre del compte perquè no hi ha connexió Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"S\'ha produït un error en registrar el compte."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"S\'estan rebent trucades."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"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="8406872554323334182">"S\'ha produït un error en registrar el compte: el nom d\'usuari o la contrasenya no són correctes."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"S\'ha produït un error en registrar el compte: comprova el nom del servidor."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"L\'aplicació <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> està utilitzant aquest compte actualment."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"Detalls del compte SIP"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"Detalls del compte SIP"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Servidor"</string>
+    <string name="username_title" msgid="6770064611005663470">"Nom d\'usuari"</string>
+    <string name="password_title" msgid="5289013731515564295">"Contrasenya"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Nom de visualització"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Adreça de servidor intermediari de sortida"</string>
+    <string name="port_title" msgid="6693965912656593862">"Número de port"</string>
+    <string name="transport_title" msgid="889155457465372527">"Tipus de transport"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Envia mantenir en línia"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Configuració opcional"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Nom d\'usuari per a l\'autenticació"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Nom d\'usuari utilitzat per a l\'autenticació"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;No definit&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Igual que el nom d\'usuari&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Opcional&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Toca per mostrar-ho tot."</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Toca per amagar-ho tot."</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> és obligatori i no es pot deixar en blanc."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"El número de port hauria d\'estar entre 1000 i 65534."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"Per fer una trucada SIP, comprova la connexió a Internet."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"Per fer i rebre trucades SIP, has d\'estar connectat a una xarxa Wi-Fi (fes servir la configuració Connexions sense fil i xarxes)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"Les trucades SIP no són compatibles."</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Automàtic"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Envia sempre"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Trucades SIP integrades"</string>
+</resources>
diff --git a/sip/res/values-cs/strings.xml b/sip/res/values-cs/strings.xml
new file mode 100644
index 0000000..7d66537
--- /dev/null
+++ b/sip/res/values-cs/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"Nastavení protokolu SIP"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"Účty SIP"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Účty"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Přijímat příchozí hovory"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Více vybíjí baterii"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"Použít volání SIP"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Použít volání SIP (pouze Wi-Fi)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Pro všechny hovory, pokud je k dispozici datová síť"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Pouze pro volání SIP"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Pro všechny hovory"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Přidat účet"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Odebrat účet"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"Účty SIP"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Ukládání účtu…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"Odstraňování účtu…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Uložit"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Zahodit"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Zavřít profil"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"OK"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Zavřít"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Kontrola stavu..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Registrace…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Probíhají další pokusy…"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Hovory nejsou přijímány."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Registrace účtu byla zastavena, protože není k dispozici připojení k internetu."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Registrace účtu byla zastavena, protože není k dispozici připojení Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Registrace účtu se nezdařila."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Příjem hovorů."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"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="8406872554323334182">"Registrace účtu se nezdařila: nesprávné uživatelské jméno nebo heslo."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Registrace účtu se nezdařila. Zkontrolujte prosím název serveru."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"Tento účet je aktuálně používán aplikací <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"Podrobnosti o účtu SIP"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"Podrobnosti o účtu SIP"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Server"</string>
+    <string name="username_title" msgid="6770064611005663470">"Uživatelské jméno"</string>
+    <string name="password_title" msgid="5289013731515564295">"Heslo"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Zobrazované jméno"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Adresa odchozího proxy serveru"</string>
+    <string name="port_title" msgid="6693965912656593862">"Číslo portu"</string>
+    <string name="transport_title" msgid="889155457465372527">"Typ přenosu"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Odesílat zprávy pro zachování připojení"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Nepovinná nastavení"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Ověřovací uživatelské jméno"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Uživatelské jméno používané k ověření"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Nenastaveno&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Stejné jako uživatelské jméno&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Nepovinné&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Výběrem této položky zobrazíte všechna nastavení"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Výběrem této položky skryjete všechna nastavení"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"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="7931422555587011830">"Číslo portu by mělo být od 1000 do 65534."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"Chcete-li uskutečnit volání SIP, nejdříve si zkontrolujte připojení k internetu."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"Chcete-li použít volání SIP, musíte být připojeni k síti Wi-Fi (použijte nastavení Bezdrátová připojení a sítě)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"Volání SIP není podporováno."</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Automaticky"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Odesílat vždy"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Vestavěné volání SIP"</string>
+</resources>
diff --git a/sip/res/values-da/strings.xml b/sip/res/values-da/strings.xml
new file mode 100644
index 0000000..628a677
--- /dev/null
+++ b/sip/res/values-da/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"SIP-indstillinger"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP-konti"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Konti"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Modtag indgående opkald"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Bruger mere batteri"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"Anvend SIP-opkald"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Anvend SIP-opkald (kun Wi-Fi)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Gælder alle opkald ved tilgængeligt datanetværk"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Kun for SIP-opkald"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Gælder alle opkald"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Tilføj konto"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Fjern konto"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP-konti"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Kontoen gemmes..."</string>
+    <string name="removing_account" msgid="5537351356808985756">"Kontoen fjernes..."</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Gem"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Kassér"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Luk profilen"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"OK"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Luk"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Tjekker status..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Registrerer..."</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Forsøger stadig..."</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Modtager ikke opkald."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Kontoregistreringen blev afbrudt, fordi der ikke er nogen internetforbindelse."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Kontotilmeldingen blev afbrudt, fordi der ikke er nogen Wi-Fi-forbindelse"</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Registreringen af kontoen mislykkedes."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Modtager opkald."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"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="8406872554323334182">"Registreringen af kontoen mislykkedes: Forkert brugernavn eller adgangskode."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Registreringen af kontoen mislykkedes. Kontrollér servernavn."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"Denne konto benyttes i øjeblikket af appen <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"Oplysninger om SIP-konto"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"Oplysninger om SIP-konto"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Server"</string>
+    <string name="username_title" msgid="6770064611005663470">"Brugernavn"</string>
+    <string name="password_title" msgid="5289013731515564295">"Adgangskode"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Visningsnavn"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Udgående proxyadresse"</string>
+    <string name="port_title" msgid="6693965912656593862">"Portnummer"</string>
+    <string name="transport_title" msgid="889155457465372527">"Transporttype"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Send keepalive"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Valgfri indstillinger"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Brugernavn til godkendelse"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Brugernavn bruges til godkendelse"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Ikke angivet&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Samme som brugernavn&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Valgfrit&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Tryk for at vise alle"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Tryk for at skjule alle"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<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="7931422555587011830">"Portnummeret skal være mellem 1000 og 65534."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"Før du foretager et SIP-opkald, skal du kontrollere din internetforbindelse."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"Du skal have forbindelse til et Wi-Fi-netværk for at foretage SIP-opkald (brug indstillingerne for Trådløst og netværk)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"SIP-opkald understøttes ikke."</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Automatisk"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Send altid"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Indbygget SIP-opkald"</string>
+</resources>
diff --git a/sip/res/values-de/strings.xml b/sip/res/values-de/strings.xml
new file mode 100644
index 0000000..cc2b857
--- /dev/null
+++ b/sip/res/values-de/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"SIP-Einstellungen"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP-Konten"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Konten"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Eingehende Anrufe annehmen"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Beansprucht den Akku stärker"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"SIP-Telefonie nutzen"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"SIP-Telefonie nutzen (nur WLAN)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Für alle Anrufe mit verfügbarem Datennetzwerk"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Nur für SIP-Anrufe"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Für alle Anrufe"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Konto hinzufügen"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Konto entfernen"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP-Konten"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Konto wird gespeichert…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"Konto wird entfernt…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Speichern"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Verwerfen"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Profil schließen"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"OK"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Schließen"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Status wird überprüft…"</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Registrierung läuft…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Wird weiter versucht…"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Eingehende Anrufe deaktiviert"</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Kontoregistrierung aufgrund fehlender Internetverbindung gestoppt"</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Kontoregistrierung aufgrund fehlender WLAN-Verbindung gestoppt"</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Fehler bei der Kontoregistrierung"</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Eingehende Anrufe aktiviert"</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"Fehler bei der Kontoregistrierung: <xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>. Erneuter Versuch zu einem späteren Zeitpunkt."</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Fehler bei der Kontoregistrierung: Nutzername oder Passwort ist falsch."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Fehler bei der Kontoregistrierung. Bitte überprüfen Sie den Servernamen."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"Dieses Konto wird momentan von der <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> App verwendet."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"SIP-Kontodetails"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"SIP-Kontodetails"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Server"</string>
+    <string name="username_title" msgid="6770064611005663470">"Nutzername"</string>
+    <string name="password_title" msgid="5289013731515564295">"Passwort"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Anzeigename"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Ausgehende Proxyadresse"</string>
+    <string name="port_title" msgid="6693965912656593862">"Portnummer"</string>
+    <string name="transport_title" msgid="889155457465372527">"Transportart"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Keep-Alive senden"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Optionale Einstellungen"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Nutzername für die Authentifizierung"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Für die Authentifizierung verwendeter Nutzername"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Nicht festgelegt&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Wie Nutzername&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Optional&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Tippen, um alle einzublenden"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Tippen, um alle auszublenden"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> ist ein Pflichtfeld. Es darf nicht leer bleiben."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"Portnummer muss zwischen 1000 und 65534 liegen."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"Überprüfen Sie zunächst Ihre Internetverbindung, um einen SIP-Anruf zu tätigen."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"Für SIP-Anrufe ist eine WLAN-Verbindung erforderlich. Wählen Sie die entsprechenden Einstellungen unter \"Drahtlos &amp; Netzwerke\" aus."</string>
+    <string name="no_voip" msgid="3038021971231952704">"SIP-Anrufe werden nicht unterstützt."</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Automatisch"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Immer senden"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Integrierte SIP-Telefonie"</string>
+</resources>
diff --git a/sip/res/values-el/strings.xml b/sip/res/values-el/strings.xml
new file mode 100644
index 0000000..5f241ae
--- /dev/null
+++ b/sip/res/values-el/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"Ρυθμίσεις SIP"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"Λογαριασμοί SIP"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Λογαριασμοί"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Λήψη εισερχόμενων κλήσεων"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Χρησιμοποιεί περισσότερη μπαταρία"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"Χρήση κλήσεων SIP"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Χρήση κλήσεων SIP (μόνο Wi-Fi)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Για όλες τις κλήσεις όταν το δίκτυο δεδομένων είναι διαθέσιμο"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Μόνο για κλήσεις SIP"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Για όλες τις κλήσεις"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Προσθήκη λογαριασμού"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Κατάργηση λογαριασμού"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"Λογαριασμοί SIP"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Αποθήκευση λογαριασμού…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"Κατάργηση του λογαριασμού…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Αποθήκευση"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Απόρριψη"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Κλείσιμο του προφίλ"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"ΟΚ"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Κλείσιμο"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Έλεγχος κατάστασης…"</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Γίνεται εγγραφή…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Γίνεται ακόμη προσπάθεια…"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Δεν γίνεται αποδοχή κλήσεων."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Η εγγραφή του λογαριασμού διακόπηκε επειδή δεν υπάρχει σύνδεση στο διαδίκτυο."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Η εγγραφή του λογαριασμού διακόπηκε επειδή δεν υπάρχει σύνδεση Wi-Fi"</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Η εγγραφή λογαριασμού απέτυχε."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Δέχεται κλήσεις."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"Αποτυχία εγγραφής λογαριασμού: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>). Θα γίνει επανάληψη αργότερα"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Αποτυχία εγγραφής λογαριασμού: Εσφαλμένο όνομα χρήστη ή κωδικός πρόσβασης."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Αποτυχία εγγραφής λογαριασμού: Ελέγξτε το όνομα του διακομιστή."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"Αυτήν τη στιγμή ο λογαριασμός χρησιμοποιείται από την εφαρμογή <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"Πληροφορίες λογαριασμού SIP"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"Πληροφορίες λογαριασμού SIP"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Διακομιστής"</string>
+    <string name="username_title" msgid="6770064611005663470">"Όνομα χρήστη"</string>
+    <string name="password_title" msgid="5289013731515564295">"Κωδικός πρόσβασης"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Εμφανιζόμενο όνομα"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Διεύθυνση διακομιστή μεσολάβησης εξερχομένων"</string>
+    <string name="port_title" msgid="6693965912656593862">"Αριθμός θύρας"</string>
+    <string name="transport_title" msgid="889155457465372527">"Τύπος μεταφοράς"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Αποστολή μηνυμάτων \"keep-alive\""</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Προαιρετικές ρυθμίσεις"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Όνομα χρήστη ελέγχου ταυτότητας"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Όνομα χρήστη που χρησιμοποιείται για έλεγχο ταυτότητας"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Δεν έχει οριστεί&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Ίδιο με το όνομα χρήστη&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Προαιρετικό&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Αγγίξτε για εμφάνιση όλων"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▷ Αγγίξτε για απόκρυψη όλων"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"Το πεδίο <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> είναι υποχρεωτικό και δεν μπορεί να είναι κενό."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"Ο αριθμός της θύρας θα πρέπει να είναι μεταξύ 1000 και 65534."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"Για να πραγματοποιήσετε μια κλήση SIP, ελέγξτε πρώτα τη σύνδεση διαδικτύου."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"Για να πραγματοποιήσετε κλήσεις SIP, θα πρέπει να συνδεθείτε σε δίκτυο Wi-Fi (χρησιμοποιήστε τις ρυθμίσεις Ασύρματο &amp; δίκτυο)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"Οι κλήσεις SIP δεν υποστηρίζονται"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Αυτόματα"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Να γίνεται πάντα αποστολή"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Ενσωματωμένη υπηρεσία κλήσεων SIP"</string>
+</resources>
diff --git a/sip/res/values-en-rAU/strings.xml b/sip/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..2b8c14a
--- /dev/null
+++ b/sip/res/values-en-rAU/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"SIP settings"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP accounts"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Accounts"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Receive incoming calls"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Uses more battery life"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"Use SIP calling"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Use SIP calling (Wi-Fi only)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"For all calls when data network is available"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Only for SIP calls"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"For all calls"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Add account"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Remove account"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP accounts"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Saving the account…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"Removing the account…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Save"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Discard"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Close the profile"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"OK"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Close"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Checking status..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Registering…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Still trying…"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Not receiving calls."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Account registration stopped because there is no Internet connection."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Account registration stopped because there is no Wi-Fi connection."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Account registration unsuccessful."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Receiving calls."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"Account registration unsuccessful: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); will try later"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Account registration unsuccessful: Incorrect username or password."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Account registration unsuccessful: Check the server name."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"This account is currently in use by the <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> app."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"SIP account details"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"SIP account details"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Server"</string>
+    <string name="username_title" msgid="6770064611005663470">"Username"</string>
+    <string name="password_title" msgid="5289013731515564295">"Password"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Display name"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Outbound proxy address"</string>
+    <string name="port_title" msgid="6693965912656593862">"Port number"</string>
+    <string name="transport_title" msgid="889155457465372527">"Transport type"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Send keep-alive"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Optional settings"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Authentication username"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Username used for authentication"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Not set&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Same as username&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Optional&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Touch to show all"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Touch to hide all"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<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="7931422555587011830">"Port number should be within 1000 and 65534."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"To place a SIP call, check your Internet connection first."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"You need to be connected to a Wi-Fi network for SIP calls (use the Wireless &amp; Network settings)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"SIP calling not supported"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Automatic"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Always send"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Built-in SIP calling"</string>
+</resources>
diff --git a/sip/res/values-en-rGB/strings.xml b/sip/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..2b8c14a
--- /dev/null
+++ b/sip/res/values-en-rGB/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"SIP settings"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP accounts"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Accounts"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Receive incoming calls"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Uses more battery life"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"Use SIP calling"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Use SIP calling (Wi-Fi only)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"For all calls when data network is available"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Only for SIP calls"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"For all calls"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Add account"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Remove account"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP accounts"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Saving the account…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"Removing the account…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Save"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Discard"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Close the profile"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"OK"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Close"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Checking status..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Registering…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Still trying…"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Not receiving calls."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Account registration stopped because there is no Internet connection."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Account registration stopped because there is no Wi-Fi connection."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Account registration unsuccessful."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Receiving calls."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"Account registration unsuccessful: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); will try later"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Account registration unsuccessful: Incorrect username or password."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Account registration unsuccessful: Check the server name."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"This account is currently in use by the <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> app."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"SIP account details"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"SIP account details"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Server"</string>
+    <string name="username_title" msgid="6770064611005663470">"Username"</string>
+    <string name="password_title" msgid="5289013731515564295">"Password"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Display name"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Outbound proxy address"</string>
+    <string name="port_title" msgid="6693965912656593862">"Port number"</string>
+    <string name="transport_title" msgid="889155457465372527">"Transport type"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Send keep-alive"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Optional settings"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Authentication username"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Username used for authentication"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Not set&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Same as username&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Optional&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Touch to show all"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Touch to hide all"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<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="7931422555587011830">"Port number should be within 1000 and 65534."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"To place a SIP call, check your Internet connection first."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"You need to be connected to a Wi-Fi network for SIP calls (use the Wireless &amp; Network settings)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"SIP calling not supported"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Automatic"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Always send"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Built-in SIP calling"</string>
+</resources>
diff --git a/sip/res/values-en-rIN/strings.xml b/sip/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..2b8c14a
--- /dev/null
+++ b/sip/res/values-en-rIN/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"SIP settings"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP accounts"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Accounts"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Receive incoming calls"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Uses more battery life"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"Use SIP calling"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Use SIP calling (Wi-Fi only)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"For all calls when data network is available"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Only for SIP calls"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"For all calls"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Add account"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Remove account"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP accounts"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Saving the account…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"Removing the account…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Save"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Discard"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Close the profile"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"OK"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Close"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Checking status..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Registering…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Still trying…"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Not receiving calls."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Account registration stopped because there is no Internet connection."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Account registration stopped because there is no Wi-Fi connection."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Account registration unsuccessful."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Receiving calls."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"Account registration unsuccessful: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); will try later"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Account registration unsuccessful: Incorrect username or password."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Account registration unsuccessful: Check the server name."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"This account is currently in use by the <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> app."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"SIP account details"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"SIP account details"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Server"</string>
+    <string name="username_title" msgid="6770064611005663470">"Username"</string>
+    <string name="password_title" msgid="5289013731515564295">"Password"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Display name"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Outbound proxy address"</string>
+    <string name="port_title" msgid="6693965912656593862">"Port number"</string>
+    <string name="transport_title" msgid="889155457465372527">"Transport type"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Send keep-alive"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Optional settings"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Authentication username"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Username used for authentication"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Not set&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Same as username&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Optional&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Touch to show all"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Touch to hide all"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<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="7931422555587011830">"Port number should be within 1000 and 65534."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"To place a SIP call, check your Internet connection first."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"You need to be connected to a Wi-Fi network for SIP calls (use the Wireless &amp; Network settings)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"SIP calling not supported"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Automatic"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Always send"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Built-in SIP calling"</string>
+</resources>
diff --git a/sip/res/values-es-rUS/strings.xml b/sip/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..8da8d43
--- /dev/null
+++ b/sip/res/values-es-rUS/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"Configuración de SIP"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"Cuentas SIP"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Cuentas"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Recibir llamadas entrantes"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Utiliza más batería"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"Utilizar llamadas SIP"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Utilizar llamadas SIP (solo Wi-Fi)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Para todas las llamadas cuando la red de datos esté disponible"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Solo para llamadas SIP"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Para todas las llamadas"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Agregar cuenta"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Eliminar cuenta"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"Cuentas SIP"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Guardando la cuenta…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"Eliminando la cuenta…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Guardar"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Descartar"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Cerrar el perfil"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"Aceptar"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Cerrar"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Comprobando el estado…"</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Registrando…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Intento en curso…"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Sin recepción de llamadas"</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Se detuvo el registro de cuenta porque no hay conexión a Internet."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Se detuvo el registro de la cuenta porque no existe una conexión Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"La cuenta no se registró correctamente."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Recibiendo llamadas"</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"La cuenta no se registró correctamente: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); se volverá a intentar más tarde."</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"La cuenta no se registró correctamente: contraseña o nombre de usuario incorrectos."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"La cuenta no se registró correctamente: verifica el nombre del servidor."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"La aplicación <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> está usando la cuenta en este momento."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"Detalles de la cuenta SIP"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"Detalles de la cuenta SIP"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Servidor"</string>
+    <string name="username_title" msgid="6770064611005663470">"Nombre de usuario"</string>
+    <string name="password_title" msgid="5289013731515564295">"Contraseña"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Nombre de visualización"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Dirección de proxy saliente"</string>
+    <string name="port_title" msgid="6693965912656593862">"Número de puerto"</string>
+    <string name="transport_title" msgid="889155457465372527">"Tipo de transporte"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Enviar mantenimiento de conexión"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Configuración opcional"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Nombre de usuario de autenticación"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Nombre de usuario utilizado para autenticación"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Sin configurar&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Igual que el nombre de usuario&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Opcional&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Tocar para mostrar todo"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Tocar para ocultar todo"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"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="7931422555587011830">"El número de puerto debe estar dentro de 1000 y 65534."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"Para realizar una llamada SIP, primero comprueba que tienes conexión a Internet."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"Tienes que estar conectado a una red Wi-Fi para las llamadas SIP (utilizar la configuración de redes inalámbricas)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"Llamada SIP no compatible"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Automático"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Enviar siempre"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Llamadas SIP integradas"</string>
+</resources>
diff --git a/sip/res/values-es/strings.xml b/sip/res/values-es/strings.xml
new file mode 100644
index 0000000..73deae6
--- /dev/null
+++ b/sip/res/values-es/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"Ajustes de SIP"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"Cuentas SIP"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Cuentas"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Recibir llamadas"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Consume más batería"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"Usar llamadas SIP"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Usar llamadas SIP (solo con Wi-Fi)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Para todas las llamadas cuando haya redes de datos disponibles"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Solo para llamadas SIP"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"En todas las llamadas"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Añadir cuenta"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Eliminar cuenta"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"Cuentas SIP"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Guardando la cuenta..."</string>
+    <string name="removing_account" msgid="5537351356808985756">"Eliminando la cuenta..."</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Guardar"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Descartar"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Cerrar el perfil"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"Aceptar"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Cerrar"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Comprobando estado..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Registrando..."</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Seguimos intentándolo..."</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Sin recepción de llamadas"</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Se ha detenido el registro de cuenta porque no hay conexión a Internet."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Se ha detenido el registro de cuenta porque no hay conexión Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Registro de cuenta incorrecto"</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Recibiendo llamadas"</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"Error al registrar la cuenta: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); vuelve a intentarlo más tarde"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Registro de cuenta incorrecto: nombre de usuario o contraseña incorrectos."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Error al registrar la cuenta: comprueba el nombre del servidor."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"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="1967247832635750410">"Detalles de cuenta SIP"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"Detalles de cuenta SIP"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Servidor"</string>
+    <string name="username_title" msgid="6770064611005663470">"Nombre de usuario"</string>
+    <string name="password_title" msgid="5289013731515564295">"Contraseña"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Mostrar nombre"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Dirección de servidor proxy saliente"</string>
+    <string name="port_title" msgid="6693965912656593862">"Número de puerto"</string>
+    <string name="transport_title" msgid="889155457465372527">"Tipo de transporte"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Enviar mensajes de mantenimiento de la conexión"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Ajustes opcionales"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Nombre de usuario de autenticación"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Nombre de usuario utilizado para la autenticación"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;No definido&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Igual que el nombre de usuario&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Opcional&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Tocar para mostrar todo"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Tocar para ocultar todo"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"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="7931422555587011830">"El número de puerto debe estar comprendido entre 1.000 y 65.534."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"Antes de realizar una llamada SIP, comprueba tu conexión a Internet."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"Debes estar conectado a una red Wi-Fi para realizar llamadas SIP (usa la opción de conexiones y redes inalámbricas)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"Llamada SIP no admitida"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Automático"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Enviar siempre"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Llamadas SIP integradas"</string>
+</resources>
diff --git a/sip/res/values-et-rEE/strings.xml b/sip/res/values-et-rEE/strings.xml
new file mode 100644
index 0000000..cc14644
--- /dev/null
+++ b/sip/res/values-et-rEE/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"SIP-i seaded"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP-kontod"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Kontod"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Võta vastu sissetulevad kõned"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Kasutab rohkem akut"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"SIP-kõnede tegemine"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"SIP-kõnede tegemine (ainult WiFi)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Kõikide kõnede puhul, kui andmesidevõrk on saadaval"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Ainult SIP-kõnede tegemiseks"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Kõikide kõnede jaoks"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Lisa konto"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Eemalda konto"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP-kontod"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Konto salvestamine ..."</string>
+    <string name="removing_account" msgid="5537351356808985756">"Konto eemaldamine ..."</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Salvesta"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Loobu"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Profiili sulgemine"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"OK"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Sule"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Oleku kontrollimine ..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Registreerimine ..."</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Registreerimine jätkub ..."</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Kõnesid ei võeta vastu."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Konto registreerimine on peatatud, sest puudub Interneti-ühendus."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Konto registreerimine on peatatud, sest puudub WiFi-ühendus."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Konto registreerimine ebaõnnestus."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Kõnede vastuvõtmine."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"Konto registreerimine ebaõnnestus: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); hiljem proovitakse uuesti"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Konto registreerimine ebaõnnestus: vale kasutajanimi või parool."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Konto registreerimine ebaõnnestus: kontrollige serveri nime."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"Kontot kasutab praegu kontoomaniku <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> rakendus"</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"SIP-konto andmed"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"SIP-konto andmed"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Server"</string>
+    <string name="username_title" msgid="6770064611005663470">"Kasutajanimi"</string>
+    <string name="password_title" msgid="5289013731515564295">"Parool"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Kuvatav nimi"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Väljuva puhverserveri aadress"</string>
+    <string name="port_title" msgid="6693965912656593862">"Pordi number"</string>
+    <string name="transport_title" msgid="889155457465372527">"Protokolli tüüp"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Saada ühenduse hoidmise eelistused"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Valikulised seaded"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Autentimise kasutajanimi"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Autentimiseks kasutatav kasutajanimi"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Määramata&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Sama kui kasutajanimi&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Valikuline&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Puudutage kõige kuvamiseks"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Puudutage kõige peitmiseks"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"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="7931422555587011830">"Pordi number peab jääma vahemikku 1000 kuni 65 534."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"SIP-kõne tegemiseks kontrollige esmalt Interneti-ühendust."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"SIP-kõnede tegemiseks peate olema ühendatud WiFi-võrku (kasutage juhtmeta seadeid ja võrgustikuseadeid)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"SIP-kõnede tegemist ei toetata"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Automaatne"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Saada alati"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Sisseehitatud SIP-kõnede tegemine"</string>
+</resources>
diff --git a/sip/res/values-eu-rES/strings.xml b/sip/res/values-eu-rES/strings.xml
new file mode 100644
index 0000000..c62a29f
--- /dev/null
+++ b/sip/res/values-eu-rES/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"SIP ezarpenak"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP kontuak"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Kontuak"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Jaso sarrerako deiak"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Bateria gehiago erabiltzen du"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"Erabili SIP deiak"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Erabili SIP deiak (Wi-Fi bidez soilik)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Dei guztietan datu-sarea erabilgarri dagoenean"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"SIP deietarako soilik"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Dei guztietan"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Gehitu kontua"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Kendu kontua"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP kontuak"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Kontua gordetzen…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"Kontua kentzen…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Gorde"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Baztertu"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Itxi profila"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"Ados"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Itxi"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Egoera egiaztatzen…"</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Erregistratzen…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Oraindik saiatzen…"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Ez da deirik jasotzen ari."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Kontua erregistratzeko prozesua gelditu da ez dagoelako Interneteko konexiorik."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Kontua erregistratzeko prozesua gelditu da ez dagoelako Wi-Fi konexiorik."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Ez da kontua erregistratu."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Deiak jasotzen."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"Ez da kontua erregistratu: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>). Geroago saiatuko gara berriro."</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Ez da kontua erregistratu: erabiltzaile-izena edo/eta pasahitza ez dira zuzenak."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Ez da kontua erregistratu: egiaztatu zerbitzari-izena."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"Une honetan <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> jabearen aplikazioa erabiltzen ari da kontua."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"SIP kontuaren xehetasunak"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"SIP kontuaren xehetasunak"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Zerbitzaria"</string>
+    <string name="username_title" msgid="6770064611005663470">"Erabiltzaile-izena"</string>
+    <string name="password_title" msgid="5289013731515564295">"Pasahitza"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Bistaratzeko izena"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Irteerako proxyaren helbidea"</string>
+    <string name="port_title" msgid="6693965912656593862">"Ataka-zenbakia"</string>
+    <string name="transport_title" msgid="889155457465372527">"Garraio mota"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Bidali konexioa mantentzeko mezua"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Aukerako ezarpenak"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Autentifikatzeko erabiltzaile-izena"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Autentifikatzeko erabili den erabiltzaile-izena"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Ezarri gabe&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Erabiltzaile-izenaren berdina&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Aukerakoa&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Guztiak erakusteko, ukitu"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Guztiak ezkutatzeko, ukitu"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> beharrezkoa da eta ezin da hutsik utzi."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"Ataka-zenbakiak 1000 eta 65534 artean egon behar luke."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"SIP deiak egiteko, egiaztatu Interneteko konexioa."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"Wi-Fi sare batera konektatuta egon behar zara SIP deiak egiteko (erabili hari gabekoen eta sareen ezarpenak)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"SIP deiak ez dira onartzen"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Automatikoa"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Bidali beti"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"SIP dei integratuak"</string>
+</resources>
diff --git a/sip/res/values-fa/strings.xml b/sip/res/values-fa/strings.xml
new file mode 100644
index 0000000..00c5414
--- /dev/null
+++ b/sip/res/values-fa/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"‏تنظیمات SIP"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"‏حساب‌های SIP"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"حساب‌ها"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"دریافت تماس‌های ورودی"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"از نیروی باتری بیشتری استفاده می‌کند"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"‏استفاده از تماس SIP"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"‏استفاده از تماس SIP (فقط Wi-Fi)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"برای همه تماس‌ها وقتی شبکه داده در دسترس است"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"‏فقط برای تماس‌های SIP"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"برای همه تماس‌ها"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"افزودن حساب"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"حذف کردن حساب"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"‏حساب‌های SIP"</string>
+    <string name="saving_account" msgid="5336529880235177448">"در حال ذخیره حساب..."</string>
+    <string name="removing_account" msgid="5537351356808985756">"در حال حذف حساب..."</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"ذخیره‌"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"صرف‌نظر کردن"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"بستن نمایه"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"تأیید"</string>
+    <string name="close_profile" msgid="3122414058856309881">"بستن"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"در حال بررسی وضعیت..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"در حال ثبت..."</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"هنوز در حال تلاش..."</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"تماس‌های دریافتی موجود نیست."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"ثبت حساب به دلیل عدم وجود اتصال اینترنتی متوقف شد."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"‏ثبت حساب به دلیل عدم وجود اتصال Wi-Fi متوقف شد."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"ثبت حساب ناموفق بود."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"در حال دریافت تماس‌ها."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"ثبت حساب ناموفق بود: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>)، بعداً امتحان می‌شود"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"ثبت حساب ناموفق بود: نام کاربری یا گذرواژه نادرست است."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"ثبت حساب ناموفق: نام سرور را بررسی کنید."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"این حساب اکنون توسط برنامه <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> در حال استفاده است."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"‏جزئیات حساب SIP"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"‏جزئیات حساب SIP"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"سرور"</string>
+    <string name="username_title" msgid="6770064611005663470">"نام کاربری"</string>
+    <string name="password_title" msgid="5289013731515564295">"گذرواژه"</string>
+    <string name="display_name_title" msgid="579241787583079773">"نام نمایشی"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"آدرس پروکسی خارج از محدوده"</string>
+    <string name="port_title" msgid="6693965912656593862">"شماره درگاه"</string>
+    <string name="transport_title" msgid="889155457465372527">"نوع حمل و نقل"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"ارسال حفظ اتصال"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"تنظیمات اختیاری"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"نام کاربری برای احراز هویت"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"نام کاربری مورد استفاده برای احراز هویت"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"‏&lt;تنظیم نشده&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"‏&lt;مانند نام کاربری&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"‏&lt;اختیاری&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ جهت نمایش همه لمس کنید"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ جهت پنهان کردن همه لمس کنید"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> ضروری است و نباید خالی بماند."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"شماره درگاه باید بین ۱۰۰۰ و ۶۵۵۳۴ باشد."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"‏برای برقراری تماس SIP، ابتدا اتصال اینترنتتان را بررسی کنید."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"‏برای برقراری تماس‌های SIP باید به شبکه Wi-Fi متصل باشید (از تنظیمات بی‌سیم و شبکه استفاده کنید)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"‏تماس SIP پشتیبانی نمی‌شود"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"خودکار"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"همیشه ارسال شود"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"‏تماس SIP درونی"</string>
+</resources>
diff --git a/sip/res/values-fi/strings.xml b/sip/res/values-fi/strings.xml
new file mode 100644
index 0000000..dd0b69a
--- /dev/null
+++ b/sip/res/values-fi/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"SIP-asetukset"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP-tilit"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Tilit"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Vastaanota saapuvia puheluita"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Käyttää enemmän akkua"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"Käytä SIP-puheluita"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Käytä SIP-puheluita (vain Wi-Fi)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Kaikki puhelut, kun verkko on käytettävissä"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Vain SIP-puhelut"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Kaikki puhelut"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Lisää tili"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Poista tili"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP-tilit"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Tiliä tallennetaan…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"Tiliä poistetaan…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Tallenna"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Hylkää"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Sulje profiili"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"OK"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Sulje"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Tarkistetaan tilaa…"</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Rekisteröidään…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Yritetään edelleen…"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Ei vastaanota puheluita."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Tilin rekisteröinti lopetettiin, koska internetyhteyttä ei ole."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Tilin rekisteröinti lopetettiin, koska Wi-Fi-yhteyttä ei ole."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Tilin rekisteröinti epäonnistui."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Vastaanottaa puheluita."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"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="8406872554323334182">"Tilin rekisteröinti epäonnistui: virheellinen käyttäjänimi tai salasana."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Tilin rekisteröinti epäonnistui: tarkista palvelimen nimi."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"Tiliä käyttää tällä hetkellä sovellus <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"SIP-tilin tiedot"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"SIP-tilin tiedot"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Palvelin"</string>
+    <string name="username_title" msgid="6770064611005663470">"Käyttäjätunnus"</string>
+    <string name="password_title" msgid="5289013731515564295">"Salasana"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Näyttönimi"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Lähettävän välityspalvelimen osoite"</string>
+    <string name="port_title" msgid="6693965912656593862">"Porttinumero"</string>
+    <string name="transport_title" msgid="889155457465372527">"Siirtotyyppi"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Lähetä tarkistusviesti"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Lisäasetukset"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Todennuksessa käytettävä käyttäjänimi"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Käyttäjänimeä käytetään todennukseen"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Ei asetettu&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Sama kuin käyttäjänimi&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Valinnainen&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Näytä kaikki koskettamalla"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Piilota kaikki koskettamalla"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<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="7931422555587011830">"Porttinumeron tulee olla 1 000 – 65 534."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"Jos haluat soittaa SIP-puhelun, tarkista ensin internetyhteytesi."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"Sinun on oltava yhteydessä Wi-Fi-verkkoon, jotta voit soittaa SIP-puheluita (vaihda asetus Langaton verkko- ja verkkoasetuksissa)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"SIP-puheluita ei tueta"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Automaattinen"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Lähetä aina"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Sisäänrakennetut SIP-puhelut"</string>
+</resources>
diff --git a/sip/res/values-fr-rCA/strings.xml b/sip/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..ea210ec
--- /dev/null
+++ b/sip/res/values-fr-rCA/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"Paramètres SIP"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"Comptes SIP"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Comptes"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Recevoir les appels"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Consomme davantage d\'énergie"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"Utiliser les appels SIP"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Utiliser les appels SIP (Wi-Fi seulement)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Pour tous les appels lorsqu\'un réseau de données est accessible"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Uniquement pour les appels SIP"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Pour tous les appels"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Ajouter un compte"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Supprimer le compte"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"Comptes SIP"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Enregistrement du compte en cours…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"Suppression du compte en cours..."</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Enregistrer"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Supprimer"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Fermer le profil"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"OK"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Fermer"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Vérification de l\'état en cours..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Enregistrement en cours…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Tentative en cours…"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Réception d\'appels impossible."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"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="9154717387473039546">"La procédure d\'enregistrement du compte a été interrompue, car il n\'y a aucune connexion Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Échec de l\'enregistrement du compte."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Réception d\'appels."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"Échec de l\'enregistrement du compte : <xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>. Une nouvelle tentative sera effectuée plus tard."</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Échec de l\'enregistrement du compte : nom d\'utilisateur ou mot de passe incorrect."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Échec de l\'enregistrement du compte : veuillez vérifier le nom du serveur."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"Ce compte est actuellement utilisé dans l\'application <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"Détails du compte SIP"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"Détails du compte SIP"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Serveur"</string>
+    <string name="username_title" msgid="6770064611005663470">"Nom d\'utilisateur"</string>
+    <string name="password_title" msgid="5289013731515564295">"Mot de passe"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Nom à afficher"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Adresse de serveur mandataire sortant"</string>
+    <string name="port_title" msgid="6693965912656593862">"Numéro de port"</string>
+    <string name="transport_title" msgid="889155457465372527">"Type de transport"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Envoyer un message keep-alive"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Paramètres facultatifs"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Nom d\'utilisateur d\'authentification"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Nom d\'utilisateur utilisé pour l\'authentification"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Non défini&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Identique au nom d\'utilisateur&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Facultatif&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"Touchez ▷ pour tout afficher"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"Touchez ▽ pour tout masquer"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"Le champ « <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> » est obligatoire. Veuillez le remplir."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"Le numéro de port doit être compris entre 1000 et 65534."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"Pour faire un appel SIP, veuillez d\'abord vérifier votre connexion Internet."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"Vous devez être connecté à un réseau Wi-Fi pour faire des appels SIP (utilisez les paramètres « Sans fil et réseaux »)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"Les appels SIP ne sont pas acceptés."</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Automatique"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Toujours envoyer"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Appels SIP intégrés"</string>
+</resources>
diff --git a/sip/res/values-fr/strings.xml b/sip/res/values-fr/strings.xml
new file mode 100644
index 0000000..1007751
--- /dev/null
+++ b/sip/res/values-fr/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"Paramètres SIP"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"Comptes SIP"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Comptes"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Recevoir les appels"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Consomme davantage de batterie"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"Utiliser les appels SIP"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Utiliser les appels SIP (Wi-Fi seulement)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Pour tous les appels lorsqu\'un réseau de données est disponible"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Pour les appels SIP seulement"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Pour tous les appels"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Ajouter un compte"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Supprimer le compte"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"Comptes SIP"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Enregistrement du compte en cours…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"Suppression du compte en cours…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Enregistrer"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Supprimer"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Fermer le profil"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"OK"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Fermer"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Vérification de l\'état en cours..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Enregistrement en cours…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Tentative en cours…"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Réception d\'appels impossible."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"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="9154717387473039546">"La procédure d\'enregistrement du compte a été interrompue, car il n\'y a aucune connexion Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Échec de l\'enregistrement du compte."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Réception d\'appels."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"Échec de l\'enregistrement du compte : <xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>. Une nouvelle tentative sera effectuée plus tard."</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Échec de l\'enregistrement du compte : nom d\'utilisateur ou mot de passe incorrect."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Échec de l\'enregistrement du compte : veuillez vérifier le nom du serveur."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"Ce compte est actuellement utilisé via l\'application <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"Détails du compte SIP"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"Détails du compte SIP"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Serveur"</string>
+    <string name="username_title" msgid="6770064611005663470">"Nom d\'utilisateur"</string>
+    <string name="password_title" msgid="5289013731515564295">"Mot de passe"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Nom à afficher"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Adresse de proxy sortant"</string>
+    <string name="port_title" msgid="6693965912656593862">"Numéro de port"</string>
+    <string name="transport_title" msgid="889155457465372527">"Type de transport"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Envoyer un keep-alive"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Paramètres facultatifs"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Nom d\'utilisateur d\'authentification"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Nom d\'utilisateur utilisé pour l\'authentification"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Non défini&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Identique au nom d\'utilisateur&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Facultatif&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Appuyer ici pour tout afficher"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Appuyer ici pour tout masquer"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"Le champ \"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g>\" est obligatoire. Veuillez le renseigner."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"Le numéro de port doit être compris entre 1000 et 65534."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"Pour passer un appel SIP, veuillez d\'abord vérifier votre connexion Internet."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"Vous devez être connecté à un réseau Wi-Fi pour passer des appels SIP (utilisez les paramètres \"Sans fil et réseaux\")."</string>
+    <string name="no_voip" msgid="3038021971231952704">"Les appels SIP ne sont pas acceptés."</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Automatique"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Toujours envoyer"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Appels SIP intégrés"</string>
+</resources>
diff --git a/sip/res/values-gl-rES/strings.xml b/sip/res/values-gl-rES/strings.xml
new file mode 100644
index 0000000..5a2c4ed
--- /dev/null
+++ b/sip/res/values-gl-rES/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"Configuración SIP"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"Contas SIP"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Contas"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Recibir chamadas entrantes"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Consume máis batería"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"Utilizar chamadas SIP"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Utilizar chamadas SIP (só coa wifi)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Para todas as chamadas cando a rede de datos está dispoñible"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Só para chamadas SIP"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Para todas as chamadas"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Engadir conta"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Eliminar conta"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"Contas SIP"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Gardando a conta..."</string>
+    <string name="removing_account" msgid="5537351356808985756">"Eliminando a conta..."</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Gardar"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Descartar"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Pechar o perfil"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"Aceptar"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Pechar"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Comprobando o estado..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Rexistrando..."</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Aínda se está tentando..."</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Non se están recibindo chamadas."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"O rexistro da conta detívose debido a que non hai conexión a Internet."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"O rexistro da conta detívose debido a que non hai conexión wifi."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Rexistro da conta incorrecto."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Recibindo chamadas."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"O rexistro da conta non se realizou correctamente: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); tentarase máis tarde"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"O rexistro da conta non se completou correctamente: nome de usuario ou contrasinal incorrectos."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Rexistro da conta incorrecto. Comproba o nome do servidor."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"Esta conta está sendo utilizada actualmente pola aplicación de <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"Detalles da conta SIP"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"Detalles da conta SIP"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Servidor"</string>
+    <string name="username_title" msgid="6770064611005663470">"Nome de usuario"</string>
+    <string name="password_title" msgid="5289013731515564295">"Contrasinal"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Nome de visualización"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Enderezo proxy saínte"</string>
+    <string name="port_title" msgid="6693965912656593862">"Número de porto"</string>
+    <string name="transport_title" msgid="889155457465372527">"Tipo de transporte"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Enviar sinal conexión"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Configuración opcional"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Nome de usuario da autenticación"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Nome de usuario utilizado para a autenticación"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Sen configurar&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Igual que o nome de usuario&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Opcional&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Toca aquí para mostrar todo"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Toca aquí para ocultar todo"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> é obrigatorio e non se pode deixar en branco."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"O número do porto debe estar comprendido entre o 1000 e o 65534."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"Para realizar unha chamada SIP, primeiro debes comprobar a túa conexión de Internet."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"Tes que estar conectado a unha rede wifi para facer chamadas SIP (utiliza a configuración de Sen fíos e rede)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"As chamadas SIP non son compatibles"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Automático"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Enviar sempre"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Chamadas SIP integradas"</string>
+</resources>
diff --git a/sip/res/values-gu-rIN/strings.xml b/sip/res/values-gu-rIN/strings.xml
new file mode 100644
index 0000000..f1a5bca
--- /dev/null
+++ b/sip/res/values-gu-rIN/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"SIP સેટિંગ્સ"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP એકાઉન્ટ્સ"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"એકાઉન્ટ્સ"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"આવનારા કૉલ્સ પ્રાપ્ત કરો"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"બધુ બૅટરીની આવરદાનો ઉપયોગ કરે છે"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"SIP કૉલિંગનો ઉપયોગ કરો"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"SIP કૉલિંગનો ઉપયોગ કરો (ફક્ત Wi-Fi)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"જ્યારે ડેટા નેટવર્ક ઉપલબ્ધ હોય ત્યારે બધા કૉલ્સ માટે"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"ફક્ત SIP કૉલ્સ માટે"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"બધા કૉલ્સ માટે"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"એકાઉન્ટ ઉમેરો"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"એકાઉન્ટ દૂર કરો"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP એકાઉન્ટ્સ"</string>
+    <string name="saving_account" msgid="5336529880235177448">"એકાઉન્ટ સાચવી રહ્યાં છે…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"એકાઉન્ટ દૂર કરી રહ્યાં છે…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"સાચવો"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"છોડી દો"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"પ્રોફાઇલ બંધ કરો"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"ઑકે"</string>
+    <string name="close_profile" msgid="3122414058856309881">"બંધ કરો"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"સ્થિતિ તપાસી રહ્યાં છે..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"નોંધણી કરી રહ્યાં છે…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"હજી પ્રયાસ કરી રહ્યાં છે..."</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"કૉલ્સ પ્રાપ્ત કરી રહ્યાં નથી."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"કોઈ ઇન્ટરનેટ કનેક્શન ન હોવાને કારણે એકાઉન્ટની નોંધણી રોકી."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"કોઈ Wi-Fi કનેક્શન ન હોવાને કારણે એકાઉન્ટની નોંધણી રોકી."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"એકાઉન્ટની નોંધણી અસફળ."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"કૉલ્સ પ્રાપ્ત કરી રહ્યાં છે."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"એકાઉન્ટની નોંધણી અસફળ: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); પછીથી પ્રયાસ કરીશું"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"એકાઉન્ટની નોંધણી અસફળ: ખોટું વપરાશકર્તાનામ અથવા પાસવર્ડ."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"એકાઉન્ટની નોંધણી અસફળ: સર્વરનું નામ તપાસો."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"આ એકાઉન્ટ હાલમાં <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> એપ્લિકેશન દ્વારા ઉપયોગમાં છે."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"SIP એકાઉન્ટ વિગતો"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"SIP એકાઉન્ટ વિગતો"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"સર્વર"</string>
+    <string name="username_title" msgid="6770064611005663470">"વપરાશકર્તાનામ"</string>
+    <string name="password_title" msgid="5289013731515564295">"પાસવર્ડ"</string>
+    <string name="display_name_title" msgid="579241787583079773">"પ્રદર્શન નામ"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"આઉટબાઉન્ડ પ્રોક્સી સરનામું"</string>
+    <string name="port_title" msgid="6693965912656593862">"પોર્ટ નંબર"</string>
+    <string name="transport_title" msgid="889155457465372527">"સંક્રમણ પ્રકાર"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"જીવંત-રાખો મોકલો"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"વૈકલ્પિક સેટિંગ્સ"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"પ્રમાણીકરણ વપરાશકર્તાનામ"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"પ્રમાણીકરણ માટે ઉપયોગમાં લેવાયેલ વપરાશકર્તાનામ"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;સેટ કરેલ નથી&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;વપરાશકર્તાનામના સમાન&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;વૈકલ્પિક&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ બધુ દર્શાવવા માટે ટચ કરો"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ બધુ છુપાવવા માટે ટચ કરો"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> આવશ્યક છે અને ખાલી છોડી શકાતું નથી."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"પોર્ટ નંબર 1000 અને 65534 ની અંદરનો હોવો જોઈએ."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"SIP કૉલ કરવા માટે, પ્રથમ તમારું ઇન્ટરનેટ કનેક્શન તપાસો."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"SIP કૉલ્સ માટે તમારે Wi-Fi નેટવર્કથી કનેક્ટ હોવું જરૂરી છે (વાયરલેસ અને નેટવર્ક સેટિંગ્સનો ઉપયોગ કરો)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"SIP કૉલિંગ સમર્થિત નથી"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"સ્વચલિત"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"હંમેશાં મોકલો"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"બિલ્ટ-ઇન SIP કૉલિંગ"</string>
+</resources>
diff --git a/sip/res/values-hi/strings.xml b/sip/res/values-hi/strings.xml
new file mode 100644
index 0000000..fbf3fd2
--- /dev/null
+++ b/sip/res/values-hi/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"SIP सेटिंग"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP खाते"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"खाते"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"इनकमिंग कॉल प्राप्त करें"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"अधिक बैटरी जीवन काल का उपयोग करती है"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"SIP कॉलिंग का उपयोग करें"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"SIP कॉलिंग का उपयोग करें (केवल वाई-फ़ाई)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"डेटा नेटवर्क उपलब्ध होने पर सभी कॉल के लिए"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"केवल SIP कॉल के लिए"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"सभी कॉल के लिए"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"खाता जोड़ें"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"खाता हटाएं"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP खाते"</string>
+    <string name="saving_account" msgid="5336529880235177448">"खाता सहेज रहा है..."</string>
+    <string name="removing_account" msgid="5537351356808985756">"खाता निकाल रहा है..."</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"जोड़ें"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"छोड़ें"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"प्रोफ़ाइल बंद करें"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"ठीक"</string>
+    <string name="close_profile" msgid="3122414058856309881">"बंद करें"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"स्थिति की जांच हो रही है..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"पंजीकरण जारी है..."</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"अब भी प्रयास कर रहा है..."</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"कॉल प्राप्त नहीं हो रहे हैं."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"खाता पंजीकरण रुक गया क्योंकि कोई इंटरनेट कनेक्शन उपलब्ध नहीं है."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"कोई वाई-फ़ाई  कनेक्शन न होने के कारण खाता पंजीकरण रोका गया."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"खाता पंजीकरण विफल."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"कॉल प्राप्त हो रहे हैं"</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"खाता पंजीकरण विफल: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); बाद में फिर से प्रयास करें"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"खाता पंजीकरण विफल: गलत उपयोगकर्ता नाम या पासवर्ड."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"खाता पंजीकरण विफल: सर्वर नाम जांचें."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"वर्तमान में <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> ऐप्स के द्वारा इस खाते का उपयोग किया जा रहा है."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"SIP खाता विवरण"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"SIP खाता विवरण"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"सर्वर"</string>
+    <string name="username_title" msgid="6770064611005663470">"उपयोगकर्ता नाम"</string>
+    <string name="password_title" msgid="5289013731515564295">"पासवर्ड"</string>
+    <string name="display_name_title" msgid="579241787583079773">"प्रदर्शन नाम"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"आउटबाउंड प्रॉक्सी पता"</string>
+    <string name="port_title" msgid="6693965912656593862">"पोर्ट नंबर"</string>
+    <string name="transport_title" msgid="889155457465372527">"परिवहन का प्रकार"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"कीप अलाइव भेजें"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"वैकल्पिक सेटिंग"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"प्रमाणीकरण उपयोगकर्ता नाम"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"प्रमाणीकरण के लिए उपयोग होने वाला उपयोगकर्ता नाम"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;सेट नहीं है&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;उपयोगकर्ता नाम के समान&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;वैकल्पिक&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ सभी दिखाने के लिए स्पर्श करें"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ सभी छिपाने के लिए स्पर्श करें"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> आवश्यक है और इसे खाली नहीं छोड़ा जा सकता."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"पोर्ट नंबर 1000 और 65534 के बीच होना चाहिए."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"SIP कॉल करने के लिए, पहले अपना इंटरनेट कनेक्‍शन जांचें."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"SIP कॉल के लिए आपको किसी वाई-फ़ाई नेटवर्क से कनेक्‍ट रहना होगा (वायरलेस और नेटवर्क सेटिंग का उपयोग करें)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"SIP कॉलिंग समर्थित नहीं है"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"स्वचालित"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"हमेशा भेजें"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"अंतर्निहित SIP कॉलिंग"</string>
+</resources>
diff --git a/sip/res/values-hr/strings.xml b/sip/res/values-hr/strings.xml
new file mode 100644
index 0000000..042cbae
--- /dev/null
+++ b/sip/res/values-hr/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"Postavke SIP-a"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP računi"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Računi"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Primi dolazne pozive"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Troši više baterije"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"Upotreba SIP poziva"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Upotreba SIP poziva (samo Wi-Fi)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Za sve pozive kada je podatkovna mreža dostupna"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Samo za SIP pozive"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Za sve pozive"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Dodaj račun"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Ukloni račun"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP računi"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Spremanje računa…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"Uklanjanje računa…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Spremi"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Odbaci"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Zatvaranje profila"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"U redu"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Zatvori"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Provjeravanje statusa..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Registracija…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Još pokušavam…"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Ne prima pozive."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Registracija računa zaustavljena je jer nema internetske veze."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Registracija računa zaustavljena je jer nema Wi-Fi veze."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Registracija računa nije uspjela."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Prima pozive."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"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="8406872554323334182">"Registracija računa nije uspjela: netočno korisničko ime ili zaporka."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Registracija računa nije uspjela: provjerite naziv poslužitelja."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"Ovaj račun trenutačno upotrebljava aplikacija <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"Pojedinosti SIP računa"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"Pojedinosti SIP računa"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Poslužitelj"</string>
+    <string name="username_title" msgid="6770064611005663470">"Korisničko ime"</string>
+    <string name="password_title" msgid="5289013731515564295">"Zaporka"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Ime za prikaz"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Odlazna proxy adresa"</string>
+    <string name="port_title" msgid="6693965912656593862">"Broj priključka"</string>
+    <string name="transport_title" msgid="889155457465372527">"Vrsta transporta"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Pošalji postavke keep-alive"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Izborne postavke"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Korisničko ime za autentifikaciju"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Korisničko ime koje se upotrebljava za autentifikaciju"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Nije postavljeno&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Isto kao korisničko ime&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Izborno&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Dodirnite da biste prikazali sve"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Dodirnite da biste sakrili sve"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"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="7931422555587011830">"Broj priključka trebao bi biti između 1000 i 65534."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"Da biste uputili SIP poziv, provjerite jeste li povezani s internetom."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"Morate se povezati s Wi-Fi mrežom za SIP pozive (upotrijebite postavke Bežično povezivanje i mreže)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"SIP pozivi nisu podržani"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Automatski"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Uvijek šalji"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Ugrađeni SIP pozivi"</string>
+</resources>
diff --git a/sip/res/values-hu/strings.xml b/sip/res/values-hu/strings.xml
new file mode 100644
index 0000000..eda6bd0
--- /dev/null
+++ b/sip/res/values-hu/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"SIP-beállítások"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP-fiókok"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Fiókok"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Beérkező hívások fogadása"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Több energiát használ"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"SIP-hívás használata"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"SIP-hívás használata (csak Wi-Fin)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Minden hívásnál, amikor nincs elérhető adathálózat"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Csak SIP-hívásokhoz"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Minden hívásnál"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Fiók hozzáadása"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Fiók eltávolítása"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP-fiókok"</string>
+    <string name="saving_account" msgid="5336529880235177448">"A fiók mentése…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"A fiók törlése…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Mentés"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Elvetés"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"A profil bezárása"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"OK"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Bezárás"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Állapot ellenőrzése…"</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Regisztrálás…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Még próbálkozik…"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Nem fogad hívásokat."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"A fiók regisztrálása leállt, mert nincs internetkapcsolat."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"A fiók regisztrálása leállt, mert nincs Wi-Fi-kapcsolat."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"A fiók regisztrálása sikertelen."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Hívások fogadása."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"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="8406872554323334182">"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="7710275557045148634">"A fiók regisztrálása nem sikerült: ellenőrizze a szerver nevét."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"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="1967247832635750410">"SIP-fiók részletei"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"SIP-fiók részletei"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Szerver"</string>
+    <string name="username_title" msgid="6770064611005663470">"Felhasználónév"</string>
+    <string name="password_title" msgid="5289013731515564295">"Jelszó"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Megjelenítendő név"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Kimenő proxy címe"</string>
+    <string name="port_title" msgid="6693965912656593862">"Port száma"</string>
+    <string name="transport_title" msgid="889155457465372527">"Átvitel típusa"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Kapcsolat megtartása"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"További beállítások"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Azonosításhoz használt felhasználónév"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Azonosításhoz használt felhasználónév"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Nincs beállítva&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Ugyanaz, mint a felhasználónév&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Nem kötelező&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Érintse meg az összes megjelenítéséhez"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Érintse meg az összes elrejtéséhez"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> megadása kötelező, nem maradhat üresen."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"A port számának 1000 és 65534 között kell lennie."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"SIP-hívás indításához előbb ellenőrizze az internetkapcsolatát."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"SIP-hívás használatához csatlakoznia kell egy Wi-Fi-hálózathoz (használja a Vezeték nélküli és egyéb hálózatok menü beállításait)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"A SIP-hívás nem támogatott"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Automatikus"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Mindig küldjön"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Beépített SIP-hívás"</string>
+</resources>
diff --git a/sip/res/values-hy-rAM/strings.xml b/sip/res/values-hy-rAM/strings.xml
new file mode 100644
index 0000000..e0eb582
--- /dev/null
+++ b/sip/res/values-hy-rAM/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"SIP կարգավորումներ"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP հաշիվներ"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Հաշիվներ"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Ընդունել մուտքային զանգեր"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Ավելի արագ է սպառում մարտկոցի լիցքը"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"Զանգ SIP-ի միջոցով"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Զանգ SIP-ի միջոցով (միայն Wi-Fi)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Բոլոր զանգերի համար, երբ տվյալների ցանցը հասանելի է"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Միայն SIP-ի միջոցով զանգերի համար"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Բոլոր զանգերի համար"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Ավելացնել հաշիվ"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Հեռացնել հաշիվը"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP հաշիվներ"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Հաշիվը պահվում է..."</string>
+    <string name="removing_account" msgid="5537351356808985756">"Հաշիվը հեռացվում է..."</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Պահել"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Հրաժարվել"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Փակեք պրոֆիլը"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"Լավ"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Փակել"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Ստուգվում է կարգավիճակը..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Գրանցում..."</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Սպասեք..."</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Զանգեր չեն ընդունվում:"</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Հաշվի գրանցումը դադարեցվել է ինտերնետ կապի բացակայության պատճառով:"</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Հաշվի գրանցումը դադարեցվել է, քանի որ չկա Wi-Fi կապ:"</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Հաշվի գրանցումը ձախողվել է:"</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Զանգերն ընդունվում են:"</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"Հաշվի գրանցումը ձախողվել է. (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>): Կփորձենք մի փոքր ուշ:"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Հաշվի գրանցումը ձախողվել է. սխալ օգտանուն կամ գաղտնաբառ:"</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Հաշվի գրանցումը ձախողվել է: Ստուգեք սերվերի անունը:"</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"Այս հաշիվը ներկայումս օգտագործվում է <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> ծրագրի կողմից:"</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"SIP հաշվի մանրամասները"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"SIP հաշվի մանրամասները"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Սերվեր"</string>
+    <string name="username_title" msgid="6770064611005663470">"Օգտանուն"</string>
+    <string name="password_title" msgid="5289013731515564295">"Գաղտնաբառ"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Ցուցադրվող անունը"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Պրոքսի-սերվերի հասցեն"</string>
+    <string name="port_title" msgid="6693965912656593862">"Միացքի համարը"</string>
+    <string name="transport_title" msgid="889155457465372527">"Փոխանցման միջոց"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Ուղարկել keep-alive"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Ընտրովի կարգավորումներ"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Նույնականացման օգտանուն"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Օգտանունն օգտագործվել է նույնականացման համար"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Կարգավորված չէ&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Նույնը, ինչ օգտանունը&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Ընտրովի&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Հպեք՝ ցուցադրելու ամենը"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Հպեք՝ թաքցնելու ամենը"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g>-ը պարտադիր է և չի կարող լինել դատարկ:"</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"Միացքի համարը պետք է լինի 1000-ի և 65534-ի սահմաններում:"</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"SIP-ի միջոցով զանգ կատարելու համար նախ ստուգեք ձեր համացանցի կապակցումը:"</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"SIP-ի միջոցով զանգեր կատարելու համար ձեզ անհրաժեշտ է կապակցվել Wi-Fi ցանցին (օգտագործեք Անլար կապի և Ցանցի կարգավորումները):"</string>
+    <string name="no_voip" msgid="3038021971231952704">"SIP-ի միջոցով զանգերը չեն աջակցվում"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Ավտոմատ"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Միշտ ուղարկել"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"SIP-ի միջոցով զանգերի ներկառուցված ծառայություն"</string>
+</resources>
diff --git a/sip/res/values-in/strings.xml b/sip/res/values-in/strings.xml
new file mode 100644
index 0000000..e4129a4
--- /dev/null
+++ b/sip/res/values-in/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"Setelan SIP"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"Akun SIP"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Akun"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Terima panggilan masuk"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Menggunakan lebih banyak masa pakai baterai"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"Gunakan panggilan SIP"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Gunakan panggilan SIP (hanya di Wi-Fi)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Untuk semua panggilan ketika jaringan data tersedia"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Hanya untuk panggilan SIP"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Untuk semua panggilan"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Tambahkan akun"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Buang akun"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"Akun SIP"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Menyimpan akun..."</string>
+    <string name="removing_account" msgid="5537351356808985756">"Membuang akun..."</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Simpan"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Buang"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Tutup profil"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"Oke"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Tutup"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Memeriksa status..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Mendaftarkan..."</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Masih mencoba..."</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Tidak menerima panggilan."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Pendaftaran akun terhenti karena tidak ada sambungan internet."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Pendaftaran akun terhenti karena tidak ada sambungan Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Pendaftaran akun gagal."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Menerima panggilan."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"Pendaftaran akun gagal: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); akan mencoba lagi nanti"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Pendaftaran akun gagal: Nama pengguna atau sandi salah."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Pendaftaran akun gagal: Periksa nama server."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"Saat ini akun digunakan oleh aplikasi <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"Detail akun SIP"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"Detail akun SIP"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Server"</string>
+    <string name="username_title" msgid="6770064611005663470">"Nama pengguna"</string>
+    <string name="password_title" msgid="5289013731515564295">"Sandi"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Nama tampilan"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Alamat proxy di luar"</string>
+    <string name="port_title" msgid="6693965912656593862">"Nomor port"</string>
+    <string name="transport_title" msgid="889155457465372527">"Jenis transportasi"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Kirim keep-alive"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Setelan opsional"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Nama pengguna autentikasi"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Nama pengguna yang digunakan untuk autentikasi"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Tidak disetel&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Sama dengan nama pengguna&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Opsional&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Sentuh untuk menampilkan semua"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Sentuh untuk menyembunyikan semua"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> diwajibkan dan tidak boleh kosong."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"Nomor port harus dalam rentang 1000 dan 65534."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"Untuk melakukan panggilan SIP, periksa sambungan internet terlebih dahulu."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"Anda harus tersambung ke jaringan Wi-Fi untuk melakukan panggilan SIP (gunakan setelan Nirkabel &amp; Jaringan)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"Panggilan SIP tidak didukung"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Otomatis"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Selalu kirim"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Panggilan SIP bawaan"</string>
+</resources>
diff --git a/sip/res/values-is-rIS/strings.xml b/sip/res/values-is-rIS/strings.xml
new file mode 100644
index 0000000..49a45e7
--- /dev/null
+++ b/sip/res/values-is-rIS/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"SIP-stillingar"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP-reikningar"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Reikningar"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Svara símtölum"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Notar meiri rafhlöðuorku"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"Nota SIP-símtal"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Nota SIP-símtal (eingöngu Wi-Fi)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Fyrir öll símtöl þegar gagnanet er tiltækt"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Aðeins fyrir SIP-símtöl"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Fyrir öll símtöl"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Bæta reikningi við"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Fjarlægja reikning"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP-reikningar"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Vistar reikninginn…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"Fjarlægir reikninginn…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Vista"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Fleygja"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Loka sniðinu"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"Í lagi"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Loka"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Athugar stöðu..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Skráir…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Enn að reyna…"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Tekur ekki við símtölum."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Reikningsskráning var stöðvuð því engin nettenging er til staðar."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Reikningsskráning var stöðvuð því engin Wi-Fi tenging er til staðar."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Reikningsskráning mistókst."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Tekur við símtölum."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"Ekki tókst að skrá reikninginn (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); reynt verður aftur síðar"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Reikningsskráning tókst ekki. Rangt notandanafn eða aðgangsorð."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Reikningsskráning mistókst. Athugaðu þjónsheitið."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"Forritið <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> er að nota þennan reikning eins og er."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"SIP-reikningsupplýsingar"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"SIP-reikningsupplýsingar"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Netþjónn"</string>
+    <string name="username_title" msgid="6770064611005663470">"Notandanafn"</string>
+    <string name="password_title" msgid="5289013731515564295">"Aðgangsorð"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Skjánafn"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Vistfang proxy-þjóns á útleið"</string>
+    <string name="port_title" msgid="6693965912656593862">"Númer gáttar"</string>
+    <string name="transport_title" msgid="889155457465372527">"Flutningsgerð"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Halda tengingu opinni"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Valfrjálsar stillingar"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Notandanafn til auðkenningar"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Notandanafn notað til auðkenningar"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Ekki valið&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Sama og notandanafnið&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Valfrjálst&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Snertu til að sýna allt"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Snertu til að fela allt"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> er áskilið og má ekki vera autt."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"Númer gáttar á að vera milli 1000 og 65534."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"Til að hringja SIP-símtal skaltu fyrst athuga nettenginguna þína."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"Þú þarft að tengjast Wi-Fi neti til að hringja SIP-símtöl (notaðu stillingar þráðlauss nets og símkerfa)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"SIP-símtöl ekki studd"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Sjálfvirkt"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Senda alltaf"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Innbyggð SIP-símtöl"</string>
+</resources>
diff --git a/sip/res/values-it/strings.xml b/sip/res/values-it/strings.xml
new file mode 100644
index 0000000..97de314
--- /dev/null
+++ b/sip/res/values-it/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"Impostazioni SIP"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"Account SIP"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Account"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Ricevi chiamate in arrivo"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Consuma più batteria"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"Utilizza chiamate SIP"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Utilizza chiamate SIP (solo Wi-Fi)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Per tutte le chiamate quando è disponibile la rete dati"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Solo per chiamate SIP"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Per tutte le chiamate"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Aggiungi account"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Rimuovi account"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"Account SIP"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Salvataggio dell\'account..."</string>
+    <string name="removing_account" msgid="5537351356808985756">"Rimozione dell\'account..."</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Salva"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Elimina"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Chiudi il profilo"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"OK"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Chiudi"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Controllo stato..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Registrazione..."</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Tentativo ancora in corso..."</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Ricezione chiamate non attiva."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Registrazione account interrotta per mancanza di collegamento Internet."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Registrazione account interrotta per mancanza di connessione Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Registrazione account non riuscita."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Ricezione chiamate attiva."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"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="8406872554323334182">"Registrazione account non riuscita: password o nome utente errato."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Registrazione account non riuscita: verifica il nome del server."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"Questo account è attualmente utilizzato dall\'applicazione <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"Dettagli account SIP"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"Dettagli account SIP"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Server"</string>
+    <string name="username_title" msgid="6770064611005663470">"Nome utente"</string>
+    <string name="password_title" msgid="5289013731515564295">"Password"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Nome visualizzato"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Indirizzo proxy in uscita"</string>
+    <string name="port_title" msgid="6693965912656593862">"Numero porta"</string>
+    <string name="transport_title" msgid="889155457465372527">"Tipo trasporto"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Invia keep-alive"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Impostazioni facoltative"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Nome utente per autenticazione"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Nome utente utilizzato per l\'autenticazione"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Non impostato&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Uguale al nome utente&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Facoltativo&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Tocca per mostrare tutto"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Tocca per nascondere tutto"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> è obbligatorio e non può essere lasciato vuoto."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"Il numero della porta deve essere compreso tra 1000 e 65534."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"Per effettuare una chiamata SIP, verifica prima la connessione Internet."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"Devi essere connesso a una rete Wi-Fi per le chiamate SIP (utilizza le impostazioni wireless e della rete)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"Chiamate SIP non supportate"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Automatico"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Invia sempre"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Chiamate SIP incorporate"</string>
+</resources>
diff --git a/sip/res/values-iw/strings.xml b/sip/res/values-iw/strings.xml
new file mode 100644
index 0000000..54712b7
--- /dev/null
+++ b/sip/res/values-iw/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"‏הגדרות SIP"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"‏חשבונות SIP"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"חשבונות"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"קבל שיחות נכנסות"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"צריכת הסוללה גבוהה יותר"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"‏שימוש בשיחות SIP"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"‏שימוש בשיחות SIP ‏(Wi-Fi בלבד)‏"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"לכל השיחות כאשר רשת הנתונים זמינה"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"‏עבור שיחות SIP בלבד"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"לכל השיחות"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"הוסף חשבון"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"הסר חשבון"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"‏חשבונות SIP"</string>
+    <string name="saving_account" msgid="5336529880235177448">"שומר את החשבון..."</string>
+    <string name="removing_account" msgid="5537351356808985756">"מסיר את החשבון..."</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"שמור"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"מחק"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"סגור את הפרופיל"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"אישור"</string>
+    <string name="close_profile" msgid="3122414058856309881">"סגור"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"בודק מצב..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"מבצע רישום..."</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"עדיין מנסה..."</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"לא מקבל שיחות."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"רישום החשבון הופסק כיוון שאין חיבור לאינטרנט."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"‏רישום החשבון הופסק כיוון שאין חיבור Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"רישום החשבון נכשל."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"מקבל שיחות."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"רישום החשבון נכשל: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); ניסיון חוזר יבוצע מאוחר יותר"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"רישום החשבון נכשל: שם המשתמש או הסיסמה שגויים."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"רישום החשבון נכשל: בדוק את שם השרת."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"האפליקציה <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> משתמשת כרגע בחשבון הזה."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"‏פרטי חשבון SIP"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"‏פרטי חשבון SIP"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"שרת"</string>
+    <string name="username_title" msgid="6770064611005663470">"שם משתמש"</string>
+    <string name="password_title" msgid="5289013731515564295">"סיסמה"</string>
+    <string name="display_name_title" msgid="579241787583079773">"שם תצוגה"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"‏כתובת שרת Proxy יוצא"</string>
+    <string name="port_title" msgid="6693965912656593862">"מספר יציאה"</string>
+    <string name="transport_title" msgid="889155457465372527">"סוג העברה"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"שלח אות חיבור"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"הגדרות אופציונליות"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"שם משתמש לאימות"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"שם משתמש המשמש לאימות"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"‏&lt;לא הוגדר&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"‏&lt;זהה לשם משתמש&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"‏&lt;אופציונלי&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ גע כדי להציג את הכל"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ גע כדי להסתיר את הכל"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> הוא שדה חובה ולא ניתן להשאיר אותו ריק."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"מספר היציאה צריך להיות בין 1000 ל-65534."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"‏כדי לבצע שיחת SIP, ראשית בדוק את חיבור האינטרנט שלך."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"‏עליך להיות מחובר לרשת Wi-Fi כדי לבצע שיחות SIP (השתמש ב\'הגדרות רשת ותקשורת אלחוטית\')."</string>
+    <string name="no_voip" msgid="3038021971231952704">"‏שיחות SIP לא נתמכות"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"אוטומטי"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"שלח תמיד"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"‏שיחות SIP מובנות"</string>
+</resources>
diff --git a/sip/res/values-ja/strings.xml b/sip/res/values-ja/strings.xml
new file mode 100644
index 0000000..b89dbec
--- /dev/null
+++ b/sip/res/values-ja/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"SIPの設定"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIPアカウント"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"アカウント"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"着信を受ける"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"電池の使用量が増えます"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"SIP通話の使用"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"SIP通話の使用（Wi-Fiのみ）"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"データネットワーク接続時はすべての通話"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"SIP通話のみ"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"すべての通話"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"アカウントを追加"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"アカウントの削除"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIPアカウント"</string>
+    <string name="saving_account" msgid="5336529880235177448">"アカウントを保存しています…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"アカウントを削除しています…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"保存"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"破棄"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"プロフィールを閉じる"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"OK"</string>
+    <string name="close_profile" msgid="3122414058856309881">"閉じる"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"ステータスを確認しています..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"登録しています…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"試行しています…"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"通話着信OFF"</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"インターネットに接続されていないため、アカウント登録処理が中断されました。"</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Wi-Fi接続されていないため、アカウントの登録を中断しました。"</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"アカウントを登録できませんでした。"</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"通話着信ON"</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"アカウントを登録できませんでした（<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>）。後ほど再試行します。"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"アカウントを登録できませんでした: ユーザー名かパスワードが正しくありません。"</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"アカウントを登録できませんでした: サーバー名を確認してください。"</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"このアカウントは現在「<xliff:g id="ACCOUNT_OWNER">%s</xliff:g>」アプリで使用されています。"</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"SIPアカウントの詳細"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"SIPアカウントの詳細"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"サーバー"</string>
+    <string name="username_title" msgid="6770064611005663470">"ユーザー名"</string>
+    <string name="password_title" msgid="5289013731515564295">"パスワード"</string>
+    <string name="display_name_title" msgid="579241787583079773">"表示名"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"発信プロキシアドレス"</string>
+    <string name="port_title" msgid="6693965912656593862">"ポート番号"</string>
+    <string name="transport_title" msgid="889155457465372527">"伝送方式"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"キープアライブを送信する"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"オプション設定"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"認証ユーザー名"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"認証に使用するユーザー名"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;未設定&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;ユーザー名と同じ&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;オプション&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷すべて表示"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽すべて非表示"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"「<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g>」は必須です。空欄にはできません。"</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"ポート番号は1000～65534で指定してください。"</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"SIP通話を発信する前に、インターネット接続を確認してください。"</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"SIP通話をするにはWi-Fネットワークに接続する必要があります（[無線とネットワーク]で設定）。"</string>
+    <string name="no_voip" msgid="3038021971231952704">"SIP通話はサポートされていません"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"自動"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"常に送信"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"内蔵SIP通話機能"</string>
+</resources>
diff --git a/sip/res/values-ka-rGE/strings.xml b/sip/res/values-ka-rGE/strings.xml
new file mode 100644
index 0000000..e5dfb94
--- /dev/null
+++ b/sip/res/values-ka-rGE/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"SIP პარამეტრები"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP ანგარიშები"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"ანგარიშები"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"შემომავალი ზარების მიღება"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"იყენებს ელემენტის მეტ ენერგიას"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"SIP დარეკვის გამოყენება"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"SIP დარეკვის გამოყენება (მხოლოდ Wi-Fi)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"ყველა ზარზე, როდესაც მონაცემთა ქსელი ხელმისაწვდომია"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"მხოლოდ SIP ზარებისათვის"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"ყველა ზარზე"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"ანგარიშის დამატება"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"ანგარიშის წაშლა"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP ანგარიშები"</string>
+    <string name="saving_account" msgid="5336529880235177448">"ანგარიშის შენახვა…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"მიმდინარეობს ანგარიშის ამოშლა…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"შენახვა"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"გაუქმება"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"პროფილის დახურვა"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"კარგი"</string>
+    <string name="close_profile" msgid="3122414058856309881">"დახურვა"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"სტატუსის შემოწმება..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"მიმდინარეობს რეგისტრაცია…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"ხელახალი მცდელობა…"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"ზარების მიღება არ ხორციელდება."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"ანგარიშის რეგისტრაცია შეჩერდა, რადგან ინტერნეტ-კავშირი არ არის."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"ანგარიშის რეგისტრაცია შეჩერდა, რადგან Wi-Fi კავშირი არ არის."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"ანგარიშის რეგისტრაცია ვერ განხორციელდა."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"იღებს ზარებს."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"ანგარიშის რეგისტრაცია ვერ განხორციელდა: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); მოგვიანებით შევეცდებით"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"ანგარიშის რეგისტრაცია ვერ განხორციელდა: მომხმარებლის სახელი ან პაროლი არასწორია."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"ანგარიშის რეგისტრაცია ვერ განხორციელდა: გადაამოწმეთ სერვერის სახელი."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"ანგარიში ამჟამად გამოიყენება <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> აპის მიერ."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"SIP ანგარიშის დეტალები"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"SIP ანგარიშის დეტალები"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"სერვერი"</string>
+    <string name="username_title" msgid="6770064611005663470">"მომხმარებლის სახელი"</string>
+    <string name="password_title" msgid="5289013731515564295">"პაროლი"</string>
+    <string name="display_name_title" msgid="579241787583079773">"ნაჩვენები სახელი"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"გამავალი პროქსის მისამართი"</string>
+    <string name="port_title" msgid="6693965912656593862">"პორტის ნომერი"</string>
+    <string name="transport_title" msgid="889155457465372527">"ტრანსპორტირების ტიპი"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"keep-alive-ის გაგზავნა"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"არასავალდებულო პარამეტრები"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"ავტორიზაციის მომხმარებლის სახელი"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"ავტორიზაციისათვის გამოყენებული მომხმარებლის სახელი"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;არ არის დაყენებული&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;იგივეა, რაც მომხმარებლის სახელი&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;სურვილისამებრ&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ შეეხეთ ყველას საჩვენებლად"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ შეეხეთ ყველას დასამალად"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> აუცილებელია და ცარიელი ვერ დარჩება."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"პორტის ნომერი უნდა იყოს 1000 – 65534 არეალში."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"SIP ზარის განხორციელებისათვის, პირველ რიგში შეამოწმეთ თქვენი ინტერნეტ კავშირი."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"SIP ზარებისათვის, დაკავშირებული უნდა იყოთ Wi-Fi ქსელთან (გამოიყენეთ უკაბელო &amp; amp; ქსელის პარამეტრები)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"SIP დარეკვა არ არის მხარდაჭერილი"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"ავტომატური"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"მუდამ გაგზავნა"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"ჩაშენებული SIP ზარში"</string>
+</resources>
diff --git a/sip/res/values-kk-rKZ/strings.xml b/sip/res/values-kk-rKZ/strings.xml
new file mode 100644
index 0000000..76c54c8
--- /dev/null
+++ b/sip/res/values-kk-rKZ/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"SIP параметрлері"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP есептік жазбалары"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Есептік жазбалар"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Кіріс қоңырауларды қабылдау"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Көбірек батарея қуатын пайдаланады"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"SIP қоңырауларын пайдалану"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"SIP қоңырауларын пайдалану (тек Wi-Fi)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Деректер желісі қол жетімді болғанда барлық қоңыраулар үшін"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Тек SIP қоңыраулары үшін"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Барлық қоңыраулар үшін"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Есептік жазба қосу"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Есептік жазбаны жою"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP есептік жазбалары"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Есептік жазба сақталуда…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"Есептік жазба жойылуда…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Сақтау"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Алып тастау"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Профильді жабу"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"Жарайды"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Жабу"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Күй тексерілуде…"</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Тіркелуде…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Әлі әрекеттенуде…"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Қоңыраулар қабылданып жатқан жоқ."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Есептік жазбаны тіркеу тоқтатылды, себебі интернет байланысы жоқ."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Есептік жазбаны тіркеу тоқтатылды, себебі Wi-Fi байланысы жоқ."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Есептік жазба тіркеу сәтсіз аяқталды."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Қоңыраулар қабылдануда."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"Есептік жазбаны тіркеу сәтсіз аяқталды: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); әрекет кейінірек қайталанады"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Есептік жазбаны тіркеу сәтсіз аяқталды: Пайдаланушы аты немесе құпия сөз қате."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Есептік жазба тіркеу сәтсіз аяқталды: Сервер атауын тексеріңіз."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"Бұл есептік жазбаны қазіргі уақытта <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> қолданбасы пайдалануда."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"SIP есептік жазбасы туралы мәліметтер"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"SIP есептік жазбасы туралы мәліметтер"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Сервер"</string>
+    <string name="username_title" msgid="6770064611005663470">"Пайдаланушы аты"</string>
+    <string name="password_title" msgid="5289013731515564295">"Құпия сөз"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Көрсетілетін ат"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Шығыс прокси мекенжайы"</string>
+    <string name="port_title" msgid="6693965912656593862">"Порт нөмірі"</string>
+    <string name="transport_title" msgid="889155457465372527">"Тасымалдау түрі"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Байланыс сақтау сигналын жіберу"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Қосымша параметрлер"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Аутентификациялау пайдаланушы аты"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Аутентификациялау үшін пайдаланылатын пайдаланушы аты"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Орнатылмаған&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Пайдаланушы атымен бірдей&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Міндетті емес&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Барлығын көрсету үшін түрту"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Барлығын жасыру үшін түрту"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> міндетті және оны бос қалдыруға болмайды."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"Порт нөмірі 1000 және 65534 аралығында болуы керек."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"SIP қоңырауын шалу үшін алдымен интернет қосылымын тексеріңіз."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"SIP қоңыраулары үшін Wi-Fi желісіне қосылған болуы керек («Сымсыз желі және желі параметрлері» тармағын пайдаланыңыз)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"SIP қоңырауларына қолдау көрсетілмейді"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Aвтоматты"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Әрқашан жіберу"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Кірістірілген SIP қоңыраулары"</string>
+</resources>
diff --git a/sip/res/values-km-rKH/strings.xml b/sip/res/values-km-rKH/strings.xml
new file mode 100644
index 0000000..c1d80b3
--- /dev/null
+++ b/sip/res/values-km-rKH/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"ការកំណត់ SIP"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"គណនី SIP"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"គណនី"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"ទទួល​ការ​ហៅ​ចូល"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"ប្រើថាមពលថ្មច្រើន"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"ប្រើការហៅ SIP"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"ប្រើការហៅ SIP (Wi-Fi តែប៉ុណ្ណោះ)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"សម្រាប់​ការ​ហៅ​ទាំងអស់ នៅ​ពេល​បណ្ដាញ​ទិន្នន័យ​អាច​ប្រើ​បាន"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"សម្រាប់ការហៅ SIP តែប៉ុណ្ណោះ"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"សម្រាប់​ការ​ហៅ​ទាំងអស់"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"បន្ថែម​គណនី"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"លុប​គណនី​​"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"គណនី SIP"</string>
+    <string name="saving_account" msgid="5336529880235177448">"កំពុង​រក្សាទុក​គណនី…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"កំពុង​លុប​គណនី…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"រក្សាទុក"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"បោះបង់"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"បិទ​​ប្រវត្តិរូប"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"យល់ព្រម"</string>
+    <string name="close_profile" msgid="3122414058856309881">"បិទ"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"កំពុង​ពិនិត្យ​​​ស្ថានភាព​..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"កំពុង​ចុះឈ្មោះ…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"នៅតែ​ព្យាយាម…"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"មិន​ទទួល​​ការ​ហៅ។"</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"បាន​បញ្ឈប់​ការ​ចុះឈ្មោះ​គណនី ពីព្រោះ​​គ្មាន​ការ​ភ្ជាប់​អ៊ីនធឺណិត​។"</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"បាន​បញ្ឈប់​ការ​ចុះឈ្មោះ​គណនី ពី​ព្រោះ​គ្មាន​ការ​​ភ្ជាប់​វ៉ាយហ្វាយ។"</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"បាន​បរាជ័យ​ការ​ចុះឈ្មោះ​គណនី។"</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"ទទួល​ការ​ហៅ។"</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"បាន​បរាជ័យ​ការ​ចុះឈ្មោះ​គណនី​៖ ( <xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g> )​; នឹង​ព្យាយាម​នៅ​ពេល​ក្រោយ"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"បាន​បរាជ័យ​ការ​ចុះឈ្មោះ​គណនី៖ ឈ្មោះ​អ្នកប្រើ ​ឬ​ពាក្យសម្ងាត់​មិន​ត្រឹមត្រូវ។"</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"បាន​បរាជ័យ​ការ​ចុះឈ្មោះ​គណនី៖ សូម​ពិនិត្យ​​ឈ្មោះ​ម៉ាស៊ីន​មេ។"</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"បច្ចុប្បន្ន​គណនី​​នេះ​កំពុង​ប្រើ​ដោយ​កម្មវិធី  <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> ។"</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"ព័ត៌មាន​​លម្អិត​គណនី​ SIP"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"ព័ត៌មាន​លម្អិត​គណនី​ SIP"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"ម៉ាស៊ីន​មេ"</string>
+    <string name="username_title" msgid="6770064611005663470">"ឈ្មោះ​អ្នកប្រើ"</string>
+    <string name="password_title" msgid="5289013731515564295">"ពាក្យសម្ងាត់"</string>
+    <string name="display_name_title" msgid="579241787583079773">"បង្ហាញ​ឈ្មោះ"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"អាសយដ្ឋាន​ប្រូកស៊ី​ចេញ"</string>
+    <string name="port_title" msgid="6693965912656593862">"លេខ​ច្រក"</string>
+    <string name="transport_title" msgid="889155457465372527">"ប្រភេទ​បញ្ជូន"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"នៅតែ​មាន​ការ​ផ្ញើ"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"ការ​កំណត់​​ជា​​ជម្រើស"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"ឈ្មោះ​អ្នកប្រើ​​សម្រាប់​​ផ្ទៀងផ្ទាត់"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"បាន​ប្រើ​ឈ្មោះ​អ្នកប្រើ​សម្រាប់​​​ផ្ទៀងផ្ទាត់"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;មិន​បាន​កំណត់&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;ដូច​ឈ្មោះ​អ្នកប្រើ&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;ជា​ជម្រើស&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"ប៉ះ ▷ ដើម្បី​បង្ហាញ​ទាំងអស់"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"ប៉ះ ▽ ដើម្បី​លាក់​ទាំងអស់"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"មិន​​អាច​ទុក​ឲ្យ​នៅ​ទទេ និង​បាន​ទាមទារ <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> ។"</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"លេខ​ច្រក​គួរតែ​នៅ​ចន្លោះ ១០០០ និង ៦៥៥៣៤។"</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"ដើម្បីដាក់ការហៅ SIP ពិនិត្យការភ្ជាប់អ៊ីនធឺណិតរបស់អ្នកជាមុនសិន។"</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"អ្នកត្រូវភ្ជាប់ទៅបណ្តាញ Wi-Fi សម្រាប់ការហៅ SIP (ប្រើការកំណត់បណ្តាញឥតខ្សែ)។"</string>
+    <string name="no_voip" msgid="3038021971231952704">"ការហៅ SIP មិនត្រូវបានគាំទ្រទេ"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"ស្វ័យប្រវត្តិ"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"ផ្ញើ​ជានិច្ច"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"ភ្ជាប់មកជាមួយការហៅ SIP"</string>
+</resources>
diff --git a/sip/res/values-kn-rIN/strings.xml b/sip/res/values-kn-rIN/strings.xml
new file mode 100644
index 0000000..0e89dd2
--- /dev/null
+++ b/sip/res/values-kn-rIN/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"SIP ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP ಖಾತೆಗಳು"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"ಖಾತೆಗಳು"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"ಒಳಬರುವ ಕರೆಗಳನ್ನು ಸ್ವೀಕರಿಸು"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"ಹೆಚ್ಚು ಬ್ಯಾಟರಿ ಬಾಳಿಕೆಯನ್ನು ಬಳಸುತ್ತದೆ"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"SIP ಕರೆ ಮಾಡುವಿಕೆಯನ್ನು ಬಳಸಿ"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"SIP ಕರೆ ಮಾಡುವಿಕೆಯನ್ನು ಬಳಸಿ (Wi-Fi ಮಾತ್ರ)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"ಡೇಟಾ ನೆಟ್‌ವರ್ಕ್‌ ಲಭ್ಯವಿರುವಾಗ ಎಲ್ಲ ಕರೆಗಳಿಗಾಗಿ"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"ಕೇವಲ SIP ಕರೆಗಳಿಗೆ ಮಾತ್ರ"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"ಎಲ್ಲ ಕರೆಗಳಿಗಾಗಿ"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"ಖಾತೆ ಸೇರಿಸು"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"ಖಾತೆಯನ್ನು ತೆಗೆದುಹಾಕು"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP ಖಾತೆಗಳು"</string>
+    <string name="saving_account" msgid="5336529880235177448">"ಖಾತೆಯನ್ನು ಉಳಿಸಲಾಗುತ್ತಿದೆ…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"ಖಾತೆಯನ್ನು ತೆಗೆದುಹಾಕಲಾಗುತ್ತಿದೆ…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"ಉಳಿಸು"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"ತಿರಸ್ಕರಿಸು"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"ಪ್ರೊಫೈಲ್ ಮುಚ್ಚಿ"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"ಸರಿ"</string>
+    <string name="close_profile" msgid="3122414058856309881">"ಮುಚ್ಚು"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"ಸ್ಥಿತಿಯನ್ನು ಪರಿಶೀಲಿಸಲಾಗುತ್ತಿದೆ..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"ನೋಂದಣಿ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"ಇನ್ನೂ ಪ್ರಯತ್ನಿಸಲಾಗುತ್ತಿದೆ…"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"ಕರೆಗಳನ್ನು ಸ್ವೀಕರಿಸುತ್ತಿಲ್ಲ."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕವಿಲ್ಲದ ಕಾರಣ ಖಾತೆ ನೋಂದಣಿಯನ್ನು ನಿಲ್ಲಿಸಲಾಗಿದೆ."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Wi-Fi ಸಂಪರ್ಕವಿಲ್ಲದ ಕಾರಣ ಖಾತೆ ನೋಂದಣಿಯನ್ನು ನಿಲ್ಲಿಸಲಾಗಿದೆ."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"ಖಾತೆ ನೋಂದಣಿಯು ಯಶಸ್ವಿಯಾಗಲಿಲ್ಲ."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"ಕರೆಗಳನ್ನು ಸ್ವೀಕರಿಸಲಾಗುತ್ತಿದೆ."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"ಖಾತೆ ನೋಂದಣಿಯು ಯಶಸ್ವಿಯಾಗಿಲ್ಲ: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); ನಂತರ ಪ್ರಯತ್ನಿಸುತ್ತೇನೆ"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"ಖಾತೆ ನೋಂದಣಿಯು ಯಶಸ್ವಿಯಾಗಲಿಲ್ಲ: ಬಳಕೆದಾರರ ಹೆಸರು ಅಥವಾ ಪಾಸ್‌ವರ್ಡ್‌ ತಪ್ಪಾಗಿದೆ."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"ಖಾತೆ ನೋಂದಣಿಯು ಯಶಸ್ವಿಯಾಗಲಿಲ್ಲ: ಸರ್ವರ್‌ ಹೆಸರನ್ನು ಪರಿಶೀಲಿಸಿ."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"ಈ ಖಾತೆಯನ್ನು ಪ್ರಸ್ತುತವಾಗಿ <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ ಬಳಸುತ್ತಿದೆ."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"SIP ಖಾತೆ ವಿವರಗಳು"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"SIP ಖಾತೆ ವಿವರಗಳು"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"ಸರ್ವರ್"</string>
+    <string name="username_title" msgid="6770064611005663470">"ಬಳಕೆದಾರಹೆಸರು"</string>
+    <string name="password_title" msgid="5289013731515564295">"ಪಾಸ್‌ವರ್ಡ್"</string>
+    <string name="display_name_title" msgid="579241787583079773">"ಹೆಸರು ಪ್ರದರ್ಶಿಸು"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"ಹೊರಹೋಗುವ ಪ್ರಾಕ್ಸಿ ವಿಳಾಸ"</string>
+    <string name="port_title" msgid="6693965912656593862">"ಪೋರ್ಟ್ ಸಂಖ್ಯೆ"</string>
+    <string name="transport_title" msgid="889155457465372527">"ಸಾರಿಗೆ ಪ್ರಕಾರ"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"ಜೀವಂತವಾಗಿ ಇರಿಸು ಅನ್ನು ಕಳುಹಿಸಿ"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"ಐಚ್ಛಿಕ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"ದೃಢೀಕರಣ ಬಳಕೆದಾರಹೆಸರು"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"ದೃಢೀಕರಣಕ್ಕಾಗಿ ಬಳಕೆದಾರ ಹೆಸರನ್ನು ಬಳಸಲಾಗಿದೆ"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;ಹೊಂದಿಸಿಲ್ಲ&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;ಬಳಕೆದಾರ ಹೆಸರಿನಂತೆ&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;ಐಚ್ಛಿಕ&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ ಎಲ್ಲವನ್ನೂ ತೋರಿಸಲು ಸ್ಪರ್ಶಿಸಿ"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ ಎಲ್ಲವನ್ನೂ ಮರೆಮಾಡಲು ಸ್ಪರ್ಶಿಸಿ"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> ಅಗತ್ಯವಿದೆ ಮತ್ತು ಖಾಲಿ ಬಿಡುವಂತಿಲ್ಲ."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"ಪೋರ್ಟ್‌ ಸಂಖ್ಯೆಯು 1000 ಮತ್ತು 65534 ರ ವ್ಯಾಪ್ತಿಯೊಳಗಿರಬೇಕು."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"SIP ಕರೆ ಮಾಡಲು, ಮೊದಲು ನಿಮ್ಮ ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕವನ್ನು ಪರಿಶೀಲಿಸಿ."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"SIP ಕರೆಗಳಿಗಾಗಿ ನೀವು Wi-Fi ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಂಪರ್ಕಗೊಂಡಿರುವ ಅಗತ್ಯವಿದೆ (ವೈರ್‌ಲೆಸ್ &amp; ನೆಟ್‌ವರ್ಕ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಬಳಸಿ)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"SIP ಕರೆ ಮಾಡುವಿಕೆ ಬೆಂಬಲಿತವಾಗಿಲ್ಲ"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"ಸ್ವಯಂಚಾಲಿತ"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"ಯಾವಾಗಲೂ ಕಳುಹಿಸು"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"ಅಂತರ್ನಿರ್ಮಿತ SIP ಕರೆ ಮಾಡುವಿಕೆ"</string>
+</resources>
diff --git a/sip/res/values-ko/strings.xml b/sip/res/values-ko/strings.xml
new file mode 100644
index 0000000..af1ed43
--- /dev/null
+++ b/sip/res/values-ko/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"SIP 설정"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP 계정"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"계정"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"수신전화 받기"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"배터리가 더 많이 소모됨"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"SIP 통화 사용"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"SIP 통화 사용(Wi-Fi 전용)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"데이터 네트워크 사용 가능 시 모든 통화에 사용"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"SIP 통화 전용"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"모든 통화에 사용"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"계정 추가"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"계정 삭제"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP 계정"</string>
+    <string name="saving_account" msgid="5336529880235177448">"계정 저장 중..."</string>
+    <string name="removing_account" msgid="5537351356808985756">"계정 삭제 중..."</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"저장"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"삭제"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"프로필 닫기"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"확인"</string>
+    <string name="close_profile" msgid="3122414058856309881">"닫기"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"상태 확인 중..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"등록 중..."</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"계속 시도 중..."</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"전화를 수신하지 않습니다."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"인터넷에 연결되어 있지 않기 때문에 계정 등록이 중지되었습니다."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Wi-Fi에 연결되어 있지 않기 때문에 계정 등록이 중지되었습니다."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"계정을 등록하지 못했습니다."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"전화를 수신합니다."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"계정을 등록하지 못했습니다(<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>). 나중에 다시 시도합니다."</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"계정을 등록하지 못했습니다. 사용자 이름 또는 비밀번호가 잘못되었습니다."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"계정을 등록하지 못했습니다. 서버 이름을 확인하세요."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"<xliff:g id="ACCOUNT_OWNER">%s</xliff:g> 앱에서 현재 이 계정을 사용 중입니다."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"SIP 계정 세부정보"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"SIP 계정 세부정보"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"서버"</string>
+    <string name="username_title" msgid="6770064611005663470">"사용자 이름"</string>
+    <string name="password_title" msgid="5289013731515564295">"비밀번호"</string>
+    <string name="display_name_title" msgid="579241787583079773">"표시 이름"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"발신 프록시 주소"</string>
+    <string name="port_title" msgid="6693965912656593862">"포트 번호"</string>
+    <string name="transport_title" msgid="889155457465372527">"전송 유형"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"연결 유지 메시지 보내기"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"설정(선택사항)"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"인증 사용자 이름"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"인증에 사용된 사용자 이름"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;설정 안 됨&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;사용자 이름과 동일&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;선택사항&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ 모두 표시하려면 터치"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ 모두 숨기려면 터치"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g>은(는) 필수이므로 비워 둘 수 없습니다."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"포트 번호는 1000~65534 사이여야 합니다."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"SIP 통화를 하려면 먼저 인터넷 연결을 확인하세요."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"SIP 통화를 사용하려면 Wi-Fi 네트워크에 연결해야 합니다(무선 및 네트워크 설정 사용)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"SIP 통화가 지원되지 않습니다."</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"자동"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"항상 보내기"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"SIP 통화 기본 지원"</string>
+</resources>
diff --git a/sip/res/values-ky-rKG/strings.xml b/sip/res/values-ky-rKG/strings.xml
new file mode 100644
index 0000000..a61df19
--- /dev/null
+++ b/sip/res/values-ky-rKG/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"SIP жөндөөлөрү"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP эсептик жазуулары"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Каттоо эсептери"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Келген чалууларды кабыл алуу"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Көбүрөөк батарея кубатын колдонот"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"SIP чалуусун пайдалануу"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"SIP чалуусун пайдалануу (Wi-Fi гана)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Дайындар тармагы жеткиликтүү болгон учурдагы бардык чалуулар үчүн"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"SIP чалуулар үчүн гана"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Бардык чалуулар үчүн"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Каттоо эсебин кошуу"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Каттоо эсебин алып салуу"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP каттоо эсептери"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Каттоо эсеби сакталууда…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"Каттоо эсеби жок кылынууда…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Сактоо"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Жокко чыгаруу"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Профилди жабуу"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"OK"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Жабуу"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Абалы текшерилүүдө…"</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Катталууда…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Дагы эле аракет жасалууда…"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Чалуулар кабыл алынбайт"</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Интернет байланышы жок болгондуктан, эсепти каттоо аракети токтотулду."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Wi-Fi байланышы жок болгондуктан, эсепти каттоо аракети токтотулду."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Эсеп катталбай калды."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Чалуулар кабыл алынат."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"Эсеп катталбай калды: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); бир аздан кийин дагы бир жолу аракет жасалат"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Эсеп катталбай калды: Колдонуучунун ысымы же сырсөзү туура эмес."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Эсеп катталбай калды. Сервердин аталышын текшериңиз."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"Бул каттоэсепти учурда <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> колдонмосу пайдаланууда."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"SIP каттоо эсебинин чоо-жайы"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"SIP каттоо эсебинин чоо-жайы"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Сервер"</string>
+    <string name="username_title" msgid="6770064611005663470">"Колдонуучу ысымы"</string>
+    <string name="password_title" msgid="5289013731515564295">"Сырсөз"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Экрандын аталышы"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Чыгуучу прокси дареги"</string>
+    <string name="port_title" msgid="6693965912656593862">"Порт номери"</string>
+    <string name="transport_title" msgid="889155457465372527">"Унаа түрү"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Туташууну текшерген билдирүүнү жөнөтүү"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Кошумча жөндөөлөр"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Аныктыкты текшерүүчү колдонуучунун ысымы"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Колдонуучунун ысымы аныктыкты текшерүү үчүн колдонулат"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Коюлган эмес&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Колдонуучунун ысымына окшош&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Кошумча&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Бардыгын көрсөтүү үчүн тийип коюңуз"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Бардыгын жашыруу үчүн тийип коюңуз"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> талап кылынат жана бош калтырганга болбойт."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"Порттун номери 1000 баштап 65534 чейин болушу керек."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"SIP чалуу жайгаштыруу үчүн, адегенде Интернет туташууңузду текшериңиз."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"SIP чалууларын жасоо үчүн Wi-Fi тармагына туташышыңыз керек (Зымсыз &amp; Тармак жөндөөлөрүн пайдаланыңыз)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"SIP чалуу колдоого алынбайт"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Автоматтык"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Ар дайым жөнөтүлсүн"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Камтылган SIP чалуу"</string>
+</resources>
diff --git a/sip/res/values-lo-rLA/strings.xml b/sip/res/values-lo-rLA/strings.xml
new file mode 100644
index 0000000..3bdc32c
--- /dev/null
+++ b/sip/res/values-lo-rLA/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"ການ​ຕັ້ງ​ຄ່າ SIP"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"ບັນ​ຊີ SIP"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"ບັນຊີ"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"ຮັບ​ສາຍ​ໂທ​ເຂົ້າ"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"ໃຊ້​ອາ​ຍຸ​ແບັດ​ເຕີ​ຣີ​ເພີ່ມ​ເຕີມ"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"ໃຊ້​ການ​ໂທ SIP"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"ໃຊ້​ການ​ໂທ SIP (Wi-Fi ເທົ່າ​ນັ້ນ)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"ສຳລັບ​ທຸກສາຍເມື່ອສາມາດ​ໃຊ້ຂໍ້ມູນ​ເຄືອຂ່າຍ​ໄດ້"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"ສຳ​ລັບ​ການ​ໂທ SIP ເທົ່າ​ນັ້ນ"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"ສຳລັບທຸກສາຍ"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"ເພີ່ມບັນຊີ"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"ລຶບບັນຊີ"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"ບັນ​ຊີ SIP"</string>
+    <string name="saving_account" msgid="5336529880235177448">"ກຳລັງບັນທຶກບັນຊີ..."</string>
+    <string name="removing_account" msgid="5537351356808985756">"ກຳລັງລຶບບັນຊີ..."</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"ບັນທຶກ"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"ຍົກເລີກ"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"ປິດ​ໂປຣໄຟລ໌"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"ຕົກລົງ"</string>
+    <string name="close_profile" msgid="3122414058856309881">"ປິດ"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"ກຳລັງ​ກວດສອບ​ສະຖານະ..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"ກຳລັງ​ລົງທະບຽນ..."</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"ຍັງຄົງພະຍາຍາມຢູ່..."</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"ບໍ່ຮັບສາຍ."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"ຢຸດ​ການ​ລົງທະບຽນ​ເນື່ອງຈາກບໍ່ມີ​ການເຊື່ອມຕໍ່​ອິນເຕີເນັດ."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"ການລົງ​ທະບຽນ​ບັນຊີຢຸດເຮັດວຽກ​ເນື່ອງຈາກ​ບໍ່ມີການ​ເຊື່ອມຕໍ່ Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"ການ​ລົງທະບຽນ​ບັນຊີ​ບໍ່ສຳເລັດ."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"ຮັບສາຍ."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"ການ​ລົງທະບຽນ​ບັນຊີ​ບໍ່ສຳເລັດ: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); ຈະ​ລອງ​ໃໝ່​ໃນ​ພາຍຫຼັງ"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"ການ​ລົງທະບຽນ​ບັນຊີ​ບໍ່ສຳເລັດ: ຊື່ຜູ່ໃຊ້ ຫຼື​ລະຫັດຜ່ານ​ບໍ່ຖືກຕ້ອງ."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"ການ​ລົງທະບຽນ​ບັນຊີ​ບໍ່​ສຳເລັດ: ກະລຸນາ​ກວດສອບ​ຊື່​ເຊີບເວີ."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"ແອັບຯ <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> ກຳລັງໃຊ້ບັນຊີນີ້ຢູ່"</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"ລາຍລະອຽດບັນຊີ SIP"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"ລາຍລະອຽດບັນຊີ SIP"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"ເຊີບເວີ"</string>
+    <string name="username_title" msgid="6770064611005663470">"ຊື່ຜູ່ໃຊ້"</string>
+    <string name="password_title" msgid="5289013731515564295">"ລະຫັດຜ່ານ"</string>
+    <string name="display_name_title" msgid="579241787583079773">"ຊື່ທີ່ສະແດງ"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"ທີ່ຢູ່ Proxy ຂາອອກ"</string>
+    <string name="port_title" msgid="6693965912656593862">"ໝາຍເລກພອດ"</string>
+    <string name="transport_title" msgid="889155457465372527">"ປະເພດການສົ່ງຂໍ້ມູນ"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"ສົ່ງ keep-alive"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"ການ​ຕັ້ງ​ຄ່າທາງ​ເລືອກ​ເສີມ"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"ຊື່​ຜູ່ໃຊ້​ສຳລັບ​ການ​ພິສູດ​ຢືນຢັນ​ໂຕ"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"ຊື່​ຜູ່ໃຊ້​ເພື່ອ​ການ​ພິສູດ​ຢືນຢັນ​ໂຕ"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;ຍັງບໍ່ໄດ້ຕັ້ງ&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;ອັນດຽວກັບຊື່ຜູ່ໃຊ້&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;ໂຕເລືອກເສີມ&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ ແຕະ​ເພື່ອ​ສະແດງ​ທັງໝົດ"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ ແຕະ​ເພື່ອ​ເຊື່ອງ​ທັງໝົດ"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"ຕ້ອງ​ລະບຸ <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> ແລະ​ບໍ່​ສາມາດ​ປ່ອຍ​ຫວ່າງ​ໄດ້."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"ໝາຍ​ເລກ​ພອດ​ຄວນ​ຢູ່​ລະຫວ່າງ 1000 ແລະ 65534."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"ເພື່ອ​ໃຊ້​ການ​ໂທ SIP, ກວດ​ເບິ່ງ​ການ​ເຊື່ອມ​ຕໍ່​ອິນ​ເຕີ​ເນັດ​ຂອງ​ທ່ານ​ກ່ອນ."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"ທ່ານ​ຈຳ​ເປັນ​ຕ້ອງ​ໄດ້​ເຊື່ອມ​ຕໍ່​ກັບ​ເຄືອ​ຂ່າຍ Wi-Fi ສຳ​ລັບ​ການ​ໂທ SIP (ໃຊ້​ການ​ຕັ້ງ​ຄ່າ​ເຄືອ​ຂ່າຍ​ຂອງ​ໄວ​ເລ​ສ)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"ການ​ໂທ SIP ບໍ່​ຮອງ​ຮັບ"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"ອັດຕະໂນມັດ"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"​ສົ່ງ​ຕະຫຼອດ"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"ການ​ໂທ SIP ໃນ​ເຄື່ອງ"</string>
+</resources>
diff --git a/sip/res/values-lt/strings.xml b/sip/res/values-lt/strings.xml
new file mode 100644
index 0000000..7ce074c
--- /dev/null
+++ b/sip/res/values-lt/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"SIP nustatymai"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP paskyros"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Paskyros"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Gauti gaunamus skambučius"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Eikvojama daugiau akumuliatoriaus energijos"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"Naudoti SIP skambinimą"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Naudoti SIP skambinimą (tik „Wi-Fi“)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Visiems skambučiams atlikti, kai pasiekiamas duomenų tinklas"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Tik SIP skambučiams"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Visiems skambučiams atlikti"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Pridėti paskyrą"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Pašalinti paskyrą"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP paskyros"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Išsaugoma paskyra..."</string>
+    <string name="removing_account" msgid="5537351356808985756">"Pašalinama paskyra..."</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Išsaugoti"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Išmesti"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Uždaryti profilį"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"Gerai"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Uždaryti"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Tikrinama būsena..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Registruojama..."</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Vis dar bandoma..."</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Skambučiai negaunami."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Paskyros registracija sustabdyta, nes neprisijungta prie interneto."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Paskyros registracija sustabdyta, nes neprisijungta prie „Wi-Fi“."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Paskyros užregistruoti nepavyko."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Gaunami skambučiai."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"Paskyros užregistruoti nepavyko: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); bus bandoma vėliau"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Paskyros užregistruoti nepavyko: netinkamas naudotojo vardas arba slaptažodis."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Paskyros užregistruoti nepavyko. Patikrinkite serverio pavadinimą."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"Šią paskyrą dabar naudoja programa „<xliff:g id="ACCOUNT_OWNER">%s</xliff:g>“."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"Išsami SIP paskyros informacija"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"Išsami SIP paskyros informacija"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Serveris"</string>
+    <string name="username_title" msgid="6770064611005663470">"Naudotojo vardas"</string>
+    <string name="password_title" msgid="5289013731515564295">"Slaptažodis"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Pateikiamas pavadinimas"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Išsiuntimo tarpinio serverio adresas"</string>
+    <string name="port_title" msgid="6693965912656593862">"Prievado numeris"</string>
+    <string name="transport_title" msgid="889155457465372527">"Transportavimo tipas"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Siųsti palaikymo pranešimus"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Pasirenkami nustatymai"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Tapatybės nustatymo naudotojo vardas"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Tapatybei nustatyti naudotas naudotojo vardas"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Nenustatyta&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Kaip naudotojo vardas&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Pasirenkama&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Jei norite viską parodyti, palieskite"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Jei norite viską paslėpti, palieskite"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"Lauke „<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g>“ būtina nurodyti vertę – jis negali likti tuščias."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"Prievado numeris turi būti nuo 1 000 iki 65 534."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"Kad atliktumėte SIP skambutį, pirmiausia patikrinkite interneto ryšį."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"Kad galėtumėte atlikti SIP skambučius, turite būti prisijungę prie „Wi-Fi“ tinklo (naudokite „Belaidžio ryšio ir tinklo“ nustatymus)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"SIP skambinimas nepalaikomas"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Automatinis"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Visada siųsti"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Integruotas SIP skambinimas"</string>
+</resources>
diff --git a/sip/res/values-lv/strings.xml b/sip/res/values-lv/strings.xml
new file mode 100644
index 0000000..b1337b5
--- /dev/null
+++ b/sip/res/values-lv/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"SIP iestatījumi"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP konti"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Konti"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Saņemt ienākošos zvanus"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Patērē vairāk akumulatora enerģijas"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"SIP zvanu izmantošana"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"SIP zvanu izmantošana (tikai Wi-Fi tīklā)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Visiem zvaniem, ja ir pieejams datu tīkls"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Tikai SIP zvaniem"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Visiem zvaniem"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Pievienot kontu"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Konta noņemšana"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP konti"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Notiek konta saglabāšana..."</string>
+    <string name="removing_account" msgid="5537351356808985756">"Notiek konta noņemšana..."</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Saglabāt"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Atmest"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Profila aizvēršana"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"Labi"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Aizvērt"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Notiek statusa pārbaude..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Notiek reģistrācija..."</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Joprojām mēģina..."</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Zvani netiek saņemti"</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Konta reģistrācija tika apturēta, jo nav interneta savienojuma."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Konta reģistrācija ir apturēta, jo nav Wi-Fi savienojuma."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Konta reģistrācija neizdevās."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Zvani tiek saņemti."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"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="8406872554323334182">"Konta reģistrācija neizdevās: nepareizs lietotājvārds vai parole."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Konta reģistrācija neizdevās: pārbaudiet servera nosaukumu."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"Šis konts pašlaik tiek izmantots lietotnē <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"Dati par SIP kontu"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"Dati par SIP kontu"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Serveris"</string>
+    <string name="username_title" msgid="6770064611005663470">"Lietotājvārds"</string>
+    <string name="password_title" msgid="5289013731515564295">"Parole"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Parādāmais nosaukums"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Izejošā starpniekservera adrese"</string>
+    <string name="port_title" msgid="6693965912656593862">"Porta numurs"</string>
+    <string name="transport_title" msgid="889155457465372527">"Transporta veids"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Saites darbības pārbaudes ziņojuma sūtīšana"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Neobligāti iestatījumi"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Autentifikācijai izmantotais lietotājvārds"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Autentifikācijai izmantotais lietotājvārds"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Nav iestatītas&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Tāds pats kā lietotājvārds&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Neobligāti&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Pieskarieties, lai rādītu visu"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Pieskarieties, lai paslēptu visu"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"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="7931422555587011830">"Porta numuram ir jābūt skaitlim no 1000 līdz 65534."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"Pirms veicat SIP zvanu, pārbaudiet interneta savienojumu."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"Lai veiktu SIP zvanus, ir jāizmanto Wi-Fi tīkls (iestatījumi Bezvadu savienojumi un tīkli)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"SIP zvani netiek atbalstīti"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Automātiski"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Vienmēr sūtīt"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Iebūvēta SIP zvanu funkcija"</string>
+</resources>
diff --git a/sip/res/values-mk-rMK/strings.xml b/sip/res/values-mk-rMK/strings.xml
new file mode 100644
index 0000000..96c043c
--- /dev/null
+++ b/sip/res/values-mk-rMK/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"Поставки на СИП"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"Сметки за SIP"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Сметки"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Примај дојдовни повици"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Повеќе ја троши батеријата"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"Користете повикување со СИП"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Користете повикување со СИП (само преку Wi-Fi)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"За сите повици кога е достапна мрежа на податоци"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Само за повици со СИП"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"За сите повици"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Додај сметка"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Отстрани сметка"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"Сметки за SIP"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Зачувување на сметката..."</string>
+    <string name="removing_account" msgid="5537351356808985756">"Сметката се отстранува..."</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Зачувај"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Отфрли"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Затвори го профилот"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"Во ред"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Затвори"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Проверување статус..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Регистрирање..."</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Уште се обидува..."</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Не прима повици."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Регистрацијата на сметка се прекина затоа што нема интернет конекција."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Регистрацијата на сметка се прекина затоа што нема Wi-Fi конекција."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Регистрацијата на сметка е неуспешна."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Примање повици."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"Регистрацијата на сметка е неуспешна: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); ќе се обиде подоцна"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Регистрацијата на сметка е неуспешна: неточно корисничко име или лозинка."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Регистрацијата на сметка е неуспешна: проверете го името на серверот."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"Апликацијата на <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> ја употребува оваа сметка во моментов."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"Детали на сметка за SIP"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"Детали на сметка за SIP"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Сервер"</string>
+    <string name="username_title" msgid="6770064611005663470">"Корисничко име"</string>
+    <string name="password_title" msgid="5289013731515564295">"Лозинка"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Прикажи име"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Излезна адреса на прокси"</string>
+    <string name="port_title" msgid="6693965912656593862">"Број на порта"</string>
+    <string name="transport_title" msgid="889155457465372527">"Тип превоз"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Испрати „одржувај врска“"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Изборни поставки"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Корисничко име за автентикација"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Корисничко име што се користи за автентикација"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Не е поставен&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Исто како корисничкото име&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"Изборно"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Допрете за да се прикажат сите"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Допрете за да се сокријат сите"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"Потребно е <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> и не може да се остави празно."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"Бројот на портата треба да биде меѓу 1000 и 65534."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"За да воспоставите повик со СИП, прво проверете го поврзувањето на интернет."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"Треба да бидете поврзани со мрежа на Wi-Fi за повици со СИП (користете ги поставките за безжичен интернет и за мрежа)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"Повикување со СИП не е поддржано"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Автоматски"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Испраќај секогаш"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Вградено повикување со СИП"</string>
+</resources>
diff --git a/sip/res/values-ml-rIN/strings.xml b/sip/res/values-ml-rIN/strings.xml
new file mode 100644
index 0000000..814f2a6
--- /dev/null
+++ b/sip/res/values-ml-rIN/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"SIP ക്രമീകരണങ്ങൾ"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP അക്കൗണ്ടുകൾ"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"അക്കൗണ്ടുകൾ"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"ഇൻകമിംഗ് കോളുകൾ സ്വീകരിക്കുക"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"കൂടുതൽ ബാറ്ററി ആയുസ് ഉപയോഗിക്കുന്നു"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"SIP കോൾചെയ്യൽ ഉപയോഗിക്കുക"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"SIP കോൾചെയ്യൽ ഉപയോഗിക്കുക (Wi-Fi മാത്രം)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"ഡാറ്റ നെറ്റ്‌വർക്ക് ലഭ്യമാകുമ്പോൾ എല്ലാ കോളുകൾക്കായും"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"SIP കോളുകൾക്ക് മാത്രം"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"എല്ലാ കോളുകൾക്കും"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"അക്കൗണ്ട് ചേർക്കുക"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"അക്കൗണ്ട് നീക്കംചെയ്യുക"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP അക്കൗണ്ടുകൾ"</string>
+    <string name="saving_account" msgid="5336529880235177448">"അക്കൗണ്ട് സംരക്ഷിക്കുന്നു…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"അക്കൗണ്ട് നീക്കംചെയ്യുന്നു…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"സംരക്ഷിക്കുക"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"നിരസിക്കുക"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"പ്രൊഫൈൽ അടയ്‌ക്കുക"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"ശരി"</string>
+    <string name="close_profile" msgid="3122414058856309881">"അടയ്‌ക്കുക"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"നില പരിശോധിക്കുന്നു..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"രജിസ്റ്റർ ചെയ്യുന്നു…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"ഇപ്പോഴും ശ്രമിക്കുന്നു…"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"കോളുകൾ സ്വീകരിക്കുന്നില്ല."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"ഇന്റർനെറ്റ് കണക്ഷനില്ലാത്താതിനാൽ അക്കൗണ്ട് രജിസ്ട്രേഷൻ നിർത്തിവച്ചു."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Wi-Fi കണക്ഷനില്ലാത്താതിനാൽ അക്കൗണ്ട് രജിസ്ട്രേഷൻ നിർത്തിവച്ചു."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"അക്കൗണ്ട് രജിസ്ട്രേഷൻ പരാജയപ്പെട്ടു."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"കോളുകൾ സ്വീകരിക്കുന്നു."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"അക്കൗണ്ട് രജിസ്‌ട്രേഷൻ പരാജയപ്പെട്ടു: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); പിന്നീട് വീണ്ടും ശ്രമിക്കും"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"അക്കൗണ്ട് രജിസ്‌ട്രേഷൻ പരാജയപ്പെട്ടു. ഉപയോക്തൃനാമമോ പാസ്‌വേഡോ തെറ്റാണ്."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"അക്കൗണ്ട് രജിസ്ട്രേഷൻ പരാജയപ്പെട്ടു: സെർവറിന്റെ പേര് പരിശോധിക്കുക."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"ഈ അക്കൗണ്ട് നിലവിൽ <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> അപ്ലിക്കേഷൻ ഉപയോഗിക്കുന്നു."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"SIP അക്കൗണ്ട് വിശദാംശങ്ങൾ"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"SIP അക്കൗണ്ട് വിശദാംശങ്ങൾ"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"സെർവർ"</string>
+    <string name="username_title" msgid="6770064611005663470">"ഉപയോക്തൃനാമം"</string>
+    <string name="password_title" msgid="5289013731515564295">"പാസ്‌വേഡ്"</string>
+    <string name="display_name_title" msgid="579241787583079773">"പ്രദർശിപ്പിക്കുന്ന പേര്"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"ഔട്ട്ബൗണ്ട് പ്രോക്സി വിലാസം"</string>
+    <string name="port_title" msgid="6693965912656593862">"പോർട്ട് നമ്പർ"</string>
+    <string name="transport_title" msgid="889155457465372527">"ട്രാൻസ്‌പോർട്ട് തരം"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"സജീവമായി തുടരുക എന്നത് അയയ്‌ക്കുക"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"ഓപ്‌ഷണൽ ക്രമീകരണങ്ങൾ"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"പ്രാമാണീകരണ ഉപയോക്തൃനാമം"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"പ്രാമാണീകരണത്തിന് ഉപയോഗിച്ച ഉപയോക്തൃനാമം"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;സജ്ജീകരിച്ചിട്ടില്ല&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;ഉപയോക്തൃനാമത്തിന് സമാനം&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;ഓപ്‌ഷണൽ&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ എല്ലാം കാണിക്കാൻ സ്‌പർശിക്കുക"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ എല്ലാം മറയ്‌ക്കാൻ സ്‌പർശിക്കുക"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> ആവശ്യമായതിനാൽ ശൂന്യമായിടാനാകില്ല."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"പോർട്ട് നമ്പർ 1000, 65534 എന്നിവയ്‌ക്കിടയിലായിരിക്കണം."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"SIP കോൾചെയ്യുന്നതിന്, ആദ്യം നിങ്ങളുടെ ഇന്റർനെറ്റ് കണക്ഷൻ പരിശോധിക്കുക."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"SIP കോളുകൾക്കായി Wi-Fi നെറ്റ്‌വർക്കിലേക്ക് കണക്‌റ്റുചെയ്യേണ്ടതുണ്ട് (വയർലെസ്, നെറ്റ്‌വർക്ക് ക്രമീകരണങ്ങൾ ഉപയോഗിക്കുക)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"SIP കോൾചെയ്യൽ പിന്തുണയ്‌ക്കുന്നില്ല"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"യാന്ത്രികമായി"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"എല്ലായ്പ്പോഴും അയയ്‌ക്കുക"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"അന്തർ നിർമ്മിത SIP കോൾചെയ്യൽ"</string>
+</resources>
diff --git a/sip/res/values-mn-rMN/strings.xml b/sip/res/values-mn-rMN/strings.xml
new file mode 100644
index 0000000..48792c6
--- /dev/null
+++ b/sip/res/values-mn-rMN/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"SIP тохиргоонууд"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP акаунтууд"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Акаунт"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Ирж буй дуудлага хүлээж авах"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Илүү их цэнэг хэрэглэдэг"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"SIP дуудлагыг ашигла"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"SIP дуудлагыг ашигла (зөвхөн Wi-Fi)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Дата сүлжээтэй үед бүх дуудлагад"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"SIP дуудлага хийхэд зориулагдсан"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Бүх дуудлагад"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Акаунт нэмэх"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Акаунтыг арилгах"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP акаунт"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Акаунтыг хадгалж байна…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"Акаунтыг арилгаж байна…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Хадгалах"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Устг"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Профайлыг хаана уу"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"Тийм"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Хаах"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Статусыг шалгаж байна..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Бүртгэж байна…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Оролдож байна…"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Дуудлага хүлээж авахгүй байна."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Интернэт холболтгүй болсон учир акаунтын бүртгэл зогслоо."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Wi-Fi холболтгүй болсон учир акаунтын бүртгэл зогслоо"</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Акаунтын бүртгэл амжилтгүй."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Дуудлага хүлээн авч байна."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"Акаунтын бүртгэл амжилтгүй боллоо: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); дараа дахин оролдох болно"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Акаунтын бүртгэл амжилтгүй боллооl: Хэрэглэгчийн нэр буюу нууц үг буруу"</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Акаунтын бүртгэл амжилтгүй: Серверийн нэрийг шалгана уу."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"Энэ акаунтыг <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> апп одоо ашиглаж байна."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"SIP акаунтын мэдээлэл"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"SIP акаунтын мэдээлэл"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Сервер"</string>
+    <string name="username_title" msgid="6770064611005663470">"Хэрэглэгчийн нэр"</string>
+    <string name="password_title" msgid="5289013731515564295">"Нууц үг"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Харуулах нэр"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Гадагш чиглэсэн прокси хаяг"</string>
+    <string name="port_title" msgid="6693965912656593862">"Портын дугаар"</string>
+    <string name="transport_title" msgid="889155457465372527">"Тээврийн хэлбэр"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Торгоох илгээх"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Сонголтын тохиргоо"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Гэрчлэлийн хэрэглэгчийн нэр"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Гэрчлэлд ашигласан хэрэглэгчийн нэр"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Тохируулаагүй&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Хэрэглэгчийн нэртэй адил&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Сонголтын&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Бүгдийг харуулахын тулд хүрнэ үү"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Бүгдийг нуухын тулд хүрнэ үү"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> заавал шаардагдах бөгөөд хоосон орхиж болохгүй."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"Портын дугаар 1000 болон 65534 хооронд байх ёстой."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"SIP дуудлага хийхийн тулд эхлээд интернет сүлжээгээ шалгана уу"</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"SIP дуудлага хийхийн тулд Wi-Fi сүлжээнд холбогдсон байх хэрэгтэй (Wi-Fi болон Сүлжээний тохиргоог ашигла)"</string>
+    <string name="no_voip" msgid="3038021971231952704">"SIP дуудлага хийхийг дэмжээгүй байна"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Автоматаар"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Байнга илгээх"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"SIP дуудлага өгөгдсөн"</string>
+</resources>
diff --git a/sip/res/values-mr-rIN/strings.xml b/sip/res/values-mr-rIN/strings.xml
new file mode 100644
index 0000000..59da732
--- /dev/null
+++ b/sip/res/values-mr-rIN/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"SIP सेटिंग्ज"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP खाती"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"खाती"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"येणारे कॉल प्राप्त करा"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"अधिक बॅटरी आयुष्‍य वापरते"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"SIP कॉल करणे वापरा"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"SIP कॉल करणे वापरा (वाय-फाय केवळ)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"डेटा नेटवर्क उपलब्ध असल्यावर सर्व कॉलसाठी"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"केवळ SIP कॉलसाठी"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"सर्व कॉलसाठी"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"खाते जोडा"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"खाते काढा"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP खाती"</string>
+    <string name="saving_account" msgid="5336529880235177448">"खाते जतन करीत आहे..."</string>
+    <string name="removing_account" msgid="5537351356808985756">"खाते काढत आहे..."</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"जतन करा"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"टाकून द्या"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"प्रोफाईल बंद करा"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"ठीक आहे"</string>
+    <string name="close_profile" msgid="3122414058856309881">"बंद करा"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"स्‍थिती तपासत आहे..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"नोंदणी करीत आहे..."</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"अद्याप प्रयत्न करीत आहे..."</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"कॉल प्राप्त होत नाहीत."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"इंटरनेट कनेक्‍शन नसल्‍याने खाते नोंदणी थांबली."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"वाय-फाय कनेक्‍शन नसल्‍याने खाते नोंदणी थांबली."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"खाते नोंदणी अयशस्वी."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"कॉल प्राप्त करीत आहे."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"खाते नोंदणी अयशस्‍वी: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); नंतर प्रयत्‍न करू"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"खाते नोंदणी अयशस्‍वी: चुकीचे वापरकर्तानाव किंवा संकेतशब्‍द."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"खाते नोंदणी अयशस्वी: सर्व्हर नाव तपासा."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"हे खाते सध्‍या <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> अ‍ॅपद्वारे वापरात आहे."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"SIP खाते तपशील"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"SIP खाते तपशील"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"सर्व्हर"</string>
+    <string name="username_title" msgid="6770064611005663470">"वापरकर्तानाव"</string>
+    <string name="password_title" msgid="5289013731515564295">"संकेतशब्द"</string>
+    <string name="display_name_title" msgid="579241787583079773">"प्रदर्शन नाव"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"आउटबाउंड प्रॉक्सी पत्ता"</string>
+    <string name="port_title" msgid="6693965912656593862">"पोर्ट नंबर"</string>
+    <string name="transport_title" msgid="889155457465372527">"वाहतूक प्रकार"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"चैतन्‍यमय-ठेवा पाठवा"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"पर्यायी सेटिंग्ज"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"प्रमाणीकरण वापरकर्तानाव"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"प्रमाणीकरणासाठी वापरकर्तानाव वापरले"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;सेट नाही&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;वापरकर्तानावासमान&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;पर्यायी&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ सर्व दर्शविण्‍यासाठी स्‍पर्श करा"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ सर्व लपविण्‍यासाठी स्‍पर्श करा"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> आवश्‍यक आहे आणि रिक्त सोडले जाऊ शकत नाही."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"पोर्ट नंबर 1000 आणि 65534 मध्‍ये असावा."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"एक SIP कॉल करण्‍यासाठी, प्रथम आपले इंटरनेट कनेक्‍शन तपासा."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"SIP कॉलसाठी आपण वाय-फाय नेटवर्कशी कनेक्‍ट केलेले असणे आवश्‍यक आहे (वायरलेस &amp; नेटवर्क सेटिंग्ज वापरा)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"SIP कॉल करणे समर्थित नाही"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"स्वयंचलित"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"नेहमी पाठवा"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"अंगभूत SIP कॉल करणे"</string>
+</resources>
diff --git a/sip/res/values-ms-rMY/strings.xml b/sip/res/values-ms-rMY/strings.xml
new file mode 100644
index 0000000..f41589e
--- /dev/null
+++ b/sip/res/values-ms-rMY/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"Tetapan SIP"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"Akaun SIP"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Akaun"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Menerima panggilan masuk"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Menggunakan lebih hayat bateri"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"Gunakan panggilan SIP"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Gunakan panggilan SIP (Wi-Fi sahaja)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Untuk semua panggilan semasa rangkaian data tersedia"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Hanya untuk panggilan SIP"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Untuk semua panggilan"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Tambah akaun"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Alih keluar akaun"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"Akaun SIP"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Menyimpan akaun..."</string>
+    <string name="removing_account" msgid="5537351356808985756">"Mengalih keluar akaun..."</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Simpan"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Buang"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Tutup profil"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"OK"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Tutup"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Menyemak status..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Mendaftar..."</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Masih mencuba..."</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Tidak menerima panggilan."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Pendaftaran akaun terhenti kerana tiada sambungan Internet."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Pendaftaran akaun terhenti kerana tiada sambungan Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Pendaftaran akaun tidak berjaya."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Menerima panggilan"</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"Pendaftaran akaun tidak berjaya: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); akan mencuba kemudian"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Pendaftaran akaun tidak berjaya: Nama pengguna atau kata laluan salah."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Pendaftaran akaun tidak berjaya: Periksa nama pelayan."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"Akaun ini sedang digunakan pada masa ini oleh apl <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"Butiran akaun SIP"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"Butiran akaun SIP"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Pelayan"</string>
+    <string name="username_title" msgid="6770064611005663470">"Nama Pengguna"</string>
+    <string name="password_title" msgid="5289013731515564295">"Kata laluan"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Nama paparan"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Alamat proksi keluar"</string>
+    <string name="port_title" msgid="6693965912656593862">"Nombor port"</string>
+    <string name="transport_title" msgid="889155457465372527">"Jenis pengangkutan"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Hantar pengekal"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Tetapan pilihan"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Nama pengguna pengesahan"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Nama pengguna yang digunakan untuk pengesahan"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Tidak ditetapkan&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Sama dengan nama pengguna&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Pilihan&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Sentuh untuk menunjukkan semua"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Sentuh untuk sembunyikan semua"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> diperlukan dan tidak boleh dibiarkan kosong."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"Nombor port harus berada dalam lingkungan 1000 dan 65534."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"Untuk membuat panggilan SIP, periksa sambungan Internet anda dahulu."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"Anda perlu disambungkan ke rangkaian Wi-Fi bagi panggilan SIP(gunakan tetapan Wayarles &amp; Rangkaian)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"Panggilan SIP tidak disokong"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Automatik"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Sentiasa hantar"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Panggilan SIP terbina dalam"</string>
+</resources>
diff --git a/sip/res/values-my-rMM/strings.xml b/sip/res/values-my-rMM/strings.xml
new file mode 100644
index 0000000..621d4fe
--- /dev/null
+++ b/sip/res/values-my-rMM/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"SIP ချိန်ညှိချက်များ"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP အကောင့်များ"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"အကောင့်များ"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"အဝင် ခေါ်ဆိုမှုများ လက်ခံရန်"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"ဘတ်ထရီ သက်တမ်းပိုသုံးပါသည်"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"SIP ခေါ်ဆိုမှု အသုံးပြုမည်"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"SIP ခေါ်ဆိုမှု အသုံးပြုမည် (ကြိုးမဲ့ အင်တာနက်သာ)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"ဒေတာ ကွန်ရက် ရှိနေစဉ် ခေါ်ဆိုမှုများ အားလုံး အတွက်"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"SIP ခေါ်ဆိုမှုများအတွက်သာ"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"ခေါ်ဆိုမှုများ အားလုံး အတွက်"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"အကောင့် ထည့်ရန်"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"အကောင့်ကို ဖယ်ရှားရန်"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP အကောင့်များ"</string>
+    <string name="saving_account" msgid="5336529880235177448">"အကောင့်ကို သိမ်းဆည်းနေ…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"အကောင့်ကို ဖယ်ရှားနေ…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"သိမ်းပါ"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"စွန့်ပစ်ရန်"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"ပရိုဖိုင်ကို ပိတ်ရန်"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"အိုကေ"</string>
+    <string name="close_profile" msgid="3122414058856309881">"ပိတ်ရန်"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"အခြေအနေကို စစ်ဆေးနေ..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"မှတ်ပုံတင်နေ…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"ကြိုးစာနေဆဲ…"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"အဝင် ခေါ်ဆိုမှုများ မရှိပါ"</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"အင်တာနက် ဆက်သွယ်မှု မရှိသောကြောင့် အကောင့် မှတ်ပုံတင်ခြင်း ရပ်ဆိုင်းသွားခဲ့သည်။"</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"ကြိုးမဲ့ ဆက်သွယ်မှု မရှိသောကြောင့် အကောင့် မှတ်ပုံတင်ခြင်း ရပ်ဆိုင်းသွားခဲ့သည်။"</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"အကောင့် မှတ်ပုံတင်ခြင်း မအောင်မြင်ပါ"</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"ခေါ်ဆိုမှုကို လက်ံခံယူနေ"</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"အကောင့် မှတ်ပုံတင်ခြင်း မအောင်မြင်ပါ: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); နောက်မှာ ထပ်ကြိုးစားမည်"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"အကောင့် မှတ်ပုံတင်ခြင်း မအောင်မြင်ပါ: စကားဝှက် သို့မဟုတ် သုံးစွဲသူအမည် မမှန်ကန်ပါ။"</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"အကောင့် မှတ်ပုံတင်ခြင်း မအောင်မြင်ပါ: ဆာဗာ အမည်ကို စစ်ဆေးပါ"</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"ဒီအကောင့်ကို လက်ရှိ <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> အပလီကေးရှင်းမှ သုံးနေသည်"</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"SIP အကောင့် အသေးစိတ်များ"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"SIP အကောင့် အသေးစိတ်များ"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"ဆာဗာ"</string>
+    <string name="username_title" msgid="6770064611005663470">"အသုံးပြုသူ အမည်"</string>
+    <string name="password_title" msgid="5289013731515564295">"စကားဝှက်"</string>
+    <string name="display_name_title" msgid="579241787583079773">"အမည်ကို ပြပေးရန်"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"အထွက် ပရော့စီ လိပ်စာ"</string>
+    <string name="port_title" msgid="6693965912656593862">"ပို့ နံပါတ်"</string>
+    <string name="transport_title" msgid="889155457465372527">"သယ်ယူပို့ဆောင်ရေးအမျိုးအစား"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"keep-alive ကို ပို့ပါ"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"ရွေးနိုင်သော ရွေးစရာများ"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"အသုံးပြုသူ အမည် အထောက်အထားကို စိစစ်ခြင်း"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"အသုံးပြုသူ အမည်ကို အထောက်အထား စိစစ်ရန် သုံးခဲ့"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;သတ်မှတ်မထားပါ&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;အသုံးပြုသူ အမည်နှင့် တူညီသော&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;လိုချင်မှ လုပ်ရန်&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ အားလုံးပြရန် ထိပါ"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ အားလုံး ဖျောက်ရန် ထိပါ"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> မှာ လိုအပ်ပြီး ပလာထား မရပါ"</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"ပို့ နံပါတ်မှာ ၁၀၀၀ မှ ၆၅၅၃၄ အတွင်းမှာ ရှိရပါမည်"</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"SIP ခေါ်ဆိုမှု ပြုလုပ်ရန်၊ သင့်အင်တာနက် ချိတ်ဆက်မှုကိုဦးစွာ စစ်ဆေးပါ။"</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"ခေါ်ဆိုမှုအတွက် ကြိုးမဲ့ကွန်ရက် ချိတ်ဆက်ရန်လိုအပ်ပါသည် (ကြိုးမဲ့ နှင့် ကွန်ရက်ချိန်ညှိချက်များကို အသုံးပြုပါ)။"</string>
+    <string name="no_voip" msgid="3038021971231952704">"SIP ခေါ်ဆိုမှု မထောက်ပံံ့ပါ။"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"အလိုအလျောက်"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"အမြဲတမ်း ပို့ရန်"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"SIP မူလခေါ်ဆိုမှု"</string>
+</resources>
diff --git a/sip/res/values-nb/strings.xml b/sip/res/values-nb/strings.xml
new file mode 100644
index 0000000..5f8501c
--- /dev/null
+++ b/sip/res/values-nb/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"SIP-innstillinger"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP-kontoer"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Kontoer"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Motta innkommende anrop"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Bruker mer batterilevetid"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"Bruk SIP-oppringing"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Bruk SIP-oppringing (kun for Wi-Fi)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"For alle anrop hvor datanettverk er tilgjengelige"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Kun for SIP-oppringing"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Bruk ved alle anrop"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Legg til konto"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Fjern kontoen"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP-kontoer"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Lagrer kontoen …"</string>
+    <string name="removing_account" msgid="5537351356808985756">"Fjerner kontoen …"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Lagre"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Forkast"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Lukk profilen"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"OK"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Lukk"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Kontrollerer statusen …"</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Registrerer …"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Prøver fortsatt …"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Mottar ikke anrop."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Kontoregistreringen stoppet på grunn av manglende Internett-tilkobling."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Kontoregistreringen stoppet på grunn av manglende Wi-Fi-tilkobling."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Kontoregistreringen mislyktes."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Mottar anrop."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"Kontoregistreringen mislyktes: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>), det gjøres et nytt forsøk"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Kontoregistreringen mislyktes: feil brukernavn eller passord."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Kontoregistreringen mislyktes: sjekk tjenernavnet."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"Denne kontoen er for øyeblikket i bruk av appen <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"Kontoinnstillinger for SIP"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"Kontoinnstillinger for SIP"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Tjener"</string>
+    <string name="username_title" msgid="6770064611005663470">"Brukernavn"</string>
+    <string name="password_title" msgid="5289013731515564295">"Passord"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Visningsnavn"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Adresse for utgående proxy-tjener"</string>
+    <string name="port_title" msgid="6693965912656593862">"Portnummer"</string>
+    <string name="transport_title" msgid="889155457465372527">"Transporttype"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Send hold-aktiv-meldinger"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Valgfrie innstillinger"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Brukernavn for autentisering"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Brukernavn brukes til autentisering"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Ikke angitt&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Samme som brukernavn&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Valgfritt&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Trykk for å vise alle"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Trykk for å skjule alle"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<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="7931422555587011830">"Portnummeret må være mellom 1000 og 65534."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"For å foreta en SIP-oppringing må du først sjekke internettilkoblingen din."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"Du må være koblet til et Wi-Fi-nettverk for å benytte SIP-oppringing (bruk Trådløst og nettverk-innstillingene)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"SIP-oppringing støttes ikke"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Automatisk"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Send alltid"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Innebygd SIP-oppringing"</string>
+</resources>
diff --git a/sip/res/values-ne-rNP/strings.xml b/sip/res/values-ne-rNP/strings.xml
new file mode 100644
index 0000000..7ef1773
--- /dev/null
+++ b/sip/res/values-ne-rNP/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"SIP सेटिङहरू"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP खाताहरू"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"खाताहरू"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"आगमन कलहरू प्राप्त गर्नुहोस्"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"बढि ब्याट्री आयु खपत गर्छ"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"SIP कल प्रयोग गर्नुहोस्"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"SIP कल प्रयोग गर्नुहोस् (Wi-Fi मात्र)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"डेटा नेटवर्क उपलब्ध हुँदा सबै कलहरूको लागि"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"मात्र SIP कलका लागि"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"सबै कलहरूको लागि"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"खाता थप्नुहोस्"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"खाता हटाउनुहोस्"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP खाताहरू"</string>
+    <string name="saving_account" msgid="5336529880235177448">"खाता बचत गर्दै..."</string>
+    <string name="removing_account" msgid="5537351356808985756">"खाता हटाउँदै..."</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"सुरक्षित गर्नुहोस्"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"त्याग्नुहोस्"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"प्रोफाइल बन्द गर्नुहोस्"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"ठीक छ"</string>
+    <string name="close_profile" msgid="3122414058856309881">"बन्द गर्नुहोस्"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"स्थिति जाँच गर्दै..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"दर्ता गर्दै..."</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"प्रयास गरिँदै..."</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"कलहरू प्राप्त भैरहेका छैनन्"</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"खाता दर्ता प्रक्रिया रोकियो किनकि इन्टरनेट जडित छैन।"</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"खाता दर्ता रोकियो किनकि वाइफाइ जडित छैन।"</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"खाता दर्ता गर्न विफल"</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"कलहरू प्राप्त गर्दै।"</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"खाता दर्ता गर्न विफल: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); पछि प्रयास गर्नुहोस्"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"खाता दर्ता प्रक्रिया असफल: गलत प्रयोगकर्ताको नाम वा पासवर्ड।"</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"खाता दर्ता गर्न असफल: सर्भरको नाम जाँच गर्नुहोस्।"</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"<xliff:g id="ACCOUNT_OWNER">%s</xliff:g> अनुप्रयोगद्वारा यो खाता हाल प्रयोगमा छ।"</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"SIP खाता विवरणहरू"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"SIP खाता विवरणहरू"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"सर्भर"</string>
+    <string name="username_title" msgid="6770064611005663470">"प्रयोगकर्ता नाम"</string>
+    <string name="password_title" msgid="5289013731515564295">"पासवर्ड"</string>
+    <string name="display_name_title" msgid="579241787583079773">"नाम प्रदर्शन गर्नुहोस्"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"बाहिरका प्रोक्सी ठेगाना"</string>
+    <string name="port_title" msgid="6693965912656593862">"पोर्ट सङ्ख्या"</string>
+    <string name="transport_title" msgid="889155457465372527">"यातायात प्रकार"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"चालु राख्नको लागि पठाउनुहोस्"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"वैकल्पिक सेटिङहरू"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"प्रमाणीकरण प्रयोगकर्ता नाम"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"प्रमाणीकरणको लागि प्रयोगकर्ता नाम प्रयोग भएको"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;सेट गरिएको छैन&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;प्रयोगकर्ता नाम जस्तै&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;वैकल्पिकgt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ छोएर सबै देखाउनुहोस्"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ छोएर सबै लुकाउनुहोस्"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> चाहिन्छ र खाली छोड्न सकिँदैन।"</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"पोर्ट संख्या १००० र  ६५५३४ को बीचमा हुनुपर्छ।"</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"एक SIP कल गर्नका लागि पहिले तपाईंको इन्टरनेट जडान जाँच गर्नुहोस्।"</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"SIP कलका लागि तपाईँ एउटा Wi-Fi सञ्जालमा जडित हुन पर्छ (ताररहित &amp; सञ्जाल सेटिङ प्रयोग गर्नुहोस्)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"SIP कल गर्न समर्थित छैन"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"स्वचालित"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"सधैँ पठाउनुहोस्"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"अन्तरनिर्मित SIP कल"</string>
+</resources>
diff --git a/sip/res/values-nl/strings.xml b/sip/res/values-nl/strings.xml
new file mode 100644
index 0000000..d440867
--- /dev/null
+++ b/sip/res/values-nl/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"SIP-instelllingen"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP-accounts"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Accounts"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Binnenkomende oproepen ontvangen"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Gebruikt meer acculading"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"SIP-oproepen gebruiken"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"SIP-oproepen gebruiken (alleen wifi)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Voor alle oproepen indien gegevensnetwerk beschikbaar is"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Alleen voor SIP-oproepen"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Voor alle oproepen"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Account toevoegen"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Account verwijderen"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP-accounts"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Het account opslaan…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"Het account verwijderen…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Opslaan"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Verwijderen"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Het profiel sluiten"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"OK"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Sluiten"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Status controleren..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Registreren…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Nog steeds bezig…"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Oproepen worden niet ontvangen."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Accountregistratie gestopt omdat er geen internetverbinding is."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Accountregistratie gestopt omdat er geen wifi-verbinding is."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Accountregistratie mislukt."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Oproepen worden ontvangen."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"Accountregistratie mislukt: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>). We proberen het later opnieuw."</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Accountregistratie mislukt: gebruikersnaam of wachtwoord onjuist."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Accountregistratie mislukt: controleer de servernaam."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"Dit account wordt momenteel gebruikt door de app <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"SIP-accountdetails"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"SIP-accountdetails"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Server"</string>
+    <string name="username_title" msgid="6770064611005663470">"Gebruikersnaam"</string>
+    <string name="password_title" msgid="5289013731515564295">"Wachtwoord"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Weergavenaam"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Adres voor uitgaande proxy"</string>
+    <string name="port_title" msgid="6693965912656593862">"Poortnummer"</string>
+    <string name="transport_title" msgid="889155457465372527">"Transporttype"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Keepalive verzenden"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Optionele instellingen"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Gebruikersnaam voor verificatie"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Gebruikersnaam die voor de verificatie wordt gebruikt"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Niet ingesteld&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Gelijk aan gebruikersnaam&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Optioneel&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Tikken om alles weer te geven"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Tikken om alles te verbergen"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> is verplicht en mag niet leeg worden gelaten."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"Het poortnummer moet tussen 1000 en 65534 liggen."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"Als u een SIP-oproep wilt plaatsen, controleert u eerst uw internetverbinding."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"U moet verbinding hebben met een wifi-netwerk voor SIP-oproepen (gebruik de instellingen bij \'Draadloos en netwerken\')."</string>
+    <string name="no_voip" msgid="3038021971231952704">"SIP-oproepen worden niet ondersteund"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Automatisch"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Altijd verzenden"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Ingebouwde SIP-oproepen"</string>
+</resources>
diff --git a/sip/res/values-pa-rIN/strings.xml b/sip/res/values-pa-rIN/strings.xml
new file mode 100644
index 0000000..1db0e5c
--- /dev/null
+++ b/sip/res/values-pa-rIN/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"SIP ਸੈਟਿੰਗਾਂ"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP ਖਾਤੇ"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"ਖਾਤੇ"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"ਇਨਕਮਿੰਗ ਕਾਲਾਂ ਪ੍ਰਾਪਤ ਕਰੋ"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"ਵੱਧ ਬੈਟਰੀ ਸਮਰੱਥਾ ਵਰਤਦਾ ਹੈ"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"SIP ਕਾਲਿੰਗ ਵਰਤੋ"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"SIP ਕਾਲਿੰਗ ਵਰਤੋ (ਕੇਵਲ Wi-Fi)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"ਜਦੋਂ ਡਾਟਾ ਨੈਟਵਰਕ ਉਪਲਬਧ ਹੋਵੇ ਤਾਂ ਸਾਰੀਆਂ ਕਾਲਾਂ ਲਈ"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"ਕੇਵਲ SIP ਕਾਲਾਂ ਲਈ"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"ਸਾਰੀਆਂ ਕਾਲਾਂ ਲਈ"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"ਖਾਤਾ ਜੋੜੋ"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"ਖਾਤਾ ਹਟਾਓ"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP ਖਾਤੇ"</string>
+    <string name="saving_account" msgid="5336529880235177448">"ਖਾਤਾ ਸੁਰੱਖਿਅਤ ਕਰ ਰਿਹਾ ਹੈ…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"ਖਾਤਾ ਹਟਾ ਰਿਹਾ ਹੈ…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"ਸੁਰੱਖਿਅਤ ਕਰੋ"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"ਬਰਖਾਸਤ ਕਰੋ"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"ਪ੍ਰੋਫਾਈਲ ਬੰਦ ਕਰੋ"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"ਠੀਕ"</string>
+    <string name="close_profile" msgid="3122414058856309881">"ਬੰਦ ਕਰੋ"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"ਸਥਿਤੀ ਦੀ ਜਾਂਚ ਕਰ ਰਿਹਾ ਹੈ..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"ਰਜਿਸਟਰ ਕਰ ਰਿਹਾ ਹੈ…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"ਅਜੇ ਵੀ ਕੋਸ਼ਿਸ਼ ਕਰ ਰਿਹਾ ਹੈ…"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"ਕਾਲਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਰਿਹਾ ਹੈ।"</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"ਖਾਤਾ ਰਜਿਸਟਰੇਸ਼ਨ ਰੁਕ ਗਿਆ ਕਿਉਂਕਿ ਕੋਈ ਇੰਟਰਨੈਟ ਕਨੈਕਸ਼ਨ ਨਹੀਂ ਹੈ।"</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"ਖਾਤਾ ਰਜਿਸਟਰੇਸ਼ਨ ਰੁਕ ਗਿਆ ਕਿਉਂਕਿ ਕੋਈ Wi-Fi ਕਨੈਕਸ਼ਨ ਨਹੀਂ ਹੈ।"</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"ਖਾਤਾ ਰਜਿਸਟਰੇਸ਼ਨ ਅਸਫਲ।"</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"ਕਾਲਾਂ ਪ੍ਰਾਪਤ ਕਰ ਰਿਹਾ ਹੈ।"</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"ਖਾਤਾ ਰਜਿਸਟਰੇਸ਼ਨ ਅਸਫਲ: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); ਬਾਅਦ ਵਿੱਚ ਕੋਸ਼ਿਸ਼ ਕਰੇਗਾ"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"ਖਾਤਾ ਰਜਿਸਟਰੇਸ਼ਨ ਅਸਫਲ: ਗ਼ਲਤ ਉਪਭੋਗਤਾ ਨਾਮ ਜਾਂ ਪਾਸਵਰਡ।"</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"ਖਾਤਾ ਰਜਿਸਟਰੇਸ਼ਨ ਅਸਫਲ: ਸਰਵਰ ਨਾਮ ਦੀ ਜਾਂਚ ਕਰੋ।"</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"ਇਹ ਖਾਤਾ ਇਸ ਵੇਲੇ <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> ਐਪ ਵੱਲੋਂ ਵਰਤੋਂ ਵਿੱਚ ਹੈ।"</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"SIP ਖਾਤਾ ਵੇਰਵੇ"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"SIP ਖਾਤਾ ਵੇਰਵੇ"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"ਸਰਵਰ"</string>
+    <string name="username_title" msgid="6770064611005663470">"ਉਪਭੋਗਤਾ ਨਾਮ"</string>
+    <string name="password_title" msgid="5289013731515564295">"ਪਾਸਵਰਡ"</string>
+    <string name="display_name_title" msgid="579241787583079773">"ਡਿਸਪਲੇ ਨਾਮ"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"ਆਊਟਬਾਊਂਡ ਪ੍ਰੌਕਸੀ ਪਤਾ"</string>
+    <string name="port_title" msgid="6693965912656593862">"ਪੋਰਟ ਨੰਬਰ"</string>
+    <string name="transport_title" msgid="889155457465372527">"ਟ੍ਰਾਂਸਪੋਰਟ ਪ੍ਰਕਾਰ"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"ਕੀਪ-ਅਲਾਈਵ ਭੇਜੋ"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"ਚੋਣ ਸੰਬੰਧੀ ਸੈਟਿੰਗਾਂ"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"ਪ੍ਰਮਾਣੀਕਰਨ ਉਪਭੋਗਤਾ ਨਾਮ"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"ਪ੍ਰਮਾਣੀਕਰਨ ਲਈ ਵਰਤਿਆ ਗਿਆ ਉਪਭੋਗਤਾ ਨਾਮ"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;ਸੈਟ ਨਹੀਂ ਕੀਤਾ&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;ਉਪਭੋਗਤਾ ਨਾਮ ਦੇ ਸਮਾਨ&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;ਚੋਣਵਾਂ&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ ਸਾਰੇ ਦਿਖਾਉਣ ਲਈ ਛੋਹਵੋ"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ ਸਾਰੇ ਲੁਕਾਉਣ ਲਈ ਛੋਹਵੋ"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> ਲੁੜੀਂਦਾ ਹੈ ਅਤੇ ਇਸਨੂੰ ਖਾਲੀ ਨਹੀਂ ਛੱਡਿਆ ਜਾ ਸਕਦਾ।"</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"ਪੋਰਟ ਨੰਬਰ 1000 ਅਤੇ 65534 ਵਿਚਕਾਰ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।"</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"ਇੱਕ SIP ਕਾਲ ਕਰਨ ਲਈ, ਪਹਿਲਾਂ ਆਪਣੇ ਇੰਟਰਨੈਟ ਕਨੈਕਸ਼ਨ ਦੀ ਜਾਂਚ ਕਰੋ।"</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"SIP ਕਾਲਾਂ ਲਈ ਤੁਹਾਨੂੰ ਇੱਕ Wi-Fi ਨੈਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਦੀ ਲੋੜ ਹੋਵੇਗੀ (ਵਾਇਰਲੈਸ &amp; ਨੈਟਵਰਕ ਸੈਟਿੰਗਾਂ ਵਰਤੋ)।"</string>
+    <string name="no_voip" msgid="3038021971231952704">"SIP ਕਾਲਿੰਗ ਸਮਰਥਿਤ ਨਹੀਂ"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"ਆਟੋਮੈਟਿਕ"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"ਹਮੇਸ਼ਾਂ ਭੇਜੋ"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"ਬਿਲਟ-ਇਨ SIP ਕਾਲਿੰਗ"</string>
+</resources>
diff --git a/sip/res/values-pl/strings.xml b/sip/res/values-pl/strings.xml
new file mode 100644
index 0000000..b8b94f7
--- /dev/null
+++ b/sip/res/values-pl/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"Ustawienia SIP"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"Konta SIP"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Konta"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Odbieraj połączenia przychodzące"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Zużywa więcej energii baterii"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"Użyj połączenia SIP"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Użyj połączenia SIP (tylko przez Wi-Fi)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Przy wszystkich połączeniach, gdy sieć transmisji danych jest dostępna"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Tylko do połączeń SIP"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Wszystkie połączenia"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Dodaj konto"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Usuń konto"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"Konta SIP"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Zapisuję konto…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"Usuwam konto…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Zapisz"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Odrzuć"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Zamknij profil"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"OK"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Zamknij"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Sprawdzam stan..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Rejestruję…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Nadal próbuję…"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Połączenia nie są odbierane."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Rejestracja konta została zatrzymana, ponieważ nie masz połączenia internetowego."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Rejestracja konta została zatrzymana, ponieważ nie masz połączenia Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Rejestracja konta nie powiodła się."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Odbieranie połączeń."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"Rejestracja konta nie powiodła się: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>). Spróbujemy ponownie później."</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Rejestracja konta nie powiodła się: nieprawidłowa nazwa użytkownika lub hasło."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Rejestracja konta nie powiodła się: sprawdź nazwę serwera."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"To konto jest obecnie używane przez aplikację <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"Szczegóły konta SIP"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"Szczegóły konta SIP"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Serwer"</string>
+    <string name="username_title" msgid="6770064611005663470">"Nazwa użytkownika"</string>
+    <string name="password_title" msgid="5289013731515564295">"Hasło"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Wyświetlana nazwa"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Proxy połączeń wychodzących"</string>
+    <string name="port_title" msgid="6693965912656593862">"Numer portu"</string>
+    <string name="transport_title" msgid="889155457465372527">"Protokół"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Utrzymuj połączenie"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Ustawienia opcjonalne"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Nazwa do uwierzytelniania"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Nazwa użytkownika używana do uwierzytelniania"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Nie ustawiono&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Taka sama jak nazwa użytkownika&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Opcjonalny&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Dotknij, by wyświetlić wszystkie ustawienia"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Dotknij, by ukryć wszystko"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"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="7931422555587011830">"Numer portu powinien mieć wartość od 1000 do 65 534."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"Aby nawiązać połączenie SIP, najpierw sprawdź połączenie internetowe."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"Połączenia SIP wymagają nawiązania połączenia z siecią Wi-Fi (użyj ustawień sieci zwykłych i bezprzewodowych)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"Połączenia SIP nie są obsługiwane"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Automatycznie"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Zawsze wysyłaj"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Wbudowanie połączenia SIP"</string>
+</resources>
diff --git a/sip/res/values-pt-rPT/strings.xml b/sip/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..6c4fa54
--- /dev/null
+++ b/sip/res/values-pt-rPT/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"Definições SIP"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"Contas SIP"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Contas"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Obter chamadas recebidas"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Utiliza mais bateria"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"Utilizar chamadas SIP"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Utilizar chamadas SIP (apenas Wi-Fi)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Para todas as chamadas quando a rede de dados estiver disponível"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Apenas para chamadas SIP"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Para todas as chamadas"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Adicionar conta"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Remover conta"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"Contas SIP"</string>
+    <string name="saving_account" msgid="5336529880235177448">"A guardar a conta..."</string>
+    <string name="removing_account" msgid="5537351356808985756">"A remover a conta..."</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Guardar"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Rejeitar"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Fechar o perfil"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"OK"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Fechar"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"A verificar estado..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"A registar..."</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Ainda a tentar..."</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Não está a receber chamadas."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"O registo da conta parou porque não existe ligação à Internet."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"O registo da conta parou porque não existe ligação Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"O registo da conta não teve êxito."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"A receber chamadas."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"O registo da conta não teve êxito: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); tentaremos mais tarde"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"O registo da conta não teve êxito: palavra-passe ou nome de utilizador incorreto"</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"O registo da conta não teve êxito: verifique o nome do servidor."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"Esta conta está atualmente a ser utilizada pela aplicação <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"Detalhes da conta SIP"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"Detalhes da conta SIP"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Servidor"</string>
+    <string name="username_title" msgid="6770064611005663470">"Nome de utilizador"</string>
+    <string name="password_title" msgid="5289013731515564295">"Palavra-passe"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Nome a apresentar"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Endereço do proxy de saída"</string>
+    <string name="port_title" msgid="6693965912656593862">"Número da porta"</string>
+    <string name="transport_title" msgid="889155457465372527">"Tipo de transporte"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Enviar mensagem keep-alive"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Definições opcionais"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Nome de utilizador para autenticação"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Nome de utilizador usado para autenticação"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Não definido&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Igual ao nome de utilizador&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Opcional&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Toque para mostrar tudo"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Toque para ocultar tudo"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> é obrigatório e tem de ser preenchido."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"O número da porta deve estar entre 1000 e 65534."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"Para efetuar uma chamada SIP, verifique primeiro a ligação à Internet."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"Precisa de uma ligação a uma rede Wi-Fi para efetuar chamadas SIP (utilize as definições Redes sem fios e outras)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"Chamadas SIP não suportadas"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Automático"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Enviar sempre"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Chamadas SIP incorporadas"</string>
+</resources>
diff --git a/sip/res/values-pt/strings.xml b/sip/res/values-pt/strings.xml
new file mode 100644
index 0000000..fabe5ad
--- /dev/null
+++ b/sip/res/values-pt/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"Configurações SIP"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"Contas SIP"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Contas"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Receber chamadas"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Usa mais bateria"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"Usar chamadas SIP"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Usar chamadas SIP (apenas Wi-Fi)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Para todas as chamadas, quando a rede de dados estiver disponível"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Apenas para chamadas SIP"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Para todas as chamadas"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Adicionar conta"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Remover conta"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"Contas SIP"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Salvando a conta..."</string>
+    <string name="removing_account" msgid="5537351356808985756">"Removendo a conta..."</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Salvar"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Descartar"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Fechar o perfil"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"Ok"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Fechar"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Verificando status..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Registrando..."</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Ainda tentando..."</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Não é possível receber chamadas."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Registro da conta interrompido porque não há conexão à internet."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Registro da conta interrompido porque não há conexão Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Falha no registro da conta."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"É possível receber chamadas."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"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="8406872554323334182">"Falha no registro da conta: nome de usuário ou senha incorretos."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Falha no registro da conta: verifique o nome do servidor."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"No momento, esta conta é usada pelo app <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"Detalhes da conta SIP"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"Detalhes da conta SIP"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Servidor"</string>
+    <string name="username_title" msgid="6770064611005663470">"Nome de usuário"</string>
+    <string name="password_title" msgid="5289013731515564295">"Senha"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Nome de exibição"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Endereço de proxy de saída"</string>
+    <string name="port_title" msgid="6693965912656593862">"Número da porta"</string>
+    <string name="transport_title" msgid="889155457465372527">"Tipo de transporte"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Enviar sinal de atividade"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Configurações opcionais"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Nome de usuário da autenticação"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Nome de usuário utilizado para autenticação"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Não definido&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Igual ao nome de usuário&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Opcional&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Toque para mostrar todas"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Toque para ocultar todas"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> é um campo obrigatório e não pode ser deixado em branco."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"O número da porta deve estar entre 1000 e 65534."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"Para fazer uma chamada SIP, verifique sua conexão com a Internet primeiro."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"Você precisa estar conectado a uma rede Wi-Fi para chamadas SIP (use as configurações sem fio e de rede)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"Chamada SIP não suportada"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Automático"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Sempre enviar"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Chamadas SIP incorporadas"</string>
+</resources>
diff --git a/sip/res/values-ro/strings.xml b/sip/res/values-ro/strings.xml
new file mode 100644
index 0000000..d900fd8
--- /dev/null
+++ b/sip/res/values-ro/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"Setări SIP"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"Conturi SIP"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Conturi"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Primiți apeluri"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Consumă mai multă baterie"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"Folosiți apelarea SIP"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Folosiți apelarea SIP (numai prin Wi-Fi)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Pentru toate apelurile, când reţeaua de date este disponibilă"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Numai pentru apeluri SIP"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Pentru toate apelurile"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Adăugați un cont"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Eliminaţi contul"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"Conturi SIP"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Se salvează contul..."</string>
+    <string name="removing_account" msgid="5537351356808985756">"Se elimină contul..."</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Salvați"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Renunțați"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Închideţi profilul"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"OK"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Închideți"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Se verifică starea..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Se înregistrează..."</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Se încearcă în continuare..."</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Nu se primesc apeluri."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Înregistrarea contului s-a oprit deoarece nu există conexiune la internet."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Înregistrarea contului s-a oprit deoarece nu există conexiune Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Înregistrarea contului nu a reuşit."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Se primesc apeluri."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"Î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="8406872554323334182">"Înregistrarea contului nu a reuşit: nume de utilizator sau parolă incorectă."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Înregistrarea contului nu a reuşit: verificaţi numele serverului."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"Acest cont este utilizat în prezent de aplicația <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"Detalii cont SIP"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"Detalii cont SIP"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Server"</string>
+    <string name="username_title" msgid="6770064611005663470">"Nume de utilizator"</string>
+    <string name="password_title" msgid="5289013731515564295">"Parolă"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Numele afişat"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Adresă proxy de ieşire"</string>
+    <string name="port_title" msgid="6693965912656593862">"Numărul portului"</string>
+    <string name="transport_title" msgid="889155457465372527">"Tip de transport"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Trimiteţi mesaje keep-alive"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Setări opţionale"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Nume de utilizator pentru autentificare"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Numele de utilizator folosit pentru autentificare"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Nesetat&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Identic cu numele de utilizator&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Opţional&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Atingeți pentru a afișa tot"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Atingeți pentru a ascunde tot"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"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="7931422555587011830">"Numărul portului trebuie să fie cuprins între 1000 și 65534."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"Pentru a efectua un apel SIP, mai întâi verificați conexiunea la internet."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"Pentru apeluri SIP trebuie să fiți conectat(ă) la o rețea Wi-Fi (folosiți setările din Wireless și rețea)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"Apelarea SIP nu este acceptată"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Automat"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Se trimite întotdeauna"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Apelare SIP integrată"</string>
+</resources>
diff --git a/sip/res/values-ru/strings.xml b/sip/res/values-ru/strings.xml
new file mode 100644
index 0000000..4a1c7be
--- /dev/null
+++ b/sip/res/values-ru/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"Настройки SIP"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP-аккаунты"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Аккаунты"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Принимать входящие"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Заряд батареи расходуется быстрее"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"Звонок через SIP"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Звонок через SIP (только Wi-Fi)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Для всех вызовов при возможности передачи данных"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Только для звонков через SIP"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Для всех вызовов"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Добавить аккаунт"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Удалить аккаунт"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP-аккаунты"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Сохранение…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"Удаление аккаунта..."</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Сохранить"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Отменить"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Закрытие профиля"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"ОК"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Закрыть"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Проверка состояния..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Регистрация..."</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Подождите..."</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Вызовы не принимаются."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Регистрация аккаунта прервана – отсутствует подключение к Интернету."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Регистрация прервана. Отсутствует подключение к сети Wi-Fi"</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Не удалось зарегистрировать аккаунт."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Вызовы принимаются."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"Не удалось зарегистрировать аккаунт (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>). Новая попытка будет предпринята позже."</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Не удалось зарегистрировать аккаунт. Неверное имя пользователя или пароль."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Не удалось зарегистрировать аккаунт. Неверное имя сервера."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"Аккаунт используется приложением \"<xliff:g id="ACCOUNT_OWNER">%s</xliff:g>\"."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"SIP-аккаунт"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"SIP-аккаунт"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Сервер"</string>
+    <string name="username_title" msgid="6770064611005663470">"Имя пользователя"</string>
+    <string name="password_title" msgid="5289013731515564295">"Пароль"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Отображаемое имя"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Адрес прокси-сервера"</string>
+    <string name="port_title" msgid="6693965912656593862">"Номер порта"</string>
+    <string name="transport_title" msgid="889155457465372527">"Протокол"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Отправлять keep-alive"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Расширенные настройки"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Имя пользователя"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Имя пользователя для аутентификации"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Не задано&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Совпадает с именем пользователя&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Необязательно&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Нажмите, чтобы показать все"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Нажмите, чтобы скрыть все"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"Поле \"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g>\" должно быть заполнено."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"Номер порта должен быть от 1000 до 65534."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"Чтобы сделать звонок через SIP, проверьте подключение к Интернету."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"Чтобы звонить через SIP, требуется подключение к сети Wi-Fi (его можно настроить в разделе \"Беспроводные сети\")."</string>
+    <string name="no_voip" msgid="3038021971231952704">"Звонки через SIP не поддерживаются"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Автоматически"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Отправлять всегда"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Встроенный сервис звонков через SIP"</string>
+</resources>
diff --git a/sip/res/values-si-rLK/strings.xml b/sip/res/values-si-rLK/strings.xml
new file mode 100644
index 0000000..cee3923
--- /dev/null
+++ b/sip/res/values-si-rLK/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"SIP සැකසීම්"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP ගිණුම්"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"ගිණුම්"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"ලේබන ඇමතුම් ලබා ගන්න"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"තව බැටරි ආයු කාලය භාවිතා කරන්න"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"SIP ඇමතුම් භාවිතය"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"SIP ඇමතුම් භාවිතය (Wi-Fi පමණයි)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"දත්ත ජාලය තිබෙන විට සියලුම ඇමතුම් සඳහා"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"SIP ඇමතුම් සඳහා පමණි"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"සියලුම ඇමතුම් සඳහා"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"ගිණුම එක් කරන්න"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"ගිණුම ඉවත් කරන්න"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP ගිණුම්"</string>
+    <string name="saving_account" msgid="5336529880235177448">"ගිණුම සුරකිමින්..."</string>
+    <string name="removing_account" msgid="5537351356808985756">"ගිණුම ඉවත් කරමින්…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"සුරකින්න"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"ඉවතලන්න"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"පැතිකඩ වසන්න"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"හරි"</string>
+    <string name="close_profile" msgid="3122414058856309881">"වසන්න"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"තත්වය පිරික්සමින්..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"ලියාපදිංචි වෙමින්..."</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"තවමත් උත්සාහ කරමින්..."</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"ලැබෙන ඇමතුම් නොවේ."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"අන්තර්ජාල සම්බන්ධතාවක් නොමැතී බැවින් ගිණුම් ලියාපදිංචිය නතර විය."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Wi-Fi සම්බන්ධතාවයක් නොමැති බැවින් ගිණුම් ලියාපදිංචි කිරීම නැවතිණි."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"ගිණුම් ලියාපදිංචිය අසාර්ථකයි."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"ඇමතුම් ලබමින්."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"ගිණුම් ලියාපදිංචිය අසාර්ථක විය: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); පසුව යළි උත්සාහ කරන්නම්"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"ගිණුම ලියාපදිංචි කිරීම අසාර්ථකයි: වැරදි පරිශීලක නාමයක් හෝ මුරපදයකි"</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"ගිණුම් ලියාපදිංචිය අසාර්ථකයි: සේවාදායකයේ නම පරික්ෂා කර බලන්න."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"මෙම ගිණුම දැනට <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> යෙදුම විසින් භාවිතා කරයි."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"SIP ගිණුම් විස්තර"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"SIP ගිණුම් විස්තර"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"සේවාදායකය"</string>
+    <string name="username_title" msgid="6770064611005663470">"පරිශීලක නාමය"</string>
+    <string name="password_title" msgid="5289013731515564295">"මුරපදය"</string>
+    <string name="display_name_title" msgid="579241787583079773">"දර්ශනය කරන නම"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"පිටතට යන ප්‍රොක්සි ලිපිනය"</string>
+    <string name="port_title" msgid="6693965912656593862">"කවුළුවේ අංකය"</string>
+    <string name="transport_title" msgid="889155457465372527">"ගමනාගමන වර්ගය"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"සජීවී-තබාගන්නා යවන්න"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"වෛකල්පිත සැකසුම්"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"සත්‍යාපන පරිශීලක නාමය"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"සත්‍යාපනය සඳහා භාවිතා වන පරිශීලක නාමය"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;පිහිටුවා නැත&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;පරිශීලක නාමය වාගේම&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;වෛකල්පිත&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ සියල්ල පෙන්වීමට ස්පර්ශ කරන්න"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ සියල්ල සැඟවීමට ස්පර්ශ කරන්න"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> අවශ්‍ය වන අතර හිස්ව තැබිය නොහැක."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"කවුළුවේ අංකය 1000 ත් 65534 ත් අතර විය යුතුය."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"SIP ඇමතුමක් ලබාගැනීමට, ඔබගේ අන්තර්ජාල සම්බන්ධතාව මුලින් පරික්ෂා කරන්න."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"SIP ඇමතුම් සඳහා Wi-Fi ජාලයට ඔබට සම්බන්ධ වීමට අවශ්‍යය වේ (රැහැන් රහිත සහ ජාල සැකසීම්)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"SIP ඇමතීම් වලට සහාය දක්වන්නේ නැත"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"ස්වයංක්‍රිය"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"සැමවිටම යවන්න"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"තැනූ SIP ඇමතුම්"</string>
+</resources>
diff --git a/sip/res/values-sk/strings.xml b/sip/res/values-sk/strings.xml
new file mode 100644
index 0000000..f55227d
--- /dev/null
+++ b/sip/res/values-sk/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"Nastavenia SIP"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"Účty SIP"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Účty"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Prijímať prichádzajúce hovory"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Má väčšiu spotrebu batérie"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"Používanie hovorov SIP"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Používanie hovorov SIP (iba sieť Wi-Fi)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Pre všetky hovory, pokiaľ je k dispozícii dátová sieť"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Iba pre hovory SIP"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Pre všetky hovory"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Pridať účet"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Odstrániť účet"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"Účty SIP"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Prebieha ukladanie účtu..."</string>
+    <string name="removing_account" msgid="5537351356808985756">"Prebieha odstraňovanie účtu..."</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Uložiť"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Zrušiť"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Zavrieť profil"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"OK"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Zavrieť"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Prebieha kontrola stavu..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Prebieha registrácia..."</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Prebiehajú ďalšie pokusy..."</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Hovory sa neprijímajú."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Registrácia účtu bola zastavená, pretože pripojenie k internetu nie je k dispozícii."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Registrácia účtu bola zastavená, pretože pripojenie Wi-Fi nie je k dispozícii."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Registrácia účtu nebola úspešná."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Príjem hovorov."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"Registrácia účtu nebola úspešná: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); skúsime to neskôr"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Registrácia účtu nebola úspešná: nesprávne používateľské meno alebo heslo."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Registrácia účtu nebola úspešná: skontrolujte názov servera."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"Tento účet momentálne používa aplikácia používateľa <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"Podrobnosti o účtu SIP"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"Podrobnosti o účtu SIP"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Server"</string>
+    <string name="username_title" msgid="6770064611005663470">"Meno používateľa"</string>
+    <string name="password_title" msgid="5289013731515564295">"Heslo"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Zobrazované meno"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Adresa výstupného servera proxy"</string>
+    <string name="port_title" msgid="6693965912656593862">"Číslo portu"</string>
+    <string name="transport_title" msgid="889155457465372527">"Typ prenosu"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Odosielať správy na zachovanie pripojenia"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Voliteľné nastavenia"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Používateľské meno na overenie"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Používateľské meno použité na overenie"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Nenastavené&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Rovnaké ako používateľské meno&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Voliteľné&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Klepnutím všetko zobrazíte"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Klepnutím všetko skryjete"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"Pole <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> je povinné a nemôže zostať prázdne."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"Číslo portu by malo byť od 1 000 do 65 534."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"Ak chcete uskutočniť hovor SIP, najprv skontrolujte svoje internetové pripojenie."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"Uskutočnenie hovorov SIP vyžaduje pripojenie k sieti Wi-Fi (použite nastavenia bezdrôtovej siete)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"Volanie SIP nie je podporované"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Automaticky"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Vždy odoslať"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Vstavané hovory SIP"</string>
+</resources>
diff --git a/sip/res/values-sl/strings.xml b/sip/res/values-sl/strings.xml
new file mode 100644
index 0000000..1768705
--- /dev/null
+++ b/sip/res/values-sl/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"Nastavitve SIP"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"Računi SIP"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Računi"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Sprejmi dohodne klice"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Poraba akumulatorja je večja"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"Uporaba klicanja SIP"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Uporaba klicanja SIP (samo v omrežju Wi-Fi)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Za vse klice, ko podatkovno omrežje ni na voljo"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Samo za klice SIP"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Za vse klice"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Dodajanje računa"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Odstrani račun"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"Računi SIP"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Shranjevanje računa ..."</string>
+    <string name="removing_account" msgid="5537351356808985756">"Odstranjevanje računa ..."</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Shrani"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Zavrzi"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Zapiranje profila"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"V redu"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Zapri"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Preverjanje stanja ..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Registriranje ..."</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Še vedno poskušamo ..."</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Ne sprejema klicev."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Registracija računa je bila prekinjena, ker ni internetne povezave."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Registracija računa je bila prekinjena, ker ni povezave Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Registracija računa ni uspela."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Sprejemanje klicev."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"Registracija računa ni uspela: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>). Pozneje sledi vnovičen poskus."</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Registracija računa ni uspela: napačno uporabniško ime ali geslo."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Registracija računa ni uspela: preverite ime strežnika."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"Ta račun trenutno uporablja aplikacija <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"Podrobnosti o računu SIP"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"Podrobnosti o računu SIP"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Strežnik"</string>
+    <string name="username_title" msgid="6770064611005663470">"Uporabniško ime"</string>
+    <string name="password_title" msgid="5289013731515564295">"Geslo"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Prikazno ime"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Naslov strežnika proxy za odhodne klice"</string>
+    <string name="port_title" msgid="6693965912656593862">"Številka vrat"</string>
+    <string name="transport_title" msgid="889155457465372527">"Vrsta prevoza"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Pošlji ohranjanje povezave"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Izbirne nastavitve"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Uporabniško ime za preverjanje pristnosti"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Uporabniško ime za preverjanje pristnosti"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Ni nastavljeno&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Enako kot uporabniško ime&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Izbirno&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Dotaknite se, da prikažete vse"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Dotaknite se, če želite skriti vse"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"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="7931422555587011830">"Številka vrat mora biti med 1000 in 65534."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"Če želite opraviti klic SIP, najprej preverite internetno povezavo."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"Za klice SIP morate biti povezani v omrežje Wi-Fi (uporabite nastavitve »Brezžično in omrežja«)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"Klicanje SIP ni podprto"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Samodejno"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Vedno pošlji"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Vgrajeno klicanje SIP"</string>
+</resources>
diff --git a/sip/res/values-sq-rAL/strings.xml b/sip/res/values-sq-rAL/strings.xml
new file mode 100644
index 0000000..f64c270
--- /dev/null
+++ b/sip/res/values-sq-rAL/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"Cilësimet SIP"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"Llogaritë SIP"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Llogaritë"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Merr telefonata hyrëse"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Pakëson jetëgjatësinë e baterisë"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"Përdor \"telefonatat SIP\""</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Përdor \"telefonatat SIP\" (vetëm Wi-Fi)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Për të gjitha telefonat kur rrjeti i të dhënave mund të përdoret"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Vetëm për telefonatat SIP"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Për të gjitha telefonatat"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Shto llogari"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Hiq llogarinë"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"Llogaritë SIP"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Po ruan llogarinë…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"Po heq llogarinë…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Ruaj"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Hidh poshtë"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Mbyll profilin"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"Në rregull!"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Mbyll"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Po kontrollon statusin..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Po regjistron..."</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Vazhdon të riprovojë…"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Nuk merr telefonata."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Regjistrimi i llogarisë ndaloi sepse nuk ka lidhje interneti."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Regjistrimi i llogarisë ndaloi sepse nuk ka lidhje Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Regjistrimi i llogarisë ishte i pasuksesshëm."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Pranimi i telefonatave."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"Regjistrimi i llogarisë ishte i pasuksesshëm: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); do të provohet sërish"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Regjistrimi i llogarisë ishte i pasuksesshëm: emri i përdoruesit ose fjalëkalimi ishte i pasaktë."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Regjistrimi i llogarisë ishte i pasuksesshëm. Kontrollo emrin e serverit."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"Kjo llogari është aktualisht në përdorim nga aplikacioni <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"Detajet e llogarisë SIP"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"Detajet e llogarisë SIP"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Serveri"</string>
+    <string name="username_title" msgid="6770064611005663470">"Emri i përdoruesit"</string>
+    <string name="password_title" msgid="5289013731515564295">"Fjalëkalimi"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Shfaq emrin"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Adresa e përfaqësuesit dalës"</string>
+    <string name="port_title" msgid="6693965912656593862">"Numri i portës"</string>
+    <string name="transport_title" msgid="889155457465372527">"Lloji i transportit"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Dërgo preferencën e kontrollit të operimit"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Cilësimet opsionale"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Emri i përdoruesit për vërtetim"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Emri i përdoruesit i përdorur për vërtetim"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;I pavendosur&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Njësoj si emri i përdoruesit&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Jo e detyrueshme&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Prek për t\'i shfaqur të gjitha"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Prek për t\'i fshehur të gjitha"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> është e detyrueshme dhe nuk mund të lihet bosh."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"Numri i portës duhet të jetë brenda 1 000 dhe 65 534."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"Për të kryer një telefonatë SIP, kontrollo lidhjen e internetit së pari."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"Duhet të jesh i lidhur me rrjetin Wi-Fi për telefonata SIP (përdor \"Me valë dhe cilësimet e rrjetit\")."</string>
+    <string name="no_voip" msgid="3038021971231952704">"\"Telefonata SIP\" nuk mbështetet"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Automatik"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Dërgo gjithmonë"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Telefonata SIP e integruar"</string>
+</resources>
diff --git a/sip/res/values-sr/strings.xml b/sip/res/values-sr/strings.xml
new file mode 100644
index 0000000..18ae28f
--- /dev/null
+++ b/sip/res/values-sr/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"Подешавања SIP-а"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP налози"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Налози"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Примај долазне позиве"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Више троши батерију"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"Користите SIP позиве"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Користите SIP позиве (само за Wi-Fi)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"За све позиве када је мрежа за пренос података доступна"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Само за SIP позиве"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"За све позиве"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Додај налог"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Уклони налог"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP налози"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Чување налога..."</string>
+    <string name="removing_account" msgid="5537351356808985756">"Уклањање налога..."</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Сачувај"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Одбаци"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Затворите профил"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"Потврди"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Затвори"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Провера статуса..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Регистровање..."</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"И даље покушава..."</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Не примамо позиве."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Регистрација налога је заустављена зато што не постоји интернет веза."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Регистрација налога је заустављена зато што не постоји Wi-Fi веза."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Регистрација налога није успела."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Примамо позиве."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"Регистрација налога није успела: <xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>; покушаћемо касније"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Регистрација налога није успела: нетачно корисничко име или лозинка."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Регистрација налога није успела: Проверите назив сервера."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"Овај налог тренутно користи апликација <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"Детаљи о SIP налогу"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"Детаљи о SIP налогу"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Сервер"</string>
+    <string name="username_title" msgid="6770064611005663470">"Корисничко име"</string>
+    <string name="password_title" msgid="5289013731515564295">"Лозинка"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Име за приказ"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Одлазна адреса проксија"</string>
+    <string name="port_title" msgid="6693965912656593862">"Број порта"</string>
+    <string name="transport_title" msgid="889155457465372527">"Тип преноса"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Пошаљи keep-alive поруку"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Опционална подешавања"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Корисничко име за потврду идентитета"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"За потврду идентитета користи се корисничко име"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Није подешено&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Исто као корисничко име&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Опционално&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Додирните да бисте приказали све"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Додирните да бисте сакрили све"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"Поље <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> је обавезно и не може да буде празно."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"Број порта би требало да буде између 1000 и 65.534."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"Да бисте упутили SIP позив, прво проверите интернет везу."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"Треба да будете повезани са Wi-Fi мрежом да бисте упућивали SIP позиве (користите Подешавања бежичних веза и мрежа)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"SIP позивање није подржано"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Аутоматски"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Увек шаљи"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Уграђена функција SIP позива"</string>
+</resources>
diff --git a/sip/res/values-sv/strings.xml b/sip/res/values-sv/strings.xml
new file mode 100644
index 0000000..685efd2
--- /dev/null
+++ b/sip/res/values-sv/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"SIP-inställningar"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP-konton"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Konton"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Ta emot inkommande samtal"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Drar mer batteri"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"Använd SIP-samtal"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Använd SIP-samtal (endast Wi-FI)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"För alla samtal när datanätverk är tillgängligt"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Endast för SIP-samtal"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"För alla samtal"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Lägg till ett konto"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Ta bort konto"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP-konton"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Kontot sparas ..."</string>
+    <string name="removing_account" msgid="5537351356808985756">"Kontot tas bort ..."</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Spara"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Ignorera"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Stäng profilen"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"OK"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Stäng"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Kontrollerar status ..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Registrerar ..."</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Försöker fortfarande ..."</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Tar inte emot samtal."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Kontoregistreringen avbröts eftersom det inte finns någon internetanslutning."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Kontoregistreringen avbröts eftersom det inte finns någon Wi-Fi-anslutning."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Det gick inte att registrera kontot."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Tar emot samtal."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"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="8406872554323334182">"Det gick inte att registrera kontot: felaktigt användarnamn eller lösenord."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Det gick inte att registrera kontot. Kontrollera servernamnet."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"Kontot används för närvarande i appen <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"Information om SIP-kontot"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"Information om SIP-kontot"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Server"</string>
+    <string name="username_title" msgid="6770064611005663470">"Användarnamn"</string>
+    <string name="password_title" msgid="5289013731515564295">"Lösenord"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Visningsnamn"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Utgående proxyadress"</string>
+    <string name="port_title" msgid="6693965912656593862">"Portnummer"</string>
+    <string name="transport_title" msgid="889155457465372527">"Transporttyp"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Skicka \"behåll aktiv\""</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Valfria inställningar"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Användarnamn vid autentisering"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Användarnamn som används vid autentisering"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Har inte angetts&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Samma som användarnamn&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Valfritt&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Tryck om du vill visa alla"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Tryck om du vill dölja alla"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<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="7931422555587011830">"Portnumret ska vara mellan 1000 och 65534."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"Om du vill ringa ett SIP-samtal kontrollerar du först att du är ansluten till internet."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"Du måste vara ansluten till Wi-Fi för att kunna ringa SIP-samtal (du ändrar detta i inställningarna för Trådlöst och nätverk)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"SIP-samtal stöds inte"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Automatiskt"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Skicka alltid"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Inbyggd tjänst för SIP-samtal"</string>
+</resources>
diff --git a/sip/res/values-sw/strings.xml b/sip/res/values-sw/strings.xml
new file mode 100644
index 0000000..714b7b2
--- /dev/null
+++ b/sip/res/values-sw/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"Mipangilio ya SIP"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"Akaunti za SIP"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Akaunti"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Pokea simu zinazoingia"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Hutumia betri zaidi"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"Tumia upigaji simu wa SIP"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Tumia upigaji simu wa SIP (Wi-Fi pekee)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Kwa simu zote wakati mtandao wa data unapatikana"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Kwa simu za SIP pekee"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Kwa simu zote"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Ongeza akaunti"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Ondoa akaunti"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"Akaunti za SIP"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Inahifadhi akaunti..."</string>
+    <string name="removing_account" msgid="5537351356808985756">"Inaondoa akaunti..."</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Hifadhi"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Tupa"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Funga wasifu"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"Sawa"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Funga"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Inakagua hali..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Inasajili..."</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Bado inajaribu..."</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Haipokei simu."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Usajili wa akaunti umekomeshwa kwa sababu hakuna muunganisho wa Intaneti."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Usajili wa akaunti umekomeshwa kwa sababu hakuna muunganisho wa Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Usajili wa akaunti haujafaulu."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Inapokea simu."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"Usajili wa akaunti hujafaulu: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); itajaribu baadaye"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Usajili wa akaunti hujafaulu: Jina la mtumiaji au nenosiri sio sahihi."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Usajili wa akaunti haujafaulu: Kagua jina la seva."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"Akaunti hii inatumika kwa sasa na programu ya <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"Maelezo ya akaunti ya SIP"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"Maelezo ya akaunti ya SIP"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Seva"</string>
+    <string name="username_title" msgid="6770064611005663470">"Mtumiaji"</string>
+    <string name="password_title" msgid="5289013731515564295">"Nenosiri"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Jina la kuonyesha"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Anwani ya seva mbadala ya kutoka"</string>
+    <string name="port_title" msgid="6693965912656593862">"Nambari ya mlango"</string>
+    <string name="transport_title" msgid="889155457465372527">"Aina ya usafiri"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Tuma weka-hai"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Mipangilio ya hiari"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Jina la mtumiaji la uthibitishaji"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Jina la mtumiaji hutumika kwa uthibitishaji"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Haijawekwa&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Sawa na jina la mtumiaji&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&amp;lt Ni hiari &gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Gusa ili uonyeshe yote"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Gusa ili ufiche zote"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> sharti ijazwe na haiwezi kuachwa wazi."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"Nambari ya mlango inafaa kuwa kati ya 1000 na 65534."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"Ili upige simu ya SIP, kwanza kagua muunganisho wako wa Intaneti."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"Inabidi uwe umeunganishwa kwenye mtandao wa Wi-Fi ili upige simu za SIP (tumia mipangilio ya Bila Kutumia Waya na Mtandao)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"Upigaji simu ya SIP hauwezi kutumika."</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Otomatiki"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Tuma kila wakati"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Upigaji simu wa SIP uliojengewa ndani ya kifaa"</string>
+</resources>
diff --git a/sip/res/values-ta-rIN/strings.xml b/sip/res/values-ta-rIN/strings.xml
new file mode 100644
index 0000000..c4c2982
--- /dev/null
+++ b/sip/res/values-ta-rIN/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"SIP அமைப்புகள்"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP கணக்குகள்"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"கணக்குகள்"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"உள்வரும் அழைப்புகளைப் பெறு"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"பேட்டரியை அதிகமாகப் பயன்படுத்தும்"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"SIP அழைப்பைப் பயன்படுத்து"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"SIP அழைப்பைப் பயன்படுத்து (வைஃபை மட்டும்)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"தரவு நெட்வொர்க் கிடைக்கும்போது எல்லா அழைப்புகளுக்கும்"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"SIP அழைப்புகளுக்கு மட்டும்"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"எல்லா அழைப்புகளுக்கும்"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"கணக்கைச் சேர்"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"கணக்கை அகற்று"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP கணக்குகள்"</string>
+    <string name="saving_account" msgid="5336529880235177448">"கணக்கைச் சேமிக்கிறது…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"கணக்கை அகற்றுகிறது…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"சேமி"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"நிராகரி"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"சுயவிவரத்தை மூடு"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"சரி"</string>
+    <string name="close_profile" msgid="3122414058856309881">"மூடு"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"நிலையைச் சரிபார்க்கிறது..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"பதிவுசெய்கிறது…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"இன்னும் முயற்சிக்கிறது…"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"அழைப்புகளைப் பெறவில்லை."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"இணைய இணைப்பு இல்லாததால், கணக்குப் பதிவு நிறுத்தப்பட்டது."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Wi-Fi இணைப்பு இல்லாததால், கணக்குப் பதிவு நிறுத்தப்பட்டது."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"கணக்குப் பதிவு தோல்வி."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"அழைப்புகளைப் பெறுதல்."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"கணக்குப் பதிவு தோல்வி: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); பிறகு முயலவும்"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"கணக்குப் பதிவு தோல்வி: பயனர்பெயர் அல்லது கடவுச்சொல் தவறானது."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"கணக்குப் பதிவு தோல்வி: சேவையகப் பெயரைச் சரிபார்க்கவும்."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"தற்போது <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> பயன்பாட்டினால் கணக்குப் பயன்படுத்தப்படுகிறது."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"SIP கணக்கு விவரங்கள்"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"SIP கணக்கு விவரங்கள்"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"சேவையகம்"</string>
+    <string name="username_title" msgid="6770064611005663470">"பயனர்பெயர்"</string>
+    <string name="password_title" msgid="5289013731515564295">"கடவுச்சொல்"</string>
+    <string name="display_name_title" msgid="579241787583079773">"காட்சிப் பெயர்"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"வெளிப்புற ப்ராக்ஸி முகவரி"</string>
+    <string name="port_title" msgid="6693965912656593862">"போர்ட் எண்"</string>
+    <string name="transport_title" msgid="889155457465372527">"பரிமாற்ற வகை"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"எப்போதும் விழிப்புடன் அனுப்பு"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"விருப்ப அமைப்பு"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"அங்கீகாரப் பயனர்பெயர்"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"அங்கீகரிப்பிற்குப் பயனர்பெயர் பயன்படுத்தப்பட்டது"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;அமைக்கப்படவில்லை&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;பயனர்பெயர் போன்றது&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;விரும்பினால்&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ எல்லாவற்றையும் காட்ட தொடவும்"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ எல்லாவற்றையும் மறைக்கத் தொடவும்"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> அவசியமானது மற்றும் வெறுமையாக விடக்கூடாது."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"போர்ட் எண் 1000 இலிருந்து 65534 க்குள் இருக்க வேண்டும்."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"SIP மூலம் அழைக்க, முதலில் இணைய இணைப்பைச் சரிபார்க்கவும்."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"SIP அழைப்புகளைச் செய்ய, வைஃபை நெட்வொர்க்குடன் இணைக்கப்பட்டிருக்க வேண்டும் (வயர்லெஸ் &amp; நெட்வொர்க் அமைப்புகளைப் பயன்படுத்தவும்)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"SIP அழைப்பு ஆதரிக்கப்படாது"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"தானியங்கு"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"எப்போதும் அனுப்பு"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"உள்கட்டமைக்கப்பட்ட SIP அழைப்பு"</string>
+</resources>
diff --git a/sip/res/values-te-rIN/strings.xml b/sip/res/values-te-rIN/strings.xml
new file mode 100644
index 0000000..713f42b
--- /dev/null
+++ b/sip/res/values-te-rIN/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"SIP సెట్టింగ్‌లు"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP ఖాతాలు"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"ఖాతాలు"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"ఇన్‌కమింగ్ కాల్‌లను స్వీకరించు"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"ఎక్కువ బ్యాటరీ జీవితకాలాన్ని ఉపయోగిస్తుంది"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"SIP కాలింగ్‌ను ఉపయోగించండి"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"SIP కాలింగ్‌ను (Wi-Fi మాత్రమే) ఉపయోగించండి"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"డేటా నెట్‌వర్క్ అందుబాటులో ఉన్నప్పుడు అన్ని కాల్‌ల కోసం"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"SIP కాల్‌ల కోసం మాత్రమే"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"అన్ని కాల్‌ల కోసం"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"ఖాతాను జోడించు"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"ఖాతాను తీసివేయి"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP ఖాతాలు"</string>
+    <string name="saving_account" msgid="5336529880235177448">"ఖాతాను సేవ్ చేస్తోంది…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"ఖాతాను తీసివేస్తోంది…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"సేవ్ చేయి"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"విస్మరించు"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"ప్రొఫైల్‌ను మూసివేయండి"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"సరే"</string>
+    <string name="close_profile" msgid="3122414058856309881">"మూసివేయి"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"స్థితిని తనిఖీ చేస్తోంది..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"నమోదు చేస్తోంది…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"ఇప్పటికీ ప్రయత్నిస్తోంది..."</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"కాల్‌లను స్వీకరించడం లేదు."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"ఇంటర్నెట్ కనెక్షన్ లేని కారణంగా ఖాతా నమోదు ఆపివేయబడింది."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Wi-Fi కనెక్షన్ లేని కారణంగా ఖాతా నమోదు ఆపివేయబడింది."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"ఖాతా నమోదు విఫలమైంది."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"కాల్‌లను స్వీకరిస్తోంది."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"ఖాతా నమోదు విఫలమైంది: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); తర్వాత ప్రయత్నిస్తుంది"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"ఖాతా నమోదు విఫలమైంది: చెల్లని వినియోగదారు పేరు లేదా పాస్‌వర్డ్."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"ఖాతా నమోదు విఫలమైంది: సర్వర్ పేరు తనిఖీ చేయండి."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"ఈ ఖాతా ప్రస్తుతం <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> అనువర్తనం ద్వారా ఉపయోగంలో ఉంది."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"SIP ఖాతా వివరాలు"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"SIP ఖాతా వివరాలు"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"సర్వర్"</string>
+    <string name="username_title" msgid="6770064611005663470">"వినియోగదారు పేరు"</string>
+    <string name="password_title" msgid="5289013731515564295">"పాస్‌వర్డ్"</string>
+    <string name="display_name_title" msgid="579241787583079773">"ప్రదర్శన పేరు"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"అవుట్‌బౌండ్ ప్రాక్సీ చిరునామా"</string>
+    <string name="port_title" msgid="6693965912656593862">"పోర్ట్ సంఖ్య"</string>
+    <string name="transport_title" msgid="889155457465372527">"రవాణా రకం"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"సక్రియంగా ఉంచే సందేశం పంపండి"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"ఐచ్ఛిక సెట్టింగ్‌లు"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"ప్రామాణీకరణ వినియోగదారు పేరు"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"ప్రామాణీకరణ కోసం వినియోగదారు పేరు ఉపయోగించబడింది"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;సెట్ చేయలేదు&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;వినియోగదారు పేరు మాదిరే&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;ఐచ్ఛికం&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ అన్నీ చూపడానికి తాకండి"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ అన్నీ దాచడానికి తాకండి"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> అవసరం కావున ఖాళీగా వదిలిపెట్టకూడదు."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"పోర్ట్ సంఖ్య 1000 మరియు 65534 మధ్య ఉండాలి."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"SIP కాల్ చేయడానికి, ముందుగా మీ ఇంటర్నెట్ కనెక్షన్‌ను తనిఖీ చేయండి."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"మీరు SIP కాల్‌లు చేయడం కోసం Wi-Fi నెట్‌వర్క్‌కు కనెక్ట్ అవ్వడం అవసరం (వైర్‌లెస్ &amp; నెట్‌వర్క్ సెట్టింగ్‌లను ఉపయోగించండి)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"SIP కాలింగ్‌కి మద్దతు లేదు"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"స్వయంచాలకం"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"ఎల్లప్పుడూ పంపు"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"అంతర్నిర్మిత SIP కాలింగ్"</string>
+</resources>
diff --git a/sip/res/values-th/strings.xml b/sip/res/values-th/strings.xml
new file mode 100644
index 0000000..c3e4e89
--- /dev/null
+++ b/sip/res/values-th/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"การตั้งค่า SIP"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"บัญชี SIP"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"บัญชี"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"รับสายเรียกเข้า"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"ใช้อายุการใช้งานแบตเตอรี่มากขึ้น"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"ใช้การโทรผ่าน SIP"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"ใช้การโทรผ่าน SIP (Wi-Fi เท่านั้น)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"สำหรับทุกสายเมื่อเครือข่ายข้อมูลใช้งานได้"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"สำหรับการโทรผ่าน SIP เท่านั้น"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"สำหรับการโทรออกทั้งหมด"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"เพิ่มบัญชี"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"นำบัญชีออก"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"บัญชี SIP"</string>
+    <string name="saving_account" msgid="5336529880235177448">"กำลังบันทึกบัญชี…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"กำลังนำบัญชีออก…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"บันทึก"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"ยกเลิก"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"ปิดโปรไฟล์"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"ตกลง"</string>
+    <string name="close_profile" msgid="3122414058856309881">"ปิด"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"กำลังตรวจสอบสถานะ..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"กำลังลงทะเบียน…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"กำลังพยายาม…"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"ไม่รับสาย"</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"การลงทะเบียนบัญชีหยุดทำงานเนื่องจากไม่มีการเชื่อมต่ออินเทอร์เน็ต"</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"การลงทะเบียนบัญชีหยุดทำงานเนื่องจากไม่มีการเชื่อมต่อ Wi-Fi"</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"การลงทะเบียนบัญชีไม่สำเร็จ"</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"รับสาย"</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"การลงทะเบียนบัญชีไม่สำเร็จ: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>) จะลองอีกครั้งในภายหลัง"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"การลงทะเบียนบัญชีไม่สำเร็จ: ชื่อผู้ใช้หรือรหัสผ่านไม่ถูกต้อง"</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"การลงทะเบียนบัญชีไม่สำเร็จ: ตรวจสอบชื่อเซิร์ฟเวอร์"</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"แอป <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> กำลังใช้บัญชีนี้อยู่ในขณะนี้"</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"รายละเอียดบัญชี SIP"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"รายละเอียดบัญชี SIP"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"เซิร์ฟเวอร์"</string>
+    <string name="username_title" msgid="6770064611005663470">"ชื่อผู้ใช้"</string>
+    <string name="password_title" msgid="5289013731515564295">"รหัสผ่าน"</string>
+    <string name="display_name_title" msgid="579241787583079773">"ชื่อที่แสดง"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"ที่อยู่พร็อกซีขาออก"</string>
+    <string name="port_title" msgid="6693965912656593862">"หมายเลขพอร์ต"</string>
+    <string name="transport_title" msgid="889155457465372527">"ประเภทการส่งผ่านข้อมูล"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"ส่งแบบ keep-alive"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"การตั้งค่าที่ไม่บังคับ"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"ชื่อผู้ใช้สำหรับตรวจสอบสิทธิ์"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"ชื่อผู้ใช้ที่ใช้ในการตรวจสอบสิทธิ์"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;ไม่ได้ตั้งค่า&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;เหมือนกับชื่อผู้ใช้&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;ไม่บังคับ&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ แตะเพื่อแสดงทั้งหมด"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ แตะเพื่อซ่อนทั้งหมด"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"ต้องระบุ <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> และไม่สามารถปล่อยว่างได้"</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"หมายเลขพอร์ตควรอยู่ระหว่าง 1000 ถึง 65534"</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"หากต้องการโทรผ่าน SIP ให้ตรวจสอบการเชื่อมต่ออินเทอร์เน็ตก่อน"</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"คุณต้องเชื่อมต่อเครือข่าย Wi-Fi เพื่อโทรผ่าน SIP (ใช้การตั้งค่าระบบไร้สายและเครือข่าย)"</string>
+    <string name="no_voip" msgid="3038021971231952704">"ไม่สนับสนุนการโทรผ่าน SIP"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"อัตโนมัติ"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"ส่งเสมอ"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"การโทรผ่าน SIP ในตัว"</string>
+</resources>
diff --git a/sip/res/values-tl/strings.xml b/sip/res/values-tl/strings.xml
new file mode 100644
index 0000000..bcc2ae5
--- /dev/null
+++ b/sip/res/values-tl/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"Mga setting ng SIP"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"Mga SIP account"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Mga Account"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Tumanggap ng mga papasok na tawag"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Gumagamit ng higit na tagal ng baterya"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"Gamitin ang pagtawag sa pamamagitan ng SIP"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Gamitin ang pagtawag sa pamamagitan ng SIP (Wi-Fi lang)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Para sa lahat ng mga tawag kapag available ang data network"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Para lang sa mga tawag sa pamamagitan ng SIP"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Para sa lahat ng tawag"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Magdagdag ng account"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Alisin ang account"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"Mga SIP account"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Sine-save ang account..."</string>
+    <string name="removing_account" msgid="5537351356808985756">"Inaalis ang account..."</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"I-save"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"I-discard"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Isara ang profile"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"Ayos"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Isara"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Tinitingnan ang status..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Inirerehistro..."</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Sinusubukan pa rin..."</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Hindi tumatanggap ng mga tawag."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Nahinto ang pagpaparehistro ng account dahil walang koneksyon sa Internet."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Nahinto ang pagpaparehistro ng account dahil walang koneksyon sa Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Hindi matagumpay ang pagpaparehistro ng account."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Tumatanggap ng mga tawag."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"Hindi matagumpay 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="8406872554323334182">"Hindi matagumpay ang pagpaparehistro ng account: Maling username o password."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Nabigo ang pagpaparehistro ng account: Tingnan ang pangalan ng server."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"Kasalukuyang ginagamit ang account na ito ng app ng <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"Mga detalye ng SIP account"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"Mga detalye ng SIP account"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Server"</string>
+    <string name="username_title" msgid="6770064611005663470">"Username"</string>
+    <string name="password_title" msgid="5289013731515564295">"Password"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Display name"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Address ng papalabas na proxy"</string>
+    <string name="port_title" msgid="6693965912656593862">"Numero ng port"</string>
+    <string name="transport_title" msgid="889155457465372527">"Uri ng paglilipat"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Magpadala ng keep-alive"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Mga opsyonal na setting"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Username sa pagpapatotoo"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Ginamit ang username para sa pagpapatotoo"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Hindi nakatakda&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Katulad ng username&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Opsyonal&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Pindutin upang ipakita lahat"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Pindutin upang itago ang lahat"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"Kinakailangan ang <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> at hindi maaaring iwanang blangko."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"Dapat na nasa pagitan ng 1000 at 65534 ang numero ng port."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"Upang tumawag sa pamamagitan ng SIP, suriin muna ang iyong koneksyon sa Internet."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"Kailangang nakakonekta ka sa isang Wi-Fi network para sa mga tawag sa pamamagitan ng SIP (gamitin ang mga setting ng Wireless at Network)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"Hindi sinusuportahan ang pagtawag sa pamamagitan ng SIP"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Awtomatiko"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Palaging ipadala"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Built-in na pagtawag sa pamamagitan ng SIP"</string>
+</resources>
diff --git a/sip/res/values-tr/strings.xml b/sip/res/values-tr/strings.xml
new file mode 100644
index 0000000..dad7ab6
--- /dev/null
+++ b/sip/res/values-tr/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"SIP ayarları"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP hesapları"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Hesaplar"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Gelen çağrıları al"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Daha fazla pil kullanır"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"SIP aramayı kullan"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"SIP aramayı kullan (sadece Kablosuz)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Veri ağı uygun durumdayken yapılan tüm çağrılar için"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Sadece SIP çağrıları için"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Tüm çağrılar için"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Hesap ekle"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Hesabı kaldır"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP hesapları"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Hesap kaydediliyor…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"Hesap kaldırılıyor…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Kaydet"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Kapat"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Profili kapat"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"Tamam"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Kapat"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Durum denetleniyor..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Kayıt olunuyor…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Denemeye devam ediliyor…"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Çağrıları almıyor."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"İnternet bağlantısı olmadığı için hesap kaydı durduruldu."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Kablosuz bağlantı olmadığı için hesap kaydı durduruldu."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Hesap kaydı başarısız oldu."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Çağrıları alıyor."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"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="8406872554323334182">"Hesap kaydı başarısız oldu: Yanlış kullanıcı adı veya şifre."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Hesap kaydı başarısız oldu: Sunucu adını kontrol edin."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"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="1967247832635750410">"SIP hesabı"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"SIP hesabı"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Sunucu"</string>
+    <string name="username_title" msgid="6770064611005663470">"Kullanıcı adı"</string>
+    <string name="password_title" msgid="5289013731515564295">"Şifre"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Görüntülenen ad"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Giden proxy adresi"</string>
+    <string name="port_title" msgid="6693965912656593862">"Bağlantı noktası numarası"</string>
+    <string name="transport_title" msgid="889155457465372527">"Aktarım türü"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Canlı tutma mesajı gönder"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"İsteğe bağlı ayarlar"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Kimlik doğrulama kullanıcı adı"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Kimlik doğrulama için kullanılan kullanıcı adı"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Ayarlanmadı&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Kullanıcı adıyla aynı&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;İsteğe bağlı&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Tümünü görmek için dokunun"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Tümünü gizlemek için dokunun"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> gerekli, bu alan boş bırakılamaz."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"Bağlantı noktası numarası 1000 ile 65534 arasında olmalıdır."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"Bir SIP çağrısı yapmak için önce İnternet bağlantınızı kontrol edin."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"SIP çağrıları için bir Kablosuz ağa bağlı olmanız (Kablosuz ve Ağ ayarlarını kullanın) gerekir."</string>
+    <string name="no_voip" msgid="3038021971231952704">"SIP çağrısı desteklenmiyor"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Otomatik"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Her zaman gönder"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Yerleşik SIP arama"</string>
+</resources>
diff --git a/sip/res/values-uk/strings.xml b/sip/res/values-uk/strings.xml
new file mode 100644
index 0000000..f577451
--- /dev/null
+++ b/sip/res/values-uk/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"Налаштування SIP"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"Облікові записи SIP"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Облікові записи"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Отримувати вхідні дзвінки"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Використовує більше заряду акумулятора"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"Використання викликів SIP"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Використання викликів SIP (лише Wi-Fi)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Для всіх дзвінків, коли доступна мережа передавання даних"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Лише для викликів SIP"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Для всіх дзвінків"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Додати обліковий запис"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Видалити обліковий запис"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"Облікові записи SIP"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Зберігання облікового запису…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"Видалення облікового запису…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Зберегти"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Відхилити"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Закрити профіль"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"ОК"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Закрити"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Перевірка статусу…"</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Реєстрація…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Повторна спроба…"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Дзвінки не надходять."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Реєстрацію облікового запису зупинено, оскільки немає з’єднання з Інтернетом."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Реєстрацію облікового запису зупинено, оскільки немає з’єднання з мережею Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Обліковий запис не зареєстровано."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Дзвінки надходять."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"Обліковий запис не зареєстровано (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>). Ми спробуємо пізніше"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Обліковий запис не зареєстровано: неправильне ім’я користувача чи пароль."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Обліковий запис не зареєстровано: перевірте ім’я сервера."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"Зараз цей обліковий запис використовується додатком <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"Дані облікового запису SIP"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"Дані облікового запису SIP"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Сервер"</string>
+    <string name="username_title" msgid="6770064611005663470">"Ім’я користувача"</string>
+    <string name="password_title" msgid="5289013731515564295">"Пароль"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Видиме ім’я"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Адреса проксі-сервера вихідних дзвінків"</string>
+    <string name="port_title" msgid="6693965912656593862">"Номер порту"</string>
+    <string name="transport_title" msgid="889155457465372527">"Тип транспортування"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Надсилання повідомлення для підтримки з’єднання"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Додаткові налаштування"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Ім’я користувача для автентифікації"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Ім’я користувача, використане для автентифікації"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Не встановлено&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Те саме, що й ім’я користувача&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Додатково&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Торкніться, щоб показати все"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Торкніться, щоб сховати все"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"Поле <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> обов’язкове. Воно не може бути порожнім."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"Введіть номер порту між 1000 та 65534."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"Щоб здійснити виклик SIP, спершу перевірте своє з’єднання з Інтернетом."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"Для викликів SIP потрібне з’єднання з мережею Wi-Fi (скористайтеся налаштуваннями бездротового зв’язку та мереж)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"Виклики SIP не підтримуються"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Автоматично"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Завжди надсилати"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Вбудована функція викликів SIP"</string>
+</resources>
diff --git a/sip/res/values-ur-rPK/strings.xml b/sip/res/values-ur-rPK/strings.xml
new file mode 100644
index 0000000..ed3d891
--- /dev/null
+++ b/sip/res/values-ur-rPK/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"‏SIP ترتیبات"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"‏SIP اکاؤنٹس"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"اکاؤنٹس"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"اِن کمنگ کالیں وصول کریں"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"مزید بیٹری استعمال کرتا ہے"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"‏SIP کالنگ استعمال کریں"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"‏SIP کالنگ استعمال کریں (صرف Wi-Fi)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"ڈیٹا نیٹ ورک دستیاب ہونے پر سبھی کالوں کیلئے"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"‏صرف SIP کالز کیلئے"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"سبھی کالوں کیلئے"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"اکاؤنٹ شامل کریں"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"اکاؤنٹ ہٹائیں"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"‏SIP اکاؤنٹس"</string>
+    <string name="saving_account" msgid="5336529880235177448">"اکاؤنٹ محفوظ کیا جا رہا ہے…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"اکاؤنٹ ہٹایا جا رہا ہے…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"محفوظ کریں"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"مسترد کریں"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"پروفائل بند کریں"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"ٹھیک ہے"</string>
+    <string name="close_profile" msgid="3122414058856309881">"بند کریں"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"اسٹیٹس کو چیک کیا جا رہا ہے…"</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"رجسٹر کیا جا رہا ہے…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"اب بھی کوشش کی جا رہی ہے…"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"کالیں موصول نہیں ہو رہی ہیں۔"</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"اکاؤنٹ رجسٹریشن رک گیا کیونکہ کوئی انٹرنیٹ کنکشن نہیں ہے۔"</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"‏اکاؤنٹ رجسٹریشن رک گیا کیونکہ کوئی Wi-Fi کنکشن نہیں ہے۔"</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"اکاؤنٹ رجسٹریشن ناکام ہوگیا۔"</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"کالز موصول ہو رہی ہیں۔"</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"اکاؤنٹ رجسٹریشن ناکام ہوگیا: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>)؛ بعد میں کوشش کرے گا"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"اکاؤنٹ رجسٹریشن ناکام ہوگیا: غلط صارف نام یا پاس ورڈ۔"</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"اکاؤنٹ رجسٹریشن ناکام ہوگیا: سرور کا نام چیک کریں۔"</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"یہ اکاؤنٹ فی الحال <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> ایپ کے ذریعہ زیر استعمال ہے۔"</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"‏SIP اکاؤنٹ کی تفصیلات"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"‏SIP اکاؤنٹ کی تفصیلات"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"سرور"</string>
+    <string name="username_title" msgid="6770064611005663470">"صارف نام"</string>
+    <string name="password_title" msgid="5289013731515564295">"پاس ورڈ"</string>
+    <string name="display_name_title" msgid="579241787583079773">"ڈسپلے نام"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"آؤٹ باؤنڈ پراکسی پتہ"</string>
+    <string name="port_title" msgid="6693965912656593862">"پورٹ نمبر"</string>
+    <string name="transport_title" msgid="889155457465372527">"ٹرانسپورٹ کی قسم"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"‏keep-alive بھیجیں"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"اختیاری ترتیبات"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"توثیق کیلئے صارف نام"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"توثیق کیلئے استعمال کردہ صارف نام"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"‏‎&lt;‎سیٹ نہیں ہے‎&gt;‎"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"‏&lt;بالکل وہی جو صارف نام ہے&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"‏‎&lt;‎اختیاری‎&gt;‎"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"◁ سبھی کو دکھانے کیلئے ٹچ کریں"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ سبھی کو چھپانے کیلئے ٹچ کریں"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> مطلوب ہے اور خالی نہیں چھوڑا جا سکتا۔"</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"پورٹ نمبر 1000 اور 65534 کے اندر ہونا چاہیے۔"</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"‏ایک SIP کال کرنے کیلئے، پہلے اپنا انٹرنیٹ کنکشن چیک کریں۔"</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"‏SIP کالز کیلئے آپ کو ایک Wi-Fi نیٹ ورک سے منسلک ہونے کی ضرورت ہے (وائرلیس اور نیٹ ورک ترتیبات استعمال کریں)۔"</string>
+    <string name="no_voip" msgid="3038021971231952704">"‏SIP کالنگ تعاون یافتہ نہیں ہے"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"خودکار"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"ہمیشہ بھیجیں"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"‏پہلے سے شامل SIP کالنگ"</string>
+</resources>
diff --git a/sip/res/values-uz-rUZ/strings.xml b/sip/res/values-uz-rUZ/strings.xml
new file mode 100644
index 0000000..a82b606
--- /dev/null
+++ b/sip/res/values-uz-rUZ/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"SIP sozlamalari"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP hisoblari"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Hisoblar"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Kiruvchi qo‘ng‘iroqlarni qabul qilish"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Batareya quvvatini ko‘p sarflaydi"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"SIP qo‘ng‘iroqlaridan foydalanish"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"SIP qo‘ng‘iroqlaridan foydalanish (faqat Wi-Fi)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Tarmoq trafigi mavjud bo‘lganda barcha qo‘ng‘iroqlar uchun"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Faqat SIP qo‘ng‘iroqlari uchun"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Barcha qo‘ng‘iroqlar uchun"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Yangi hisob qo‘shish"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Hisobni o‘chirish"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP hisoblari"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Hisob saqlanmoqda…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"Hisob o‘chirilmoqda…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Saqlash"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Bekor qilish"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Profilni yoping"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"OK"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Yopish"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Holati tekshirilmoqda…"</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Ro‘yxatdan o‘tkazilmoqda…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Hanuzgacha urinilmoqda…"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Qo‘ng‘iroqlar qabul qilinmayapti."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Hisobni ro‘yxatdan o‘tkazish to‘xtatildi, chunki internetga ulanilmagan."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Hisobni ro‘yxatdan o‘tkazish to‘xtatildi, chunki Wi-Fi ulanishlari mavjud emas."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Hisobni ro‘yxatdan o‘tkazish muvaffaqiyatsiz tugadi."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Qabul qilingan qo‘ng‘iroqlar."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"Hisobni ro‘yxatdan o‘tkazish amalga oshmadi: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); keyinroq urinib ko‘riladi"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Hisobni ro‘yxatdan o‘tkazish amalga oshmadi: foydalanuvchi nomi yoki parol xato."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Hisobni ro‘yxatdan o‘tkazish muvaffaqiyatsiz tugadi: server nomini tekshirib ko‘ring."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"Ushbu hisob <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> ilovasi tomonidan hozirda foydalanilmoqda."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"SIP hisobi ma’lumotlari"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"SIP hisobi ma’lumotlari"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Server"</string>
+    <string name="username_title" msgid="6770064611005663470">"Foydalanuvchi nomi"</string>
+    <string name="password_title" msgid="5289013731515564295">"Parol"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Nomini ko‘rsatish"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Chiquvchi proksi manzili"</string>
+    <string name="port_title" msgid="6693965912656593862">"Port raqami"</string>
+    <string name="transport_title" msgid="889155457465372527">"Transport turi"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Faollikni saqlash tanlovini jo‘natish"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Ixtiyoriy sozlamalar"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Foydalanuvchi nomini tasdiqdan o‘tkazish"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Foydalanuvchi nomi tasdiqdan o‘tish uchun foydalaniladi"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;O‘rnatilmagan&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Foydalanuvchi nomi bilan bir xil&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Ixtiyoriy&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Barchasini ko‘rsatish uchun bosing"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Barchasini yashirish uchun bosing"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g>ni to‘ldirish shart, u bo‘sh qolmasligi kerak."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"Port raqami 1000 va 65534 oralig‘ida bo‘lishi kerak."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"SIP qo‘ng‘irog‘ini amalga oshirish uchun avval internetga ulanishni tekshiring."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"SIP qo‘ng‘iroqlarini amalga oshirish uchun biror Wi-Fi tarmog‘iga ulanish lozim (“Simsiz tarmoqlar” sozlamalaridan foydalaning)"</string>
+    <string name="no_voip" msgid="3038021971231952704">"SIP qo‘ng‘iroqlari qo‘llab-quvvatlanmaydi"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Avtomatik"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Doimo jo‘natilsin"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Ichki o‘rnatilgan SIP qo‘ng‘iroqlari"</string>
+</resources>
diff --git a/sip/res/values-vi/strings.xml b/sip/res/values-vi/strings.xml
new file mode 100644
index 0000000..04a1908
--- /dev/null
+++ b/sip/res/values-vi/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"Cài đặt SIP"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"Tài khoản SIP"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Tài khoản"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Nhận cuộc gọi đến"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Sử dụng nhiều thời lượng pin hơn"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"Sử dụng tính năng gọi điện SIP"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Sử dụng tính năng gọi điện SIP (chỉ Wi-Fi)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"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="1815335903940609729">"Chỉ dành cho cuộc gọi SIP"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Dành cho tất cả các cuộc gọi"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Thêm tài khoản"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Xóa tài khoản"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"Tài khoản SIP"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Đang lưu tài khoản..."</string>
+    <string name="removing_account" msgid="5537351356808985756">"Đang xóa tài khoản..."</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Lưu"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Hủy"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Đóng tiểu sử"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"OK"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Đóng"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Đang kiểm tra trạng thái..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Đang đăng ký…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Vẫn đang thử..."</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Đang không nhận cuộc gọi."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Đă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="9154717387473039546">"Đă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="514205414303796800">"Đăng ký tài khoản không thành công."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Đang nhận cuộc gọi."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"Đă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="8406872554323334182">"Đă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="7710275557045148634">"Đă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="9041060473615403041">"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="1967247832635750410">"Chi tiết tài khoản SIP"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"Chi tiết tài khoản SIP"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Máy chủ"</string>
+    <string name="username_title" msgid="6770064611005663470">"Tên người dùng"</string>
+    <string name="password_title" msgid="5289013731515564295">"Mật khẩu"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Tên hiển thị"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Địa chỉ proxy đi"</string>
+    <string name="port_title" msgid="6693965912656593862">"Số cổng"</string>
+    <string name="transport_title" msgid="889155457465372527">"Loại truyền tải"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Gửi giữ kết nối"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Cài đặt tùy chọn"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Tên người dùng xác thực"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Tên người dùng được sử dụng để xác thực"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Chưa được đặt&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Giống như tên người dùng&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Tùy chọn&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Chạm để hiển thị tất cả"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Chạm để ẩn tất cả"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<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="7931422555587011830">"Số cổng phải trong khoảng từ 1000 đến 65534."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"Để thực hiện cuộc gọi SIP, trước tiên hãy kiểm tra kết nối Internet của bạn."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"Bạn cần kết nối với mạng Wi-Fi cho cuộc gọi SIP (hãy sử dụng cài đặt Không dây và Mạng)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"Tính năng gọi điện SIP không được hỗ trợ"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Tự động"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Luôn luôn gửi"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Tính năng gọi điện SIP tích hợp sẵn"</string>
+</resources>
diff --git a/sip/res/values-zh-rCN/strings.xml b/sip/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..2d073c1
--- /dev/null
+++ b/sip/res/values-zh-rCN/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"SIP 设置"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP 帐户"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"帐户"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"接听来电"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"会消耗更多电量"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"使用 SIP 通话功能"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"使用 SIP 通话功能（仅通过 WLAN 网络）"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"所有通话（数据网络可用时）"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"仅用于 SIP 通话"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"所有通话"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"添加帐户"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"移除帐户"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"互联网电话帐户"</string>
+    <string name="saving_account" msgid="5336529880235177448">"正在保存帐户…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"正在移除帐户…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"保存"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"舍弃"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"关闭个人资料"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"确定"</string>
+    <string name="close_profile" msgid="3122414058856309881">"关闭"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"正在检查状态…"</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"正在注册…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"仍在尝试…"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"无法接听电话。"</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"由于未连接到互联网，帐户注册已停止。"</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"由于未连接到WLAN网络，帐户注册已停止。"</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"帐户注册失败。"</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"可以接听电话。"</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"帐户注册失败：（<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>）；系统会在稍后重试"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"帐户注册失败：用户名或密码有误。"</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"帐户注册失败：请检查服务器名称。"</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"<xliff:g id="ACCOUNT_OWNER">%s</xliff:g>应用目前正在使用此帐户。"</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"互联网电话帐户详情"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"互联网电话帐户详情"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"服务器"</string>
+    <string name="username_title" msgid="6770064611005663470">"用户名"</string>
+    <string name="password_title" msgid="5289013731515564295">"密码"</string>
+    <string name="display_name_title" msgid="579241787583079773">"显示名称"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"出站代理地址"</string>
+    <string name="port_title" msgid="6693965912656593862">"端口号"</string>
+    <string name="transport_title" msgid="889155457465372527">"传输类型"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"发送持续连接消息"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"可选设置"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"身份验证用户名"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"用于身份验证的用户名"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;未设置&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;与用户名相同&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;可选&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ 触摸可全部显示"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ 触摸可全部隐藏"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"“<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g>”属于必填字段，不得留空。"</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"端口号应在1000与65534之间。"</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"要拨打 SIP 电话，请先检查您的互联网连接。"</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"您需要连接到 WLAN 网络才能拨打 SIP 电话（使用“无线和网络”设置）。"</string>
+    <string name="no_voip" msgid="3038021971231952704">"不支持 SIP 通话功能"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"自动"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"一律发送"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"内置 SIP 通话功能"</string>
+</resources>
diff --git a/sip/res/values-zh-rHK/strings.xml b/sip/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..84fbcf0
--- /dev/null
+++ b/sip/res/values-zh-rHK/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"SIP 設定"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP 帳戶"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"帳戶"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"接聽來電"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"消耗更多電量"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"使用 SIP 通話"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"使用 SIP 通話 (只限 Wi-Fi)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"數據網絡可用時，適用於所有通話"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"只限 SIP 通話"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"適用於所有通話"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"新增帳戶"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"移除帳戶"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP 帳戶"</string>
+    <string name="saving_account" msgid="5336529880235177448">"正在儲存帳戶…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"正在移除帳戶…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"儲存"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"捨棄"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"關閉個人檔案"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"確定"</string>
+    <string name="close_profile" msgid="3122414058856309881">"關閉"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"正在檢查狀態…"</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"正在註冊…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"仍在嘗試…"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"無法接聽電話。"</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"由於未連結互聯網，帳戶的註冊已停止。"</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"由於未連結 Wi-Fi 網絡，帳戶的註冊已停止。"</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"帳戶註冊失敗。"</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"可以接聽電話。"</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"帳戶註冊失敗：(<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>)；將於稍後重試"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"帳戶註冊失敗：使用者名稱或密碼不正確。"</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"帳戶註冊失敗：請查看伺服器名稱。"</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"這個帳戶目前正由 <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> 應用程式使用。"</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"SIP 帳戶詳情"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"SIP 帳戶詳情"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"伺服器"</string>
+    <string name="username_title" msgid="6770064611005663470">"使用者名稱"</string>
+    <string name="password_title" msgid="5289013731515564295">"密碼"</string>
+    <string name="display_name_title" msgid="579241787583079773">"顯示名稱"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"對外代理伺服器位址"</string>
+    <string name="port_title" msgid="6693965912656593862">"通訊埠號碼"</string>
+    <string name="transport_title" msgid="889155457465372527">"傳輸類型"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"傳送 keep-alive"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"選用設定"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"驗證使用者名稱"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"用於驗證的使用者名稱"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;未設定&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;與使用者名稱相同&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;非必填&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ 輕觸即可全部顯示"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ 輕觸即可全部隱藏"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"「<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g>」為必填欄位，不得留空。"</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"通訊埠號碼必須介乎 1000 至 65534 之間。"</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"如要進行 SIP 通話，請先檢查您的互聯網連線。"</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"如要進行 SIP 通話，您需要連線至 Wi-Fi 網絡 (使用無線和網絡設定)。"</string>
+    <string name="no_voip" msgid="3038021971231952704">"不支援 SIP 通話"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"自動"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"永遠傳送"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"內置 SIP 通話"</string>
+</resources>
diff --git a/sip/res/values-zh-rTW/strings.xml b/sip/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..70a08dd
--- /dev/null
+++ b/sip/res/values-zh-rTW/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"SIP 設定"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP 帳戶"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"帳戶"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"接聽來電"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"耗電量會因此增加"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"使用 SIP 通話功能"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"使用 SIP 通話功能 (僅限 Wi-Fi)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"數據網路可用時，適用於所有通話"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"僅適用於 SIP 通話"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"適用於所有通話"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"新增帳戶"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"移除帳戶"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP 帳戶"</string>
+    <string name="saving_account" msgid="5336529880235177448">"正在儲存帳戶…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"正在移除帳戶…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"儲存"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"捨棄"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"關閉個人資料"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"確定"</string>
+    <string name="close_profile" msgid="3122414058856309881">"關閉"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"正在檢查狀態..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"註冊中…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"仍在嘗試中…"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"無法接聽電話。"</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"因沒有網際網路連線，帳戶的註冊作業已停止。"</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"找不到 Wi-Fi 連線，帳戶註冊作業已中止。"</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"帳戶註冊失敗。"</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"可以接聽電話。"</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"帳戶註冊失敗：(<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>)；將於稍後重試"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"帳戶註冊失敗：使用者名稱或密碼不正確。"</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"帳戶註冊失敗：請檢查伺服器名稱。"</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"這個帳戶目前由 <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> 應用程式使用中。"</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"SIP 帳戶詳細資料"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"SIP 帳戶詳細資料"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"伺服器"</string>
+    <string name="username_title" msgid="6770064611005663470">"使用者名稱"</string>
+    <string name="password_title" msgid="5289013731515564295">"密碼"</string>
+    <string name="display_name_title" msgid="579241787583079773">"顯示名稱"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"連出 Proxy 位址"</string>
+    <string name="port_title" msgid="6693965912656593862">"通訊埠號碼"</string>
+    <string name="transport_title" msgid="889155457465372527">"傳輸類型"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"傳送 keep-alive"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"選用設定"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"驗證使用者名稱"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"用於進行驗證的使用者名稱"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;未設定&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;與使用者名稱相同&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;選擇性&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ 輕觸即可全部顯示"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ 輕觸即可全部隱藏"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"「<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g>」為必填欄位，不得留空。"</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"通訊埠號碼必須介於 1000 到 65534 間。"</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"如要撥打 SIP 電話，請先檢查您的網際網路連線。"</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"您必須連上 Wi-Fi 網路，才能使用 SIP 通話功能 (透過「無線與網路」設定)。"</string>
+    <string name="no_voip" msgid="3038021971231952704">"不支援 SIP 通話功能"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"自動"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"一律傳送"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"內建 SIP 通話功能"</string>
+</resources>
diff --git a/sip/res/values-zu/strings.xml b/sip/res/values-zu/strings.xml
new file mode 100644
index 0000000..8e79375
--- /dev/null
+++ b/sip/res/values-zu/strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"Izilungiselelo ze-SIP"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"Ama-akhawunti we-SIP"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Ama-akhawunti"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Thola amakholi angenayo"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Isebenzisa impilo yebhethri eningi"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"Sebenzisa ukushaya kwe-SIP"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Sebenzisa ukushaya kwe-SIP (i-Wi-Fi kuphela)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Yawo wonke amakholi uma inethiwekhi yedatha itholakala"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Ngeyamakholi we-SIP kuphela"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Yamakholi wonke"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Engeza i-akhawunti"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Susa i-akhawunti"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"Ama-akhawunti we-SIP"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Ilondoloza i-akhawunti…"</string>
+    <string name="removing_account" msgid="5537351356808985756">"Isusa i-akhawunti…"</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Londoloza"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"Lahla"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Vala iphrofayela"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"KULUNGILE"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Vala"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Ihlola isimo..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Iyabhalisa…"</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Isazama namanje…"</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Ayamukeli amakholi."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"Ukubhaliswa kwe-akhawunti kumisiwe ngoba akukho ukuxhumeka kwe-inthanethi."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Ukubhaliswa kwe-akhawunti kumisiwe ngoba akukho ukuxhumeka kwe-Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Ukubhaliswa kwe-akhawunti akuphumelelanga."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Yamukela amakholi."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"Ukubhaliswa kwe-akhawunti akuphumelelanga: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>; izozama emuva kwesikhathi"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Ukubhaliswa kwe-akhawunti akuphumelelanga: Igama lomsebenzisi elingalungile noma iphasiwedi."</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Ukubhaliswa kwe-akhawunti akuphumelelanga: Hlola igama leseva."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"Le akhawunti okwamanje isetshenziswa nguhlelo lokusebenza lwe-<xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"Imininingwane ye-akhawunti ye-SIP"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"Imininingwane ye-akhawunti ye-SIP"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Iseva"</string>
+    <string name="username_title" msgid="6770064611005663470">"Igama lomsebenzisi"</string>
+    <string name="password_title" msgid="5289013731515564295">"Iphasiwedi"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Bonisa igama"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Ikheli lommeleli ophumayo"</string>
+    <string name="port_title" msgid="6693965912656593862">"Inombolo yembobo"</string>
+    <string name="transport_title" msgid="889155457465372527">"Uhlobo lwendlela yezokuthutha"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Thumula igcina kuphila"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Izilungiselelo ongazikhetha"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Igama lomsebenzisi lokufakazela ubuqiniso"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Igama lomsebenzisi elisetshenziselwa ukufakazela ubuqiniso"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Ayisethiwe&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;Ifana negama lomsebenzisi&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Ongakukhetha&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Thinta ukuze ubonise konke"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Thinta ukuze ufihle konke"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"I-<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> iyadingeka futhi ayikwazi ukungabi nalutho."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"Inombolo yembobo kumele ibe phakathi kokungu-1000 nokungu-65534."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"Ukuze wenze ikholi ye-SIP, hlola ukuxhumeka kwe-inthanethi yakho kuqala."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"Kuzomele uxhumeke kunethiwekhi ye-Wi-Fi ngamakholi we-SIP (sebenzisa izilungiselelo ezingenantambo nenethiwekhi)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"Ukushaya kwe-SIP akusekelwe"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Okuzenzakalelayo"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Thumela njalo"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Ukushaya okwakhelwe ngaphakathi kwe-SIP"</string>
+</resources>
diff --git a/sip/src/com/android/services/telephony/sip/SipPhoneAccountSettingsActivity.java b/sip/src/com/android/services/telephony/sip/SipPhoneAccountSettingsActivity.java
new file mode 100644
index 0000000..0455346
--- /dev/null
+++ b/sip/src/com/android/services/telephony/sip/SipPhoneAccountSettingsActivity.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.services.telephony.sip;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.net.sip.SipProfile;
+import android.os.Bundle;
+import android.os.Parcelable;
+import android.telecom.PhoneAccountHandle;
+import android.telecom.TelecomManager;
+import android.util.Log;
+
+/**
+ * This activity receives the standard telecom intent to open settings for a PhoneAccount. It
+ * translates the incoming phone account to a SIP profile and opens the corresponding
+ * PreferenceActivity for said profile.
+ */
+public final class SipPhoneAccountSettingsActivity extends Activity {
+    private static final String TAG = "SipSettingsActivity";
+
+    /** ${inheritDoc} */
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Intent intent = getIntent();
+        Log.i(TAG, "" + intent);
+        if (intent != null) {
+            PhoneAccountHandle accountHandle = (PhoneAccountHandle)
+                    intent.getParcelableExtra(TelecomManager.EXTRA_PHONE_ACCOUNT_HANDLE);
+            Log.i(TAG, "" + accountHandle);
+
+            if (accountHandle != null) {
+                SipProfileDb profileDb = new SipProfileDb(this);
+                String sipUri = SipUtil.getSipUriFromPhoneAccount(accountHandle);
+                SipProfile profile = profileDb.retrieveSipProfile(sipUri);
+                if (profile != null) {
+                    Intent settingsIntent = new Intent(this, SipEditor.class);
+                    settingsIntent.putExtra(SipSettings.KEY_SIP_PROFILE, (Parcelable) profile);
+                    startActivity(settingsIntent);
+                }
+            }
+        }
+
+        finish();
+    }
+}
diff --git a/sip/src/com/android/services/telephony/sip/SipProfileDb.java b/sip/src/com/android/services/telephony/sip/SipProfileDb.java
index 00e214f..5641af9 100644
--- a/sip/src/com/android/services/telephony/sip/SipProfileDb.java
+++ b/sip/src/com/android/services/telephony/sip/SipProfileDb.java
@@ -20,6 +20,7 @@
 
 import android.content.Context;
 import android.net.sip.SipProfile;
+import android.text.TextUtils;
 import android.util.Log;
 
 import java.io.File;
@@ -42,6 +43,8 @@
     private static final String PROFILES_DIR = "/profiles/";
     private static final String PROFILE_OBJ_FILE = ".pobj";
 
+    private static final String SCHEME_PREFIX = "sip:";
+
     private String mProfilesDirectory;
     private SipSharedPreferences mSipSharedPreferences;
     private int mProfilesCount = -1;
@@ -100,6 +103,15 @@
         }
     }
 
+    public SipProfile retrieveSipProfile(String sipUri) {
+        sipUri = sipUri.trim();
+        if (sipUri.startsWith(SCHEME_PREFIX)) {
+            return retrieveSipProfileFromName(sipUri.substring(SCHEME_PREFIX.length()));
+        }
+
+        return null;
+    }
+
     private List<SipProfile> retrieveSipProfileListInternal() {
         List<SipProfile> sipProfileList = Collections.synchronizedList(
                 new ArrayList<SipProfile>());
@@ -108,23 +120,35 @@
         String[] dirs = root.list();
         if (dirs == null) return sipProfileList;
         for (String dir : dirs) {
-            File f = new File(new File(root, dir), PROFILE_OBJ_FILE);
-            if (!f.exists()) continue;
-            try {
-                SipProfile p = deserialize(f);
-                if (p == null) continue;
-                if (!dir.equals(p.getProfileName())) continue;
-
-                sipProfileList.add(p);
-            } catch (IOException e) {
-                log("retrieveSipProfileListInternal, exception: " + e);
-            }
+            SipProfile p = retrieveSipProfileFromName(dir);
+            if (p == null) continue;
+            sipProfileList.add(p);
         }
         mProfilesCount = sipProfileList.size();
         mSipSharedPreferences.setProfilesCount(mProfilesCount);
         return sipProfileList;
     }
 
+    private SipProfile retrieveSipProfileFromName(String name) {
+        if (TextUtils.isEmpty(name)) {
+            return null;
+        }
+
+        File root = new File(mProfilesDirectory);
+        File f = new File(new File(root, name), PROFILE_OBJ_FILE);
+        if (f.exists()) {
+            try {
+                SipProfile p = deserialize(f);
+                if (p != null && name.equals(p.getProfileName())) {
+                    return p;
+                }
+            } catch (IOException e) {
+                log("retrieveSipProfileListInternal, exception: " + e);
+            }
+        }
+        return null;
+    }
+
     private SipProfile deserialize(File profileObjectFile) throws IOException {
         AtomicFile atomicFile = new AtomicFile(profileObjectFile);
         ObjectInputStream ois = null;
diff --git a/sip/src/com/android/services/telephony/sip/SipSettings.java b/sip/src/com/android/services/telephony/sip/SipSettings.java
index 7da0131..b89a5b1 100644
--- a/sip/src/com/android/services/telephony/sip/SipSettings.java
+++ b/sip/src/com/android/services/telephony/sip/SipSettings.java
@@ -57,25 +57,20 @@
  * The PreferenceActivity class for managing sip profile preferences.
  */
 public class SipSettings extends PreferenceActivity {
-    private static final String PREFIX = "[SipSettings] ";
-    private static final boolean VERBOSE = false; /* STOP SHIP if true */
-
     public static final String SIP_SHARED_PREFERENCES = "SIP_PREFERENCES";
 
-    private static final int MENU_ADD_ACCOUNT = Menu.FIRST;
-
     static final String KEY_SIP_PROFILE = "sip_profile";
+    static final int REQUEST_ADD_OR_EDIT_SIP_PROFILE = 1;
 
+    private static final String PREFIX = "[SipSettings] ";
+    private static final boolean VERBOSE = false; /* STOP SHIP if true */
+    private static final int MENU_ADD_ACCOUNT = Menu.FIRST;
     private static final String PREF_SIP_LIST = "sip_account_list";
 
-    private static final int REQUEST_ADD_OR_EDIT_SIP_PROFILE = 1;
-
     private PackageManager mPackageManager;
     private SipManager mSipManager;
     private SipProfileDb mProfileDb;
-
     private SipProfile mProfile; // profile that's being edited
-
     private PreferenceCategory mSipListContainer;
     private Map<String, SipPreference> mSipPreferenceMap;
     private List<SipProfile> mSipProfileList;
@@ -144,8 +139,6 @@
         addPreferencesFromResource(R.xml.sip_setting);
         mSipListContainer = (PreferenceCategory) findPreference(PREF_SIP_LIST);
 
-        updateProfilesStatus();
-
         ActionBar actionBar = getActionBar();
         if (actionBar != null) {
             actionBar.setDisplayHomeAsUpEnabled(true);
@@ -155,6 +148,7 @@
     @Override
     public void onResume() {
         super.onResume();
+        updateProfilesStatus();
     }
 
     @Override
diff --git a/sip/src/com/android/services/telephony/sip/SipUtil.java b/sip/src/com/android/services/telephony/sip/SipUtil.java
index ea5ea46..7e94804 100644
--- a/sip/src/com/android/services/telephony/sip/SipUtil.java
+++ b/sip/src/com/android/services/telephony/sip/SipUtil.java
@@ -105,7 +105,15 @@
      * @return The PhoneAccount.
      */
     static PhoneAccount createPhoneAccount(Context context, SipProfile profile) {
+        // Build a URI to represent the SIP account.  Does not use SipProfile#getUriString() since
+        // that prototype can include transport information which we do not want to see in the
+        // phone account.
+        String sipAddress = profile.getUserName() + "@" + profile.getSipDomain();
+        Uri sipUri = Uri.parse(PhoneAccount.SCHEME_SIP + ":" + sipAddress);
 
+        // SipProfile#getUriString() is used here for legacy reasons. Changing to use the sipAddress
+        // defined above would cause SIP profiles with a TCP transport to be duplicated in the
+        // PhoneAccountRegistry since the ID would change on re-registration.
         PhoneAccountHandle accountHandle =
                 SipUtil.createAccountHandle(context, profile.getUriString());
 
@@ -118,8 +126,8 @@
         PhoneAccount.Builder builder = PhoneAccount.builder(accountHandle, profile.getDisplayName())
                 .setCapabilities(PhoneAccount.CAPABILITY_CALL_PROVIDER
                         | PhoneAccount.CAPABILITY_MULTI_USER)
-                .setAddress(Uri.parse(profile.getUriString()))
-                .setShortDescription(profile.getDisplayName())
+                .setAddress(sipUri)
+                .setShortDescription(sipAddress)
                 .setIcon(context, R.drawable.ic_dialer_sip_black_24dp)
                 .setSupportedUriSchemes(supportedUriSchemes);
 
diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index eae9bfc..1b8f96f 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -25,56 +25,36 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.database.Cursor;
-import android.media.AudioManager;
-import android.os.AsyncResult;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
 import android.os.UserHandle;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
-import android.provider.ContactsContract.CommonDataKinds;
 import android.provider.Settings;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
-import android.telephony.PhoneStateListener;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.MenuItem;
-import android.widget.ListAdapter;
 import android.widget.Toast;
 
+import com.android.ims.ImsConfig;
 import com.android.ims.ImsManager;
 import com.android.internal.telephony.CallForwardInfo;
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneConstants;
 import com.android.phone.common.util.SettingsUtil;
 import com.android.phone.settings.AccountSelectionPreference;
-import com.android.phone.settings.CallForwardInfoUtil;
-import com.android.phone.settings.TtyModeListPreference;
-import com.android.phone.settings.VoicemailDialogUtil;
-import com.android.phone.settings.VoicemailNotificationSettingsUtil;
-import com.android.phone.settings.VoicemailProviderListPreference;
-import com.android.phone.settings.VoicemailProviderListPreference.VoicemailProvider;
-import com.android.phone.settings.VoicemailProviderSettings;
-import com.android.phone.settings.VoicemailProviderSettingsUtil;
-import com.android.phone.settings.VoicemailRingtonePreference;
+import com.android.phone.settings.VoicemailSettingsActivity;
 import com.android.phone.settings.fdn.FdnSetting;
 import com.android.services.telephony.sip.SipUtil;
 
 import java.lang.String;
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Top level "Call settings" UI; see res/xml/call_feature_setting.xml
@@ -91,57 +71,15 @@
  * For the "Mobile network settings" screen under the main Settings app,
  * See {@link MobileNetworkSettings}.
  *
- * TODO: Settings should be split into PreferenceFragments where possible (ie. voicemail).
- *
  * @see com.android.phone.MobileNetworkSettings
  */
 public class CallFeaturesSetting extends PreferenceActivity
-        implements DialogInterface.OnClickListener,
-                Preference.OnPreferenceChangeListener,
-                EditPhoneNumberPreference.OnDialogClosedListener,
-                EditPhoneNumberPreference.GetDefaultNumberListener {
+        implements Preference.OnPreferenceChangeListener {
     private static final String LOG_TAG = "CallFeaturesSetting";
     private static final boolean DBG = (PhoneGlobals.DBG_LEVEL >= 2);
     // STOPSHIP if true. Flag to override behavior default behavior to hide VT setting.
     private static final boolean ENABLE_VT_FLAG = false;
 
-    /**
-     * 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";
-    // 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";
-    // 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
-    public static final String FWD_NUMBER_EXTRA = "com.android.phone.ForwardingNumber";
-    // Extra put in the return from VM provider config containing call forwarding number to set
-    public static final String FWD_NUMBER_TIME_EXTRA = "com.android.phone.ForwardingNumberTime";
-    // If the VM provider returns non null value in this extra we will force the user to
-    // choose another VM provider
-    public static final String SIGNOUT_EXTRA = "com.android.phone.Signout";
-
-    /**
-     * 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";
-
-    /**
-     * String Extra put into ACTION_ADD_VOICEMAIL to indicate that the voicemail setup screen should
-     * be opened.
-     */
-    public static final String SETUP_VOICEMAIL_EXTRA = "com.android.phone.SetupVoicemail";
-
-    // 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(!)
     // TODO: Consider moving these strings to strings.xml, so that they are not duplicated here and
@@ -149,180 +87,23 @@
     // persistent, they are used as the key to store shared preferences and the name should not be
     // changed unless the settings are also migrated.
     private static final String VOICEMAIL_SETTING_SCREEN_PREF_KEY = "button_voicemail_category_key";
-    private static final String BUTTON_VOICEMAIL_KEY = "button_voicemail_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";
     private static final String BUTTON_FDN_KEY   = "button_fdn_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_GSM_UMTS_OPTIONS = "button_gsm_more_expand_key";
     private static final String BUTTON_CDMA_OPTIONS = "button_cdma_more_expand_key";
-    private static final String CALL_FORWARDING_KEY = "call_forwarding_key";
-    private static final String ADDITIONAL_GSM_SETTINGS_KEY = "additional_gsm_call_settings_key";
 
     private static final String PHONE_ACCOUNT_SETTINGS_KEY =
             "phone_account_settings_preference_screen";
 
     private static final String ENABLE_VIDEO_CALLING_KEY = "button_enable_video_calling";
 
-    /** Event for Async voicemail change call */
-    private static final int EVENT_VOICEMAIL_CHANGED        = 500;
-    private static final int EVENT_FORWARDING_CHANGED       = 501;
-    private static final int EVENT_FORWARDING_GET_COMPLETED = 502;
-
-    public static final String HAC_KEY = "HACSetting";
-    public static final String HAC_VAL_ON = "ON";
-    public static final String HAC_VAL_OFF = "OFF";
-
-    /** Handle to voicemail pref */
-    private static final int VOICEMAIL_PREF_ID = 1;
-    private static final int VOICEMAIL_PROVIDER_CFG_ID = 2;
-
     private Phone mPhone;
-    private AudioManager mAudioManager;
-
     private SubscriptionInfoHelper mSubscriptionInfoHelper;
 
-    private EditPhoneNumberPreference mSubMenuVoicemailSettings;
-
-    /** Whether dialpad plays DTMF tone or not. */
     private CheckBoxPreference mButtonAutoRetry;
-    private CheckBoxPreference mButtonHAC;
-    private ListPreference mButtonDTMF;
-    private TtyModeListPreference mButtonTTY;
-    private VoicemailProviderListPreference mVoicemailProviders;
     private PreferenceScreen mVoicemailSettingsScreen;
-    private PreferenceScreen mVoicemailSettings;
-    private VoicemailRingtonePreference mVoicemailNotificationRingtone;
-    private CheckBoxPreference mVoicemailNotificationVibrate;
     private CheckBoxPreference mEnableVideoCalling;
 
-    /**
-     * Results of reading forwarding settings
-     */
-    private CallForwardInfo[] mForwardingReadResults = null;
-
-    /**
-     * Result of forwarding number change.
-     * Keys are reasons (eg. unconditional forwarding).
-     */
-    private Map<Integer, AsyncResult> mForwardingChangeResults = null;
-
-    /**
-     * Expected CF read result types.
-     * This set keeps track of the CF types for which we've issued change
-     * commands so we can tell when we've received all of the responses.
-     */
-    private Collection<Integer> mExpectedChangeResultReasons = null;
-
-    /**
-     * Result of vm number change
-     */
-    private AsyncResult mVoicemailChangeResult = null;
-
-    /**
-     * Previous VM provider setting so we can return to it in case of failure.
-     */
-    private String mPreviousVMProviderKey = null;
-
-    /**
-     * Id of the dialog being currently shown.
-     */
-    private int mCurrentDialogId = 0;
-
-    /**
-     * Flag indicating that we are invoking settings for the voicemail provider programmatically
-     * due to vm provider change.
-     */
-    private boolean mVMProviderSettingsForced = false;
-
-    /**
-     * Flag indicating that we are making changes to vm or fwd numbers
-     * due to vm provider change.
-     */
-    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.
-     */
-    private boolean mVMChangeCompletedSuccessfully = false;
-
-    /**
-     * True if we had full or partial failure setting forwarding numbers and so need to roll them
-     * back.
-     */
-    private boolean mFwdChangesRequireRollback = false;
-
-    /**
-     * Id of error msg to display to user once we are done reverting the VM provider to the previous
-     * one.
-     */
-    private int mVMOrFwdSetError = 0;
-
-    /** string to hold old voicemail number as it is being updated. */
-    private String mOldVmNumber;
-
-    // New call forwarding settings and vm number we will be setting
-    // Need to save these since before we get to saving we need to asynchronously
-    // query the existing forwarding settings.
-    private CallForwardInfo[] mNewFwdSettings;
-    private String mNewVMNumber;
-
-    private boolean mForeground;
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        mForeground = false;
-
-        if (ImsManager.isVolteEnabledByPlatform(this) &&
-                !mPhone.getContext().getResources().getBoolean(
-                        com.android.internal.R.bool.config_carrier_volte_tty_supported)) {
-            TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
-            tm.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
-        }
-    }
-
-    /**
-     * We have to pull current settings from the network for all kinds of
-     * voicemail providers so we can tell whether we have to update them,
-     * so use this bit to keep track of whether we're reading settings for the
-     * default provider and should therefore save them out when done.
-     */
-    private boolean mReadingSettingsForDefaultProvider = false;
-
-    /**
-     * Used to indicate that the voicemail preference should be shown.
-     */
-    private boolean mShowVoicemailPreference = false;
-
-    /**
-     * Used to indicate that the voicemail setup screen should be shown.
-     */
-    private boolean mSetupVoicemail = false;
-
-    private final PhoneStateListener mPhoneStateListener = new PhoneStateListener() {
-        /**
-         * Enable/disable the TTY setting when in/out of a call (and if carrier doesn't
-         * support VoLTE with TTY).
-         * @see android.telephony.PhoneStateListener#onCallStateChanged(int,
-         * java.lang.String)
-         */
-        @Override
-        public void onCallStateChanged(int state, String incomingNumber) {
-            if (DBG) log("PhoneStateListener.onCallStateChanged: state=" + state);
-            Preference pref = getPreferenceScreen().findPreference(BUTTON_TTY_KEY);
-            if (pref != null) {
-                pref.setEnabled(state == TelephonyManager.CALL_STATE_IDLE);
-            }
-        }
-    };
-
     /*
      * Click Listeners, handle click based on objects attached to UI.
      */
@@ -330,57 +111,11 @@
     // Click listener for all toggle events
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
-        if (preference == mSubMenuVoicemailSettings) {
-            return true;
-        } else if (preference == mButtonDTMF) {
-            return true;
-        } else if (preference == mButtonTTY) {
-            return true;
-        } else if (preference == mButtonAutoRetry) {
+        if (preference == mButtonAutoRetry) {
             android.provider.Settings.Global.putInt(mPhone.getContext().getContentResolver(),
                     android.provider.Settings.Global.CALL_AUTO_RETRY,
                     mButtonAutoRetry.isChecked() ? 1 : 0);
             return true;
-        } else if (preference == mButtonHAC) {
-            int hac = mButtonHAC.isChecked() ? 1 : 0;
-            // Update HAC value in Settings database
-            Settings.System.putInt(mPhone.getContext().getContentResolver(),
-                    Settings.System.HEARING_AID, hac);
-
-            // Update HAC Value in AudioManager
-            mAudioManager.setParameter(HAC_KEY, hac != 0 ? HAC_VAL_ON : HAC_VAL_OFF);
-            return true;
-        } else if (preference.getKey().equals(mVoicemailSettings.getKey())) {
-            // Check key instead of comparing reference because closing the voicemail notification
-            // ringtone dialog invokes onResume(), but leaves the old preference screen up,
-            // TODO: Revert to checking reference after migrating voicemail to its own activity.
-            if (DBG) log("onPreferenceTreeClick: Voicemail Settings Preference is clicked.");
-
-            final Dialog dialog = ((PreferenceScreen) preference).getDialog();
-            if (dialog != null) {
-                dialog.getActionBar().setDisplayHomeAsUpEnabled(false);
-            }
-
-            if (preference.getIntent() != null) {
-                if (DBG) log("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; use default behavior in xml.");
-
-                // onActivityResult() will not be called, so reset variables here.
-                mPreviousVMProviderKey = VoicemailProviderListPreference.DEFAULT_KEY;
-                mVMProviderSettingsForced = false;
-                return false;
-            }
-        } else if (preference == mVoicemailSettingsScreen) {
-            final Dialog dialog = mVoicemailSettingsScreen.getDialog();
-            if (dialog != null) {
-                dialog.getActionBar().setDisplayHomeAsUpEnabled(false);
-            }
-            return false;
         }
         return false;
     }
@@ -397,44 +132,7 @@
     public boolean onPreferenceChange(Preference preference, Object objValue) {
         if (DBG) log("onPreferenceChange: \"" + preference + "\" changed to \"" + objValue + "\"");
 
-        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 == mVoicemailProviders) {
-            final String newProviderKey = (String) objValue;
-
-            // 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 is made to the VM provider setting.");
-                return true;
-            }
-            updateVMPreferenceWidgets(newProviderKey);
-
-            final VoicemailProviderSettings newProviderSettings =
-                    VoicemailProviderSettingsUtil.load(this, newProviderKey);
-
-            // If the user switches to a voice mail provider and we have numbers stored for it we
-            // will automatically change the phone's voice mail and forwarding number to the stored
-            // ones. Otherwise we will bring up provider's configuration UI.
-            if (newProviderSettings == null) {
-                // Force the user into a configuration of the chosen provider
-                Log.w(LOG_TAG, "Saved preferences not found - invoking config");
-                mVMProviderSettingsForced = true;
-                simulatePreferenceClick(mVoicemailSettings);
-            } else {
-                if (DBG) log("Saved preferences found - switching to them");
-                // Set this flag so if we get a failure we revert to previous provider
-                mChangingVMorFwdDueToProviderChange = true;
-                saveVoiceMailAndForwardingNumber(newProviderKey, newProviderSettings);
-            }
-        } else if (preference.getKey().equals(mVoicemailNotificationVibrate.getKey())) {
-            // Check key instead of comparing reference because closing the voicemail notification
-            // ringtone dialog invokes onResume(), but leaves the old preference screen up,
-            // TODO: Revert to checking reference after migrating voicemail to its own activity.
-            VoicemailNotificationSettingsUtil.setVibrationEnabled(
-                    mPhone, Boolean.TRUE.equals(objValue));
-        } else if (preference == mEnableVideoCalling) {
+        if (preference == mEnableVideoCalling) {
             if (ImsManager.isEnhanced4gLteModeSettingEnabledByUser(mPhone.getContext())) {
                 PhoneGlobals.getInstance().phoneMgr.enableVideoCalling((boolean) objValue);
             } else {
@@ -463,674 +161,6 @@
     }
 
     @Override
-    public void onDialogClosed(EditPhoneNumberPreference preference, int buttonClicked) {
-        if (DBG) log("onDialogClosed: Button clicked is " + buttonClicked);
-
-        if (buttonClicked == DialogInterface.BUTTON_NEGATIVE) {
-            return;
-        }
-
-        if (preference == mSubMenuVoicemailSettings) {
-            VoicemailProviderSettings newSettings = new VoicemailProviderSettings(
-                    mSubMenuVoicemailSettings.getPhoneNumber(),
-                    VoicemailProviderSettings.NO_FORWARDING);
-            saveVoiceMailAndForwardingNumber(mVoicemailProviders.getKey(), newSettings);
-        }
-    }
-
-    /**
-     * Implemented for EditPhoneNumberPreference.GetDefaultNumberListener.
-     * 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
-            // mSubMenuVoicemailSettings itself, so we should return null.
-            if (DBG) log("updating default for voicemail dialog");
-            updateVoiceNumberField();
-            return null;
-        }
-
-        String vmDisplay = mPhone.getVoiceMailNumber();
-        if (TextUtils.isEmpty(vmDisplay)) {
-            // if there is no voicemail number, we just return null to
-            // indicate no contribution.
-            return null;
-        }
-
-        // Return the voicemail number prepended with "VM: "
-        if (DBG) log("updating default for call forwarding dialogs");
-        return getString(R.string.voicemail_abbreviated) + " " + vmDisplay;
-    }
-
-    private void switchToPreviousVoicemailProvider() {
-        if (DBG) log("switchToPreviousVoicemailProvider " + mPreviousVMProviderKey);
-
-        if (mPreviousVMProviderKey == null) {
-            return;
-        }
-
-        if (mVMChangeCompletedSuccessfully || mFwdChangesRequireRollback) {
-            showDialogIfForeground(VoicemailDialogUtil.VM_REVERTING_DIALOG);
-            final VoicemailProviderSettings prevSettings =
-                    VoicemailProviderSettingsUtil.load(this, mPreviousVMProviderKey);
-            if (prevSettings == null) {
-                Log.e(LOG_TAG, "VoicemailProviderSettings for the key \""
-                        + mPreviousVMProviderKey + "\" is null but should be loaded.");
-            }
-
-            if (mVMChangeCompletedSuccessfully) {
-                mNewVMNumber = prevSettings.getVoicemailNumber();
-                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) {
-                Log.i(LOG_TAG, "Requested to rollback forwarding changes.");
-
-                final CallForwardInfo[] prevFwdSettings = prevSettings.getForwardingSettings();
-                if (prevFwdSettings != null) {
-                    Map<Integer, AsyncResult> results = mForwardingChangeResults;
-                    resetForwardingChangeState();
-                    for (int i = 0; i < prevFwdSettings.length; i++) {
-                        CallForwardInfo fi = prevFwdSettings[i];
-                        if (DBG) log("Reverting fwd #: " + i + ": " + fi.toString());
-                        // Only revert the settings for which the update succeeded.
-                        AsyncResult result = results.get(fi.reason);
-                        if (result != null && result.exception == null) {
-                            mExpectedChangeResultReasons.add(fi.reason);
-                            CallForwardInfoUtil.setCallForwardingOption(mPhone, fi,
-                                    mRevertOptionComplete.obtainMessage(
-                                            EVENT_FORWARDING_CHANGED, i, 0));
-                        }
-                    }
-                }
-            }
-        } else {
-            if (DBG) log("No need to revert");
-            onRevertDone();
-        }
-    }
-
-    private void onRevertDone() {
-        if (DBG) log("onRevertDone: Changing provider key back to " + mPreviousVMProviderKey);
-
-        updateVMPreferenceWidgets(mPreviousVMProviderKey);
-        updateVoiceNumberField();
-        if (mVMOrFwdSetError != 0) {
-            showDialogIfForeground(mVMOrFwdSetError);
-            mVMOrFwdSetError = 0;
-        }
-    }
-
-    @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) {
-            boolean failure = false;
-
-            // No matter how the processing of result goes lets clear the flag
-            if (DBG) log("mVMProviderSettingsForced: " + mVMProviderSettingsForced);
-            final boolean isVMProviderSettingsForced = mVMProviderSettingsForced;
-            mVMProviderSettingsForced = false;
-
-            String vmNum = null;
-            if (resultCode != RESULT_OK) {
-                if (DBG) log("onActivityResult: vm provider cfg result not OK.");
-                failure = true;
-            } else {
-                if (data == null) {
-                    if (DBG) log("onActivityResult: vm provider cfg result has no data");
-                    failure = true;
-                } else {
-                    if (data.getBooleanExtra(SIGNOUT_EXTRA, false)) {
-                        if (DBG) log("Provider requested signout");
-                        if (isVMProviderSettingsForced) {
-                            if (DBG) log("Going back to previous provider on signout");
-                            switchToPreviousVoicemailProvider();
-                        } else {
-                            final String victim = mVoicemailProviders.getKey();
-                            if (DBG) log("Relaunching activity and ignoring " + victim);
-                            Intent i = new Intent(ACTION_ADD_VOICEMAIL);
-                            i.putExtra(IGNORE_PROVIDER_EXTRA, victim);
-                            i.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                            this.startActivity(i);
-                        }
-                        return;
-                    }
-                    vmNum = data.getStringExtra(VM_NUMBER_EXTRA);
-                    if (vmNum == null || vmNum.length() == 0) {
-                        if (DBG) log("onActivityResult: vm provider cfg result has no vmnum");
-                        failure = true;
-                    }
-                }
-            }
-            if (failure) {
-                if (DBG) log("Failure in return from voicemail provider.");
-                if (isVMProviderSettingsForced) {
-                    switchToPreviousVoicemailProvider();
-                }
-
-                return;
-            }
-            mChangingVMorFwdDueToProviderChange = isVMProviderSettingsForced;
-            final String fwdNum = data.getStringExtra(FWD_NUMBER_EXTRA);
-
-            // TODO: It would be nice to load the current network setting for this and
-            // send it to the provider when it's config is invoked so it can use this as default
-            final int fwdNumTime = data.getIntExtra(FWD_NUMBER_TIME_EXTRA, 20);
-
-            if (DBG) log("onActivityResult: cfg result has forwarding number " + fwdNum);
-            saveVoiceMailAndForwardingNumber(mVoicemailProviders.getKey(),
-                    new VoicemailProviderSettings(vmNum, fwdNum, fwdNumTime));
-            return;
-        }
-
-        if (requestCode == VOICEMAIL_PREF_ID) {
-            if (resultCode != RESULT_OK) {
-                if (DBG) log("onActivityResult: contact picker result not OK.");
-                return;
-            }
-
-            Cursor cursor = null;
-            try {
-                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;
-            } finally {
-                if (cursor != null) {
-                    cursor.close();
-                }
-            }
-        }
-
-        super.onActivityResult(requestCode, resultCode, data);
-    }
-
-    /**
-     * Wrapper around showDialog() that will silently do nothing if we're
-     * not in the foreground.
-     *
-     * This is useful here because most of the dialogs we display from
-     * this class are triggered by asynchronous events (like
-     * success/failure messages from the telephony layer) and it's
-     * possible for those events to come in even after the user has gone
-     * to a different screen.
-     */
-    // TODO: this is too brittle: it's still easy to accidentally add new
-    // code here that calls showDialog() directly (which will result in a
-    // WindowManager$BadTokenException if called after the activity has
-    // been stopped.)
-    //
-    // It would be cleaner to do the "if (mForeground)" check in one
-    // central place, maybe by using a single Handler for all asynchronous
-    // events (and have *that* discard events if we're not in the
-    // foreground.)
-    //
-    // Unfortunately it's not that simple, since we sometimes need to do
-    // actual work to handle these events whether or not we're in the
-    // foreground (see the Handler code in mSetOptionComplete for
-    // example.)
-    //
-    // TODO: It's a bit worrisome that we don't do anything in error cases when we're not in the
-    // foreground. Consider displaying a toast instead.
-    private void showDialogIfForeground(int id) {
-        if (mForeground) {
-            showDialog(id);
-        }
-    }
-
-    private void dismissDialogSafely(int id) {
-        try {
-            dismissDialog(id);
-        } catch (IllegalArgumentException e) {
-            // This is expected in the case where we were in the background
-            // at the time we would normally have shown the dialog, so we didn't
-            // show it.
-        }
-    }
-
-    /**
-     * TODO: Refactor to make it easier to understand what's done in the different stages.
-     */
-    private void saveVoiceMailAndForwardingNumber(
-            String key, VoicemailProviderSettings newSettings) {
-        if (DBG) log("saveVoiceMailAndForwardingNumber: " + newSettings.toString());
-        mNewVMNumber = newSettings.getVoicemailNumber();
-        mNewVMNumber = (mNewVMNumber == null) ? "" : mNewVMNumber;
-        mNewFwdSettings = newSettings.getForwardingSettings();
-
-        // No fwd settings on CDMA.
-        boolean isCdma = mPhone.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA;
-        if (isCdma) {
-            if (DBG) log("ignoring forwarding setting since this is CDMA phone");
-            mNewFwdSettings = VoicemailProviderSettings.NO_FORWARDING;
-        }
-
-        // Throw a warning if the voicemail is the same and we did not change forwarding.
-        if (mNewVMNumber.equals(mOldVmNumber)
-                && mNewFwdSettings == VoicemailProviderSettings.NO_FORWARDING) {
-            showDialogIfForeground(VoicemailDialogUtil.VM_NOCHANGE_ERROR_DIALOG);
-            return;
-        }
-
-        VoicemailProviderSettingsUtil.save(this, key, newSettings);
-        mVMChangeCompletedSuccessfully = false;
-        mFwdChangesRequireRollback = false;
-        mVMOrFwdSetError = 0;
-
-        // Don't read call forwarding settings if CDMA. Call forwarding is not supported by CDMA.
-        if (!key.equals(mPreviousVMProviderKey) && !isCdma) {
-            mReadingSettingsForDefaultProvider =
-                    mPreviousVMProviderKey.equals(VoicemailProviderListPreference.DEFAULT_KEY);
-            if (DBG) log("Reading current forwarding settings");
-            int numSettingsReasons = VoicemailProviderSettings.FORWARDING_SETTINGS_REASONS.length;
-            mForwardingReadResults = new CallForwardInfo[numSettingsReasons];
-            for (int i = 0; i < mForwardingReadResults.length; i++) {
-                mPhone.getCallForwardingOption(
-                        VoicemailProviderSettings.FORWARDING_SETTINGS_REASONS[i],
-                        mGetOptionComplete.obtainMessage(EVENT_FORWARDING_GET_COMPLETED, i, 0));
-            }
-            showDialogIfForeground(VoicemailDialogUtil.VM_FWD_READING_DIALOG);
-        } else {
-            saveVoiceMailAndForwardingNumberStage2();
-        }
-
-        // Refresh the MWI indicator if it is already showing.
-        PhoneGlobals.getInstance().refreshMwiIndicator(mSubscriptionInfoHelper.getSubId());
-    }
-
-    private final Handler mGetOptionComplete = new Handler() {
-        @Override
-        public void handleMessage(Message msg) {
-            AsyncResult result = (AsyncResult) msg.obj;
-            switch (msg.what) {
-                case EVENT_FORWARDING_GET_COMPLETED:
-                    handleForwardingSettingsReadResult(result, msg.arg1);
-                    break;
-            }
-        }
-    };
-
-    private void handleForwardingSettingsReadResult(AsyncResult ar, int idx) {
-        if (DBG) Log.d(LOG_TAG, "handleForwardingSettingsReadResult: " + idx);
-
-        Throwable error = null;
-        if (ar.exception != null) {
-            error = ar.exception;
-            if (DBG) Log.d(LOG_TAG, "FwdRead: ar.exception=" + error.getMessage());
-        }
-        if (ar.userObj instanceof Throwable) {
-            error = (Throwable) ar.userObj;
-            if (DBG) Log.d(LOG_TAG, "FwdRead: userObj=" + error.getMessage());
-        }
-
-        // We may have already gotten an error and decided to ignore the other results.
-        if (mForwardingReadResults == null) {
-            if (DBG) Log.d(LOG_TAG, "Ignoring fwd reading result: " + idx);
-            return;
-        }
-
-        // In case of error ignore other results, show an error dialog
-        if (error != null) {
-            if (DBG) Log.d(LOG_TAG, "Error discovered for fwd read : " + idx);
-            mForwardingReadResults = null;
-            dismissDialogSafely(VoicemailDialogUtil.VM_FWD_READING_DIALOG);
-            showDialogIfForeground(VoicemailDialogUtil.FWD_GET_RESPONSE_ERROR_DIALOG);
-            return;
-        }
-
-        // Get the forwarding info.
-        mForwardingReadResults[idx] = CallForwardInfoUtil.getCallForwardInfo(
-                (CallForwardInfo[]) ar.result,
-                VoicemailProviderSettings.FORWARDING_SETTINGS_REASONS[idx]);
-
-        // Check if we got all the results already
-        boolean done = true;
-        for (int i = 0; i < mForwardingReadResults.length; i++) {
-            if (mForwardingReadResults[i] == null) {
-                done = false;
-                break;
-            }
-        }
-
-        if (done) {
-            if (DBG) Log.d(LOG_TAG, "Done receiving fwd info");
-            dismissDialogSafely(VoicemailDialogUtil.VM_FWD_READING_DIALOG);
-
-            if (mReadingSettingsForDefaultProvider) {
-                VoicemailProviderSettingsUtil.save(mPhone.getContext(),
-                        VoicemailProviderListPreference.DEFAULT_KEY,
-                        new VoicemailProviderSettings(mOldVmNumber, mForwardingReadResults));
-                mReadingSettingsForDefaultProvider = false;
-            }
-            saveVoiceMailAndForwardingNumberStage2();
-        }
-    }
-
-    private void resetForwardingChangeState() {
-        mForwardingChangeResults = new HashMap<Integer, AsyncResult>();
-        mExpectedChangeResultReasons = new HashSet<Integer>();
-    }
-
-    // Called after we are done saving the previous forwarding settings if we needed.
-    private void saveVoiceMailAndForwardingNumberStage2() {
-        mForwardingChangeResults = null;
-        mVoicemailChangeResult = null;
-        if (mNewFwdSettings != VoicemailProviderSettings.NO_FORWARDING) {
-            resetForwardingChangeState();
-            for (int i = 0; i < mNewFwdSettings.length; i++) {
-                CallForwardInfo fi = mNewFwdSettings[i];
-                CallForwardInfo fiForReason =
-                        CallForwardInfoUtil.infoForReason(mForwardingReadResults, fi.reason);
-                final boolean doUpdate = CallForwardInfoUtil.isUpdateRequired(fiForReason, fi);
-
-                if (doUpdate) {
-                    if (DBG) log("Setting fwd #: " + i + ": " + fi.toString());
-                    mExpectedChangeResultReasons.add(i);
-
-                    CallForwardInfoUtil.setCallForwardingOption(mPhone, fi,
-                            mSetOptionComplete.obtainMessage(
-                                    EVENT_FORWARDING_CHANGED, fi.reason, 0));
-                }
-            }
-            showDialogIfForeground(VoicemailDialogUtil.VM_FWD_SAVING_DIALOG);
-        } else {
-            if (DBG) log("Not touching fwd #");
-            setVMNumberWithCarrier();
-        }
-    }
-
-    private void setVMNumberWithCarrier() {
-        if (DBG) log("save voicemail #: " + mNewVMNumber);
-
-        mPhone.setVoiceMailNumber(
-                mPhone.getVoiceMailAlphaTag().toString(),
-                mNewVMNumber,
-                Message.obtain(mSetOptionComplete, EVENT_VOICEMAIL_CHANGED));
-    }
-
-    /**
-     * Callback to handle option update completions
-     */
-    private final Handler mSetOptionComplete = new Handler() {
-        @Override
-        public void handleMessage(Message msg) {
-            AsyncResult result = (AsyncResult) msg.obj;
-            boolean done = false;
-            switch (msg.what) {
-                case EVENT_VOICEMAIL_CHANGED:
-                    mVoicemailChangeResult = result;
-                    mVMChangeCompletedSuccessfully = isVmChangeSuccess();
-                    done = true;
-                    break;
-                case EVENT_FORWARDING_CHANGED:
-                    mForwardingChangeResults.put(msg.arg1, result);
-                    if (result.exception != null) {
-                        Log.w(LOG_TAG, "Error in setting fwd# " + msg.arg1 + ": " +
-                                result.exception.getMessage());
-                    }
-                    if (isForwardingCompleted()) {
-                        if (isFwdChangeSuccess()) {
-                            if (DBG) log("Overall fwd changes completed ok, starting vm change");
-                            setVMNumberWithCarrier();
-                        } else {
-                            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();
-                            while (it.hasNext()) {
-                                Map.Entry<Integer,AsyncResult> entry = it.next();
-                                if (entry.getValue().exception == null) {
-                                    // If at least one succeeded we have to revert
-                                    Log.i(LOG_TAG, "Rollback will be required");
-                                    mFwdChangesRequireRollback = true;
-                                    break;
-                                }
-                            }
-                            if (!mFwdChangesRequireRollback) {
-                                Log.i(LOG_TAG, "No rollback needed.");
-                            }
-                            done = true;
-                        }
-                    }
-                    break;
-                default:
-                    // TODO: should never reach this, may want to throw exception
-            }
-
-            if (done) {
-                if (DBG) log("All VM provider related changes done");
-                if (mForwardingChangeResults != null) {
-                    dismissDialogSafely(VoicemailDialogUtil.VM_FWD_SAVING_DIALOG);
-                }
-                handleSetVmOrFwdMessage();
-            }
-        }
-    };
-
-    /**
-     * Callback to handle option revert completions
-     */
-    private final Handler mRevertOptionComplete = new Handler() {
-        @Override
-        public void handleMessage(Message msg) {
-            AsyncResult result = (AsyncResult) msg.obj;
-            switch (msg.what) {
-                case EVENT_VOICEMAIL_CHANGED:
-                    if (DBG) log("VM revert complete msg");
-                    mVoicemailChangeResult = result;
-                    break;
-
-                case EVENT_FORWARDING_CHANGED:
-                    if (DBG) log("FWD revert complete msg ");
-                    mForwardingChangeResults.put(msg.arg1, result);
-                    if (result.exception != null) {
-                        if (DBG) log("Error in reverting fwd# " + msg.arg1 + ": " +
-                                result.exception.getMessage());
-                    }
-                    break;
-
-                default:
-                    // TODO: should never reach this, may want to throw exception
-            }
-
-            final boolean done = (!mVMChangeCompletedSuccessfully || mVoicemailChangeResult != null)
-                    && (!mFwdChangesRequireRollback || isForwardingCompleted());
-            if (done) {
-                if (DBG) log("All VM reverts done");
-                dismissDialogSafely(VoicemailDialogUtil.VM_REVERTING_DIALOG);
-                onRevertDone();
-            }
-        }
-    };
-
-    /**
-     * Return true if there is a change result for every reason for which we expect a result.
-     */
-    private boolean isForwardingCompleted() {
-        if (mForwardingChangeResults == null) {
-            return true;
-        }
-
-        for (Integer reason : mExpectedChangeResultReasons) {
-            if (mForwardingChangeResults.get(reason) == null) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    private boolean isFwdChangeSuccess() {
-        if (mForwardingChangeResults == null) {
-            return true;
-        }
-
-        for (AsyncResult result : mForwardingChangeResults.values()) {
-            Throwable exception = result.exception;
-            if (exception != null) {
-                String msg = exception.getMessage();
-                msg = (msg != null) ? msg : "";
-                Log.w(LOG_TAG, "Failed to change forwarding setting. Reason: " + msg);
-                return false;
-            }
-        }
-        return true;
-    }
-
-    private boolean isVmChangeSuccess() {
-        if (mVoicemailChangeResult.exception != null) {
-            String msg = mVoicemailChangeResult.exception.getMessage();
-            msg = (msg != null) ? msg : "";
-            Log.w(LOG_TAG, "Failed to change voicemail. Reason: " + msg);
-            return false;
-        }
-        return true;
-    }
-
-    private void handleSetVmOrFwdMessage() {
-        if (DBG) log("handleSetVMMessage: set VM request complete");
-
-        if (!isFwdChangeSuccess()) {
-            handleVmOrFwdSetError(VoicemailDialogUtil.FWD_SET_RESPONSE_ERROR_DIALOG);
-        } else if (!isVmChangeSuccess()) {
-            handleVmOrFwdSetError(VoicemailDialogUtil.VM_RESPONSE_ERROR_DIALOG);
-        } else {
-            handleVmAndFwdSetSuccess(VoicemailDialogUtil.VM_CONFIRM_DIALOG);
-        }
-    }
-
-    /**
-     * Called when Voicemail Provider or its forwarding settings failed. Rolls back partly made
-     * changes to those settings and show "failure" dialog.
-     *
-     * @param dialogId ID of the dialog to show for the specific error case. Either
-     *     {@link #FWD_SET_RESPONSE_ERROR_DIALOG} or {@link #VM_RESPONSE_ERROR_DIALOG}
-     */
-    private void handleVmOrFwdSetError(int dialogId) {
-        if (mChangingVMorFwdDueToProviderChange) {
-            mVMOrFwdSetError = dialogId;
-            mChangingVMorFwdDueToProviderChange = false;
-            switchToPreviousVoicemailProvider();
-            return;
-        }
-        mChangingVMorFwdDueToProviderChange = false;
-        showDialogIfForeground(dialogId);
-        updateVoiceNumberField();
-    }
-
-    /**
-     * 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 dialogId) {
-        if (DBG) log("handleVmAndFwdSetSuccess: key is " + mVoicemailProviders.getKey());
-
-        mPreviousVMProviderKey = mVoicemailProviders.getKey();
-        mChangingVMorFwdDueToProviderChange = false;
-        showDialogIfForeground(dialogId);
-        updateVoiceNumberField();
-    }
-
-    /**
-     * Update the voicemail number from what we've recorded on the sim.
-     */
-    private void updateVoiceNumberField() {
-        if (DBG) log("updateVoiceNumberField()");
-
-        mOldVmNumber = mPhone.getVoiceMailNumber();
-        if (TextUtils.isEmpty(mOldVmNumber)) {
-            mSubMenuVoicemailSettings.setPhoneNumber("");
-            mSubMenuVoicemailSettings.setSummary(getString(R.string.voicemail_number_not_set));
-        } else {
-            mSubMenuVoicemailSettings.setPhoneNumber(mOldVmNumber);
-            mSubMenuVoicemailSettings.setSummary(mOldVmNumber);
-        }
-    }
-
-    /*
-     * Helper Methods for Activity class.
-     * The initial query commands are split into two pieces now
-     * for individual expansion.  This combined with the ability
-     * to cancel queries allows for a much better user experience,
-     * and also ensures that the user only waits to update the
-     * data that is relevant.
-     */
-
-    @Override
-    protected void onPrepareDialog(int id, Dialog dialog) {
-        super.onPrepareDialog(id, dialog);
-        mCurrentDialogId = id;
-    }
-
-    // dialog creation method, called by showDialog()
-    @Override
-    protected Dialog onCreateDialog(int dialogId) {
-        return VoicemailDialogUtil.getDialog(this, dialogId);
-    }
-
-    // This is a method implemented for DialogInterface.OnClickListener.
-    // Used with the error dialog to close the app, voicemail dialog to just dismiss.
-    // Close button is mapped to BUTTON_POSITIVE for the errors that close the activity,
-    // while those that are mapped to BUTTON_NEUTRAL only move the preference focus.
-    public void onClick(DialogInterface dialog, int which) {
-        if (DBG) log("onClick: button clicked is " + which);
-
-        dialog.dismiss();
-        switch (which){
-            case DialogInterface.BUTTON_NEGATIVE:
-                if (mCurrentDialogId == VoicemailDialogUtil.FWD_GET_RESPONSE_ERROR_DIALOG) {
-                    // We failed to get current forwarding settings and the user
-                    // does not wish to continue.
-                    switchToPreviousVoicemailProvider();
-                }
-                break;
-            case DialogInterface.BUTTON_POSITIVE:
-                if (mCurrentDialogId == VoicemailDialogUtil.FWD_GET_RESPONSE_ERROR_DIALOG) {
-                    // We failed to get current forwarding settings but the user
-                    // wishes to continue changing settings to the new vm provider
-                    saveVoiceMailAndForwardingNumberStage2();
-                } else {
-                    finish();
-                }
-                return;
-            default:
-                // just let the dialog close and go back to the input
-        }
-
-        // In all dialogs, all buttons except BUTTON_POSITIVE lead to the end of user interaction
-        // with settings UI. If we were called to explicitly configure voice mail then
-        // we finish the settings activity here to come back to whatever the user was doing.
-        if (getIntent().getAction().equals(ACTION_ADD_VOICEMAIL)) {
-            finish();
-        }
-    }
-
-    /*
-     * Activity class methods
-     */
-
-    @Override
     protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         if (DBG) log("onCreate: Intent is " + getIntent());
@@ -1143,15 +173,6 @@
             return;
         }
 
-        mAudioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
-
-        // Show the voicemail preference in onResume if the calling intent specifies the
-        // ACTION_ADD_VOICEMAIL action.
-        mShowVoicemailPreference = (icicle == null) &&
-                TextUtils.equals(getIntent().getAction(), ACTION_ADD_VOICEMAIL);
-        mSetupVoicemail = mShowVoicemailPreference &&
-                getIntent().getBooleanExtra(SETUP_VOICEMAIL_EXTRA, false);
-
         mSubscriptionInfoHelper = new SubscriptionInfoHelper(this, getIntent());
         mSubscriptionInfoHelper.setActionBarTitle(
                 getActionBar(), getResources(), R.string.call_settings_with_label);
@@ -1161,7 +182,6 @@
     @Override
     protected void onResume() {
         super.onResume();
-        mForeground = true;
 
         PreferenceScreen preferenceScreen = getPreferenceScreen();
         if (preferenceScreen != null) {
@@ -1181,49 +201,15 @@
         }
 
         PreferenceScreen prefSet = getPreferenceScreen();
-        mSubMenuVoicemailSettings = (EditPhoneNumberPreference) findPreference(BUTTON_VOICEMAIL_KEY);
-        mSubMenuVoicemailSettings.setParentActivity(this, VOICEMAIL_PREF_ID, this);
-        mSubMenuVoicemailSettings.setDialogOnClosedListener(this);
-        mSubMenuVoicemailSettings.setDialogTitle(R.string.voicemail_settings_number_label);
-
-        mButtonDTMF = (ListPreference) findPreference(BUTTON_DTMF_KEY);
-        mButtonAutoRetry = (CheckBoxPreference) findPreference(BUTTON_RETRY_KEY);
-        mButtonHAC = (CheckBoxPreference) findPreference(BUTTON_HAC_KEY);
-        mButtonTTY = (TtyModeListPreference) findPreference(
-                getResources().getString(R.string.tty_mode_key));
-
-        mVoicemailProviders = (VoicemailProviderListPreference) findPreference(
-                BUTTON_VOICEMAIL_PROVIDER_KEY);
-        mVoicemailProviders.init(mPhone, getIntent());
-        mVoicemailProviders.setOnPreferenceChangeListener(this);
-        mPreviousVMProviderKey = mVoicemailProviders.getValue();
-
         mVoicemailSettingsScreen =
                 (PreferenceScreen) findPreference(VOICEMAIL_SETTING_SCREEN_PREF_KEY);
-        mVoicemailSettings = (PreferenceScreen) findPreference(BUTTON_VOICEMAIL_SETTING_KEY);
+        mVoicemailSettingsScreen.setIntent(mSubscriptionInfoHelper.getIntent(
+                VoicemailSettingsActivity.class));
 
-        mVoicemailNotificationRingtone = (VoicemailRingtonePreference) findPreference(
-                getResources().getString(R.string.voicemail_notification_ringtone_key));
-        mVoicemailNotificationRingtone.init(mPhone);
-
-        mVoicemailNotificationVibrate = (CheckBoxPreference) findPreference(
-                getResources().getString(R.string.voicemail_notification_vibrate_key));
-        mVoicemailNotificationVibrate.setOnPreferenceChangeListener(this);
-
-        updateVMPreferenceWidgets(mVoicemailProviders.getValue());
+        mButtonAutoRetry = (CheckBoxPreference) findPreference(BUTTON_RETRY_KEY);
 
         mEnableVideoCalling = (CheckBoxPreference) findPreference(ENABLE_VIDEO_CALLING_KEY);
 
-        if (getResources().getBoolean(R.bool.dtmf_type_enabled)) {
-            mButtonDTMF.setOnPreferenceChangeListener(this);
-            int dtmf = Settings.System.getInt(getContentResolver(),
-                    Settings.System.DTMF_TONE_TYPE_WHEN_DIALING, Constants.DTMF_TONE_TYPE_NORMAL);
-            mButtonDTMF.setValueIndex(dtmf);
-        } else {
-            prefSet.removePreference(mButtonDTMF);
-            mButtonDTMF = null;
-        }
-
         if (getResources().getBoolean(R.bool.auto_retry_enabled)) {
             mButtonAutoRetry.setOnPreferenceChangeListener(this);
             int autoretry = Settings.Global.getInt(
@@ -1234,28 +220,13 @@
             mButtonAutoRetry = null;
         }
 
-        if (getResources().getBoolean(R.bool.hac_enabled)) {
-            mButtonHAC.setOnPreferenceChangeListener(this);
-            int hac = Settings.System.getInt(getContentResolver(), Settings.System.HEARING_AID, 0);
-            mButtonHAC.setChecked(hac != 0);
+        Preference cdmaOptions = prefSet.findPreference(BUTTON_CDMA_OPTIONS);
+        Preference gsmOptions = prefSet.findPreference(BUTTON_GSM_UMTS_OPTIONS);
+        if (getResources().getBoolean(R.bool.world_phone)) {
+            cdmaOptions.setIntent(mSubscriptionInfoHelper.getIntent(CdmaCallOptions.class));
+            gsmOptions.setIntent(mSubscriptionInfoHelper.getIntent(GsmUmtsCallOptions.class));
         } else {
-            prefSet.removePreference(mButtonHAC);
-            mButtonHAC = null;
-        }
-
-        if (!telephonyManager.isMultiSimEnabled() && telecomManager.isTtySupported()) {
-            mButtonTTY.init();
-        } else {
-            prefSet.removePreference(mButtonTTY);
-            mButtonTTY = null;
-        }
-
-        if (!getResources().getBoolean(R.bool.world_phone)) {
-            Preference cdmaOptions = prefSet.findPreference(BUTTON_CDMA_OPTIONS);
             prefSet.removePreference(cdmaOptions);
-
-            // TODO: Support MSIM for this preference option.
-            Preference gsmOptions = prefSet.findPreference(BUTTON_GSM_UMTS_OPTIONS);
             prefSet.removePreference(gsmOptions);
 
             int phoneType = mPhone.getPhoneType();
@@ -1264,9 +235,6 @@
                     getContentResolver(), Settings.Global.HIDE_CARRIER_NETWORK_SETTINGS, 0) == 1;
             if (shouldHideCarrierSettings) {
                 prefSet.removePreference(fdnButton);
-                if (mButtonDTMF != null) {
-                    prefSet.removePreference(mButtonDTMF);
-                }
             } else {
                 if (phoneType == PhoneConstants.PHONE_TYPE_CDMA) {
                     prefSet.removePreference(fdnButton);
@@ -1279,15 +247,7 @@
 
                     if (getResources().getBoolean(R.bool.config_additional_call_setting)) {
                         addPreferencesFromResource(R.xml.gsm_umts_call_options);
-
-                        Preference callForwardingPref = prefSet.findPreference(CALL_FORWARDING_KEY);
-                        callForwardingPref.setIntent(mSubscriptionInfoHelper.getIntent(
-                                GsmUmtsCallForwardOptions.class));
-
-                        Preference additionalGsmSettingsPref =
-                                prefSet.findPreference(ADDITIONAL_GSM_SETTINGS_KEY);
-                        additionalGsmSettingsPref.setIntent(mSubscriptionInfoHelper.getIntent(
-                                GsmUmtsAdditionalCallOptions.class));
+                        GsmUmtsCallOptions.init(prefSet, mSubscriptionInfoHelper);
                     }
                 } else {
                     throw new IllegalStateException("Unexpected phone type: " + phoneType);
@@ -1295,36 +255,11 @@
             }
         }
 
-        // check the intent that started this activity and pop up the voicemail
-        // dialog if we've been asked to.
-        // If we have at least one non default VM provider registered then bring up
-        // the selection for the VM provider, otherwise bring up a VM number dialog.
-        // We only bring up the dialog the first time we are called (not after orientation change)
-        if (mShowVoicemailPreference) {
-            if (DBG) log("ACTION_ADD_VOICEMAIL Intent is thrown");
-            if (mSetupVoicemail) {
-                simulatePreferenceClick(mVoicemailSettingsScreen);
-                mSetupVoicemail = false;
-            } else if (mVoicemailProviders.hasMoreThanOneVoicemailProvider()) {
-                if (DBG) log("Voicemail data has more than one provider.");
-                simulatePreferenceClick(mVoicemailProviders);
-            } else {
-                onPreferenceChange(mVoicemailProviders, VoicemailProviderListPreference.DEFAULT_KEY);
-                mVoicemailProviders.setValue(VoicemailProviderListPreference.DEFAULT_KEY);
-            }
-            mShowVoicemailPreference = false;
-        }
-
-        updateVoiceNumberField();
-        mVMProviderSettingsForced = false;
-
-        mVoicemailNotificationVibrate.setChecked(
-                VoicemailNotificationSettingsUtil.isVibrationEnabled(mPhone));
-
         if (ImsManager.isVtEnabledByPlatform(mPhone.getContext()) && ENABLE_VT_FLAG) {
             boolean currentValue =
                     ImsManager.isEnhanced4gLteModeSettingEnabledByUser(mPhone.getContext())
-                    ? PhoneGlobals.getInstance().phoneMgr.isVideoCallingEnabled() : false;
+                    ? PhoneGlobals.getInstance().phoneMgr.isVideoCallingEnabled(
+                            getOpPackageName()) : false;
             mEnableVideoCalling.setChecked(currentValue);
             mEnableVideoCalling.setOnPreferenceChangeListener(this);
         } else {
@@ -1335,7 +270,32 @@
                 !mPhone.getContext().getResources().getBoolean(
                         com.android.internal.R.bool.config_carrier_volte_tty_supported)) {
             TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
-            tm.listen(mPhoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);
+            /* tm.listen(mPhoneStateListener, PhoneStateListener.LISTEN_CALL_STATE); */
+        }
+
+        Preference wifiCallingSettings = findPreference(
+                getResources().getString(R.string.wifi_calling_settings_key));
+        if (!ImsManager.isWfcEnabledByPlatform(mPhone.getContext())) {
+            prefSet.removePreference(wifiCallingSettings);
+        } else {
+            int resId = com.android.internal.R.string.wifi_calling_off_summary;
+            if (ImsManager.isWfcEnabledByUser(mPhone.getContext())) {
+                int wfcMode = ImsManager.getWfcMode(mPhone.getContext());
+                switch (wfcMode) {
+                    case ImsConfig.WfcModeFeatureValueConstants.WIFI_ONLY:
+                        resId = com.android.internal.R.string.wfc_mode_wifi_only_summary;
+                        break;
+                    case ImsConfig.WfcModeFeatureValueConstants.CELLULAR_PREFERRED:
+                        resId = com.android.internal.R.string.wfc_mode_cellular_preferred_summary;
+                        break;
+                    case ImsConfig.WfcModeFeatureValueConstants.WIFI_PREFERRED:
+                        resId = com.android.internal.R.string.wfc_mode_wifi_preferred_summary;
+                        break;
+                    default:
+                        if (DBG) log("Unexpected WFC mode value: " + wfcMode);
+                }
+            }
+            wifiCallingSettings.setSummary(resId);
         }
     }
 
@@ -1353,58 +313,6 @@
         Log.d(LOG_TAG, msg);
     }
 
-    /**
-     * Updates the look of the VM preference widgets based on current VM provider settings.
-     * Note that the provider name is loaded fxrorm the found activity via loadLabel in
-     * {@link VoicemailProviderListPreference#initVoiceMailProviders()} in order for it to be
-     * localizable.
-     */
-    private void updateVMPreferenceWidgets(String currentProviderSetting) {
-        final String key = currentProviderSetting;
-        final VoicemailProvider provider = mVoicemailProviders.getVoicemailProvider(key);
-
-        /* This is the case when we are coming up on a freshly wiped phone and there is no
-         persisted value for the list preference mVoicemailProviders.
-         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: key: " + key + " -> null.");
-
-            mVoicemailProviders.setSummary(getString(R.string.sum_voicemail_choose_provider));
-            mVoicemailSettings.setEnabled(false);
-            mVoicemailSettings.setIntent(null);
-            mVoicemailNotificationVibrate.setEnabled(false);
-        } else {
-            if (DBG) log("updateVMPreferenceWidget: key: " + key + " -> " + provider.toString());
-
-            final String providerName = provider.name;
-            mVoicemailProviders.setSummary(providerName);
-            mVoicemailSettings.setEnabled(true);
-            mVoicemailSettings.setIntent(provider.intent);
-            mVoicemailNotificationVibrate.setEnabled(true);
-        }
-    }
-
-
-    /**
-     * Simulates user clicking on a passed preference.
-     * Usually needed when the preference is a dialog preference and we want to invoke
-     * a dialog for this preference programmatically.
-     * TODO: figure out if there is a cleaner way to cause preference dlg to come up
-     */
-    private void simulatePreferenceClick(Preference preference) {
-        // Go through settings until we find our setting
-        // and then simulate a click on it to bring up the dialog
-        final ListAdapter adapter = getPreferenceScreen().getRootAdapter();
-        for (int idx = 0; idx < adapter.getCount(); idx++) {
-            if (adapter.getItem(idx) == preference) {
-                getPreferenceScreen().onItemClick(this.getListView(),
-                        null, idx, adapter.getItemId(idx));
-                break;
-            }
-        }
-    }
-
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         final int itemId = item.getItemId();
diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
new file mode 100644
index 0000000..c6a1921
--- /dev/null
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -0,0 +1,366 @@
+/**
+ * Copyright (c) 2015, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package com.android.phone;
+
+import static android.Manifest.permission.READ_PHONE_STATE;
+import static com.android.internal.telephony.uicc.IccCardProxy.ACTION_INTERNAL_SIM_STATE_CHANGED;
+
+import android.app.ActivityManagerNative;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.ServiceConnection;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.os.AsyncResult;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.Message;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.UserHandle;
+import android.service.carrier.CarrierConfigService;
+import android.service.carrier.CarrierIdentifier;
+import android.service.carrier.ICarrierConfigService;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.util.Log;
+
+import com.android.internal.telephony.ICarrierConfigLoader;
+import com.android.internal.telephony.IccCardConstants;
+import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.PhoneConstants;
+import com.android.internal.telephony.PhoneFactory;
+import com.android.internal.telephony.TelephonyIntents;
+
+import java.util.List;
+
+/**
+ * CarrierConfigLoader binds to privileged carrier apps to fetch carrier config overlays.
+ * TODO: implement persist cache
+ * TODO: add gid2 to phone
+ * TODO: handle package install/uninstall events
+ */
+
+public class CarrierConfigLoader extends ICarrierConfigLoader.Stub {
+    private static final String TAG = "CarrierConfigLoader";
+    // Package name for default carrier config app, bundled with system image.
+    private static final String DEFAULT_CARRIER_CONFIG_PACKAGE = "com.android.carrierconfig";
+
+    /** The singleton instance. */
+    private static CarrierConfigLoader sInstance;
+    // The context for phone app, passed from PhoneGlobals.
+    private Context mContext;
+    // Carrier configs from default app, indexed by phoneID.
+    private Bundle[] mConfigFromDefaultApp;
+    // Carrier configs from privileged carrier config app, indexed by phoneID.
+    private Bundle[] mConfigFromCarrierApp;
+    // Service connection for binding to config app.
+    private ConfigServiceConnection[] mServiceConnection;
+
+    // Broadcast receiver for SIM and pkg intents, register intent filter in constructor.
+    private final BroadcastReceiver mReceiver = new ConfigLoaderBroadcastReceiver();
+
+    // Message codes; see mHandler below.
+    // Request from SubscriptionInfoUpdater when SIM becomes absent or error.
+    private static final int EVENT_CLEAR_CONFIG = 0;
+    // Request from SubscriptionInfoUpdater to update config.
+    private static final int EVENT_UPDATE_CONFIG = 1;
+    // Request from carrier app to reload config.
+    private static final int EVENT_RELOAD_CONFIG = 2;
+    // Has connected to default app.
+    private static final int EVENT_CONNECTED_TO_DEFAULT = 3;
+    // Has connected to carrier app.
+    private static final int EVENT_CONNECTED_TO_CARRIER = 4;
+    // Config has been loaded from default app.
+    private static final int EVENT_LOADED_FROM_DEFAULT = 5;
+    // Config has been loaded from carrier app.
+    private static final int EVENT_LOADED_FROM_CARRIER = 6;
+
+
+    // Handler to process various events.
+    // For each phoneId, state transition should be: default app bind->connected->loaded,
+    // carrier app (if exists) bind-> connected->loaded. At any time, at most one connection is active.
+    // If events are not in this order, previous connection will be unbind, so only latest event takes effect. 
+    // We broadcast config change when:
+    // 1. loaded from carrier app
+    // 2. loaded from default app if no carrier app
+    // 3. config cleared, possibly due to sim removed
+    // 4. bind or IPC error
+    private Handler mHandler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            int phoneId = msg.arg1;
+            log("mHandler: " + msg.what + " phoneId: " + phoneId);
+            CarrierIdentifier carrierId;
+            ConfigServiceConnection conn;
+            Bundle config;
+            switch (msg.what) {
+                case EVENT_CLEAR_CONFIG:
+                    mConfigFromDefaultApp[phoneId] = null;
+                    mConfigFromCarrierApp[phoneId] = null;
+                    mServiceConnection[phoneId] = null;
+                    broadcastConfigChangedIntent(phoneId);
+                    break;
+                case EVENT_UPDATE_CONFIG:
+                    // Use persist cache to avoid loading from app.
+                    // Fall through to next event if cache not hit.
+                case EVENT_RELOAD_CONFIG:
+                    if (!bindToConfigPackage(DEFAULT_CARRIER_CONFIG_PACKAGE,
+                            phoneId, EVENT_CONNECTED_TO_DEFAULT)) {
+                        //Send bcast if bind fails
+                        broadcastConfigChangedIntent(phoneId);
+                    }
+                    break;
+
+                case EVENT_CONNECTED_TO_DEFAULT:
+                    carrierId = getCarrierIdForPhoneId(phoneId);
+                    conn = (ConfigServiceConnection) msg.obj;
+                    // If new service connection has been created, unbind.
+                    if (mServiceConnection[phoneId] != conn || conn.service == null) {
+                        mContext.unbindService(conn);
+                        break;
+                    }
+                    try {
+                        ICarrierConfigService configService = ICarrierConfigService.Stub.asInterface(conn.service);
+                        config = configService.getCarrierConfig(carrierId);
+                        mConfigFromDefaultApp[phoneId] = config;
+                        mHandler.sendMessage(mHandler.obtainMessage(EVENT_LOADED_FROM_DEFAULT, phoneId));
+                    } catch (RemoteException ex) {
+                        Log.e(TAG, "Failed to get carrier config: " + ex.toString());
+                    } finally {
+                        mContext.unbindService(mServiceConnection[phoneId]);
+                    }
+                    break;
+
+                case EVENT_LOADED_FROM_DEFAULT:
+                    if (mServiceConnection[phoneId] == null) {
+                        break;
+                    }
+                    List<String> carrierPackageNames = TelephonyManager.from(mContext)
+                            .getCarrierPackageNamesForIntent(new Intent(CarrierConfigService.SERVICE_INTERFACE));
+                    log("Found carrier config app: " + carrierPackageNames);
+                    if (carrierPackageNames != null && carrierPackageNames.size() > 0) {
+                        if (!bindToConfigPackage(carrierPackageNames.get(0),
+                                phoneId, EVENT_CONNECTED_TO_CARRIER)) {
+                            broadcastConfigChangedIntent(phoneId);
+                        }
+                    } else {
+                        broadcastConfigChangedIntent(phoneId);
+                    }
+                    break;
+
+                case EVENT_CONNECTED_TO_CARRIER:
+                    carrierId = getCarrierIdForPhoneId(phoneId);
+                    conn = (ConfigServiceConnection) msg.obj;
+                    // If new service connection has been created, unbind.
+                    if (mServiceConnection[phoneId] != conn ||
+                        conn.service == null) {
+                        mContext.unbindService(conn);
+                        break;
+                    }
+                    try {
+                        ICarrierConfigService configService = ICarrierConfigService.Stub.asInterface(conn.service);
+                        config = configService.getCarrierConfig(carrierId);
+                        mConfigFromCarrierApp[phoneId] = config;
+                        mHandler.sendMessage(mHandler.obtainMessage(EVENT_LOADED_FROM_CARRIER, phoneId));
+                    } catch (RemoteException ex) {
+                        Log.e(TAG, "Failed to get carrier config: " + ex.toString());
+                    } finally {
+                        mContext.unbindService(mServiceConnection[phoneId]);
+                    }
+                    break;
+
+                case EVENT_LOADED_FROM_CARRIER:
+                    if (mServiceConnection[phoneId] == null) {
+                        break;
+                    }
+                    broadcastConfigChangedIntent(phoneId);
+                    break;
+            }
+        }
+    };
+
+    /**
+     * Constructs a CarrierConfigLoader, registers it as a service, and registers a broadcast
+     * receiver for relevant events.
+     */
+    private CarrierConfigLoader(Context context) {
+        mContext = context;
+
+        // Register for package updates.
+        IntentFilter triggers = new IntentFilter();
+        triggers.addAction(Intent.ACTION_PACKAGE_ADDED);
+        triggers.addAction(Intent.ACTION_PACKAGE_CHANGED);
+        triggers.addAction(Intent.ACTION_PACKAGE_REMOVED);
+        mContext.registerReceiver(mReceiver, triggers);
+
+        int numPhones = TelephonyManager.from(context).getPhoneCount();
+        mConfigFromDefaultApp = new Bundle[numPhones];
+        mConfigFromCarrierApp = new Bundle[numPhones];
+        mServiceConnection = new ConfigServiceConnection[numPhones];
+        // Make this service available through ServiceManager.
+        ServiceManager.addService(Context.CARRIER_CONFIG_SERVICE, this);
+        log("CarrierConfigLoader has started");
+    }
+
+    /**
+     * Initialize the singleton CarrierConfigLoader instance.
+     *
+     * This is only done once, at startup, from {@link com.android.phone.PhoneApp#onCreate}.
+     */
+    /* package */
+    static CarrierConfigLoader init(Context context) {
+        synchronized (CarrierConfigLoader.class) {
+            if (sInstance == null) {
+                sInstance = new CarrierConfigLoader(context);
+            } else {
+                Log.wtf(TAG, "init() called multiple times!  sInstance = " + sInstance);
+            }
+            return sInstance;
+        }
+    }
+
+    private void broadcastConfigChangedIntent(int phoneId) {
+        Intent intent = new Intent(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);
+        intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);
+        SubscriptionManager.putPhoneIdAndSubIdExtra(intent, phoneId);
+        ActivityManagerNative.broadcastStickyIntent(intent, READ_PHONE_STATE,
+              UserHandle.USER_ALL);
+    }
+
+    /** Binds to the default or carrier config app. */
+    private boolean bindToConfigPackage(String pkgName, int phoneId, int eventId) {
+        log("Binding to " + pkgName + " for phone " + phoneId);
+        Intent carrierConfigService = new Intent(CarrierConfigService.SERVICE_INTERFACE);
+        carrierConfigService.setPackage(pkgName);
+        mServiceConnection[phoneId] = new ConfigServiceConnection(phoneId, eventId);
+        try {
+            return mContext.bindService(carrierConfigService, mServiceConnection[phoneId],
+                    Context.BIND_AUTO_CREATE);
+        } catch (SecurityException ex) {
+            return false;
+        }
+    }
+
+    private CarrierIdentifier getCarrierIdForPhoneId(int phoneId) {
+        String mcc = "";
+        String mnc = "";
+        String imsi = "";
+        String gid1 = "";
+        String gid2 = "";
+        String spn = TelephonyManager.from(mContext).getSimOperatorNameForPhone(phoneId);
+        String simOperator = TelephonyManager.from(mContext).getSimOperatorNumericForPhone(phoneId);
+        // A valid simOperator should be 5 or 6 digits, depending on the length of the MNC.
+        if (simOperator != null && simOperator.length() >= 3) {
+            mcc = simOperator.substring(0, 3);
+            mnc = simOperator.substring(3);
+        }
+        Phone phone = PhoneFactory.getPhone(phoneId);
+        if (phone != null) {
+            imsi = phone.getSubscriberId();
+            gid1 = phone.getGroupIdLevel1();
+            // add gid2 after phone supports it.
+        }
+
+        return new CarrierIdentifier(mcc, mnc, spn, imsi, gid1, gid2);
+    }
+
+    @Override
+    public Bundle getConfigForSubId(int subId) {
+        int phoneId = SubscriptionManager.getPhoneId(subId);
+        Bundle retConfig = CarrierConfigManager.getDefaultConfig();
+        if (SubscriptionManager.isValidPhoneId(phoneId)) {
+            Bundle config = mConfigFromDefaultApp[phoneId];
+            if (config != null) retConfig.putAll(config);
+            config = mConfigFromCarrierApp[phoneId];
+            if (config != null) retConfig.putAll(config);
+        }
+        return retConfig;
+    }
+
+    @Override
+    public void reloadCarrierConfigForSubId(int subId) {
+        int phoneId = SubscriptionManager.getPhoneId(subId);
+        if (SubscriptionManager.isValidPhoneId(phoneId)) {
+            mHandler.sendMessage(mHandler.obtainMessage(EVENT_RELOAD_CONFIG, phoneId));
+        } else {
+            log("Ignore invalid phoneId: " + phoneId + " for subId: " + subId);
+        }
+    }
+
+    @Override
+    public void updateConfigForPhoneId(int phoneId, String simState) {
+        log("update config for phoneId: " + phoneId + " simState: " + simState);
+        if (!SubscriptionManager.isValidPhoneId(phoneId)) {
+            return;
+        }
+        // requires Java 7 for switch on string.
+        switch (simState) {
+            case IccCardConstants.INTENT_VALUE_ICC_ABSENT:
+            case IccCardConstants.INTENT_VALUE_ICC_CARD_IO_ERROR:
+            case IccCardConstants.INTENT_VALUE_ICC_UNKNOWN:
+                mHandler.sendMessage(mHandler.obtainMessage(EVENT_CLEAR_CONFIG, phoneId));
+                break;
+            case IccCardConstants.INTENT_VALUE_ICC_LOADED:
+            case IccCardConstants.INTENT_VALUE_ICC_LOCKED:
+                mHandler.sendMessage(mHandler.obtainMessage(EVENT_UPDATE_CONFIG, phoneId));
+                break;
+        }
+    }
+
+    private class ConfigServiceConnection implements ServiceConnection {
+        int phoneId;
+        int eventId;
+        IBinder service;
+
+        public ConfigServiceConnection(int phoneId, int eventId) {
+            this.phoneId = phoneId;
+            this.eventId = eventId;
+        }
+
+        @Override
+        public void onServiceConnected(ComponentName name, IBinder service) {
+            log("Connected to config app: " + name.flattenToString());
+            this.service = service;
+            mHandler.sendMessage(mHandler.obtainMessage(eventId, phoneId, -1, this));
+        }
+
+        @Override
+        public void onServiceDisconnected(ComponentName name) {
+            this.service = null;
+        }
+    }
+
+    private class ConfigLoaderBroadcastReceiver extends BroadcastReceiver {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            log("Receive action: " + action);
+        }
+    }
+
+    private static void log(String msg) {
+        Log.d(TAG, msg);
+    }
+}
+
diff --git a/src/com/android/phone/CdmaCallOptions.java b/src/com/android/phone/CdmaCallOptions.java
index 8eecd27..8f7b1b1 100644
--- a/src/com/android/phone/CdmaCallOptions.java
+++ b/src/com/android/phone/CdmaCallOptions.java
@@ -29,6 +29,7 @@
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
 import android.util.Log;
+import android.view.MenuItem;
 
 public class CdmaCallOptions extends PreferenceActivity {
     private static final String LOG_TAG = "CdmaCallOptions";
@@ -43,8 +44,12 @@
 
         addPreferencesFromResource(R.xml.cdma_call_privacy);
 
+        SubscriptionInfoHelper subInfoHelper = new SubscriptionInfoHelper(this, getIntent());
+        subInfoHelper.setActionBarTitle(
+                getActionBar(), getResources(), R.string.labelCdmaMore_with_label);
+
         mButtonVoicePrivacy = (CheckBoxPreference) findPreference(BUTTON_VP_KEY);
-        if (PhoneGlobals.getPhone().getPhoneType() != PhoneConstants.PHONE_TYPE_CDMA
+        if (subInfoHelper.getPhone().getPhoneType() != PhoneConstants.PHONE_TYPE_CDMA
                 || getResources().getBoolean(R.bool.config_voice_privacy_disable)) {
             //disable the entire screen
             getPreferenceScreen().setEnabled(false);
@@ -52,6 +57,16 @@
     }
 
     @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        final int itemId = item.getItemId();
+        if (itemId == android.R.id.home) {
+            onBackPressed();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
         if (preference.getKey().equals(BUTTON_VP_KEY)) {
             return true;
diff --git a/src/com/android/phone/Constants.java b/src/com/android/phone/Constants.java
index 79a1e9a..64414e9 100644
--- a/src/com/android/phone/Constants.java
+++ b/src/com/android/phone/Constants.java
@@ -130,7 +130,4 @@
     // OutgoingCallBroadcaster, OtaUtils, etc.)
     //
 
-    // Dtmf tone type setting value for CDMA phone
-    public static final int DTMF_TONE_TYPE_NORMAL = 0;
-    public static final int DTMF_TONE_TYPE_LONG   = 1;
 }
diff --git a/src/com/android/phone/EditPhoneNumberPreference.java b/src/com/android/phone/EditPhoneNumberPreference.java
index 86671a8..8a672f1 100644
--- a/src/com/android/phone/EditPhoneNumberPreference.java
+++ b/src/com/android/phone/EditPhoneNumberPreference.java
@@ -94,7 +94,7 @@
      * DialogPreference.onDialogClosed(), except we also pass in a buttonClicked
      * value indicating which of the three possible buttons were pressed.
      */
-    interface OnDialogClosedListener {
+    public interface OnDialogClosedListener {
         void onDialogClosed(EditPhoneNumberPreference preference, int buttonClicked);
     }
 
@@ -102,7 +102,7 @@
      * Interface for the default number setting listener.  Handles requests for
      * the default display number for the dialog.
      */
-    interface GetDefaultNumberListener {
+    public interface GetDefaultNumberListener {
         /**
          * Notify that we are looking for a default display value.
          * @return null if there is no contribution from this interface,
diff --git a/src/com/android/phone/EmergencyActionGroup.java b/src/com/android/phone/EmergencyActionGroup.java
new file mode 100644
index 0000000..b8d17c9
--- /dev/null
+++ b/src/com/android/phone/EmergencyActionGroup.java
@@ -0,0 +1,351 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.phone;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.annotation.Nullable;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.provider.Settings;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewAnimationUtils;
+import android.view.ViewGroup;
+import android.view.accessibility.AccessibilityManager;
+import android.view.animation.AnimationUtils;
+import android.view.animation.Interpolator;
+import android.widget.Button;
+import android.widget.FrameLayout;
+import android.widget.TextView;
+
+import java.util.List;
+
+public class EmergencyActionGroup extends FrameLayout implements View.OnClickListener {
+
+    private static final long HIDE_DELAY = 3000;
+    private static final int RIPPLE_DURATION = 600;
+    private static final long RIPPLE_PAUSE = 1000;
+
+    private final Interpolator mFastOutLinearInInterpolator;
+
+    private ViewGroup mSelectedContainer;
+    private TextView mSelectedLabel;
+    private View mRippleView;
+    private View mLaunchHint;
+
+    private View mLastRevealed;
+
+    private MotionEvent mPendingTouchEvent;
+
+    private boolean mHiding;
+
+    public EmergencyActionGroup(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        mFastOutLinearInInterpolator = AnimationUtils.loadInterpolator(context,
+                android.R.interpolator.fast_out_linear_in);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+
+        setupAssistActions();
+
+        mSelectedContainer = (ViewGroup) findViewById(R.id.selected_container);
+        mSelectedContainer.setOnClickListener(this);
+        mSelectedLabel = (TextView) findViewById(R.id.selected_label);
+        mRippleView = findViewById(R.id.ripple_view);
+        mLaunchHint = findViewById(R.id.launch_hint);
+    }
+
+    /**
+     * Called by the activity before a touch event is dispatched to the view hierarchy.
+     */
+    public void onPreTouchEvent(MotionEvent event) {
+        mPendingTouchEvent = event;
+    }
+
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent event) {
+        boolean handled = super.dispatchTouchEvent(event);
+        if (mPendingTouchEvent == event && handled) {
+            mPendingTouchEvent = null;
+        }
+        return handled;
+    }
+
+    /**
+     * Called by the activity after a touch event is dispatched to the view hierarchy.
+     */
+    public void onPostTouchEvent(MotionEvent event) {
+        // Hide the confirmation button if a touch event was delivered to the activity but not to
+        // this view.
+        if (mPendingTouchEvent != null) {
+            hideTheButton();
+        }
+        mPendingTouchEvent = null;
+    }
+
+
+
+    private void setupAssistActions() {
+        int[] buttonIds = new int[] {R.id.action1, R.id.action2, R.id.action3};
+
+        List<ResolveInfo> infos = resolveAssistPackageAndQueryActivites();
+
+        for (int i = 0; i < 3; i++) {
+            Button button = (Button) findViewById(buttonIds[i]);
+            boolean visible = false;
+
+            button.setOnClickListener(this);
+
+            if (infos != null && infos.size() > i && infos.get(i) != null) {
+                ResolveInfo info = infos.get(i);
+                ComponentName name = getComponentName(info);
+
+                button.setTag(R.id.tag_intent,
+                        new Intent(TelephonyManager.ACTION_EMERGENCY_ASSISTANCE)
+                                .setComponent(name));
+                button.setText(info.loadLabel(getContext().getPackageManager()));
+                visible = true;
+            }
+
+            button.setVisibility(visible ? View.VISIBLE : View.GONE);
+        }
+    }
+
+    private List<ResolveInfo> resolveAssistPackageAndQueryActivites() {
+        List<ResolveInfo> infos = queryAssistActivities();
+
+        if (infos == null || infos.isEmpty()) {
+            PackageManager packageManager = getContext().getPackageManager();
+            Intent queryIntent = new Intent(TelephonyManager.ACTION_EMERGENCY_ASSISTANCE);
+            infos = packageManager.queryIntentActivities(queryIntent, 0);
+
+            PackageInfo bestMatch = null;
+            for (int i = 0; i < infos.size(); i++) {
+                if (infos.get(i).activityInfo == null) continue;
+                String packageName = infos.get(i).activityInfo.packageName;
+                PackageInfo packageInfo;
+                try {
+                    packageInfo = packageManager.getPackageInfo(packageName, 0);
+                } catch (PackageManager.NameNotFoundException e) {
+                    continue;
+                }
+                // Get earliest installed app, but prioritize system apps.
+                if (bestMatch == null
+                        || !isSystemApp(bestMatch) && isSystemApp(packageInfo)
+                        || isSystemApp(bestMatch) == isSystemApp(packageInfo)
+                                && bestMatch.firstInstallTime > packageInfo.firstInstallTime) {
+                    bestMatch = packageInfo;
+                }
+            }
+
+            if (bestMatch != null) {
+                Settings.Secure.putString(getContext().getContentResolver(),
+                        Settings.Secure.EMERGENCY_ASSISTANCE_APPLICATION,
+                        bestMatch.packageName);
+                return queryAssistActivities();
+            } else {
+                return null;
+            }
+        } else {
+            return infos;
+        }
+    }
+
+    private List<ResolveInfo> queryAssistActivities() {
+        String assistPackage = Settings.Secure.getString(
+                getContext().getContentResolver(),
+                Settings.Secure.EMERGENCY_ASSISTANCE_APPLICATION);
+        List<ResolveInfo> infos = null;
+
+        if (!TextUtils.isEmpty(assistPackage)) {
+            Intent queryIntent = new Intent(TelephonyManager.ACTION_EMERGENCY_ASSISTANCE)
+                    .setPackage(assistPackage);
+            infos = getContext().getPackageManager().queryIntentActivities(queryIntent, 0);
+        }
+        return infos;
+    }
+
+    private boolean isSystemApp(PackageInfo info) {
+        return info.applicationInfo != null
+                && (info.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0;
+    }
+
+    private ComponentName getComponentName(ResolveInfo resolveInfo) {
+        if (resolveInfo == null || resolveInfo.activityInfo == null) return null;
+        return new ComponentName(resolveInfo.activityInfo.packageName,
+                resolveInfo.activityInfo.name);
+    }
+
+    @Override
+    public void onClick(View v) {
+        Intent intent = (Intent) v.getTag(R.id.tag_intent);
+
+        switch (v.getId()) {
+            case R.id.action1:
+            case R.id.action2:
+            case R.id.action3:
+                if (AccessibilityManager.getInstance(mContext).isTouchExplorationEnabled()) {
+                    getContext().startActivity(intent);
+                } else {
+                    revealTheButton(v);
+                }
+                break;
+            case R.id.selected_container:
+                if (!mHiding) {
+                    getContext().startActivity(intent);
+                }
+                break;
+        }
+    }
+
+    private void revealTheButton(View v) {
+        mSelectedContainer.setVisibility(VISIBLE);
+        int centerX = v.getLeft() + v.getWidth() / 2;
+        int centerY = v.getTop() + v.getHeight() / 2;
+        Animator reveal = ViewAnimationUtils.createCircularReveal(
+                mSelectedContainer,
+                centerX,
+                centerY,
+                0,
+                Math.max(centerX, mSelectedContainer.getWidth() - centerX)
+                        + Math.max(centerY, mSelectedContainer.getHeight() - centerY));
+        reveal.start();
+
+        animateHintText(mSelectedLabel, v, reveal);
+        animateHintText(mLaunchHint, v, reveal);
+
+        mSelectedLabel.setText(((Button) v).getText());
+        mSelectedContainer.setTag(R.id.tag_intent, v.getTag(R.id.tag_intent));
+        mLastRevealed = v;
+        postDelayed(mHideRunnable, HIDE_DELAY);
+        postDelayed(mRippleRunnable, RIPPLE_PAUSE / 2);
+
+        // Transfer focus from the originally clicked button to the expanded button.
+        mSelectedContainer.requestFocus();
+    }
+
+    private void animateHintText(View selectedView, View v, Animator reveal) {
+        selectedView.setTranslationX(
+                (v.getLeft() + v.getWidth() / 2 - mSelectedContainer.getWidth() / 2) / 5);
+        selectedView.animate()
+                .setDuration(reveal.getDuration() / 3)
+                .setStartDelay(reveal.getDuration() / 5)
+                .translationX(0)
+                .setInterpolator(mFastOutLinearInInterpolator)
+                .start();
+    }
+
+    private void hideTheButton() {
+        if (mHiding || mSelectedContainer.getVisibility() != VISIBLE) {
+            return;
+        }
+
+        mHiding = true;
+
+        removeCallbacks(mHideRunnable);
+
+        View v = mLastRevealed;
+        int centerX = v.getLeft() + v.getWidth() / 2;
+        int centerY = v.getTop() + v.getHeight() / 2;
+        Animator reveal = ViewAnimationUtils.createCircularReveal(
+                mSelectedContainer,
+                centerX,
+                centerY,
+                Math.max(centerX, mSelectedContainer.getWidth() - centerX)
+                        + Math.max(centerY, mSelectedContainer.getHeight() - centerY),
+                0);
+        reveal.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                mSelectedContainer.setVisibility(INVISIBLE);
+                removeCallbacks(mRippleRunnable);
+                mHiding = false;
+            }
+        });
+        reveal.start();
+
+        // Transfer focus back to the originally clicked button.
+        if (mSelectedContainer.isFocused()) {
+            v.requestFocus();
+        }
+    }
+
+    private void startRipple() {
+        final View ripple = mRippleView;
+        ripple.animate().cancel();
+        ripple.setVisibility(VISIBLE);
+        Animator reveal = ViewAnimationUtils.createCircularReveal(
+                ripple,
+                ripple.getLeft() + ripple.getWidth() / 2,
+                ripple.getTop() + ripple.getHeight() / 2,
+                0,
+                ripple.getWidth() / 2);
+        reveal.setDuration(RIPPLE_DURATION);
+        reveal.start();
+
+        ripple.setAlpha(0);
+        ripple.animate().alpha(1).setDuration(RIPPLE_DURATION / 2)
+                .withEndAction(new Runnable() {
+            @Override
+            public void run() {
+                ripple.animate().alpha(0).setDuration(RIPPLE_DURATION / 2)
+                        .withEndAction(new Runnable() {
+                            @Override
+                            public void run() {
+                                ripple.setVisibility(INVISIBLE);
+                                postDelayed(mRippleRunnable, RIPPLE_PAUSE);
+                            }
+                        }).start();
+            }
+        }).start();
+    }
+
+    private final Runnable mHideRunnable = new Runnable() {
+        @Override
+        public void run() {
+            if (!isAttachedToWindow()) return;
+            hideTheButton();
+        }
+    };
+
+    private final Runnable mRippleRunnable = new Runnable() {
+        @Override
+        public void run() {
+            if (!isAttachedToWindow()) return;
+            startRipple();
+        }
+    };
+
+
+}
diff --git a/src/com/android/phone/EmergencyDialer.java b/src/com/android/phone/EmergencyDialer.java
index 6995d89..c7dd1e9 100644
--- a/src/com/android/phone/EmergencyDialer.java
+++ b/src/com/android/phone/EmergencyDialer.java
@@ -40,6 +40,7 @@
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.MenuItem;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.WindowManager;
 import android.view.accessibility.AccessibilityManager;
@@ -115,12 +116,14 @@
     // Haptic feedback (vibration) for dialer key presses.
     private HapticFeedback mHaptic = new HapticFeedback();
 
+    private EmergencyActionGroup mEmergencyActionGroup;
+
     // 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();
+                finishAndRemoveTask();
             }
         }
     };
@@ -239,6 +242,8 @@
         } catch (Resources.NotFoundException nfe) {
              Log.e(LOG_TAG, "Vibrate control bool missing.", nfe);
         }
+
+        mEmergencyActionGroup = (EmergencyActionGroup) findViewById(R.id.emergency_action_group);
     }
 
     @Override
@@ -340,6 +345,14 @@
     }
 
     @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        mEmergencyActionGroup.onPreTouchEvent(ev);
+        boolean handled = super.dispatchTouchEvent(ev);
+        mEmergencyActionGroup.onPostTouchEvent(ev);
+        return handled;
+    }
+
+    @Override
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.deleteButton: {
diff --git a/src/com/android/phone/ErrorDialogActivity.java b/src/com/android/phone/ErrorDialogActivity.java
index 4635f86..bf09376 100644
--- a/src/com/android/phone/ErrorDialogActivity.java
+++ b/src/com/android/phone/ErrorDialogActivity.java
@@ -23,6 +23,8 @@
 import android.os.Bundle;
 import android.util.Log;
 
+import com.android.phone.settings.VoicemailSettingsActivity;
+
 /**
  * Used to display an error dialog from within the Telephony service when an outgoing call fails
  */
@@ -105,8 +107,8 @@
         }
 
         // navigate to the Voicemail setting in the Call Settings activity.
-        Intent intent = new Intent(CallFeaturesSetting.ACTION_ADD_VOICEMAIL);
-        intent.setClass(this, CallFeaturesSetting.class);
+        Intent intent = new Intent(VoicemailSettingsActivity.ACTION_ADD_VOICEMAIL);
+        intent.setClass(this, VoicemailSettingsActivity.class);
         startActivity(intent);
         finish();
     }
diff --git a/src/com/android/phone/GsmUmtsCallOptions.java b/src/com/android/phone/GsmUmtsCallOptions.java
index a9a1940..419e72c 100644
--- a/src/com/android/phone/GsmUmtsCallOptions.java
+++ b/src/com/android/phone/GsmUmtsCallOptions.java
@@ -21,6 +21,7 @@
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
+import android.view.MenuItem;
 
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneConstants;
@@ -29,15 +30,43 @@
     private static final String LOG_TAG = "GsmUmtsCallOptions";
     private final boolean DBG = (PhoneGlobals.DBG_LEVEL >= 2);
 
+    private static final String CALL_FORWARDING_KEY = "call_forwarding_key";
+    private static final String ADDITIONAL_GSM_SETTINGS_KEY = "additional_gsm_call_settings_key";
+
     @Override
     protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
         addPreferencesFromResource(R.xml.gsm_umts_call_options);
 
-        if (PhoneGlobals.getPhone().getPhoneType() != PhoneConstants.PHONE_TYPE_GSM) {
+        SubscriptionInfoHelper subInfoHelper = new SubscriptionInfoHelper(this, getIntent());
+        subInfoHelper.setActionBarTitle(
+                getActionBar(), getResources(), R.string.labelGsmMore_with_label);
+        init(getPreferenceScreen(), subInfoHelper);
+
+        if (subInfoHelper.getPhone().getPhoneType() != PhoneConstants.PHONE_TYPE_GSM) {
             //disable the entire screen
             getPreferenceScreen().setEnabled(false);
         }
     }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        final int itemId = item.getItemId();
+        if (itemId == android.R.id.home) {
+            onBackPressed();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    public static void init(PreferenceScreen prefScreen, SubscriptionInfoHelper subInfoHelper) {
+        Preference callForwardingPref = prefScreen.findPreference(CALL_FORWARDING_KEY);
+        callForwardingPref.setIntent(subInfoHelper.getIntent(GsmUmtsCallForwardOptions.class));
+
+        Preference additionalGsmSettingsPref =
+                prefScreen.findPreference(ADDITIONAL_GSM_SETTINGS_KEY);
+        additionalGsmSettingsPref.setIntent(
+                subInfoHelper.getIntent(GsmUmtsAdditionalCallOptions.class));
+    }
 }
diff --git a/src/com/android/phone/ImsUtil.java b/src/com/android/phone/ImsUtil.java
index c3d780b..868a0f1 100644
--- a/src/com/android/phone/ImsUtil.java
+++ b/src/com/android/phone/ImsUtil.java
@@ -16,9 +16,16 @@
 
 package com.android.phone;
 
+import android.content.Context;
+import android.util.Log;
+
+import com.android.ims.ImsConfig;
+import com.android.ims.ImsManager;
 import com.android.phone.PhoneGlobals;
 
 public class ImsUtil {
+    private static final String LOG_TAG = ImsUtil.class.getSimpleName();
+    private static final boolean DBG = (PhoneGlobals.DBG_LEVEL >= 2);
 
     private static boolean sImsPhoneSupported = false;
 
@@ -31,10 +38,32 @@
     }
 
     /**
-     * @return true if this device supports voice calls using the built-in SIP stack.
+     * @return {@code true} if this device supports voice calls using the built-in SIP stack.
      */
     static boolean isImsPhoneSupported() {
         return sImsPhoneSupported;
 
     }
+
+    /**
+     * @return {@code true} if WFC is supported by the platform and has been enabled by the user.
+     */
+    public static boolean isWfcEnabled(Context context) {
+        boolean isEnabledByPlatform = ImsManager.isWfcEnabledByPlatform(context);
+        boolean isEnabledByUser = ImsManager.isWfcEnabledByUser(context);
+        if (DBG) Log.d(LOG_TAG, "isWfcEnabled :: isEnabledByPlatform=" + isEnabledByPlatform);
+        if (DBG) Log.d(LOG_TAG, "isWfcEnabled :: isEnabledByUser=" + isEnabledByUser);
+        return isEnabledByPlatform && isEnabledByUser;
+    }
+
+    /**
+     * @return {@code true} if the device is configured to use "Wi-Fi only" mode. If WFC is not
+     * enabled, this will return {@code false}.
+     */
+    public static boolean isWfcModeWifiOnly(Context context) {
+        boolean isWifiOnlyMode =
+                ImsManager.getWfcMode(context) == ImsConfig.WfcModeFeatureValueConstants.WIFI_ONLY;
+        if (DBG) Log.d(LOG_TAG, "isWfcModeWifiOnly :: isWifiOnlyMode" + isWifiOnlyMode);
+        return isWfcEnabled(context) && isWifiOnlyMode;
+    }
 }
diff --git a/src/com/android/phone/InCallScreenShowActivation.java b/src/com/android/phone/InCallScreenShowActivation.java
index 34710a1..3b5fe16 100644
--- a/src/com/android/phone/InCallScreenShowActivation.java
+++ b/src/com/android/phone/InCallScreenShowActivation.java
@@ -25,6 +25,7 @@
 import android.os.Bundle;
 import android.os.SystemProperties;
 import android.provider.Settings;
+import android.telephony.CarrierConfigManager;
 import android.util.Log;
 
 import com.android.internal.telephony.Phone;
@@ -71,7 +72,8 @@
 
         if (intent.getAction().equals(OtaUtils.ACTION_PERFORM_CDMA_PROVISIONING)) {
 
-            boolean usesHfa = getResources().getBoolean(R.bool.config_use_hfa_for_provisioning);
+            Bundle carrierConfig = app.getCarrierConfig();
+            boolean usesHfa = carrierConfig.getBoolean(CarrierConfigManager.BOOL_USE_HFA_FOR_PROVISIONING);
             if (usesHfa) {
                 Log.i(LOG_TAG, "Starting Hfa from ACTION_PERFORM_CDMA_PROVISIONING");
                 startHfa();
@@ -79,7 +81,7 @@
                 return;
             }
 
-            boolean usesOtasp = getResources().getBoolean(R.bool.config_use_otasp_for_provisioning);
+            boolean usesOtasp = carrierConfig.getBoolean(CarrierConfigManager.BOOL_USE_OTASP_FOR_PROVISIONING);
             if (usesOtasp) {
                 // On voice-capable devices, we perform CDMA provisioning in
                 // "interactive" mode by directly launching the InCallScreen.
diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index 3e43ba1..571f32f 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -17,7 +17,6 @@
 package com.android.phone;
 
 import com.android.ims.ImsManager;
-import com.android.ims.ImsException;
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneConstants;
 import com.android.internal.telephony.PhoneFactory;
@@ -35,7 +34,6 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.SharedPreferences;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.net.Uri;
 import android.os.AsyncResult;
@@ -48,7 +46,6 @@
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
-import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
 import android.preference.SwitchPreference;
 import android.telephony.PhoneStateListener;
@@ -59,12 +56,10 @@
 import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.ListView;
 import android.widget.TabHost;
 import android.widget.TabHost.OnTabChangeListener;
 import android.widget.TabHost.TabContentFactory;
 import android.widget.TabHost.TabSpec;
-import android.widget.TabWidget;
 
 /**
  * "Mobile network settings" screen.  This preference screen lets you
@@ -147,11 +142,10 @@
         @Override
         public void onCallStateChanged(int state, String incomingNumber) {
             if (DBG) log("PhoneStateListener.onCallStateChanged: state=" + state);
+            boolean enabled = (state == TelephonyManager.CALL_STATE_IDLE) &&
+                    ImsManager.isNonTtyOrTtyOnVolteEnabled(getApplicationContext());
             Preference pref = getPreferenceScreen().findPreference(BUTTON_4G_LTE_KEY);
-            if (pref != null) {
-                pref.setEnabled((state == TelephonyManager.CALL_STATE_IDLE) &&
-                        ImsManager.isNonTtyOrTtyOnVolteEnabled(getApplicationContext()));
-            }
+            if (pref != null) pref.setEnabled(enabled && hasActiveSubscriptions());
         }
     };
 
@@ -241,7 +235,7 @@
             return true;
         }  else if (preference == mButtonEnabledNetworks) {
             int settingsNetworkMode = android.provider.Settings.Global.getInt(mPhone.getContext().
-                    getContentResolver(),
+                            getContentResolver(),
                     android.provider.Settings.Global.PREFERRED_NETWORK_MODE + phoneSubId,
                     preferredNetworkMode);
             mButtonEnabledNetworks.setValue(Integer.toString(settingsNetworkMode));
@@ -393,7 +387,8 @@
     };
 
     private void updatePhone(int slotId) {
-        final SubscriptionInfo sir = findRecordBySlotId(slotId);
+        final SubscriptionInfo sir = mSubscriptionManager
+                .getActiveSubscriptionInfoForSimSlotIndex(slotId);
         if (sir != null) {
             mPhone = PhoneFactory.getPhone(
                     SubscriptionManager.getPhoneId(sir.getSubscriptionId()));
@@ -436,7 +431,6 @@
         addPreferencesFromResource(R.xml.network_setting);
 
         mButton4glte = (SwitchPreference)findPreference(BUTTON_4G_LTE_KEY);
-
         mButton4glte.setOnPreferenceChangeListener(this);
 
         try {
@@ -492,14 +486,9 @@
         // and the UI state would be inconsistent with actual state
         mButtonDataRoam.setChecked(mPhone.getDataRoamingEnabled());
 
-        if (getPreferenceScreen().findPreference(BUTTON_PREFERED_NETWORK_MODE) != null)  {
-            mPhone.getPreferredNetworkType(mHandler.obtainMessage(
-                    MyHandler.MESSAGE_GET_PREFERRED_NETWORK_TYPE));
-        }
-
-        if (getPreferenceScreen().findPreference(BUTTON_ENABLED_NETWORKS_KEY) != null)  {
-            mPhone.getPreferredNetworkType(mHandler.obtainMessage(
-                    MyHandler.MESSAGE_GET_PREFERRED_NETWORK_TYPE));
+        if (getPreferenceScreen().findPreference(BUTTON_PREFERED_NETWORK_MODE) != null
+                || getPreferenceScreen().findPreference(BUTTON_ENABLED_NETWORKS_KEY) != null)  {
+            updatePreferredNetworkUIFromDb();
         }
 
         if (ImsManager.isVolteEnabledByPlatform(this)
@@ -508,9 +497,10 @@
             tm.listen(mPhoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);
         }
 
-        mButton4glte.setChecked(ImsManager.isEnhanced4gLteModeSettingEnabledByUser(this)
-                && ImsManager.isNonTtyOrTtyOnVolteEnabled(this));
-        // NOTE: The button will be enabled/disabled in mPhoneStateListener
+        // NOTE: Buttons will be enabled/disabled in mPhoneStateListener
+        boolean enh4glteMode = ImsManager.isEnhanced4gLteModeSettingEnabledByUser(this)
+                && ImsManager.isNonTtyOrTtyOnVolteEnabled(this);
+        mButton4glte.setChecked(enh4glteMode);
 
         mSubscriptionManager.addOnSubscriptionsChangedListener(mOnSubscriptionsChangeListener);
 
@@ -518,6 +508,10 @@
 
     }
 
+    private boolean hasActiveSubscriptions() {
+        return mActiveSubInfos.size() > 0;
+    }
+
     private void updateBody() {
         final Context context = getApplicationContext();
         PreferenceScreen prefSet = getPreferenceScreen();
@@ -707,11 +701,15 @@
          * but you do need to remember that this all needs to work when subscriptions
          * change dynamically such as when hot swapping sims.
          */
-        boolean hasActiveSubscriptions = mActiveSubInfos.size() > 0;
+        boolean hasActiveSubscriptions = hasActiveSubscriptions();
+        TelephonyManager tm = (TelephonyManager) getSystemService(
+                Context.TELEPHONY_SERVICE);
+        boolean canChange4glte = (tm.getCallState() == TelephonyManager.CALL_STATE_IDLE) &&
+                ImsManager.isNonTtyOrTtyOnVolteEnabled(getApplicationContext());
         mButtonDataRoam.setEnabled(hasActiveSubscriptions);
         mButtonPreferredNetworkMode.setEnabled(hasActiveSubscriptions);
         mButtonEnabledNetworks.setEnabled(hasActiveSubscriptions);
-        mButton4glte.setEnabled(hasActiveSubscriptions);
+        mButton4glte.setEnabled(hasActiveSubscriptions && canChange4glte);
         mLteDataServicePref.setEnabled(hasActiveSubscriptions);
         Preference ps;
         PreferenceScreen root = getPreferenceScreen();
@@ -843,9 +841,10 @@
                         .obtainMessage(MyHandler.MESSAGE_SET_PREFERRED_NETWORK_TYPE));
             }
         } else if (preference == mButton4glte) {
-            SwitchPreference ltePref = (SwitchPreference)preference;
-            ltePref.setChecked(!ltePref.isChecked());
-            ImsManager.setEnhanced4gLteModeSetting(this, ltePref.isChecked());
+            SwitchPreference enhanced4gModePref = (SwitchPreference) preference;
+            boolean enhanced4gMode = !enhanced4gModePref.isChecked();
+            enhanced4gModePref.setChecked(enhanced4gMode);
+            ImsManager.setEnhanced4gLteModeSetting(this, enhanced4gModePref.isChecked());
         } else if (preference == mButtonDataRoam) {
             if (DBG) log("onPreferenceTreeClick: preference == mButtonDataRoam.");
 
@@ -855,7 +854,7 @@
                 mOkClicked = false;
                 new AlertDialog.Builder(this).setMessage(
                         getResources().getString(R.string.roaming_warning))
-                        .setTitle(android.R.string.dialog_alert_title)
+                        .setTitle(R.string.roaming_alert_title)
                         .setIconAttribute(android.R.attr.alertDialogIcon)
                         .setPositiveButton(android.R.string.yes, this)
                         .setNegativeButton(android.R.string.no, this)
@@ -874,121 +873,63 @@
 
     private class MyHandler extends Handler {
 
-        static final int MESSAGE_GET_PREFERRED_NETWORK_TYPE = 0;
-        static final int MESSAGE_SET_PREFERRED_NETWORK_TYPE = 1;
+        static final int MESSAGE_SET_PREFERRED_NETWORK_TYPE = 0;
 
         @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) {
-            final int phoneSubId = mPhone.getSubId();
-            AsyncResult ar = (AsyncResult) msg.obj;
-
-            if (ar.exception == null) {
-                int modemNetworkMode = ((int[])ar.result)[0];
-
-                if (DBG) {
-                    log ("handleGetPreferredNetworkTypeResponse: modemNetworkMode = " +
-                            modemNetworkMode);
-                }
-
-                int settingsNetworkMode = android.provider.Settings.Global.getInt(
-                        mPhone.getContext().getContentResolver(),
-                        android.provider.Settings.Global.PREFERRED_NETWORK_MODE + phoneSubId,
-                        preferredNetworkMode);
-
-                if (DBG) {
-                    log("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_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_AND_EVDO ||
-                        modemNetworkMode == Phone.NT_MODE_LTE_GSM_WCDMA ||
-                        modemNetworkMode == Phone.NT_MODE_LTE_CDMA_EVDO_GSM_WCDMA ||
-                        modemNetworkMode == Phone.NT_MODE_LTE_ONLY ||
-                        modemNetworkMode == Phone.NT_MODE_LTE_WCDMA) {
-                    if (DBG) {
-                        log("handleGetPreferredNetworkTypeResponse: if 1: modemNetworkMode = " +
-                                modemNetworkMode);
-                    }
-
-                    //check changes in modemNetworkMode
-                    if (modemNetworkMode != settingsNetworkMode) {
-                        if (DBG) {
-                            log("handleGetPreferredNetworkTypeResponse: if 2: " +
-                                    "modemNetworkMode != settingsNetworkMode");
-                        }
-
-                        settingsNetworkMode = modemNetworkMode;
-
-                        if (DBG) { log("handleGetPreferredNetworkTypeResponse: if 2: " +
-                                "settingsNetworkMode = " + settingsNetworkMode);
-                        }
-                    }
-
-                    UpdatePreferredNetworkModeSummary(modemNetworkMode);
-                    UpdateEnabledNetworksValueAndSummary(modemNetworkMode);
-                    // changes the mButtonPreferredNetworkMode accordingly to modemNetworkMode
-                    mButtonPreferredNetworkMode.setValue(Integer.toString(modemNetworkMode));
-                } else {
-                    if (DBG) log("handleGetPreferredNetworkTypeResponse: else: reset to default");
-                    resetNetworkModeToDefault();
-                }
-            }
-        }
-
         private void handleSetPreferredNetworkTypeResponse(Message msg) {
             AsyncResult ar = (AsyncResult) msg.obj;
             final int phoneSubId = mPhone.getSubId();
 
             if (ar.exception == null) {
-                int networkMode = Integer.valueOf(
-                        mButtonPreferredNetworkMode.getValue()).intValue();
-                android.provider.Settings.Global.putInt(mPhone.getContext().getContentResolver(),
-                        android.provider.Settings.Global.PREFERRED_NETWORK_MODE + phoneSubId,
-                        networkMode );
-                networkMode = Integer.valueOf(
-                        mButtonEnabledNetworks.getValue()).intValue();
-                android.provider.Settings.Global.putInt(mPhone.getContext().getContentResolver(),
-                        android.provider.Settings.Global.PREFERRED_NETWORK_MODE + phoneSubId,
-                        networkMode );
+                int networkMode;
+                if (getPreferenceScreen().findPreference(BUTTON_PREFERED_NETWORK_MODE) != null)  {
+                    networkMode =  Integer.valueOf(
+                            mButtonPreferredNetworkMode.getValue()).intValue();
+                    android.provider.Settings.Global.putInt(mPhone.getContext().getContentResolver(),
+                            android.provider.Settings.Global.PREFERRED_NETWORK_MODE + phoneSubId,
+                            networkMode );
+                }
+                if (getPreferenceScreen().findPreference(BUTTON_ENABLED_NETWORKS_KEY) != null)  {
+                    networkMode = Integer.valueOf(
+                            mButtonEnabledNetworks.getValue()).intValue();
+                    android.provider.Settings.Global.putInt(mPhone.getContext().getContentResolver(),
+                            android.provider.Settings.Global.PREFERRED_NETWORK_MODE + phoneSubId,
+                            networkMode );
+                }
             } else {
-                mPhone.getPreferredNetworkType(obtainMessage(MESSAGE_GET_PREFERRED_NETWORK_TYPE));
+                if (DBG) {
+                    log("handleSetPreferredNetworkTypeResponse: exception in setting network mode.");
+                }
+                updatePreferredNetworkUIFromDb();
             }
         }
+    }
 
-        private void resetNetworkModeToDefault() {
-            final int phoneSubId = mPhone.getSubId();
-            //set the mButtonPreferredNetworkMode
-            mButtonPreferredNetworkMode.setValue(Integer.toString(preferredNetworkMode));
-            mButtonEnabledNetworks.setValue(Integer.toString(preferredNetworkMode));
-            //set the Settings.System
-            android.provider.Settings.Global.putInt(mPhone.getContext().getContentResolver(),
-                        android.provider.Settings.Global.PREFERRED_NETWORK_MODE + phoneSubId,
-                        preferredNetworkMode );
-            //Set the Modem
-            mPhone.setPreferredNetworkType(preferredNetworkMode,
-                    this.obtainMessage(MyHandler.MESSAGE_SET_PREFERRED_NETWORK_TYPE));
+    private void updatePreferredNetworkUIFromDb() {
+        final int phoneSubId = mPhone.getSubId();
+
+        int settingsNetworkMode = android.provider.Settings.Global.getInt(
+                mPhone.getContext().getContentResolver(),
+                android.provider.Settings.Global.PREFERRED_NETWORK_MODE + phoneSubId,
+                preferredNetworkMode);
+
+        if (DBG) {
+            log("updatePreferredNetworkUIFromDb: settingsNetworkMode = " +
+                    settingsNetworkMode);
         }
+
+        UpdatePreferredNetworkModeSummary(settingsNetworkMode);
+        UpdateEnabledNetworksValueAndSummary(settingsNetworkMode);
+        // changes the mButtonPreferredNetworkMode accordingly to settingsNetworkMode
+        mButtonPreferredNetworkMode.setValue(Integer.toString(settingsNetworkMode));
     }
 
     private void UpdatePreferredNetworkModeSummary(int NetworkMode) {
@@ -1271,23 +1212,4 @@
         }
     }
 
-    /**
-     * finds a record with slotId.
-     * Since the number of SIMs are few, an array is fine.
-     */
-    public SubscriptionInfo findRecordBySlotId(final int slotId) {
-        if (mActiveSubInfos != null) {
-            final int subInfoLength = mActiveSubInfos.size();
-
-            for (int i = 0; i < subInfoLength; ++i) {
-                final SubscriptionInfo sir = mActiveSubInfos.get(i);
-                if (sir.getSimSlotIndex() == slotId) {
-                    //Right now we take the first subscription on a SIM.
-                    return sir;
-                }
-            }
-        }
-
-        return null;
-    }
 }
diff --git a/src/com/android/phone/NotificationMgr.java b/src/com/android/phone/NotificationMgr.java
index c38be71..1460d63 100644
--- a/src/com/android/phone/NotificationMgr.java
+++ b/src/com/android/phone/NotificationMgr.java
@@ -25,6 +25,7 @@
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.UserInfo;
+import android.content.res.Resources;
 import android.net.Uri;
 import android.os.SystemProperties;
 import android.os.UserHandle;
@@ -48,6 +49,7 @@
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneBase;
 import com.android.internal.telephony.TelephonyCapabilities;
+import com.android.phone.settings.VoicemailSettingsActivity;
 import com.android.phone.settings.VoicemailNotificationSettingsUtil;
 import com.android.phone.settings.VoicemailProviderSettingsUtil;
 
@@ -357,10 +359,9 @@
                 // to the voicemail settings.
                 notificationText = mContext.getString(
                         R.string.notification_voicemail_no_vm_number);
-                intent = new Intent(CallFeaturesSetting.ACTION_ADD_VOICEMAIL);
-                intent.putExtra(CallFeaturesSetting.SETUP_VOICEMAIL_EXTRA, true);
+                intent = new Intent(VoicemailSettingsActivity.ACTION_ADD_VOICEMAIL);
                 intent.putExtra(SubscriptionInfoHelper.SUB_ID_EXTRA, subId);
-                intent.setClass(mContext, CallFeaturesSetting.class);
+                intent.setClass(mContext, VoicemailSettingsActivity.class);
             } else {
                 if (mTelephonyManager.getPhoneCount() > 1) {
                     notificationText = subInfo.getDisplayName().toString();
@@ -383,6 +384,7 @@
                 ringtoneUri = VoicemailNotificationSettingsUtil.getRingtoneUri(mPhone);
             }
 
+            Resources res = mContext.getResources();
             Notification.Builder builder = new Notification.Builder(mContext);
             builder.setSmallIcon(resId)
                     .setWhen(System.currentTimeMillis())
@@ -391,8 +393,8 @@
                     .setContentText(notificationText)
                     .setContentIntent(pendingIntent)
                     .setSound(ringtoneUri)
-                    .setColor(mContext.getResources().getColor(R.color.dialer_theme_color))
-                    .setOngoing(true);
+                    .setColor(res.getColor(R.color.dialer_theme_color))
+                    .setOngoing(res.getBoolean(R.bool.voicemail_notification_persistent));
 
             if (VoicemailNotificationSettingsUtil.isVibrationEnabled(phone)) {
                 builder.setDefaults(Notification.DEFAULT_VIBRATE);
diff --git a/src/com/android/phone/OutgoingCallBroadcaster.java b/src/com/android/phone/OutgoingCallBroadcaster.java
index 96e9e7b..1a23bc4 100644
--- a/src/com/android/phone/OutgoingCallBroadcaster.java
+++ b/src/com/android/phone/OutgoingCallBroadcaster.java
@@ -16,6 +16,7 @@
 
 package com.android.phone;
 
+import android.Manifest;
 import android.app.Activity;
 import android.app.ActivityManagerNative;
 import android.app.AlertDialog;
@@ -72,9 +73,6 @@
     // Do not check in with VDBG = true, since that may write PII to the system log.
     private static final boolean VDBG = false;
 
-    /** Required permission for any app that wants to consume ACTION_NEW_OUTGOING_CALL. */
-    private static final String PERMISSION = android.Manifest.permission.PROCESS_OUTGOING_CALLS;
-
     public static final String ACTION_SIP_SELECT_PHONE = "com.android.phone.SIP_SELECT_PHONE";
     public static final String EXTRA_ALREADY_CALLED = "android.phone.extra.ALREADY_CALLED";
     public static final String EXTRA_ORIGINAL_URI = "android.phone.extra.ORIGINAL_URI";
@@ -638,7 +636,9 @@
         mHandler.sendEmptyMessageDelayed(EVENT_OUTGOING_CALL_TIMEOUT,
                 OUTGOING_CALL_TIMEOUT_THRESHOLD);
         sendOrderedBroadcastAsUser(broadcastIntent, UserHandle.OWNER,
-                PERMISSION, new OutgoingCallReceiver(),
+                android.Manifest.permission.PROCESS_OUTGOING_CALLS,
+                AppOpsManager.OP_PROCESS_OUTGOING_CALLS,
+                new OutgoingCallReceiver(),
                 null,  // scheduler
                 Activity.RESULT_OK,  // initialCode
                 number,  // initialData: initial value for the result data
diff --git a/src/com/android/phone/PhoneGlobals.java b/src/com/android/phone/PhoneGlobals.java
index d13ebfe..fcef594 100644
--- a/src/com/android/phone/PhoneGlobals.java
+++ b/src/com/android/phone/PhoneGlobals.java
@@ -34,6 +34,7 @@
 import android.media.AudioManager;
 import android.net.Uri;
 import android.os.AsyncResult;
+import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.IPowerManager;
@@ -47,6 +48,7 @@
 import android.os.UserHandle;
 import android.preference.PreferenceManager;
 import android.provider.Settings.System;
+import android.telephony.CarrierConfigManager;
 import android.telephony.ServiceState;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
@@ -64,7 +66,9 @@
 import com.android.internal.telephony.TelephonyCapabilities;
 import com.android.internal.telephony.TelephonyIntents;
 import com.android.phone.common.CallLogAsync;
+import com.android.phone.settings.SettingsConstants;
 import com.android.server.sip.SipService;
+import com.android.services.telephony.activation.SimActivationManager;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -143,7 +147,9 @@
     CallNotifier notifier;
     CallerInfoCache callerInfoCache;
     NotificationMgr notificationMgr;
-    PhoneInterfaceManager phoneMgr;
+    public PhoneInterfaceManager phoneMgr;
+    public SimActivationManager simActivationManager;
+    CarrierConfigLoader configLoader;
 
     private BluetoothManager bluetoothManager;
     private CallGatewayManager callGatewayManager;
@@ -233,7 +239,7 @@
                 // TODO: This event should be handled by the lock screen, just
                 // like the "SIM missing" and "Sim locked" cases (bug 1804111).
                 case EVENT_SIM_NETWORK_LOCKED:
-                    if (getResources().getBoolean(R.bool.ignore_sim_network_locked_events)) {
+                    if (getCarrierConfig().getBoolean(CarrierConfigManager.BOOL_IGNORE_SIM_NETWORK_LOCKED_EVENTS)) {
                         // Some products don't have the concept of a "SIM network lock"
                         Log.i(LOG_TAG, "Ignoring EVENT_SIM_NETWORK_LOCKED event; "
                               + "not showing 'SIM network unlock' PIN entry screen");
@@ -399,6 +405,8 @@
 
             phoneMgr = PhoneInterfaceManager.init(this, PhoneFactory.getDefaultPhone());
 
+            configLoader = CarrierConfigLoader.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
@@ -440,6 +448,8 @@
         cdmaOtaScreenState = new OtaUtils.CdmaOtaScreenState();
         cdmaOtaInCallScreenUiState = new OtaUtils.CdmaOtaInCallScreenUiState();
 
+        simActivationManager = new SimActivationManager();
+
         // XXX pre-load the SimProvider so that it's ready
         resolver.getType(Uri.parse("content://icc/adn"));
 
@@ -456,9 +466,9 @@
                     android.provider.Settings.System.HEARING_AID,
                     0);
             AudioManager audioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
-            audioManager.setParameter(CallFeaturesSetting.HAC_KEY, hac != 0 ?
-                                      CallFeaturesSetting.HAC_VAL_ON :
-                                      CallFeaturesSetting.HAC_VAL_OFF);
+            audioManager.setParameter(SettingsConstants.HAC_KEY,
+                    hac == SettingsConstants.HAC_ENABLED
+                            ? SettingsConstants.HAC_VAL_ON : SettingsConstants.HAC_VAL_OFF);
         }
     }
 
@@ -501,6 +511,14 @@
         return mCM;
     }
 
+    /* package */ Bundle getCarrierConfig() {
+        return getCarrierConfigForSubId(SubscriptionManager.getDefaultSubId());
+    }
+
+    /* package */ Bundle getCarrierConfigForSubId(int subId) {
+        return configLoader.getConfigForSubId(subId);
+    }
+
     /**
      * Returns PendingIntent for hanging up ongoing phone call. This will typically be used from
      * Notification context.
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 9eb0b0b..3b629d5 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -35,6 +35,9 @@
 import android.os.UserHandle;
 import android.preference.PreferenceManager;
 import android.provider.Settings;
+import android.telecom.PhoneAccount;
+import android.telecom.TelecomManager;
+import android.telephony.CarrierConfigManager;
 import android.telephony.CellInfo;
 import android.telephony.IccOpenLogicalChannelResponse;
 import android.telephony.NeighboringCellInfo;
@@ -60,6 +63,7 @@
 import com.android.internal.telephony.PhoneFactory;
 import com.android.internal.telephony.ProxyController;
 import com.android.internal.telephony.PhoneConstants;
+import com.android.internal.telephony.RILConstants;
 import com.android.internal.telephony.SubscriptionController;
 import com.android.internal.telephony.uicc.IccIoResult;
 import com.android.internal.telephony.uicc.IccUtils;
@@ -120,6 +124,8 @@
     private static final int EVENT_EXCHANGE_SIM_IO_DONE = 32;
     private static final int CMD_SET_VOICEMAIL_NUMBER = 33;
     private static final int EVENT_SET_VOICEMAIL_NUMBER_DONE = 34;
+    private static final int CMD_SET_NETWORK_SELECTION_MODE_AUTOMATIC = 35;
+    private static final int EVENT_SET_NETWORK_SELECTION_MODE_AUTOMATIC_DONE = 36;
 
     /** The singleton instance. */
     private static PhoneInterfaceManager sInstance;
@@ -553,7 +559,7 @@
                 case CMD_GET_PREFERRED_NETWORK_TYPE:
                     request = (MainThreadRequest) msg.obj;
                     onCompleted = obtainMessage(EVENT_GET_PREFERRED_NETWORK_TYPE_DONE, request);
-                    mPhone.getPreferredNetworkType(onCompleted);
+                    getPhoneFromRequest(request).getPreferredNetworkType(onCompleted);
                     break;
 
                 case EVENT_GET_PREFERRED_NETWORK_TYPE_DONE:
@@ -581,7 +587,7 @@
                     request = (MainThreadRequest) msg.obj;
                     onCompleted = obtainMessage(EVENT_SET_PREFERRED_NETWORK_TYPE_DONE, request);
                     int networkType = (Integer) request.argument;
-                    mPhone.setPreferredNetworkType(networkType, onCompleted);
+                    getPhoneFromRequest(request).setPreferredNetworkType(networkType, onCompleted);
                     break;
 
                 case EVENT_SET_PREFERRED_NETWORK_TYPE_DONE:
@@ -615,6 +621,17 @@
                     handleNullReturnEvent(msg, "setVoicemailNumber");
                     break;
 
+                case CMD_SET_NETWORK_SELECTION_MODE_AUTOMATIC:
+                    request = (MainThreadRequest) msg.obj;
+                    onCompleted = obtainMessage(EVENT_SET_NETWORK_SELECTION_MODE_AUTOMATIC_DONE,
+                            request);
+                    getPhoneFromRequest(request).setNetworkSelectionModeAutomatic(onCompleted);
+                    break;
+
+                case EVENT_SET_NETWORK_SELECTION_MODE_AUTOMATIC_DONE:
+                    handleNullReturnEvent(msg, "setNetworkSelectionModeAutomatic");
+                    break;
+
                 default:
                     Log.w(LOG_TAG, "MainThreadHandler: unexpected message code: " + msg.what);
                     break;
@@ -790,7 +807,16 @@
         }
 
         boolean isValid = false;
-        List<SubscriptionInfo> slist = mSubscriptionController.getActiveSubscriptionInfoList();
+        List<SubscriptionInfo> slist;
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            slist = mSubscriptionController.getActiveSubscriptionInfoList(
+                    mPhone.getContext().getOpPackageName());
+        } finally {
+             Binder.restoreCallingIdentity(identity);
+        }
+
         if (slist != null) {
             for (SubscriptionInfo subInfoRecord : slist) {
                 if (subInfoRecord.getSubscriptionId() == subId) {
@@ -908,8 +934,11 @@
         return (getPhone(subId).getState() == PhoneConstants.State.IDLE);
     }
 
-    public boolean isSimPinEnabled() {
-        enforceReadPermission();
+    public boolean isSimPinEnabled(String callingPackage) {
+        if (!canReadPhoneState(callingPackage, "isSimPinEnabled")) {
+            return false;
+        }
+
         return (PhoneGlobals.getInstance().isSimPinEnabled());
     }
 
@@ -1185,16 +1214,13 @@
     }
 
     @Override
-    public Bundle getCellLocation() {
-        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);
+    public Bundle getCellLocation(String callingPackage) {
+        enforceFineOrCoarseLocationPermission("getCellLocation");
+
+        // OP_COARSE_LOCATION controls both fine and coarse location.
+        if (mAppOps.noteOp(AppOpsManager.OP_COARSE_LOCATION, Binder.getCallingUid(),
+                callingPackage) != AppOpsManager.MODE_ALLOWED) {
+            return null;
         }
 
         if (checkIfCallerIsSelfOrForegroundUser()) {
@@ -1209,6 +1235,20 @@
         }
     }
 
+    private void enforceFineOrCoarseLocationPermission(String message) {
+        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, message);
+        }
+    }
+
+
     @Override
     public void enableLocationUpdates() {
         enableLocationUpdatesForSubscriber(getDefaultSubscription());
@@ -1234,22 +1274,19 @@
     @Override
     @SuppressWarnings("unchecked")
     public List<NeighboringCellInfo> getNeighboringCellInfo(String callingPackage) {
-        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);
+        enforceFineOrCoarseLocationPermission("getNeighboringCellInfo");
+
+        // OP_COARSE_LOCATION controls both fine and coarse location.
+        if (mAppOps.noteOp(AppOpsManager.OP_COARSE_LOCATION, Binder.getCallingUid(),
+                callingPackage) != AppOpsManager.MODE_ALLOWED) {
+            return null;
         }
 
         if (mAppOps.noteOp(AppOpsManager.OP_NEIGHBORING_CELLS, Binder.getCallingUid(),
                 callingPackage) != AppOpsManager.MODE_ALLOWED) {
             return null;
         }
+
         if (checkIfCallerIsSelfOrForegroundUser()) {
             if (DBG_LOC) log("getNeighboringCellInfo: is active user");
 
@@ -1270,16 +1307,13 @@
 
 
     @Override
-    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);
+    public List<CellInfo> getAllCellInfo(String callingPackage) {
+        enforceFineOrCoarseLocationPermission("getAllCellInfo");
+
+        // OP_COARSE_LOCATION controls both fine and coarse location.
+        if (mAppOps.noteOp(AppOpsManager.OP_COARSE_LOCATION, Binder.getCallingUid(),
+                callingPackage) != AppOpsManager.MODE_ALLOWED) {
+            return null;
         }
 
         if (checkIfCallerIsSelfOrForegroundUser()) {
@@ -1337,15 +1371,6 @@
     }
 
     /**
-     * Make sure the caller has the READ_PHONE_STATE permission.
-     *
-     * @throws SecurityException if the caller does not have the required permission
-     */
-    private void enforceReadPermission() {
-        mApp.enforceCallingOrSelfPermission(android.Manifest.permission.READ_PHONE_STATE, null);
-    }
-
-    /**
      * Make sure the caller has the MODIFY_PHONE_STATE permission.
      *
      * @throws SecurityException if the caller does not have the required permission
@@ -1404,6 +1429,12 @@
                 null);
     }
 
+    private void enforceConnectivityInternalPermission() {
+        mApp.enforceCallingOrSelfPermission(
+                android.Manifest.permission.CONNECTIVITY_INTERNAL,
+                "ConnectivityService");
+    }
+
     private String createTelUrl(String number) {
         if (TextUtils.isEmpty(number)) {
             return null;
@@ -1847,8 +1878,12 @@
         return 0;
     }
 
-    public String[] getPcscfAddress(String apnType) {
-        enforceReadPermission();
+    public String[] getPcscfAddress(String apnType, String callingPackage) {
+        if (!canReadPhoneState(callingPackage, "getPcscfAddress")) {
+            return new String[0];
+        }
+
+
         return mPhone.getPcscfAddress(apnType);
     }
 
@@ -1858,14 +1893,28 @@
     }
 
     /**
+     * Set the network selection mode to automatic.
+     *
+     */
+    @Override
+    public void setNetworkSelectionModeAutomatic(int subId) {
+        enforceModifyPermissionOrCarrierPrivilege();
+        if (DBG) log("setNetworkSelectionModeAutomatic: subId " + subId);
+        sendRequest(CMD_SET_NETWORK_SELECTION_MODE_AUTOMATIC, null, subId);
+    }
+
+    /**
      * Get the calculated preferred network type.
      * Used for debugging incorrect network type.
      *
      * @return the preferred network type, defined in RILConstants.java.
      */
     @Override
-    public int getCalculatedPreferredNetworkType() {
-        enforceReadPermission();
+    public int getCalculatedPreferredNetworkType(String callingPackage) {
+        if (!canReadPhoneState(callingPackage, "getCalculatedPreferredNetworkType")) {
+            return RILConstants.PREFERRED_NETWORK_MODE;
+        }
+
         return PhoneFactory.calculatePreferredNetworkType(mPhone.getContext(), 0); // wink FIXME: need to get SubId from somewhere.
     }
 
@@ -1876,10 +1925,10 @@
      * @return the preferred network type, defined in RILConstants.java.
      */
     @Override
-    public int getPreferredNetworkType() {
+    public int getPreferredNetworkType(int subId) {
         enforceModifyPermissionOrCarrierPrivilege();
         if (DBG) log("getPreferredNetworkType");
-        int[] result = (int[]) sendRequest(CMD_GET_PREFERRED_NETWORK_TYPE, null);
+        int[] result = (int[]) sendRequest(CMD_GET_PREFERRED_NETWORK_TYPE, null, subId);
         int networkType = (result != null ? result[0] : -1);
         if (DBG) log("getPreferredNetworkType: " + networkType);
         return networkType;
@@ -1893,15 +1942,14 @@
      * @return true on success; false on any failure.
      */
     @Override
-    public boolean setPreferredNetworkType(int networkType) {
+    public boolean setPreferredNetworkType(int subId, int networkType) {
         enforceModifyPermissionOrCarrierPrivilege();
-        final int phoneSubId = mPhone.getSubId();
-        if (DBG) log("setPreferredNetworkType: type " + networkType);
-        Boolean success = (Boolean) sendRequest(CMD_SET_PREFERRED_NETWORK_TYPE, networkType);
+        if (DBG) log("setPreferredNetworkType: subId " + subId + " type " + networkType);
+        Boolean success = (Boolean) sendRequest(CMD_SET_PREFERRED_NETWORK_TYPE, networkType, subId);
         if (DBG) log("setPreferredNetworkType: " + (success ? "ok" : "fail"));
         if (success) {
             Settings.Global.putInt(mPhone.getContext().getContentResolver(),
-                    Settings.Global.PREFERRED_NETWORK_MODE + phoneSubId, networkType);
+                    Settings.Global.PREFERRED_NETWORK_MODE + subId, networkType);
         }
         return success;
     }
@@ -2000,14 +2048,18 @@
     }
 
     @Override
-    public List<String> getCarrierPackageNamesForIntent(Intent intent) {
-        UiccCard card = UiccController.getInstance().getUiccCard(mPhone.getPhoneId());
+    public List<String> getCarrierPackageNamesForIntentAndPhone(Intent intent, int phoneId) {
+        if (!SubscriptionManager.isValidPhoneId(phoneId)) {
+            loge("phoneId " + phoneId + " is not valid.");
+            return null;
+        }
+        UiccCard card = UiccController.getInstance().getUiccCard(phoneId);
         if (card == null) {
             loge("getCarrierPackageNamesForIntent: No UICC");
             return null ;
         }
         return card.getCarrierPackageNamesForIntent(
-            mPhone.getContext().getPackageManager(), intent);
+                mPhone.getContext().getPackageManager(), intent);
     }
 
     private String getIccId(int subId) {
@@ -2067,8 +2119,10 @@
     }
 
     @Override
-    public String getLine1NumberForDisplay(int subId) {
-        enforceReadPermission();
+    public String getLine1NumberForDisplay(int subId, String callingPackage) {
+        if (!canReadPhoneState(callingPackage, "getLine1NumberForDisplay")) {
+            return null;
+        }
 
         String iccId = getIccId(subId);
         if (iccId != null) {
@@ -2079,8 +2133,10 @@
     }
 
     @Override
-    public String getLine1AlphaTagForDisplay(int subId) {
-        enforceReadPermission();
+    public String getLine1AlphaTagForDisplay(int subId, String callingPackage) {
+        if (!canReadPhoneState(callingPackage, "getLine1AlphaTagForDisplay")) {
+            return null;
+        }
 
         String iccId = getIccId(subId);
         if (iccId != null) {
@@ -2223,8 +2279,11 @@
     }
 
     @Override
-    public boolean isVideoCallingEnabled() {
-        enforceReadPermission();
+    public boolean isVideoCallingEnabled(String callingPackage) {
+        if (!canReadPhoneState(callingPackage, "isVideoCallingEnabled")) {
+            return false;
+        }
+
         // Check the user preference and the  system-level IMS setting. Even if the user has
         // enabled video calling, if IMS is disabled we aren't able to support video calling.
         // In the long run, we may instead need to check if there exists a connection service
@@ -2234,6 +2293,29 @@
                 && mTelephonySharedPreferences.getBoolean(PREF_ENABLE_VIDEO_CALLING, true);
     }
 
+    @Override
+    public boolean canChangeDtmfToneLength() {
+        return mApp.getCarrierConfig().getBoolean(CarrierConfigManager.BOOL_DTMF_TYPE_ENABLED);
+    }
+
+    @Override
+    public boolean isWorldPhone() {
+        return mApp.getCarrierConfig().getBoolean(CarrierConfigManager.BOOL_WORLD_PHONE);
+    }
+
+    @Override
+    public boolean isTtyModeSupported() {
+        TelecomManager telecomManager = TelecomManager.from(mPhone.getContext());
+        TelephonyManager telephonyManager =
+                (TelephonyManager) mPhone.getContext().getSystemService(Context.TELEPHONY_SERVICE);
+        return !telephonyManager.isMultiSimEnabled() && telecomManager.isTtySupported();
+    }
+
+    @Override
+    public boolean isHearingAidCompatibilitySupported() {
+        return mPhone.getContext().getResources().getBoolean(R.bool.hac_enabled);
+    }
+
     /**
      * Returns the unique device ID of phone, for example, the IMEI for
      * GSM and the MEID for CDMA phones. Return null if device ID is not available.
@@ -2242,8 +2324,11 @@
      *   {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}
      */
     @Override
-    public String getDeviceId() {
-        enforceReadPermission();
+    public String getDeviceId(String callingPackage) {
+        if (!canReadPhoneState(callingPackage, "getDeviceId")) {
+            return null;
+        }
+
         final Phone phone = PhoneFactory.getPhone(0);
         if (phone != null) {
             return phone.getDeviceId();
@@ -2256,7 +2341,56 @@
      * {@hide}
      * Returns the IMS Registration Status
      */
+    @Override
     public boolean isImsRegistered() {
         return mPhone.isImsRegistered();
     }
+
+    @Override
+    public int getSubIdForPhoneAccount(PhoneAccount phoneAccount) {
+        return PhoneUtils.getSubIdForPhoneAccount(phoneAccount);
+    }
+
+    /*
+     * {@hide}
+     * Returns the IMS Registration Status
+     */
+    public boolean isWifiCallingEnabled() {
+        return mPhone.isWifiCallingEnabled();
+    }
+
+    /*
+     * {@hide}
+     * Returns the IMS Registration Status
+     */
+    public boolean isVolteEnabled() {
+        return mPhone.isVolteEnabled();
+    }
+
+    private boolean canReadPhoneState(String callingPackage, String message) {
+        mApp.enforceCallingOrSelfPermission(
+                android.Manifest.permission.READ_PHONE_STATE, message);
+
+        if (mAppOps.noteOp(AppOpsManager.OP_READ_PHONE_STATE, Binder.getCallingUid(),
+                callingPackage) != AppOpsManager.MODE_ALLOWED) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public void factoryReset(int subId) {
+        enforceConnectivityInternalPermission();
+        if (SubscriptionManager.isUsableSubIdValue(subId)) {
+            // Enable data
+            setDataEnabled(subId, true);
+            // Set network selection mode to automatic
+            setNetworkSelectionModeAutomatic(subId);
+            // Set preferred mobile network type to the best available
+            setPreferredNetworkType(subId, Phone.PREFERRED_NT_MODE);
+            // Turn off roaming
+            SubscriptionManager.from(mApp).setDataRoaming(0, subId);
+        }
+    }
 }
diff --git a/src/com/android/phone/PhoneUtils.java b/src/com/android/phone/PhoneUtils.java
index 7b9ceab..b9135c8 100644
--- a/src/com/android/phone/PhoneUtils.java
+++ b/src/com/android/phone/PhoneUtils.java
@@ -36,6 +36,8 @@
 import android.telecom.PhoneAccountHandle;
 import android.telecom.VideoProfile;
 import android.telephony.PhoneNumberUtils;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.ContextThemeWrapper;
@@ -60,6 +62,7 @@
 import com.android.internal.telephony.TelephonyCapabilities;
 import com.android.internal.telephony.TelephonyProperties;
 import com.android.internal.telephony.sip.SipPhone;
+import com.android.internal.telephony.uicc.UiccCard;
 import com.android.phone.CallGatewayManager.RawGatewayInfo;
 import com.android.services.telephony.TelephonyConnectionService;
 
@@ -2447,20 +2450,79 @@
                 == Configuration.ORIENTATION_LANDSCAPE;
     }
 
+    public static PhoneAccountHandle makePstnPhoneAccountHandle(String id) {
+        return makePstnPhoneAccountHandleWithPrefix(id, "", false);
+    }
+
+    public static PhoneAccountHandle makePstnPhoneAccountHandle(int phoneId) {
+        return makePstnPhoneAccountHandle(PhoneFactory.getPhone(phoneId));
+    }
+
     public static PhoneAccountHandle makePstnPhoneAccountHandle(Phone phone) {
         return makePstnPhoneAccountHandleWithPrefix(phone, "", false);
     }
 
     public static PhoneAccountHandle makePstnPhoneAccountHandleWithPrefix(
             Phone phone, String prefix, boolean isEmergency) {
-        ComponentName pstnConnectionServiceName =
-                new ComponentName(phone.getContext(), TelephonyConnectionService.class);
         // TODO: Should use some sort of special hidden flag to decorate this account as
         // an emergency-only account
-        String id = isEmergency ? "E" : prefix + String.valueOf(phone.getSubId());
+        String id = isEmergency ? "E" : prefix + String.valueOf(phone.getIccSerialNumber());
+        return makePstnPhoneAccountHandleWithPrefix(id, prefix, isEmergency);
+    }
+
+    public static PhoneAccountHandle makePstnPhoneAccountHandleWithPrefix(
+            String id, String prefix, boolean isEmergency) {
+        ComponentName pstnConnectionServiceName = getPstnConnectionServiceName();
         return new PhoneAccountHandle(pstnConnectionServiceName, id);
     }
 
+    public static int getSubIdForPhoneAccount(PhoneAccount phoneAccount) {
+        if (phoneAccount != null
+                && phoneAccount.hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION)) {
+            return getSubIdForPhoneAccountHandle(phoneAccount.getAccountHandle());
+        }
+        return SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+    }
+
+    public static int getSubIdForPhoneAccountHandle(PhoneAccountHandle handle) {
+        if (handle != null && handle.getComponentName().equals(getPstnConnectionServiceName())) {
+            Phone phone = getPhoneFromIccId(handle.getId());
+            if (phone != null) {
+                return phone.getSubId();
+            }
+        }
+        return SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+    }
+
+    /**
+     * Determine if a given phone account corresponds to an active SIM
+     *
+     * @param sm An instance of the subscription manager so it is not recreated for each calling of
+     * this method.
+     * @param handle The handle for the phone account to check
+     * @return {@code true} If there is an active SIM for this phone account,
+     * {@code false} otherwise.
+     */
+    public static boolean isPhoneAccountActive(SubscriptionManager sm, PhoneAccountHandle handle) {
+        return sm.getActiveSubscriptionInfoForIccIndex(handle.getId()) != null;
+    }
+
+    private static ComponentName getPstnConnectionServiceName() {
+        return new ComponentName(PhoneGlobals.getInstance(), TelephonyConnectionService.class);
+    }
+
+    private static Phone getPhoneFromIccId(String iccId) {
+        if (!TextUtils.isEmpty(iccId)) {
+            for (Phone phone : PhoneFactory.getPhones()) {
+                String phoneIccId = phone.getIccSerialNumber();
+                if (iccId.equals(phoneIccId)) {
+                    return phone;
+                }
+            }
+        }
+        return null;
+    }
+
     /**
      * Register ICC status for all phones.
      */
diff --git a/src/com/android/phone/TimeConsumingPreferenceActivity.java b/src/com/android/phone/TimeConsumingPreferenceActivity.java
index bab9469..08a5a95 100644
--- a/src/com/android/phone/TimeConsumingPreferenceActivity.java
+++ b/src/com/android/phone/TimeConsumingPreferenceActivity.java
@@ -179,6 +179,8 @@
     public void onException(Preference preference, CommandException exception) {
         if (exception.getCommandError() == CommandException.Error.FDN_CHECK_FAILURE) {
             onError(preference, FDN_CHECK_FAILURE);
+        } else if (exception.getCommandError() == CommandException.Error.RADIO_NOT_AVAILABLE) {
+            onError(preference, RADIO_OFF_ERROR);
         } else {
             preference.setEnabled(false);
             onError(preference, EXCEPTION_ERROR);
diff --git a/src/com/android/phone/common/mail/Address.java b/src/com/android/phone/common/mail/Address.java
new file mode 100644
index 0000000..5928b63
--- /dev/null
+++ b/src/com/android/phone/common/mail/Address.java
@@ -0,0 +1,544 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.phone.common.mail;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.text.Html;
+import android.text.TextUtils;
+import android.text.util.Rfc822Token;
+import android.text.util.Rfc822Tokenizer;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.phone.common.mail.utils.LogUtils;
+
+import org.apache.james.mime4j.codec.EncoderUtil;
+import org.apache.james.mime4j.decoder.DecoderUtil;
+
+import java.util.ArrayList;
+import java.util.regex.Pattern;
+
+/**
+ * This class represent email address.
+ *
+ * RFC822 email address may have following format.
+ *   "name" <address> (comment)
+ *   "name" <address>
+ *   name <address>
+ *   address
+ * Name and comment part should be MIME/base64 encoded in header if necessary.
+ *
+ */
+public class Address implements Parcelable {
+    public static final String ADDRESS_DELIMETER = ",";
+    /**
+     *  Address part, in the form local_part@domain_part. No surrounding angle brackets.
+     */
+    private String mAddress;
+
+    /**
+     * Name part. No surrounding double quote, and no MIME/base64 encoding.
+     * This must be null if Address has no name part.
+     */
+    private String mPersonal;
+
+    /**
+     * When personal is set, it will return the first token of the personal
+     * string. Otherwise, it will return the e-mail address up to the '@' sign.
+     */
+    private String mSimplifiedName;
+
+    // Regex that matches address surrounded by '<>' optionally. '^<?([^>]+)>?$'
+    private static final Pattern REMOVE_OPTIONAL_BRACKET = Pattern.compile("^<?([^>]+)>?$");
+    // Regex that matches personal name surrounded by '""' optionally. '^"?([^"]+)"?$'
+    private static final Pattern REMOVE_OPTIONAL_DQUOTE = Pattern.compile("^\"?([^\"]*)\"?$");
+    // Regex that matches escaped character '\\([\\"])'
+    private static final Pattern UNQUOTE = Pattern.compile("\\\\([\\\\\"])");
+
+    // TODO: LOCAL_PART and DOMAIN_PART_PART are too permissive and can be improved.
+    // TODO: Fix this to better constrain comments.
+    /** Regex for the local part of an email address. */
+    private static final String LOCAL_PART = "[^@]+";
+    /** Regex for each part of the domain part, i.e. the thing between the dots. */
+    private static final String DOMAIN_PART_PART = "[[\\w][\\d]\\-\\(\\)\\[\\]]+";
+    /** Regex for the domain part, which is two or more {@link #DOMAIN_PART_PART} separated by . */
+    private static final String DOMAIN_PART =
+            "(" + DOMAIN_PART_PART + "\\.)+" + DOMAIN_PART_PART;
+
+    /** Pattern to check if an email address is valid. */
+    private static final Pattern EMAIL_ADDRESS =
+            Pattern.compile("\\A" + LOCAL_PART + "@" + DOMAIN_PART + "\\z");
+
+    private static final Address[] EMPTY_ADDRESS_ARRAY = new Address[0];
+
+    // delimiters are chars that do not appear in an email address, used by fromHeader
+    private static final char LIST_DELIMITER_EMAIL = '\1';
+    private static final char LIST_DELIMITER_PERSONAL = '\2';
+
+    private static final String LOG_TAG = "Email Address";
+
+    @VisibleForTesting
+    public Address(String address) {
+        setAddress(address);
+    }
+
+    public Address(String address, String personal) {
+        setPersonal(personal);
+        setAddress(address);
+    }
+
+    /**
+     * Returns a simplified string for this e-mail address.
+     * When a name is known, it will return the first token of that name. Otherwise, it will
+     * return the e-mail address up to the '@' sign.
+     */
+    public String getSimplifiedName() {
+        if (mSimplifiedName == null) {
+            if (TextUtils.isEmpty(mPersonal) && !TextUtils.isEmpty(mAddress)) {
+                int atSign = mAddress.indexOf('@');
+                mSimplifiedName = (atSign != -1) ? mAddress.substring(0, atSign) : "";
+            } else if (!TextUtils.isEmpty(mPersonal)) {
+
+                // TODO: use Contacts' NameSplitter for more reliable first-name extraction
+
+                int end = mPersonal.indexOf(' ');
+                while (end > 0 && mPersonal.charAt(end - 1) == ',') {
+                    end--;
+                }
+                mSimplifiedName = (end < 1) ? mPersonal : mPersonal.substring(0, end);
+
+            } else {
+                LogUtils.w(LOG_TAG, "Unable to get a simplified name");
+                mSimplifiedName = "";
+            }
+        }
+        return mSimplifiedName;
+    }
+
+    public static synchronized Address getEmailAddress(String rawAddress) {
+        if (TextUtils.isEmpty(rawAddress)) {
+            return null;
+        }
+        String name, address;
+        final Rfc822Token[] tokens = Rfc822Tokenizer.tokenize(rawAddress);
+        if (tokens.length > 0) {
+            final String tokenizedName = tokens[0].getName();
+            name = tokenizedName != null ? Html.fromHtml(tokenizedName.trim()).toString()
+                    : "";
+            address = Html.fromHtml(tokens[0].getAddress()).toString();
+        } else {
+            name = "";
+            address = rawAddress == null ?
+                    "" : Html.fromHtml(rawAddress).toString();
+        }
+        return new Address(address, name);
+    }
+
+    public String getAddress() {
+        return mAddress;
+    }
+
+    public void setAddress(String address) {
+        mAddress = REMOVE_OPTIONAL_BRACKET.matcher(address).replaceAll("$1");
+    }
+
+    /**
+     * Get name part as UTF-16 string. No surrounding double quote, and no MIME/base64 encoding.
+     *
+     * @return Name part of email address. Returns null if it is omitted.
+     */
+    public String getPersonal() {
+        return mPersonal;
+    }
+
+    /**
+     * Set personal part from UTF-16 string. Optional surrounding double quote will be removed.
+     * It will be also unquoted and MIME/base64 decoded.
+     *
+     * @param personal name part of email address as UTF-16 string. Null is acceptable.
+     */
+    public void setPersonal(String personal) {
+        mPersonal = decodeAddressPersonal(personal);
+    }
+
+    /**
+     * Decodes name from UTF-16 string. Optional surrounding double quote will be removed.
+     * It will be also unquoted and MIME/base64 decoded.
+     *
+     * @param personal name part of email address as UTF-16 string. Null is acceptable.
+     */
+    public static String decodeAddressPersonal(String personal) {
+        if (personal != null) {
+            personal = REMOVE_OPTIONAL_DQUOTE.matcher(personal).replaceAll("$1");
+            personal = UNQUOTE.matcher(personal).replaceAll("$1");
+            personal = DecoderUtil.decodeEncodedWords(personal);
+            if (personal.length() == 0) {
+                personal = null;
+            }
+        }
+        return personal;
+    }
+
+    /**
+     * This method is used to check that all the addresses that the user
+     * entered in a list (e.g. To:) are valid, so that none is dropped.
+     */
+    @VisibleForTesting
+    public static boolean isAllValid(String addressList) {
+        // This code mimics the parse() method below.
+        // I don't know how to better avoid the code-duplication.
+        if (addressList != null && addressList.length() > 0) {
+            Rfc822Token[] tokens = Rfc822Tokenizer.tokenize(addressList);
+            for (int i = 0, length = tokens.length; i < length; ++i) {
+                Rfc822Token token = tokens[i];
+                String address = token.getAddress();
+                if (!TextUtils.isEmpty(address) && !isValidAddress(address)) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Parse a comma-delimited list of addresses in RFC822 format and return an
+     * array of Address objects.
+     *
+     * @param addressList Address list in comma-delimited string.
+     * @return An array of 0 or more Addresses.
+     */
+    public static Address[] parse(String addressList) {
+        if (addressList == null || addressList.length() == 0) {
+            return EMPTY_ADDRESS_ARRAY;
+        }
+        Rfc822Token[] tokens = Rfc822Tokenizer.tokenize(addressList);
+        ArrayList<Address> addresses = new ArrayList<Address>();
+        for (int i = 0, length = tokens.length; i < length; ++i) {
+            Rfc822Token token = tokens[i];
+            String address = token.getAddress();
+            if (!TextUtils.isEmpty(address)) {
+                if (isValidAddress(address)) {
+                    String name = token.getName();
+                    if (TextUtils.isEmpty(name)) {
+                        name = null;
+                    }
+                    addresses.add(new Address(address, name));
+                }
+            }
+        }
+        return addresses.toArray(new Address[addresses.size()]);
+    }
+
+    /**
+     * Checks whether a string email address is valid.
+     * E.g. name@domain.com is valid.
+     */
+    @VisibleForTesting
+    static boolean isValidAddress(final String address) {
+        return EMAIL_ADDRESS.matcher(address).find();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o instanceof Address) {
+            // It seems that the spec says that the "user" part is case-sensitive,
+            // while the domain part in case-insesitive.
+            // So foo@yahoo.com and Foo@yahoo.com are different.
+            // This may seem non-intuitive from the user POV, so we
+            // may re-consider it if it creates UI trouble.
+            // A problem case is "replyAll" sending to both
+            // a@b.c and to A@b.c, which turn out to be the same on the server.
+            // Leave unchanged for now (i.e. case-sensitive).
+            return getAddress().equals(((Address) o).getAddress());
+        }
+        return super.equals(o);
+    }
+
+    @Override
+    public int hashCode() {
+        return getAddress().hashCode();
+    }
+
+    /**
+     * Get human readable address string.
+     * Do not use this for email header.
+     *
+     * @return Human readable address string.  Not quoted and not encoded.
+     */
+    @Override
+    public String toString() {
+        if (mPersonal != null && !mPersonal.equals(mAddress)) {
+            if (mPersonal.matches(".*[\\(\\)<>@,;:\\\\\".\\[\\]].*")) {
+                return ensureQuotedString(mPersonal) + " <" + mAddress + ">";
+            } else {
+                return mPersonal + " <" + mAddress + ">";
+            }
+        } else {
+            return mAddress;
+        }
+    }
+
+    /**
+     * Ensures that the given string starts and ends with the double quote character. The string is
+     * not modified in any way except to add the double quote character to start and end if it's not
+     * already there.
+     *
+     * sample -> "sample"
+     * "sample" -> "sample"
+     * ""sample"" -> "sample"
+     * "sample"" -> "sample"
+     * sa"mp"le -> "sa"mp"le"
+     * "sa"mp"le" -> "sa"mp"le"
+     * (empty string) -> ""
+     * " -> ""
+     */
+    private static String ensureQuotedString(String s) {
+        if (s == null) {
+            return null;
+        }
+        if (!s.matches("^\".*\"$")) {
+            return "\"" + s + "\"";
+        } else {
+            return s;
+        }
+    }
+
+    /**
+     * Get human readable comma-delimited address string.
+     *
+     * @param addresses Address array
+     * @return Human readable comma-delimited address string.
+     */
+    @VisibleForTesting
+    public static String toString(Address[] addresses) {
+        return toString(addresses, ADDRESS_DELIMETER);
+    }
+
+    /**
+     * Get human readable address strings joined with the specified separator.
+     *
+     * @param addresses Address array
+     * @param separator Separator
+     * @return Human readable comma-delimited address string.
+     */
+    public static String toString(Address[] addresses, String separator) {
+        if (addresses == null || addresses.length == 0) {
+            return null;
+        }
+        if (addresses.length == 1) {
+            return addresses[0].toString();
+        }
+        StringBuilder sb = new StringBuilder(addresses[0].toString());
+        for (int i = 1; i < addresses.length; i++) {
+            sb.append(separator);
+            // TODO: investigate why this .trim() is needed.
+            sb.append(addresses[i].toString().trim());
+        }
+        return sb.toString();
+    }
+
+    /**
+     * Get RFC822/MIME compatible address string.
+     *
+     * @return RFC822/MIME compatible address string.
+     * It may be surrounded by double quote or quoted and MIME/base64 encoded if necessary.
+     */
+    public String toHeader() {
+        if (mPersonal != null) {
+            return EncoderUtil.encodeAddressDisplayName(mPersonal) + " <" + mAddress + ">";
+        } else {
+            return mAddress;
+        }
+    }
+
+    /**
+     * Get RFC822/MIME compatible comma-delimited address string.
+     *
+     * @param addresses Address array
+     * @return RFC822/MIME compatible comma-delimited address string.
+     * it may be surrounded by double quoted or quoted and MIME/base64 encoded if necessary.
+     */
+    public static String toHeader(Address[] addresses) {
+        if (addresses == null || addresses.length == 0) {
+            return null;
+        }
+        if (addresses.length == 1) {
+            return addresses[0].toHeader();
+        }
+        StringBuilder sb = new StringBuilder(addresses[0].toHeader());
+        for (int i = 1; i < addresses.length; i++) {
+            // We need space character to be able to fold line.
+            sb.append(", ");
+            sb.append(addresses[i].toHeader());
+        }
+        return sb.toString();
+    }
+
+    /**
+     * Get Human friendly address string.
+     *
+     * @return the personal part of this Address, or the address part if the
+     * personal part is not available
+     */
+    @VisibleForTesting
+    public String toFriendly() {
+        if (mPersonal != null && mPersonal.length() > 0) {
+            return mPersonal;
+        } else {
+            return mAddress;
+        }
+    }
+
+    /**
+     * Creates a comma-delimited list of addresses in the "friendly" format (see toFriendly() for
+     * details on the per-address conversion).
+     *
+     * @param addresses Array of Address[] values
+     * @return A comma-delimited string listing all of the addresses supplied.  Null if source
+     * was null or empty.
+     */
+    @VisibleForTesting
+    public static String toFriendly(Address[] addresses) {
+        if (addresses == null || addresses.length == 0) {
+            return null;
+        }
+        if (addresses.length == 1) {
+            return addresses[0].toFriendly();
+        }
+        StringBuilder sb = new StringBuilder(addresses[0].toFriendly());
+        for (int i = 1; i < addresses.length; i++) {
+            sb.append(", ");
+            sb.append(addresses[i].toFriendly());
+        }
+        return sb.toString();
+    }
+
+    /**
+     * Returns exactly the same result as Address.toString(Address.fromHeader(addressList)).
+     */
+    @VisibleForTesting
+    public static String fromHeaderToString(String addressList) {
+        return toString(fromHeader(addressList));
+    }
+
+    /**
+     * Returns exactly the same result as Address.toHeader(Address.parse(addressList)).
+     */
+    @VisibleForTesting
+    public static String parseToHeader(String addressList) {
+        return Address.toHeader(Address.parse(addressList));
+    }
+
+    /**
+     * Returns null if the addressList has 0 addresses, otherwise returns the first address.
+     * The same as Address.fromHeader(addressList)[0] for non-empty list.
+     * This is an utility method that offers some performance optimization opportunities.
+     */
+    @VisibleForTesting
+    public static Address firstAddress(String addressList) {
+        Address[] array = fromHeader(addressList);
+        return array.length > 0 ? array[0] : null;
+    }
+
+    /**
+     * This method exists to convert an address list formatted in a deprecated legacy format to the
+     * standard RFC822 header format. {@link #fromHeader(String)} is capable of reading the legacy
+     * format and the RFC822 format. {@link #toHeader()} always produces the RFC822 format.
+     *
+     * This implementation is brute-force, and could be replaced with a more efficient version
+     * if desired.
+     */
+    public static String reformatToHeader(String addressList) {
+        return toHeader(fromHeader(addressList));
+    }
+
+    /**
+     * @param addressList a CSV of RFC822 addresses or the deprecated legacy string format
+     * @return array of addresses parsed from <code>addressList</code>
+     */
+    @VisibleForTesting
+    public static Address[] fromHeader(String addressList) {
+        if (addressList == null || addressList.length() == 0) {
+            return EMPTY_ADDRESS_ARRAY;
+        }
+        // IF we're CSV, just parse
+        if ((addressList.indexOf(LIST_DELIMITER_PERSONAL) == -1) &&
+                (addressList.indexOf(LIST_DELIMITER_EMAIL) == -1)) {
+            return Address.parse(addressList);
+        }
+        // Otherwise, do backward-compatible unpack
+        ArrayList<Address> addresses = new ArrayList<Address>();
+        int length = addressList.length();
+        int pairStartIndex = 0;
+        int pairEndIndex;
+
+        /* addressEndIndex is only re-scanned (indexOf()) when a LIST_DELIMITER_PERSONAL
+           is used, not for every email address; i.e. not for every iteration of the while().
+           This reduces the theoretical complexity from quadratic to linear,
+           and provides some speed-up in practice by removing redundant scans of the string.
+        */
+        int addressEndIndex = addressList.indexOf(LIST_DELIMITER_PERSONAL);
+
+        while (pairStartIndex < length) {
+            pairEndIndex = addressList.indexOf(LIST_DELIMITER_EMAIL, pairStartIndex);
+            if (pairEndIndex == -1) {
+                pairEndIndex = length;
+            }
+            Address address;
+            if (addressEndIndex == -1 || pairEndIndex <= addressEndIndex) {
+                // in this case the DELIMITER_PERSONAL is in a future pair,
+                // so don't use personal, and don't update addressEndIndex
+                address = new Address(addressList.substring(pairStartIndex, pairEndIndex), null);
+            } else {
+                address = new Address(addressList.substring(pairStartIndex, addressEndIndex),
+                        addressList.substring(addressEndIndex + 1, pairEndIndex));
+                // only update addressEndIndex when we use the LIST_DELIMITER_PERSONAL
+                addressEndIndex = addressList.indexOf(LIST_DELIMITER_PERSONAL, pairEndIndex + 1);
+            }
+            addresses.add(address);
+            pairStartIndex = pairEndIndex + 1;
+        }
+        return addresses.toArray(new Address[addresses.size()]);
+    }
+
+    public static final Creator<Address> CREATOR = new Creator<Address>() {
+        @Override
+        public Address createFromParcel(Parcel parcel) {
+            return new Address(parcel);
+        }
+
+        @Override
+        public Address[] newArray(int size) {
+            return new Address[size];
+        }
+    };
+
+    public Address(Parcel in) {
+        setPersonal(in.readString());
+        setAddress(in.readString());
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel out, int flags) {
+        out.writeString(mPersonal);
+        out.writeString(mAddress);
+    }
+}
diff --git a/src/com/android/phone/common/mail/AuthenticationFailedException.java b/src/com/android/phone/common/mail/AuthenticationFailedException.java
new file mode 100644
index 0000000..f13ab45
--- /dev/null
+++ b/src/com/android/phone/common/mail/AuthenticationFailedException.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.phone.common.mail;
+
+public class AuthenticationFailedException extends MessagingException {
+    public static final long serialVersionUID = -1;
+
+    public AuthenticationFailedException(String message) {
+        super(MessagingException.AUTHENTICATION_FAILED, message);
+    }
+
+    public AuthenticationFailedException(int exceptionType, String message) {
+        super(exceptionType, message);
+    }
+
+    public AuthenticationFailedException(String message, Throwable throwable) {
+        super(MessagingException.AUTHENTICATION_FAILED, message, throwable);
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/phone/common/mail/Base64Body.java b/src/com/android/phone/common/mail/Base64Body.java
new file mode 100644
index 0000000..757b4b7
--- /dev/null
+++ b/src/com/android/phone/common/mail/Base64Body.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.phone.common.mail;
+
+import android.util.Base64;
+import android.util.Base64OutputStream;
+
+import org.apache.commons.io.IOUtils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+public class Base64Body implements Body {
+    private final InputStream mSource;
+    // Because we consume the input stream, we can only write out once
+    private boolean mAlreadyWritten;
+
+    public Base64Body(InputStream source) {
+        mSource = source;
+    }
+
+    @Override
+    public InputStream getInputStream() throws MessagingException {
+        return mSource;
+    }
+
+    /**
+     * This method consumes the input stream, so can only be called once
+     * @param out Stream to write to
+     * @throws IllegalStateException If called more than once
+     * @throws IOException
+     * @throws MessagingException
+     */
+    @Override
+    public void writeTo(OutputStream out)
+            throws IllegalStateException, IOException, MessagingException {
+        if (mAlreadyWritten) {
+            throw new IllegalStateException("Base64Body can only be written once");
+        }
+        mAlreadyWritten = true;
+        try {
+            final Base64OutputStream b64out = new Base64OutputStream(out, Base64.DEFAULT);
+            IOUtils.copyLarge(mSource, b64out);
+        } finally {
+            mSource.close();
+        }
+    }
+}
diff --git a/src/com/android/phone/common/mail/Body.java b/src/com/android/phone/common/mail/Body.java
new file mode 100644
index 0000000..8625ef2
--- /dev/null
+++ b/src/com/android/phone/common/mail/Body.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.phone.common.mail;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+public interface Body {
+    public InputStream getInputStream() throws MessagingException;
+    public void writeTo(OutputStream out) throws IOException, MessagingException;
+}
diff --git a/src/com/android/phone/common/mail/BodyPart.java b/src/com/android/phone/common/mail/BodyPart.java
new file mode 100644
index 0000000..78140c8
--- /dev/null
+++ b/src/com/android/phone/common/mail/BodyPart.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.phone.common.mail;
+
+public abstract class BodyPart implements Part {
+    protected Multipart mParent;
+
+    public Multipart getParent() {
+        return mParent;
+    }
+}
diff --git a/src/com/android/phone/common/mail/CertificateValidationException.java b/src/com/android/phone/common/mail/CertificateValidationException.java
new file mode 100644
index 0000000..d8ae9b4
--- /dev/null
+++ b/src/com/android/phone/common/mail/CertificateValidationException.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.phone.common.mail;
+
+public class CertificateValidationException extends MessagingException {
+    public static final long serialVersionUID = -1;
+
+    public CertificateValidationException(String message) {
+        super(MessagingException.CERTIFICATE_VALIDATION_ERROR, message);
+    }
+
+    public CertificateValidationException(String message, Throwable throwable) {
+        super(MessagingException.CERTIFICATE_VALIDATION_ERROR, message, throwable);
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/phone/common/mail/FetchProfile.java b/src/com/android/phone/common/mail/FetchProfile.java
new file mode 100644
index 0000000..01c1fcf
--- /dev/null
+++ b/src/com/android/phone/common/mail/FetchProfile.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.phone.common.mail;
+
+import java.util.ArrayList;
+
+/**
+ * <pre>
+ * A FetchProfile is a list of items that should be downloaded in bulk for a set of messages.
+ * FetchProfile can contain the following objects:
+ *      FetchProfile.Item:      Described below.
+ *      Message:                Indicates that the body of the entire message should be fetched.
+ *                              Synonymous with FetchProfile.Item.BODY.
+ *      Part:                   Indicates that the given Part should be fetched. The provider
+ *                              is expected have previously created the given BodyPart and stored
+ *                              any information it needs to download the content.
+ * </pre>
+ */
+public class FetchProfile extends ArrayList<Fetchable> {
+    /**
+     * Default items available for pre-fetching. It should be expected that any
+     * item fetched by using these items could potentially include all of the
+     * previous items.
+     */
+    public enum Item implements Fetchable {
+        /**
+         * Download the flags of the message.
+         */
+        FLAGS,
+
+        /**
+         * Download the envelope of the message. This should include at minimum
+         * the size and the following headers: date, subject, from, content-type, to, cc
+         */
+        ENVELOPE,
+
+        /**
+         * Download the structure of the message. This maps directly to IMAP's BODYSTRUCTURE
+         * and may map to other providers.
+         * The provider should, if possible, fill in a properly formatted MIME structure in
+         * the message without actually downloading any message data. If the provider is not
+         * capable of this operation it should specifically set the body of the message to null
+         * so that upper levels can detect that a full body download is needed.
+         */
+        STRUCTURE,
+
+        /**
+         * A sane portion of the entire message, cut off at a provider determined limit.
+         * This should generaly be around 50kB.
+         */
+        BODY_SANE,
+
+        /**
+         * The entire message.
+         */
+        BODY,
+    }
+
+    /**
+     * @return the first {@link Part} in this collection, or null if it doesn't contain
+     * {@link Part}.
+     */
+    public Part getFirstPart() {
+        for (Fetchable o : this) {
+            if (o instanceof Part) {
+                return (Part) o;
+            }
+        }
+        return null;
+    }
+}
diff --git a/src/com/android/phone/common/mail/Fetchable.java b/src/com/android/phone/common/mail/Fetchable.java
new file mode 100644
index 0000000..829c672
--- /dev/null
+++ b/src/com/android/phone/common/mail/Fetchable.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.phone.common.mail;
+
+/**
+ * Interface for classes that can be added to {@link FetchProfile}.
+ * i.e. {@link Part} and its subclasses, and {@link FetchProfile.Item}.
+ */
+public interface Fetchable {
+}
diff --git a/src/com/android/phone/common/mail/FixedLengthInputStream.java b/src/com/android/phone/common/mail/FixedLengthInputStream.java
new file mode 100644
index 0000000..499feca
--- /dev/null
+++ b/src/com/android/phone/common/mail/FixedLengthInputStream.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.phone.common.mail;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * A filtering InputStream that stops allowing reads after the given length has been read. This
+ * is used to allow a client to read directly from an underlying protocol stream without reading
+ * past where the protocol handler intended the client to read.
+ */
+public class FixedLengthInputStream extends InputStream {
+    private final InputStream mIn;
+    private final int mLength;
+    private int mCount;
+
+    public FixedLengthInputStream(InputStream in, int length) {
+        this.mIn = in;
+        this.mLength = length;
+    }
+
+    @Override
+    public int available() throws IOException {
+        return mLength - mCount;
+    }
+
+    @Override
+    public int read() throws IOException {
+        if (mCount < mLength) {
+            mCount++;
+            return mIn.read();
+        } else {
+            return -1;
+        }
+    }
+
+    @Override
+    public int read(byte[] b, int offset, int length) throws IOException {
+        if (mCount < mLength) {
+            int d = mIn.read(b, offset, Math.min(mLength - mCount, length));
+            if (d == -1) {
+                return -1;
+            } else {
+                mCount += d;
+                return d;
+            }
+        } else {
+            return -1;
+        }
+    }
+
+    @Override
+    public int read(byte[] b) throws IOException {
+        return read(b, 0, b.length);
+    }
+
+    public int getLength() {
+        return mLength;
+    }
+
+    @Override
+    public String toString() {
+        return String.format("FixedLengthInputStream(in=%s, length=%d)", mIn.toString(), mLength);
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/phone/common/mail/Flag.java b/src/com/android/phone/common/mail/Flag.java
new file mode 100644
index 0000000..aa5d7e9
--- /dev/null
+++ b/src/com/android/phone/common/mail/Flag.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.phone.common.mail;
+
+/**
+ * Flags that can be applied to Messages.
+ */
+public class Flag {
+    // If adding new flags: ALL FLAGS MUST BE UPPER CASE.
+    public static final String DELETED = "deleted";
+    public static final String SEEN = "seen";
+    public static final String ANSWERED = "answered";
+    public static final String FLAGGED = "flagged";
+    public static final String DRAFT = "draft";
+    public static final String RECENT = "recent";
+}
diff --git a/src/com/android/phone/common/mail/MailTransport.java b/src/com/android/phone/common/mail/MailTransport.java
new file mode 100644
index 0000000..c66130c
--- /dev/null
+++ b/src/com/android/phone/common/mail/MailTransport.java
@@ -0,0 +1,237 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.phone.common.mail;
+
+import android.content.Context;
+
+import com.android.phone.common.mail.store.ImapStore;
+import com.android.phone.common.mail.utils.LogUtils;
+
+import java.net.SocketAddress;
+
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLPeerUnverifiedException;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.SSLSocket;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+
+/**
+ * Make connection and perform operations on mail server by reading and writing lines.
+ */
+public class MailTransport {
+    private static final String TAG = "MailTransport";
+
+    // TODO protected eventually
+    /*protected*/ public static final int SOCKET_CONNECT_TIMEOUT = 10000;
+    /*protected*/ public static final int SOCKET_READ_TIMEOUT = 60000;
+
+    private static final HostnameVerifier HOSTNAME_VERIFIER =
+            HttpsURLConnection.getDefaultHostnameVerifier();
+
+    private Context mContext;
+    private String mHost;
+    private int mPort;
+    private Socket mSocket;
+    private BufferedInputStream mIn;
+    private BufferedOutputStream mOut;
+    private int mFlags;
+
+    public MailTransport(Context context, String address, int port, int flags) {
+        mContext = context;
+        mHost = address;
+        mPort = port;
+        mFlags = flags;
+    }
+
+    /**
+     * Returns a new transport, using the current transport as a model. The new transport is
+     * configured identically, but not opened or connected in any way.
+     */
+    @Override
+    public MailTransport clone() {
+        return new MailTransport(mContext, mHost, mPort, mFlags);
+    }
+
+    public boolean canTrySslSecurity() {
+        return (mFlags & ImapStore.FLAG_SSL) != 0;
+    }
+
+    public boolean canTrustAllCertificates() {
+        return (mFlags & ImapStore.FLAG_TRUST_ALL) != 0;
+    }
+
+    /**
+     * Attempts to open a connection using the Uri supplied for connection parameters.  Will attempt
+     * an SSL connection if indicated.
+     */
+    public void open() throws MessagingException, CertificateValidationException {
+        LogUtils.d(TAG, "*** IMAP open " + mHost + ":" + String.valueOf(mPort));
+
+        try {
+            SocketAddress socketAddress = new InetSocketAddress(mHost, mPort);
+            if (canTrySslSecurity()) {
+                mSocket = HttpsURLConnection.getDefaultSSLSocketFactory().createSocket();
+            } else {
+                mSocket = new Socket();
+            }
+            mSocket.connect(socketAddress, SOCKET_CONNECT_TIMEOUT);
+            // After the socket connects to an SSL server, confirm that the hostname is as expected
+            if (canTrySslSecurity() && !canTrustAllCertificates()) {
+                verifyHostname(mSocket, mHost);
+            }
+
+            mIn = new BufferedInputStream(mSocket.getInputStream(), 1024);
+            mOut = new BufferedOutputStream(mSocket.getOutputStream(), 512);
+            mSocket.setSoTimeout(SOCKET_READ_TIMEOUT);
+        } catch (SSLException e) {
+            LogUtils.d(TAG, e.toString());
+            throw new CertificateValidationException(e.getMessage(), e);
+        } catch (IOException ioe) {
+            LogUtils.d(TAG, ioe.toString());
+            throw new MessagingException(MessagingException.IOERROR, ioe.toString());
+        } catch (IllegalArgumentException iae) {
+            LogUtils.d(TAG, iae.toString());
+            throw new MessagingException(MessagingException.UNSPECIFIED_EXCEPTION, iae.toString());
+        }
+    }
+
+    /**
+     * Lightweight version of SSLCertificateSocketFactory.verifyHostname, which provides this
+     * service but is not in the public API.
+     *
+     * Verify the hostname of the certificate used by the other end of a
+     * connected socket. It is harmless to call this method redundantly if the hostname has already
+     * been verified.
+     *
+     * <p>Wildcard certificates are allowed to verify any matching hostname,
+     * so "foo.bar.example.com" is verified if the peer has a certificate
+     * for "*.example.com".
+     *
+     * @param socket An SSL socket which has been connected to a server
+     * @param hostname The expected hostname of the remote server
+     * @throws IOException if something goes wrong handshaking with the server
+     * @throws SSLPeerUnverifiedException if the server cannot prove its identity
+      */
+    private static void verifyHostname(Socket socket, String hostname) throws IOException {
+        // The code at the start of OpenSSLSocketImpl.startHandshake()
+        // ensures that the call is idempotent, so we can safely call it.
+        SSLSocket ssl = (SSLSocket) socket;
+        ssl.startHandshake();
+
+        SSLSession session = ssl.getSession();
+        if (session == null) {
+            throw new SSLException("Cannot verify SSL socket without session");
+        }
+        // TODO: Instead of reporting the name of the server we think we're connecting to,
+        // we should be reporting the bad name in the certificate.  Unfortunately this is buried
+        // in the verifier code and is not available in the verifier API, and extracting the
+        // CN & alts is beyond the scope of this patch.
+        if (!HOSTNAME_VERIFIER.verify(hostname, session)) {
+            throw new SSLPeerUnverifiedException(
+                    "Certificate hostname not useable for server: " + hostname);
+        }
+    }
+
+    public boolean isOpen() {
+        return (mIn != null && mOut != null &&
+                mSocket != null && mSocket.isConnected() && !mSocket.isClosed());
+    }
+
+    /**
+     * Close the connection.  MUST NOT return any exceptions - must be "best effort" and safe.
+     */
+    public void close() {
+        try {
+            mIn.close();
+        } catch (Exception e) {
+            // May fail if the connection is already closed.
+        }
+        try {
+            mOut.close();
+        } catch (Exception e) {
+            // May fail if the connection is already closed.
+        }
+        try {
+            mSocket.close();
+        } catch (Exception e) {
+            // May fail if the connection is already closed.
+        }
+        mIn = null;
+        mOut = null;
+        mSocket = null;
+    }
+
+    public InputStream getInputStream() {
+        return mIn;
+    }
+
+    public OutputStream getOutputStream() {
+        return mOut;
+    }
+
+    /**
+     * Writes a single line to the server using \r\n termination.
+     */
+    public void writeLine(String s, String sensitiveReplacement) throws IOException {
+        if (sensitiveReplacement != null) {
+            LogUtils.d(TAG, ">>> " + sensitiveReplacement);
+        } else {
+            LogUtils.d(TAG, ">>> " + s);
+        }
+
+        OutputStream out = getOutputStream();
+        out.write(s.getBytes());
+        out.write('\r');
+        out.write('\n');
+        out.flush();
+    }
+
+    /**
+     * Reads a single line from the server, using either \r\n or \n as the delimiter.  The
+     * delimiter char(s) are not included in the result.
+     */
+    public String readLine(boolean loggable) throws IOException {
+        StringBuffer sb = new StringBuffer();
+        InputStream in = getInputStream();
+        int d;
+        while ((d = in.read()) != -1) {
+            if (((char)d) == '\r') {
+                continue;
+            } else if (((char)d) == '\n') {
+                break;
+            } else {
+                sb.append((char)d);
+            }
+        }
+        if (d == -1) {
+            LogUtils.d(TAG, "End of stream reached while trying to read line.");
+        }
+        String ret = sb.toString();
+        if (loggable) {
+            LogUtils.d(TAG, "<<< " + ret);
+        }
+        return ret;
+    }
+}
diff --git a/src/com/android/phone/common/mail/MeetingInfo.java b/src/com/android/phone/common/mail/MeetingInfo.java
new file mode 100644
index 0000000..9fbafe7
--- /dev/null
+++ b/src/com/android/phone/common/mail/MeetingInfo.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.phone.common.mail;
+
+public class MeetingInfo {
+    // Predefined tags; others can be added
+    public static final String MEETING_DTSTAMP = "DTSTAMP";
+    public static final String MEETING_UID = "UID";
+    public static final String MEETING_ORGANIZER_EMAIL = "ORGMAIL";
+    public static final String MEETING_DTSTART = "DTSTART";
+    public static final String MEETING_DTEND = "DTEND";
+    public static final String MEETING_TITLE = "TITLE";
+    public static final String MEETING_LOCATION = "LOC";
+    public static final String MEETING_RESPONSE_REQUESTED = "RESPONSE";
+    public static final String MEETING_ALL_DAY = "ALLDAY";
+}
diff --git a/src/com/android/phone/common/mail/Message.java b/src/com/android/phone/common/mail/Message.java
new file mode 100644
index 0000000..0a5ed35
--- /dev/null
+++ b/src/com/android/phone/common/mail/Message.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.phone.common.mail;
+
+import com.android.internal.annotations.VisibleForTesting;
+
+import java.util.Date;
+import java.util.HashSet;
+
+public abstract class Message implements Part, Body {
+    public static final Message[] EMPTY_ARRAY = new Message[0];
+
+    public static final String RECIPIENT_TYPE_TO = "to";
+    public static final String RECIPIENT_TYPE_CC = "cc";
+    public static final String RECIPIENT_TYPE_BCC = "bcc";
+    public enum RecipientType {
+        TO, CC, BCC,
+    }
+
+    protected String mUid;
+
+    private HashSet<String> mFlags = null;
+
+    protected Date mInternalDate;
+
+    public String getUid() {
+        return mUid;
+    }
+
+    public void setUid(String uid) {
+        this.mUid = uid;
+    }
+
+    public abstract String getSubject() throws MessagingException;
+
+    public abstract void setSubject(String subject) throws MessagingException;
+
+    public Date getInternalDate() {
+        return mInternalDate;
+    }
+
+    public void setInternalDate(Date internalDate) {
+        this.mInternalDate = internalDate;
+    }
+
+    public abstract Date getReceivedDate() throws MessagingException;
+
+    public abstract Date getSentDate() throws MessagingException;
+
+    public abstract void setSentDate(Date sentDate) throws MessagingException;
+
+    public abstract Address[] getRecipients(String type) throws MessagingException;
+
+    public abstract void setRecipients(String type, Address[] addresses)
+            throws MessagingException;
+
+    public void setRecipient(String type, Address address) throws MessagingException {
+        setRecipients(type, new Address[] {
+            address
+        });
+    }
+
+    public abstract Address[] getFrom() throws MessagingException;
+
+    public abstract void setFrom(Address from) throws MessagingException;
+
+    public abstract Address[] getReplyTo() throws MessagingException;
+
+    public abstract void setReplyTo(Address[] from) throws MessagingException;
+
+    // Always use these instead of getHeader("Message-ID") or setHeader("Message-ID");
+    public abstract void setMessageId(String messageId) throws MessagingException;
+    public abstract String getMessageId() throws MessagingException;
+
+    @Override
+    public boolean isMimeType(String mimeType) throws MessagingException {
+        return getContentType().startsWith(mimeType);
+    }
+
+    private HashSet<String> getFlagSet() {
+        if (mFlags == null) {
+            mFlags = new HashSet<String>();
+        }
+        return mFlags;
+    }
+
+    /*
+     * TODO Refactor Flags at some point to be able to store user defined flags.
+     */
+    public String[] getFlags() {
+        return getFlagSet().toArray(new String[] {});
+    }
+
+    /**
+     * Set/clear a flag directly, without involving overrides of {@link #setFlag} in subclasses.
+     * Only used for testing.
+     */
+    @VisibleForTesting
+    private final void setFlagDirectlyForTest(String flag, boolean set) throws MessagingException {
+        if (set) {
+            getFlagSet().add(flag);
+        } else {
+            getFlagSet().remove(flag);
+        }
+    }
+
+    public void setFlag(String flag, boolean set) throws MessagingException {
+        setFlagDirectlyForTest(flag, set);
+    }
+
+    /**
+     * This method calls setFlag(String, boolean)
+     * @param flags
+     * @param set
+     */
+    public void setFlags(String[] flags, boolean set) throws MessagingException {
+        for (String flag : flags) {
+            setFlag(flag, set);
+        }
+    }
+
+    public boolean isSet(String flag) {
+        return getFlagSet().contains(flag);
+    }
+
+    public abstract void saveChanges() throws MessagingException;
+
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + ':' + mUid;
+    }
+}
diff --git a/src/com/android/phone/common/mail/MessageDateComparator.java b/src/com/android/phone/common/mail/MessageDateComparator.java
new file mode 100644
index 0000000..5d8baa7
--- /dev/null
+++ b/src/com/android/phone/common/mail/MessageDateComparator.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.phone.common.mail;
+
+import java.util.Comparator;
+
+public class MessageDateComparator implements Comparator<Message> {
+    @Override
+    public int compare(Message o1, Message o2) {
+        try {
+            if (o1.getSentDate() == null) {
+                return 1;
+            } else if (o2.getSentDate() == null) {
+                return -1;
+            } else
+                return o2.getSentDate().compareTo(o1.getSentDate());
+        } catch (Exception e) {
+            return 0;
+        }
+    }
+}
diff --git a/src/com/android/phone/common/mail/MessagingException.java b/src/com/android/phone/common/mail/MessagingException.java
new file mode 100644
index 0000000..e4c674a
--- /dev/null
+++ b/src/com/android/phone/common/mail/MessagingException.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.phone.common.mail;
+
+/**
+ * This exception is used for most types of failures that occur during server interactions.
+ *
+ * Data passed through this exception should be considered non-localized.  Any strings should
+ * either be internal-only (for debugging) or server-generated.
+ *
+ * TO DO: Does it make sense to further collapse AuthenticationFailedException and
+ * CertificateValidationException and any others into this?
+ */
+public class MessagingException extends Exception {
+    public static final long serialVersionUID = -1;
+
+    public static final int NO_ERROR = -1;
+    /** Any exception that does not specify a specific issue */
+    public static final int UNSPECIFIED_EXCEPTION = 0;
+    /** Connection or IO errors */
+    public static final int IOERROR = 1;
+    /** The configuration requested TLS but the server did not support it. */
+    public static final int TLS_REQUIRED = 2;
+    /** Authentication is required but the server did not support it. */
+    public static final int AUTH_REQUIRED = 3;
+    /** General security failures */
+    public static final int GENERAL_SECURITY = 4;
+    /** Authentication failed */
+    public static final int AUTHENTICATION_FAILED = 5;
+    /** Attempt to create duplicate account */
+    public static final int DUPLICATE_ACCOUNT = 6;
+    /** Required security policies reported - advisory only */
+    public static final int SECURITY_POLICIES_REQUIRED = 7;
+   /** Required security policies not supported */
+    public static final int SECURITY_POLICIES_UNSUPPORTED = 8;
+   /** The protocol (or protocol version) isn't supported */
+    public static final int PROTOCOL_VERSION_UNSUPPORTED = 9;
+    /** The server's SSL certificate couldn't be validated */
+    public static final int CERTIFICATE_VALIDATION_ERROR = 10;
+    /** Authentication failed during autodiscover */
+    public static final int AUTODISCOVER_AUTHENTICATION_FAILED = 11;
+    /** Autodiscover completed with a result (non-error) */
+    public static final int AUTODISCOVER_AUTHENTICATION_RESULT = 12;
+    /** Ambiguous failure; server error or bad credentials */
+    public static final int AUTHENTICATION_FAILED_OR_SERVER_ERROR = 13;
+    /** The server refused access */
+    public static final int ACCESS_DENIED = 14;
+    /** The server refused access */
+    public static final int ATTACHMENT_NOT_FOUND = 15;
+    /** A client SSL certificate is required for connections to the server */
+    public static final int CLIENT_CERTIFICATE_REQUIRED = 16;
+    /** The client SSL certificate specified is invalid */
+    public static final int CLIENT_CERTIFICATE_ERROR = 17;
+    /** The server indicates it does not support OAuth authentication */
+    public static final int OAUTH_NOT_SUPPORTED = 18;
+    /** The server indicates it experienced an internal error */
+    public static final int SERVER_ERROR = 19;
+
+    protected int mExceptionType;
+    // Exception type-specific data
+    protected Object mExceptionData;
+
+    public MessagingException(String message, Throwable throwable) {
+        this(UNSPECIFIED_EXCEPTION, message, throwable);
+    }
+
+    public MessagingException(int exceptionType, String message, Throwable throwable) {
+        super(message, throwable);
+        mExceptionType = exceptionType;
+        mExceptionData = null;
+    }
+
+    /**
+     * Constructs a MessagingException with an exceptionType and a null message.
+     * @param exceptionType The exception type to set for this exception.
+     */
+    public MessagingException(int exceptionType) {
+        this(exceptionType, null, null);
+    }
+
+    /**
+     * Constructs a MessagingException with a message.
+     * @param message the message for this exception
+     */
+    public MessagingException(String message) {
+        this(UNSPECIFIED_EXCEPTION, message, null);
+    }
+
+    /**
+     * Constructs a MessagingException with an exceptionType and a message.
+     * @param exceptionType The exception type to set for this exception.
+     */
+    public MessagingException(int exceptionType, String message) {
+        this(exceptionType, message, null);
+    }
+
+    /**
+     * Constructs a MessagingException with an exceptionType, a message, and data
+     * @param exceptionType The exception type to set for this exception.
+     * @param message the message for the exception (or null)
+     * @param data exception-type specific data for the exception (or null)
+     */
+    public MessagingException(int exceptionType, String message, Object data) {
+        super(message);
+        mExceptionType = exceptionType;
+        mExceptionData = data;
+    }
+
+    /**
+     * Return the exception type.  Will be OTHER_EXCEPTION if not explicitly set.
+     *
+     * @return Returns the exception type.
+     */
+    public int getExceptionType() {
+        return mExceptionType;
+    }
+    /**
+     * Return the exception data.  Will be null if not explicitly set.
+     *
+     * @return Returns the exception data.
+     */
+    public Object getExceptionData() {
+        return mExceptionData;
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/phone/common/mail/Multipart.java b/src/com/android/phone/common/mail/Multipart.java
new file mode 100644
index 0000000..77963c8
--- /dev/null
+++ b/src/com/android/phone/common/mail/Multipart.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.phone.common.mail;
+
+import java.util.ArrayList;
+
+public abstract class Multipart implements Body {
+    protected Part mParent;
+
+    protected ArrayList<BodyPart> mParts = new ArrayList<BodyPart>();
+
+    protected String mContentType;
+
+    public void addBodyPart(BodyPart part) throws MessagingException {
+        mParts.add(part);
+    }
+
+    public void addBodyPart(BodyPart part, int index) throws MessagingException {
+        mParts.add(index, part);
+    }
+
+    public BodyPart getBodyPart(int index) throws MessagingException {
+        return mParts.get(index);
+    }
+
+    public String getContentType() throws MessagingException {
+        return mContentType;
+    }
+
+    public int getCount() throws MessagingException {
+        return mParts.size();
+    }
+
+    public boolean removeBodyPart(BodyPart part) throws MessagingException {
+        return mParts.remove(part);
+    }
+
+    public void removeBodyPart(int index) throws MessagingException {
+        mParts.remove(index);
+    }
+
+    public Part getParent() throws MessagingException {
+        return mParent;
+    }
+
+    public void setParent(Part parent) throws MessagingException {
+        this.mParent = parent;
+    }
+}
diff --git a/src/com/android/phone/common/mail/PackedString.java b/src/com/android/phone/common/mail/PackedString.java
new file mode 100644
index 0000000..6cbba9e
--- /dev/null
+++ b/src/com/android/phone/common/mail/PackedString.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.phone.common.mail;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * A utility class for creating and modifying Strings that are tagged and packed together.
+ *
+ * Uses non-printable (control chars) for internal delimiters;  Intended for regular displayable
+ * strings only, so please use base64 or other encoding if you need to hide any binary data here.
+ *
+ * Binary compatible with Address.pack() format, which should migrate to use this code.
+ */
+public class PackedString {
+
+    /**
+     * Packing format is:
+     *   element : [ value ] or [ value TAG-DELIMITER tag ]
+     *   packed-string : [ element ] [ ELEMENT-DELIMITER [ element ] ]*
+     */
+    private static final char DELIMITER_ELEMENT = '\1';
+    private static final char DELIMITER_TAG = '\2';
+
+    private String mString;
+    private HashMap<String, String> mExploded;
+    private static final HashMap<String, String> EMPTY_MAP = new HashMap<String, String>();
+
+    /**
+     * Create a packed string using an already-packed string (e.g. from database)
+     * @param string packed string
+     */
+    public PackedString(String string) {
+        mString = string;
+        mExploded = null;
+    }
+
+    /**
+     * Get the value referred to by a given tag.  If the tag does not exist, return null.
+     * @param tag identifier of string of interest
+     * @return returns value, or null if no string is found
+     */
+    public String get(String tag) {
+        if (mExploded == null) {
+            mExploded = explode(mString);
+        }
+        return mExploded.get(tag);
+    }
+
+    /**
+     * Return a map of all of the values referred to by a given tag.  This is a shallow
+     * copy, don't edit the values.
+     * @return a map of the values in the packed string
+     */
+    public Map<String, String> unpack() {
+        if (mExploded == null) {
+            mExploded = explode(mString);
+        }
+        return new HashMap<String,String>(mExploded);
+    }
+
+    /**
+     * Read out all values into a map.
+     */
+    private static HashMap<String, String> explode(String packed) {
+        if (packed == null || packed.length() == 0) {
+            return EMPTY_MAP;
+        }
+        HashMap<String, String> map = new HashMap<String, String>();
+
+        int length = packed.length();
+        int elementStartIndex = 0;
+        int elementEndIndex = 0;
+        int tagEndIndex = packed.indexOf(DELIMITER_TAG);
+
+        while (elementStartIndex < length) {
+            elementEndIndex = packed.indexOf(DELIMITER_ELEMENT, elementStartIndex);
+            if (elementEndIndex == -1) {
+                elementEndIndex = length;
+            }
+            String tag;
+            String value;
+            if (tagEndIndex == -1 || elementEndIndex <= tagEndIndex) {
+                // in this case the DELIMITER_PERSONAL is in a future pair (or not found)
+                // so synthesize a positional tag for the value, and don't update tagEndIndex
+                value = packed.substring(elementStartIndex, elementEndIndex);
+                tag = Integer.toString(map.size());
+            } else {
+                value = packed.substring(elementStartIndex, tagEndIndex);
+                tag = packed.substring(tagEndIndex + 1, elementEndIndex);
+                // scan forward for next tag, if any
+                tagEndIndex = packed.indexOf(DELIMITER_TAG, elementEndIndex + 1);
+            }
+            map.put(tag, value);
+            elementStartIndex = elementEndIndex + 1;
+        }
+
+        return map;
+    }
+
+    /**
+     * Builder class for creating PackedString values.  Can also be used for editing existing
+     * PackedString representations.
+     */
+    static public class Builder {
+        HashMap<String, String> mMap;
+
+        /**
+         * Create a builder that's empty (for filling)
+         */
+        public Builder() {
+            mMap = new HashMap<String, String>();
+        }
+
+        /**
+         * Create a builder using the values of an existing PackedString (for editing).
+         */
+        public Builder(String packed) {
+            mMap = explode(packed);
+        }
+
+        /**
+         * Add a tagged value
+         * @param tag identifier of string of interest
+         * @param value the value to record in this position.  null to delete entry.
+         */
+        public void put(String tag, String value) {
+            if (value == null) {
+                mMap.remove(tag);
+            } else {
+                mMap.put(tag, value);
+            }
+        }
+
+        /**
+         * Get the value referred to by a given tag.  If the tag does not exist, return null.
+         * @param tag identifier of string of interest
+         * @return returns value, or null if no string is found
+         */
+        public String get(String tag) {
+            return mMap.get(tag);
+        }
+
+        /**
+         * Pack the values and return a single, encoded string
+         */
+        @Override
+        public String toString() {
+            StringBuilder sb = new StringBuilder();
+            for (Map.Entry<String,String> entry : mMap.entrySet()) {
+                if (sb.length() > 0) {
+                    sb.append(DELIMITER_ELEMENT);
+                }
+                sb.append(entry.getValue());
+                sb.append(DELIMITER_TAG);
+                sb.append(entry.getKey());
+            }
+            return sb.toString();
+        }
+    }
+}
diff --git a/src/com/android/phone/common/mail/Part.java b/src/com/android/phone/common/mail/Part.java
new file mode 100644
index 0000000..d064e2a
--- /dev/null
+++ b/src/com/android/phone/common/mail/Part.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.phone.common.mail;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+public interface Part extends Fetchable {
+    public void addHeader(String name, String value) throws MessagingException;
+
+    public void removeHeader(String name) throws MessagingException;
+
+    public void setHeader(String name, String value) throws MessagingException;
+
+    public Body getBody() throws MessagingException;
+
+    public String getContentType() throws MessagingException;
+
+    public String getDisposition() throws MessagingException;
+
+    public String getContentId() throws MessagingException;
+
+    public String[] getHeader(String name) throws MessagingException;
+
+    public void setExtendedHeader(String name, String value) throws MessagingException;
+
+    public String getExtendedHeader(String name) throws MessagingException;
+
+    public int getSize() throws MessagingException;
+
+    public boolean isMimeType(String mimeType) throws MessagingException;
+
+    public String getMimeType() throws MessagingException;
+
+    public void setBody(Body body) throws MessagingException;
+
+    public void writeTo(OutputStream out) throws IOException, MessagingException;
+}
diff --git a/src/com/android/phone/common/mail/PeekableInputStream.java b/src/com/android/phone/common/mail/PeekableInputStream.java
new file mode 100644
index 0000000..d29fc6b
--- /dev/null
+++ b/src/com/android/phone/common/mail/PeekableInputStream.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.phone.common.mail;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * A filtering InputStream that allows single byte "peeks" without consuming the byte. The
+ * client of this stream can call peek() to see the next available byte in the stream
+ * and a subsequent read will still return the peeked byte.
+ */
+public class PeekableInputStream extends InputStream {
+    private final InputStream mIn;
+    private boolean mPeeked;
+    private int mPeekedByte;
+
+    public PeekableInputStream(InputStream in) {
+        this.mIn = in;
+    }
+
+    @Override
+    public int read() throws IOException {
+        if (!mPeeked) {
+            return mIn.read();
+        } else {
+            mPeeked = false;
+            return mPeekedByte;
+        }
+    }
+
+    public int peek() throws IOException {
+        if (!mPeeked) {
+            mPeekedByte = read();
+            mPeeked = true;
+        }
+        return mPeekedByte;
+    }
+
+    @Override
+    public int read(byte[] b, int offset, int length) throws IOException {
+        if (!mPeeked) {
+            return mIn.read(b, offset, length);
+        } else {
+            b[0] = (byte)mPeekedByte;
+            mPeeked = false;
+            int r = mIn.read(b, offset + 1, length - 1);
+            if (r == -1) {
+                return 1;
+            } else {
+                return r + 1;
+            }
+        }
+    }
+
+    @Override
+    public int read(byte[] b) throws IOException {
+        return read(b, 0, b.length);
+    }
+
+    @Override
+    public String toString() {
+        return String.format("PeekableInputStream(in=%s, peeked=%b, peekedByte=%d)",
+                mIn.toString(), mPeeked, mPeekedByte);
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/phone/common/mail/TempDirectory.java b/src/com/android/phone/common/mail/TempDirectory.java
new file mode 100644
index 0000000..8fa0e44
--- /dev/null
+++ b/src/com/android/phone/common/mail/TempDirectory.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.phone.common.mail;
+
+import android.content.Context;
+
+import java.io.File;
+
+/**
+ * TempDirectory caches the directory used for caching file.  It is set up during application
+ * initialization.
+ */
+public class TempDirectory {
+    private static File sTempDirectory = null;
+
+    public static void setTempDirectory(Context context) {
+        sTempDirectory = context.getCacheDir();
+    }
+
+    public static File getTempDirectory() {
+        if (sTempDirectory == null) {
+            throw new RuntimeException(
+                    "TempDirectory not set.  " +
+                    "If in a unit test, call Email.setTempDirectory(context) in setUp().");
+        }
+        return sTempDirectory;
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/phone/common/mail/internet/BinaryTempFileBody.java b/src/com/android/phone/common/mail/internet/BinaryTempFileBody.java
new file mode 100644
index 0000000..e2bdd89
--- /dev/null
+++ b/src/com/android/phone/common/mail/internet/BinaryTempFileBody.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.phone.common.mail.internet;
+
+import com.android.phone.common.mail.Body;
+import com.android.phone.common.mail.MessagingException;
+import com.android.phone.common.mail.TempDirectory;
+
+import org.apache.commons.io.IOUtils;
+
+import android.util.Base64;
+import android.util.Base64OutputStream;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FilterInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+/**
+ * A Body that is backed by a temp file. The Body exposes a getOutputStream method that allows
+ * the user to write to the temp file. After the write the body is available via getInputStream
+ * and writeTo one time. After writeTo is called, or the InputStream returned from
+ * getInputStream is closed the file is deleted and the Body should be considered disposed of.
+ */
+public class BinaryTempFileBody implements Body {
+    private File mFile;
+
+    /**
+     * An alternate way to put data into a BinaryTempFileBody is to simply supply an already-
+     * created file.  Note that this file will be deleted after it is read.
+     * @param filePath The file containing the data to be stored on disk temporarily
+     */
+    public void setFile(String filePath) {
+        mFile = new File(filePath);
+    }
+
+    public OutputStream getOutputStream() throws IOException {
+        mFile = File.createTempFile("body", null, TempDirectory.getTempDirectory());
+        mFile.deleteOnExit();
+        return new FileOutputStream(mFile);
+    }
+
+    @Override
+    public InputStream getInputStream() throws MessagingException {
+        try {
+            return new BinaryTempFileBodyInputStream(new FileInputStream(mFile));
+        }
+        catch (IOException ioe) {
+            throw new MessagingException("Unable to open body", ioe);
+        }
+    }
+
+    @Override
+    public void writeTo(OutputStream out) throws IOException, MessagingException {
+        InputStream in = getInputStream();
+        Base64OutputStream base64Out = new Base64OutputStream(
+            out, Base64.CRLF | Base64.NO_CLOSE);
+        IOUtils.copy(in, base64Out);
+        base64Out.close();
+        mFile.delete();
+        in.close();
+    }
+
+    class BinaryTempFileBodyInputStream extends FilterInputStream {
+        public BinaryTempFileBodyInputStream(InputStream in) {
+            super(in);
+        }
+
+        @Override
+        public void close() throws IOException {
+            super.close();
+            mFile.delete();
+        }
+    }
+}
diff --git a/src/com/android/phone/common/mail/internet/MimeBodyPart.java b/src/com/android/phone/common/mail/internet/MimeBodyPart.java
new file mode 100644
index 0000000..286a4f2
--- /dev/null
+++ b/src/com/android/phone/common/mail/internet/MimeBodyPart.java
@@ -0,0 +1,207 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.phone.common.mail.internet;
+
+import com.android.phone.common.mail.Body;
+import com.android.phone.common.mail.BodyPart;
+import com.android.phone.common.mail.MessagingException;
+
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.util.regex.Pattern;
+
+/**
+ * TODO this is a close approximation of Message, need to update along with
+ * Message.
+ */
+public class MimeBodyPart extends BodyPart {
+    protected MimeHeader mHeader = new MimeHeader();
+    protected MimeHeader mExtendedHeader;
+    protected Body mBody;
+    protected int mSize;
+
+    // regex that matches content id surrounded by "<>" optionally.
+    private static final Pattern REMOVE_OPTIONAL_BRACKETS = Pattern.compile("^<?([^>]+)>?$");
+    // regex that matches end of line.
+    private static final Pattern END_OF_LINE = Pattern.compile("\r?\n");
+
+    public MimeBodyPart() throws MessagingException {
+        this(null);
+    }
+
+    public MimeBodyPart(Body body) throws MessagingException {
+        this(body, null);
+    }
+
+    public MimeBodyPart(Body body, String mimeType) throws MessagingException {
+        if (mimeType != null) {
+            setHeader(MimeHeader.HEADER_CONTENT_TYPE, mimeType);
+        }
+        setBody(body);
+    }
+
+    protected String getFirstHeader(String name) throws MessagingException {
+        return mHeader.getFirstHeader(name);
+    }
+
+    @Override
+    public void addHeader(String name, String value) throws MessagingException {
+        mHeader.addHeader(name, value);
+    }
+
+    @Override
+    public void setHeader(String name, String value) throws MessagingException {
+        mHeader.setHeader(name, value);
+    }
+
+    @Override
+    public String[] getHeader(String name) throws MessagingException {
+        return mHeader.getHeader(name);
+    }
+
+    @Override
+    public void removeHeader(String name) throws MessagingException {
+        mHeader.removeHeader(name);
+    }
+
+    @Override
+    public Body getBody() throws MessagingException {
+        return mBody;
+    }
+
+    @Override
+    public void setBody(Body body) throws MessagingException {
+        this.mBody = body;
+        if (body instanceof com.android.phone.common.mail.Multipart) {
+            com.android.phone.common.mail.Multipart multipart =
+                ((com.android.phone.common.mail.Multipart)body);
+            multipart.setParent(this);
+            setHeader(MimeHeader.HEADER_CONTENT_TYPE, multipart.getContentType());
+        }
+        else if (body instanceof TextBody) {
+            String contentType = String.format("%s;\n charset=utf-8", getMimeType());
+            String name = MimeUtility.getHeaderParameter(getContentType(), "name");
+            if (name != null) {
+                contentType += String.format(";\n name=\"%s\"", name);
+            }
+            setHeader(MimeHeader.HEADER_CONTENT_TYPE, contentType);
+            setHeader(MimeHeader.HEADER_CONTENT_TRANSFER_ENCODING, "base64");
+        }
+    }
+
+    @Override
+    public String getContentType() throws MessagingException {
+        String contentType = getFirstHeader(MimeHeader.HEADER_CONTENT_TYPE);
+        if (contentType == null) {
+            return "text/plain";
+        } else {
+            return contentType;
+        }
+    }
+
+    @Override
+    public String getDisposition() throws MessagingException {
+        String contentDisposition = getFirstHeader(MimeHeader.HEADER_CONTENT_DISPOSITION);
+        if (contentDisposition == null) {
+            return null;
+        } else {
+            return contentDisposition;
+        }
+    }
+
+    @Override
+    public String getContentId() throws MessagingException {
+        String contentId = getFirstHeader(MimeHeader.HEADER_CONTENT_ID);
+        if (contentId == null) {
+            return null;
+        } else {
+            // remove optionally surrounding brackets.
+            return REMOVE_OPTIONAL_BRACKETS.matcher(contentId).replaceAll("$1");
+        }
+    }
+
+    @Override
+    public String getMimeType() throws MessagingException {
+        return MimeUtility.getHeaderParameter(getContentType(), null);
+    }
+
+    @Override
+    public boolean isMimeType(String mimeType) throws MessagingException {
+        return getMimeType().equals(mimeType);
+    }
+
+    public void setSize(int size) {
+        this.mSize = size;
+    }
+
+    @Override
+    public int getSize() throws MessagingException {
+        return mSize;
+    }
+
+    /**
+     * Set extended header
+     *
+     * @param name Extended header name
+     * @param value header value - flattened by removing CR-NL if any
+     * remove header if value is null
+     * @throws MessagingException
+     */
+    @Override
+    public void setExtendedHeader(String name, String value) throws MessagingException {
+        if (value == null) {
+            if (mExtendedHeader != null) {
+                mExtendedHeader.removeHeader(name);
+            }
+            return;
+        }
+        if (mExtendedHeader == null) {
+            mExtendedHeader = new MimeHeader();
+        }
+        mExtendedHeader.setHeader(name, END_OF_LINE.matcher(value).replaceAll(""));
+    }
+
+    /**
+     * Get extended header
+     *
+     * @param name Extended header name
+     * @return header value - null if header does not exist
+     * @throws MessagingException
+     */
+    @Override
+    public String getExtendedHeader(String name) throws MessagingException {
+        if (mExtendedHeader == null) {
+            return null;
+        }
+        return mExtendedHeader.getFirstHeader(name);
+    }
+
+    /**
+     * Write the MimeMessage out in MIME format.
+     */
+    @Override
+    public void writeTo(OutputStream out) throws IOException, MessagingException {
+        BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(out), 1024);
+        mHeader.writeTo(out);
+        writer.write("\r\n");
+        writer.flush();
+        if (mBody != null) {
+            mBody.writeTo(out);
+        }
+    }
+}
diff --git a/src/com/android/phone/common/mail/internet/MimeHeader.java b/src/com/android/phone/common/mail/internet/MimeHeader.java
new file mode 100644
index 0000000..7e6a07f
--- /dev/null
+++ b/src/com/android/phone/common/mail/internet/MimeHeader.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.phone.common.mail.internet;
+
+import com.android.phone.common.mail.MessagingException;
+
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.util.ArrayList;
+
+public class MimeHeader {
+    /**
+     * Application specific header that contains Store specific information about an attachment.
+     * In IMAP this contains the IMAP BODYSTRUCTURE part id so that the ImapStore can later
+     * retrieve the attachment at will from the server.
+     * The info is recorded from this header on LocalStore.appendMessage and is put back
+     * into the MIME data by LocalStore.fetch.
+     */
+    public static final String HEADER_ANDROID_ATTACHMENT_STORE_DATA = "X-Android-Attachment-StoreData";
+
+    public static final String HEADER_CONTENT_TYPE = "Content-Type";
+    public static final String HEADER_CONTENT_TRANSFER_ENCODING = "Content-Transfer-Encoding";
+    public static final String HEADER_CONTENT_DISPOSITION = "Content-Disposition";
+    public static final String HEADER_CONTENT_ID = "Content-ID";
+
+    /**
+     * Fields that should be omitted when writing the header using writeTo()
+     */
+    private static final String[] WRITE_OMIT_FIELDS = {
+//        HEADER_ANDROID_ATTACHMENT_DOWNLOADED,
+//        HEADER_ANDROID_ATTACHMENT_ID,
+        HEADER_ANDROID_ATTACHMENT_STORE_DATA
+    };
+
+    protected final ArrayList<Field> mFields = new ArrayList<Field>();
+
+    public void clear() {
+        mFields.clear();
+    }
+
+    public String getFirstHeader(String name) throws MessagingException {
+        String[] header = getHeader(name);
+        if (header == null) {
+            return null;
+        }
+        return header[0];
+    }
+
+    public void addHeader(String name, String value) throws MessagingException {
+        mFields.add(new Field(name, value));
+    }
+
+    public void setHeader(String name, String value) throws MessagingException {
+        if (name == null || value == null) {
+            return;
+        }
+        removeHeader(name);
+        addHeader(name, value);
+    }
+
+    public String[] getHeader(String name) throws MessagingException {
+        ArrayList<String> values = new ArrayList<String>();
+        for (Field field : mFields) {
+            if (field.name.equalsIgnoreCase(name)) {
+                values.add(field.value);
+            }
+        }
+        if (values.size() == 0) {
+            return null;
+        }
+        return values.toArray(new String[] {});
+    }
+
+    public void removeHeader(String name) throws MessagingException {
+        ArrayList<Field> removeFields = new ArrayList<Field>();
+        for (Field field : mFields) {
+            if (field.name.equalsIgnoreCase(name)) {
+                removeFields.add(field);
+            }
+        }
+        mFields.removeAll(removeFields);
+    }
+
+    /**
+     * Write header into String
+     *
+     * @return CR-NL separated header string except the headers in writeOmitFields
+     * null if header is empty
+     */
+    public String writeToString() {
+        if (mFields.size() == 0) {
+            return null;
+        }
+        StringBuilder builder = new StringBuilder();
+        for (Field field : mFields) {
+            if (!arrayContains(WRITE_OMIT_FIELDS, field.name)) {
+                builder.append(field.name + ": " + field.value + "\r\n");
+            }
+        }
+        return builder.toString();
+    }
+
+    public void writeTo(OutputStream out) throws IOException, MessagingException {
+        BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(out), 1024);
+        for (Field field : mFields) {
+            if (!arrayContains(WRITE_OMIT_FIELDS, field.name)) {
+                writer.write(field.name + ": " + field.value + "\r\n");
+            }
+        }
+        writer.flush();
+    }
+
+    private static class Field {
+        final String name;
+        final String value;
+
+        public Field(String name, String value) {
+            this.name = name;
+            this.value = value;
+        }
+
+        @Override
+        public String toString() {
+            return name + "=" + value;
+        }
+    }
+
+    @Override
+    public String toString() {
+        return (mFields == null) ? null : mFields.toString();
+    }
+
+    public final static boolean arrayContains(Object[] a, Object o) {
+        int index = arrayIndex(a, o);
+        return (index >= 0);
+    }
+
+    public final static int arrayIndex(Object[] a, Object o) {
+        for (int i = 0, count = a.length; i < count; i++) {
+            if (a[i].equals(o)) {
+                return i;
+            }
+        }
+        return -1;
+    }
+}
diff --git a/src/com/android/phone/common/mail/internet/MimeMessage.java b/src/com/android/phone/common/mail/internet/MimeMessage.java
new file mode 100644
index 0000000..f4c6c88
--- /dev/null
+++ b/src/com/android/phone/common/mail/internet/MimeMessage.java
@@ -0,0 +1,675 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.phone.common.mail.internet;
+
+import com.android.phone.common.mail.Address;
+import com.android.phone.common.mail.Body;
+import com.android.phone.common.mail.BodyPart;
+import com.android.phone.common.mail.Message;
+import com.android.phone.common.mail.MessagingException;
+import com.android.phone.common.mail.Multipart;
+import com.android.phone.common.mail.Part;
+import com.android.phone.common.mail.utils.LogUtils;
+
+import org.apache.james.mime4j.BodyDescriptor;
+import org.apache.james.mime4j.ContentHandler;
+import org.apache.james.mime4j.EOLConvertingInputStream;
+import org.apache.james.mime4j.MimeStreamParser;
+import org.apache.james.mime4j.field.DateTimeField;
+import org.apache.james.mime4j.field.Field;
+
+import android.text.TextUtils;
+
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+import java.util.Stack;
+import java.util.regex.Pattern;
+
+/**
+ * An implementation of Message that stores all of its metadata in RFC 822 and
+ * RFC 2045 style headers.
+ *
+ * NOTE:  Automatic generation of a local message-id is becoming unwieldy and should be removed.
+ * It would be better to simply do it explicitly on local creation of new outgoing messages.
+ */
+public class MimeMessage extends Message {
+    private MimeHeader mHeader;
+    private MimeHeader mExtendedHeader;
+
+    // NOTE:  The fields here are transcribed out of headers, and values stored here will supersede
+    // the values found in the headers.  Use caution to prevent any out-of-phase errors.  In
+    // particular, any adds/changes/deletes here must be echoed by changes in the parse() function.
+    private Address[] mFrom;
+    private Address[] mTo;
+    private Address[] mCc;
+    private Address[] mBcc;
+    private Address[] mReplyTo;
+    private Date mSentDate;
+    private Body mBody;
+    protected int mSize;
+    private boolean mInhibitLocalMessageId = false;
+    private boolean mComplete = true;
+
+    // Shared random source for generating local message-id values
+    private static final java.util.Random sRandom = new java.util.Random();
+
+    // In MIME, en_US-like date format should be used. In other words "MMM" should be encoded to
+    // "Jan", not the other localized format like "Ene" (meaning January in locale es).
+    // This conversion is used when generating outgoing MIME messages. Incoming MIME date
+    // headers are parsed by org.apache.james.mime4j.field.DateTimeField which does not have any
+    // localization code.
+    private static final SimpleDateFormat DATE_FORMAT =
+        new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss Z", Locale.US);
+
+    // regex that matches content id surrounded by "<>" optionally.
+    private static final Pattern REMOVE_OPTIONAL_BRACKETS = Pattern.compile("^<?([^>]+)>?$");
+    // regex that matches end of line.
+    private static final Pattern END_OF_LINE = Pattern.compile("\r?\n");
+
+    public MimeMessage() {
+        mHeader = null;
+    }
+
+    /**
+     * Generate a local message id.  This is only used when none has been assigned, and is
+     * installed lazily.  Any remote (typically server-assigned) message id takes precedence.
+     * @return a long, locally-generated message-ID value
+     */
+    private static String generateMessageId() {
+        final StringBuilder sb = new StringBuilder();
+        sb.append("<");
+        for (int i = 0; i < 24; i++) {
+            // We'll use a 5-bit range (0..31)
+            final int value = sRandom.nextInt() & 31;
+            final char c = "0123456789abcdefghijklmnopqrstuv".charAt(value);
+            sb.append(c);
+        }
+        sb.append(".");
+        sb.append(Long.toString(System.currentTimeMillis()));
+        sb.append("@email.android.com>");
+        return sb.toString();
+    }
+
+    /**
+     * Parse the given InputStream using Apache Mime4J to build a MimeMessage.
+     *
+     * @param in InputStream providing message content
+     * @throws IOException
+     * @throws MessagingException
+     */
+    public MimeMessage(InputStream in) throws IOException, MessagingException {
+        parse(in);
+    }
+
+    private MimeStreamParser init() {
+        // Before parsing the input stream, clear all local fields that may be superceded by
+        // the new incoming message.
+        getMimeHeaders().clear();
+        mInhibitLocalMessageId = true;
+        mFrom = null;
+        mTo = null;
+        mCc = null;
+        mBcc = null;
+        mReplyTo = null;
+        mSentDate = null;
+        mBody = null;
+
+        final MimeStreamParser parser = new MimeStreamParser();
+        parser.setContentHandler(new MimeMessageBuilder());
+        return parser;
+    }
+
+    protected void parse(InputStream in) throws IOException, MessagingException {
+        final MimeStreamParser parser = init();
+        parser.parse(new EOLConvertingInputStream(in));
+        mComplete = !parser.getPrematureEof();
+    }
+
+    public void parse(InputStream in, EOLConvertingInputStream.Callback callback)
+            throws IOException, MessagingException {
+        final MimeStreamParser parser = init();
+        parser.parse(new EOLConvertingInputStream(in, getSize(), callback));
+        mComplete = !parser.getPrematureEof();
+    }
+
+    /**
+     * Return the internal mHeader value, with very lazy initialization.
+     * The goal is to save memory by not creating the headers until needed.
+     */
+    private MimeHeader getMimeHeaders() {
+        if (mHeader == null) {
+            mHeader = new MimeHeader();
+        }
+        return mHeader;
+    }
+
+    @Override
+    public Date getReceivedDate() throws MessagingException {
+        return null;
+    }
+
+    @Override
+    public Date getSentDate() throws MessagingException {
+        if (mSentDate == null) {
+            try {
+                DateTimeField field = (DateTimeField)Field.parse("Date: "
+                        + MimeUtility.unfoldAndDecode(getFirstHeader("Date")));
+                mSentDate = field.getDate();
+                // TODO: We should make it more clear what exceptions can be thrown here,
+                // and whether they reflect a normal or error condition.
+            } catch (Exception e) {
+                LogUtils.v(LogUtils.TAG, "Message missing Date header");
+            }
+        }
+        if (mSentDate == null) {
+            // If we still don't have a date, fall back to "Delivery-date"
+            try {
+                DateTimeField field = (DateTimeField)Field.parse("Date: "
+                        + MimeUtility.unfoldAndDecode(getFirstHeader("Delivery-date")));
+                mSentDate = field.getDate();
+                // TODO: We should make it more clear what exceptions can be thrown here,
+                // and whether they reflect a normal or error condition.
+            } catch (Exception e) {
+                LogUtils.v(LogUtils.TAG, "Message also missing Delivery-Date header");
+            }
+        }
+        return mSentDate;
+    }
+
+    @Override
+    public void setSentDate(Date sentDate) throws MessagingException {
+        setHeader("Date", DATE_FORMAT.format(sentDate));
+        this.mSentDate = sentDate;
+    }
+
+    @Override
+    public String getContentType() throws MessagingException {
+        final String contentType = getFirstHeader(MimeHeader.HEADER_CONTENT_TYPE);
+        if (contentType == null) {
+            return "text/plain";
+        } else {
+            return contentType;
+        }
+    }
+
+    @Override
+    public String getDisposition() throws MessagingException {
+        return getFirstHeader(MimeHeader.HEADER_CONTENT_DISPOSITION);
+    }
+
+    @Override
+    public String getContentId() throws MessagingException {
+        final String contentId = getFirstHeader(MimeHeader.HEADER_CONTENT_ID);
+        if (contentId == null) {
+            return null;
+        } else {
+            // remove optionally surrounding brackets.
+            return REMOVE_OPTIONAL_BRACKETS.matcher(contentId).replaceAll("$1");
+        }
+    }
+
+    public boolean isComplete() {
+        return mComplete;
+    }
+
+    @Override
+    public String getMimeType() throws MessagingException {
+        return MimeUtility.getHeaderParameter(getContentType(), null);
+    }
+
+    @Override
+    public int getSize() throws MessagingException {
+        return mSize;
+    }
+
+    /**
+     * Returns a list of the given recipient type from this message. If no addresses are
+     * found the method returns an empty array.
+     */
+    @Override
+    public Address[] getRecipients(String type) throws MessagingException {
+        if (type == RECIPIENT_TYPE_TO) {
+            if (mTo == null) {
+                mTo = Address.parse(MimeUtility.unfold(getFirstHeader("To")));
+            }
+            return mTo;
+        } else if (type == RECIPIENT_TYPE_CC) {
+            if (mCc == null) {
+                mCc = Address.parse(MimeUtility.unfold(getFirstHeader("CC")));
+            }
+            return mCc;
+        } else if (type == RECIPIENT_TYPE_BCC) {
+            if (mBcc == null) {
+                mBcc = Address.parse(MimeUtility.unfold(getFirstHeader("BCC")));
+            }
+            return mBcc;
+        } else {
+            throw new MessagingException("Unrecognized recipient type.");
+        }
+    }
+
+    @Override
+    public void setRecipients(String type, Address[] addresses) throws MessagingException {
+        final int TO_LENGTH = 4;  // "To: "
+        final int CC_LENGTH = 4;  // "Cc: "
+        final int BCC_LENGTH = 5; // "Bcc: "
+        if (type == RECIPIENT_TYPE_TO) {
+            if (addresses == null || addresses.length == 0) {
+                removeHeader("To");
+                this.mTo = null;
+            } else {
+                setHeader("To", MimeUtility.fold(Address.toHeader(addresses), TO_LENGTH));
+                this.mTo = addresses;
+            }
+        } else if (type == RECIPIENT_TYPE_CC) {
+            if (addresses == null || addresses.length == 0) {
+                removeHeader("CC");
+                this.mCc = null;
+            } else {
+                setHeader("CC", MimeUtility.fold(Address.toHeader(addresses), CC_LENGTH));
+                this.mCc = addresses;
+            }
+        } else if (type == RECIPIENT_TYPE_BCC) {
+            if (addresses == null || addresses.length == 0) {
+                removeHeader("BCC");
+                this.mBcc = null;
+            } else {
+                setHeader("BCC", MimeUtility.fold(Address.toHeader(addresses), BCC_LENGTH));
+                this.mBcc = addresses;
+            }
+        } else {
+            throw new MessagingException("Unrecognized recipient type.");
+        }
+    }
+
+    /**
+     * Returns the unfolded, decoded value of the Subject header.
+     */
+    @Override
+    public String getSubject() throws MessagingException {
+        return MimeUtility.unfoldAndDecode(getFirstHeader("Subject"));
+    }
+
+    @Override
+    public void setSubject(String subject) throws MessagingException {
+        final int HEADER_NAME_LENGTH = 9;     // "Subject: "
+        setHeader("Subject", MimeUtility.foldAndEncode2(subject, HEADER_NAME_LENGTH));
+    }
+
+    @Override
+    public Address[] getFrom() throws MessagingException {
+        if (mFrom == null) {
+            String list = MimeUtility.unfold(getFirstHeader("From"));
+            if (list == null || list.length() == 0) {
+                list = MimeUtility.unfold(getFirstHeader("Sender"));
+            }
+            mFrom = Address.parse(list);
+        }
+        return mFrom;
+    }
+
+    @Override
+    public void setFrom(Address from) throws MessagingException {
+        final int FROM_LENGTH = 6;  // "From: "
+        if (from != null) {
+            setHeader("From", MimeUtility.fold(from.toHeader(), FROM_LENGTH));
+            this.mFrom = new Address[] {
+                    from
+                };
+        } else {
+            this.mFrom = null;
+        }
+    }
+
+    @Override
+    public Address[] getReplyTo() throws MessagingException {
+        if (mReplyTo == null) {
+            mReplyTo = Address.parse(MimeUtility.unfold(getFirstHeader("Reply-to")));
+        }
+        return mReplyTo;
+    }
+
+    @Override
+    public void setReplyTo(Address[] replyTo) throws MessagingException {
+        final int REPLY_TO_LENGTH = 10;  // "Reply-to: "
+        if (replyTo == null || replyTo.length == 0) {
+            removeHeader("Reply-to");
+            mReplyTo = null;
+        } else {
+            setHeader("Reply-to", MimeUtility.fold(Address.toHeader(replyTo), REPLY_TO_LENGTH));
+            mReplyTo = replyTo;
+        }
+    }
+
+    /**
+     * Set the mime "Message-ID" header
+     * @param messageId the new Message-ID value
+     * @throws MessagingException
+     */
+    @Override
+    public void setMessageId(String messageId) throws MessagingException {
+        setHeader("Message-ID", messageId);
+    }
+
+    /**
+     * Get the mime "Message-ID" header.  This value will be preloaded with a locally-generated
+     * random ID, if the value has not previously been set.  Local generation can be inhibited/
+     * overridden by explicitly clearing the headers, removing the message-id header, etc.
+     * @return the Message-ID header string, or null if explicitly has been set to null
+     */
+    @Override
+    public String getMessageId() throws MessagingException {
+        String messageId = getFirstHeader("Message-ID");
+        if (messageId == null && !mInhibitLocalMessageId) {
+            messageId = generateMessageId();
+            setMessageId(messageId);
+        }
+        return messageId;
+    }
+
+    @Override
+    public void saveChanges() throws MessagingException {
+        throw new MessagingException("saveChanges not yet implemented");
+    }
+
+    @Override
+    public Body getBody() throws MessagingException {
+        return mBody;
+    }
+
+    @Override
+    public void setBody(Body body) throws MessagingException {
+        this.mBody = body;
+        if (body instanceof Multipart) {
+            final Multipart multipart = ((Multipart)body);
+            multipart.setParent(this);
+            setHeader(MimeHeader.HEADER_CONTENT_TYPE, multipart.getContentType());
+            setHeader("MIME-Version", "1.0");
+        }
+        else if (body instanceof TextBody) {
+            setHeader(MimeHeader.HEADER_CONTENT_TYPE, String.format("%s;\n charset=utf-8",
+                    getMimeType()));
+            setHeader(MimeHeader.HEADER_CONTENT_TRANSFER_ENCODING, "base64");
+        }
+    }
+
+    protected String getFirstHeader(String name) throws MessagingException {
+        return getMimeHeaders().getFirstHeader(name);
+    }
+
+    @Override
+    public void addHeader(String name, String value) throws MessagingException {
+        getMimeHeaders().addHeader(name, value);
+    }
+
+    @Override
+    public void setHeader(String name, String value) throws MessagingException {
+        getMimeHeaders().setHeader(name, value);
+    }
+
+    @Override
+    public String[] getHeader(String name) throws MessagingException {
+        return getMimeHeaders().getHeader(name);
+    }
+
+    @Override
+    public void removeHeader(String name) throws MessagingException {
+        getMimeHeaders().removeHeader(name);
+        if ("Message-ID".equalsIgnoreCase(name)) {
+            mInhibitLocalMessageId = true;
+        }
+    }
+
+    /**
+     * Set extended header
+     *
+     * @param name Extended header name
+     * @param value header value - flattened by removing CR-NL if any
+     * remove header if value is null
+     * @throws MessagingException
+     */
+    @Override
+    public void setExtendedHeader(String name, String value) throws MessagingException {
+        if (value == null) {
+            if (mExtendedHeader != null) {
+                mExtendedHeader.removeHeader(name);
+            }
+            return;
+        }
+        if (mExtendedHeader == null) {
+            mExtendedHeader = new MimeHeader();
+        }
+        mExtendedHeader.setHeader(name, END_OF_LINE.matcher(value).replaceAll(""));
+    }
+
+    /**
+     * Get extended header
+     *
+     * @param name Extended header name
+     * @return header value - null if header does not exist
+     * @throws MessagingException
+     */
+    @Override
+    public String getExtendedHeader(String name) throws MessagingException {
+        if (mExtendedHeader == null) {
+            return null;
+        }
+        return mExtendedHeader.getFirstHeader(name);
+    }
+
+    /**
+     * Set entire extended headers from String
+     *
+     * @param headers Extended header and its value - "CR-NL-separated pairs
+     * if null or empty, remove entire extended headers
+     * @throws MessagingException
+     */
+    public void setExtendedHeaders(String headers) throws MessagingException {
+        if (TextUtils.isEmpty(headers)) {
+            mExtendedHeader = null;
+        } else {
+            mExtendedHeader = new MimeHeader();
+            for (final String header : END_OF_LINE.split(headers)) {
+                final String[] tokens = header.split(":", 2);
+                if (tokens.length != 2) {
+                    throw new MessagingException("Illegal extended headers: " + headers);
+                }
+                mExtendedHeader.setHeader(tokens[0].trim(), tokens[1].trim());
+            }
+        }
+    }
+
+    /**
+     * Get entire extended headers as String
+     *
+     * @return "CR-NL-separated extended headers - null if extended header does not exist
+     */
+    public String getExtendedHeaders() {
+        if (mExtendedHeader != null) {
+            return mExtendedHeader.writeToString();
+        }
+        return null;
+    }
+
+    /**
+     * Write message header and body to output stream
+     *
+     * @param out Output steam to write message header and body.
+     */
+    @Override
+    public void writeTo(OutputStream out) throws IOException, MessagingException {
+        final BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(out), 1024);
+        // Force creation of local message-id
+        getMessageId();
+        getMimeHeaders().writeTo(out);
+        // mExtendedHeader will not be write out to external output stream,
+        // because it is intended to internal use.
+        writer.write("\r\n");
+        writer.flush();
+        if (mBody != null) {
+            mBody.writeTo(out);
+        }
+    }
+
+    @Override
+    public InputStream getInputStream() throws MessagingException {
+        return null;
+    }
+
+    class MimeMessageBuilder implements ContentHandler {
+        private final Stack<Object> stack = new Stack<Object>();
+
+        public MimeMessageBuilder() {
+        }
+
+        private void expect(Class<?> c) {
+            if (!c.isInstance(stack.peek())) {
+                throw new IllegalStateException("Internal stack error: " + "Expected '"
+                        + c.getName() + "' found '" + stack.peek().getClass().getName() + "'");
+            }
+        }
+
+        @Override
+        public void startMessage() {
+            if (stack.isEmpty()) {
+                stack.push(MimeMessage.this);
+            } else {
+                expect(Part.class);
+                try {
+                    final MimeMessage m = new MimeMessage();
+                    ((Part)stack.peek()).setBody(m);
+                    stack.push(m);
+                } catch (MessagingException me) {
+                    throw new Error(me);
+                }
+            }
+        }
+
+        @Override
+        public void endMessage() {
+            expect(MimeMessage.class);
+            stack.pop();
+        }
+
+        @Override
+        public void startHeader() {
+            expect(Part.class);
+        }
+
+        @Override
+        public void field(String fieldData) {
+            expect(Part.class);
+            try {
+                final String[] tokens = fieldData.split(":", 2);
+                ((Part)stack.peek()).addHeader(tokens[0], tokens[1].trim());
+            } catch (MessagingException me) {
+                throw new Error(me);
+            }
+        }
+
+        @Override
+        public void endHeader() {
+            expect(Part.class);
+        }
+
+        @Override
+        public void startMultipart(BodyDescriptor bd) {
+            expect(Part.class);
+
+            final Part e = (Part)stack.peek();
+            try {
+                final MimeMultipart multiPart = new MimeMultipart(e.getContentType());
+                e.setBody(multiPart);
+                stack.push(multiPart);
+            } catch (MessagingException me) {
+                throw new Error(me);
+            }
+        }
+
+        @Override
+        public void body(BodyDescriptor bd, InputStream in) throws IOException {
+            expect(Part.class);
+            final Body body = MimeUtility.decodeBody(in, bd.getTransferEncoding());
+            try {
+                ((Part)stack.peek()).setBody(body);
+            } catch (MessagingException me) {
+                throw new Error(me);
+            }
+        }
+
+        @Override
+        public void endMultipart() {
+            stack.pop();
+        }
+
+        @Override
+        public void startBodyPart() {
+            expect(MimeMultipart.class);
+
+            try {
+                final MimeBodyPart bodyPart = new MimeBodyPart();
+                ((MimeMultipart)stack.peek()).addBodyPart(bodyPart);
+                stack.push(bodyPart);
+            } catch (MessagingException me) {
+                throw new Error(me);
+            }
+        }
+
+        @Override
+        public void endBodyPart() {
+            expect(BodyPart.class);
+            stack.pop();
+        }
+
+        @Override
+        public void epilogue(InputStream is) throws IOException {
+            expect(MimeMultipart.class);
+            final StringBuilder sb = new StringBuilder();
+            int b;
+            while ((b = is.read()) != -1) {
+                sb.append((char)b);
+            }
+            // TODO: why is this commented out?
+            // ((Multipart) stack.peek()).setEpilogue(sb.toString());
+        }
+
+        @Override
+        public void preamble(InputStream is) throws IOException {
+            expect(MimeMultipart.class);
+            final StringBuilder sb = new StringBuilder();
+            int b;
+            while ((b = is.read()) != -1) {
+                sb.append((char)b);
+            }
+            try {
+                ((MimeMultipart)stack.peek()).setPreamble(sb.toString());
+            } catch (MessagingException me) {
+                throw new Error(me);
+            }
+        }
+
+        @Override
+        public void raw(InputStream is) throws IOException {
+            throw new UnsupportedOperationException("Not supported");
+        }
+    }
+}
diff --git a/src/com/android/phone/common/mail/internet/MimeMultipart.java b/src/com/android/phone/common/mail/internet/MimeMultipart.java
new file mode 100644
index 0000000..3e118e4
--- /dev/null
+++ b/src/com/android/phone/common/mail/internet/MimeMultipart.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.phone.common.mail.internet;
+
+import com.android.phone.common.mail.BodyPart;
+import com.android.phone.common.mail.MessagingException;
+import com.android.phone.common.mail.Multipart;
+
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+
+public class MimeMultipart extends Multipart {
+    protected String mPreamble;
+
+    protected String mContentType;
+
+    protected String mBoundary;
+
+    protected String mSubType;
+
+    public MimeMultipart() throws MessagingException {
+        mBoundary = generateBoundary();
+        setSubType("mixed");
+    }
+
+    public MimeMultipart(String contentType) throws MessagingException {
+        this.mContentType = contentType;
+        try {
+            mSubType = MimeUtility.getHeaderParameter(contentType, null).split("/")[1];
+            mBoundary = MimeUtility.getHeaderParameter(contentType, "boundary");
+            if (mBoundary == null) {
+                throw new MessagingException("MultiPart does not contain boundary: " + contentType);
+            }
+        } catch (Exception e) {
+            throw new MessagingException(
+                    "Invalid MultiPart Content-Type; must contain subtype and boundary. ("
+                            + contentType + ")", e);
+        }
+    }
+
+    public String generateBoundary() {
+        StringBuffer sb = new StringBuffer();
+        sb.append("----");
+        for (int i = 0; i < 30; i++) {
+            sb.append(Integer.toString((int)(Math.random() * 35), 36));
+        }
+        return sb.toString().toUpperCase();
+    }
+
+    public String getPreamble() throws MessagingException {
+        return mPreamble;
+    }
+
+    public void setPreamble(String preamble) throws MessagingException {
+        this.mPreamble = preamble;
+    }
+
+    @Override
+    public String getContentType() throws MessagingException {
+        return mContentType;
+    }
+
+    public void setSubType(String subType) throws MessagingException {
+        this.mSubType = subType;
+        mContentType = String.format("multipart/%s; boundary=\"%s\"", subType, mBoundary);
+    }
+
+    @Override
+    public void writeTo(OutputStream out) throws IOException, MessagingException {
+        BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(out), 1024);
+
+        if (mPreamble != null) {
+            writer.write(mPreamble + "\r\n");
+        }
+
+        for (int i = 0, count = mParts.size(); i < count; i++) {
+            BodyPart bodyPart = mParts.get(i);
+            writer.write("--" + mBoundary + "\r\n");
+            writer.flush();
+            bodyPart.writeTo(out);
+            writer.write("\r\n");
+        }
+
+        writer.write("--" + mBoundary + "--\r\n");
+        writer.flush();
+    }
+
+    @Override
+    public InputStream getInputStream() throws MessagingException {
+        return null;
+    }
+
+    public String getSubTypeForTest() {
+        return mSubType;
+    }
+}
diff --git a/src/com/android/phone/common/mail/internet/MimeUtility.java b/src/com/android/phone/common/mail/internet/MimeUtility.java
new file mode 100644
index 0000000..ba5036f
--- /dev/null
+++ b/src/com/android/phone/common/mail/internet/MimeUtility.java
@@ -0,0 +1,416 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.phone.common.mail.internet;
+
+import android.text.TextUtils;
+import android.util.Base64;
+import android.util.Base64DataException;
+import android.util.Base64InputStream;
+import android.util.Log;
+
+import com.android.phone.common.mail.Body;
+import com.android.phone.common.mail.BodyPart;
+import com.android.phone.common.mail.Message;
+import com.android.phone.common.mail.MessagingException;
+import com.android.phone.common.mail.Multipart;
+import com.android.phone.common.mail.Part;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.james.mime4j.codec.EncoderUtil;
+import org.apache.james.mime4j.decoder.DecoderUtil;
+import org.apache.james.mime4j.decoder.QuotedPrintableInputStream;
+import org.apache.james.mime4j.util.CharsetUtil;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class MimeUtility {
+    private static final String LOG_TAG = "Email";
+
+    public static final String MIME_TYPE_RFC822 = "message/rfc822";
+    private final static Pattern PATTERN_CR_OR_LF = Pattern.compile("\r|\n");
+
+    /**
+     * Replace sequences of CRLF+WSP with WSP.  Tries to preserve original string
+     * object whenever possible.
+     */
+    public static String unfold(String s) {
+        if (s == null) {
+            return null;
+        }
+        Matcher patternMatcher = PATTERN_CR_OR_LF.matcher(s);
+        if (patternMatcher.find()) {
+            patternMatcher.reset();
+            s = patternMatcher.replaceAll("");
+        }
+        return s;
+    }
+
+    public static String decode(String s) {
+        if (s == null) {
+            return null;
+        }
+        return DecoderUtil.decodeEncodedWords(s);
+    }
+
+    public static String unfoldAndDecode(String s) {
+        return decode(unfold(s));
+    }
+
+    // TODO implement proper foldAndEncode
+    // NOTE: When this really works, we *must* remove all calls to foldAndEncode2() to prevent
+    // duplication of encoding.
+    public static String foldAndEncode(String s) {
+        return s;
+    }
+
+    /**
+     * INTERIM version of foldAndEncode that will be used only by Subject: headers.
+     * This is safer than implementing foldAndEncode() (see above) and risking unknown damage
+     * to other headers.
+     *
+     * TODO: Copy this code to foldAndEncode(), get rid of this function, confirm all working OK.
+     *
+     * @param s original string to encode and fold
+     * @param usedCharacters number of characters already used up by header name
+
+     * @return the String ready to be transmitted
+     */
+    public static String foldAndEncode2(String s, int usedCharacters) {
+        // james.mime4j.codec.EncoderUtil.java
+        // encode:  encodeIfNecessary(text, usage, numUsedInHeaderName)
+        // Usage.TEXT_TOKENlooks like the right thing for subjects
+        // use WORD_ENTITY for address/names
+
+        String encoded = EncoderUtil.encodeIfNecessary(s, EncoderUtil.Usage.TEXT_TOKEN,
+                usedCharacters);
+
+        return fold(encoded, usedCharacters);
+    }
+
+    /**
+     * INTERIM:  From newer version of org.apache.james (but we don't want to import
+     * the entire MimeUtil class).
+     *
+     * Splits the specified string into a multiple-line representation with
+     * lines no longer than 76 characters (because the line might contain
+     * encoded words; see <a href='http://www.faqs.org/rfcs/rfc2047.html'>RFC
+     * 2047</a> section 2). If the string contains non-whitespace sequences
+     * longer than 76 characters a line break is inserted at the whitespace
+     * character following the sequence resulting in a line longer than 76
+     * characters.
+     *
+     * @param s
+     *            string to split.
+     * @param usedCharacters
+     *            number of characters already used up. Usually the number of
+     *            characters for header field name plus colon and one space.
+     * @return a multiple-line representation of the given string.
+     */
+    public static String fold(String s, int usedCharacters) {
+        final int maxCharacters = 76;
+
+        final int length = s.length();
+        if (usedCharacters + length <= maxCharacters)
+            return s;
+
+        StringBuilder sb = new StringBuilder();
+
+        int lastLineBreak = -usedCharacters;
+        int wspIdx = indexOfWsp(s, 0);
+        while (true) {
+            if (wspIdx == length) {
+                sb.append(s.substring(Math.max(0, lastLineBreak)));
+                return sb.toString();
+            }
+
+            int nextWspIdx = indexOfWsp(s, wspIdx + 1);
+
+            if (nextWspIdx - lastLineBreak > maxCharacters) {
+                sb.append(s.substring(Math.max(0, lastLineBreak), wspIdx));
+                sb.append("\r\n");
+                lastLineBreak = wspIdx;
+            }
+
+            wspIdx = nextWspIdx;
+        }
+    }
+
+    /**
+     * INTERIM:  From newer version of org.apache.james (but we don't want to import
+     * the entire MimeUtil class).
+     *
+     * Search for whitespace.
+     */
+    private static int indexOfWsp(String s, int fromIndex) {
+        final int len = s.length();
+        for (int index = fromIndex; index < len; index++) {
+            char c = s.charAt(index);
+            if (c == ' ' || c == '\t')
+                return index;
+        }
+        return len;
+    }
+
+    /**
+     * Returns the named parameter of a header field. If name is null the first
+     * parameter is returned, or if there are no additional parameters in the
+     * field the entire field is returned. Otherwise the named parameter is
+     * searched for in a case insensitive fashion and returned. If the parameter
+     * cannot be found the method returns null.
+     *
+     * TODO: quite inefficient with the inner trimming & splitting.
+     * TODO: Also has a latent bug: uses "startsWith" to match the name, which can false-positive.
+     * TODO: The doc says that for a null name you get the first param, but you get the header.
+     *    Should probably just fix the doc, but if other code assumes that behavior, fix the code.
+     * TODO: Need to decode %-escaped strings, as in: filename="ab%22d".
+     *       ('+' -> ' ' conversion too? check RFC)
+     *
+     * @param header
+     * @param name
+     * @return the entire header (if name=null), the found parameter, or null
+     */
+    public static String getHeaderParameter(String header, String name) {
+        if (header == null) {
+            return null;
+        }
+        String[] parts = unfold(header).split(";");
+        if (name == null) {
+            return parts[0].trim();
+        }
+        String lowerCaseName = name.toLowerCase();
+        for (String part : parts) {
+            if (part.trim().toLowerCase().startsWith(lowerCaseName)) {
+                String[] parameterParts = part.split("=", 2);
+                if (parameterParts.length < 2) {
+                    return null;
+                }
+                String parameter = parameterParts[1].trim();
+                if (parameter.startsWith("\"") && parameter.endsWith("\"")) {
+                    return parameter.substring(1, parameter.length() - 1);
+                } else {
+                    return parameter;
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Reads the Part's body and returns a String based on any charset conversion that needed
+     * to be done.
+     * @param part The part containing a body
+     * @return a String containing the converted text in the body, or null if there was no text
+     * or an error during conversion.
+     */
+    public static String getTextFromPart(Part part) {
+        try {
+            if (part != null && part.getBody() != null) {
+                InputStream in = part.getBody().getInputStream();
+                String mimeType = part.getMimeType();
+                if (mimeType != null && MimeUtility.mimeTypeMatches(mimeType, "text/*")) {
+                    /*
+                     * Now we read the part into a buffer for further processing. Because
+                     * the stream is now wrapped we'll remove any transfer encoding at this point.
+                     */
+                    ByteArrayOutputStream out = new ByteArrayOutputStream();
+                    IOUtils.copy(in, out);
+                    in.close();
+                    in = null;      // we want all of our memory back, and close might not release
+
+                    /*
+                     * We've got a text part, so let's see if it needs to be processed further.
+                     */
+                    String charset = getHeaderParameter(part.getContentType(), "charset");
+                    if (charset != null) {
+                        /*
+                         * See if there is conversion from the MIME charset to the Java one.
+                         */
+                        charset = CharsetUtil.toJavaCharset(charset);
+                    }
+                    /*
+                     * No encoding, so use us-ascii, which is the standard.
+                     */
+                    if (charset == null) {
+                        charset = "ASCII";
+                    }
+                    /*
+                     * Convert and return as new String
+                     */
+                    String result = out.toString(charset);
+                    out.close();
+                    return result;
+                }
+            }
+
+        }
+        catch (OutOfMemoryError oom) {
+            /*
+             * If we are not able to process the body there's nothing we can do about it. Return
+             * null and let the upper layers handle the missing content.
+             */
+            Log.e(LOG_TAG, "Unable to getTextFromPart " + oom.toString());
+        }
+        catch (Exception e) {
+            /*
+             * If we are not able to process the body there's nothing we can do about it. Return
+             * null and let the upper layers handle the missing content.
+             */
+            Log.e(LOG_TAG, "Unable to getTextFromPart " + e.toString());
+        }
+        return null;
+    }
+
+    /**
+     * Returns true if the given mimeType matches the matchAgainst specification.  The comparison
+     * ignores case and the matchAgainst string may include "*" for a wildcard (e.g. "image/*").
+     *
+     * @param mimeType A MIME type to check.
+     * @param matchAgainst A MIME type to check against. May include wildcards.
+     * @return true if the mimeType matches
+     */
+    public static boolean mimeTypeMatches(String mimeType, String matchAgainst) {
+        Pattern p = Pattern.compile(matchAgainst.replaceAll("\\*", "\\.\\*"),
+                Pattern.CASE_INSENSITIVE);
+        return p.matcher(mimeType).matches();
+    }
+
+    /**
+     * Returns true if the given mimeType matches any of the matchAgainst specifications.  The
+     * comparison ignores case and the matchAgainst strings may include "*" for a wildcard
+     * (e.g. "image/*").
+     *
+     * @param mimeType A MIME type to check.
+     * @param matchAgainst An array of MIME types to check against. May include wildcards.
+     * @return true if the mimeType matches any of the matchAgainst strings
+     */
+    public static boolean mimeTypeMatches(String mimeType, String[] matchAgainst) {
+        for (String matchType : matchAgainst) {
+            if (mimeTypeMatches(mimeType, matchType)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Given an input stream and a transfer encoding, return a wrapped input stream for that
+     * encoding (or the original if none is required)
+     * @param in the input stream
+     * @param contentTransferEncoding the content transfer encoding
+     * @return a properly wrapped stream
+     */
+    public static InputStream getInputStreamForContentTransferEncoding(InputStream in,
+            String contentTransferEncoding) {
+        if (contentTransferEncoding != null) {
+            contentTransferEncoding =
+                MimeUtility.getHeaderParameter(contentTransferEncoding, null);
+            if ("quoted-printable".equalsIgnoreCase(contentTransferEncoding)) {
+                in = new QuotedPrintableInputStream(in);
+            }
+            else if ("base64".equalsIgnoreCase(contentTransferEncoding)) {
+                in = new Base64InputStream(in, Base64.DEFAULT);
+            }
+        }
+        return in;
+    }
+
+    /**
+     * Removes any content transfer encoding from the stream and returns a Body.
+     */
+    public static Body decodeBody(InputStream in, String contentTransferEncoding)
+            throws IOException {
+        /*
+         * We'll remove any transfer encoding by wrapping the stream.
+         */
+        in = getInputStreamForContentTransferEncoding(in, contentTransferEncoding);
+        BinaryTempFileBody tempBody = new BinaryTempFileBody();
+        OutputStream out = tempBody.getOutputStream();
+        try {
+            IOUtils.copy(in, out);
+        } catch (Base64DataException bde) {
+            // TODO Need to fix this somehow
+            //String warning = "\n\n" + Email.getMessageDecodeErrorString();
+            //out.write(warning.getBytes());
+        } finally {
+            out.close();
+        }
+        return tempBody;
+    }
+
+    /**
+     * Recursively scan a Part (usually a Message) and sort out which of its children will be
+     * "viewable" and which will be attachments.
+     *
+     * @param part The part to be broken down
+     * @param viewables This arraylist will be populated with all parts that appear to be
+     * the "message" (e.g. text/plain & text/html)
+     * @param attachments This arraylist will be populated with all parts that appear to be
+     * attachments (including inlines)
+     * @throws MessagingException
+     */
+    public static void collectParts(Part part, ArrayList<Part> viewables,
+            ArrayList<Part> attachments) throws MessagingException {
+        String disposition = part.getDisposition();
+        String dispositionType = MimeUtility.getHeaderParameter(disposition, null);
+        // If a disposition is not specified, default to "inline"
+        boolean inline =
+                TextUtils.isEmpty(dispositionType) || "inline".equalsIgnoreCase(dispositionType);
+        // The lower-case mime type
+        String mimeType = part.getMimeType().toLowerCase();
+
+        if (part.getBody() instanceof Multipart) {
+            // If the part is Multipart but not alternative it's either mixed or
+            // something we don't know about, which means we treat it as mixed
+            // per the spec. We just process its pieces recursively.
+            MimeMultipart mp = (MimeMultipart)part.getBody();
+            boolean foundHtml = false;
+            if (mp.getSubTypeForTest().equals("alternative")) {
+                for (int i = 0; i < mp.getCount(); i++) {
+                    if (mp.getBodyPart(i).isMimeType("text/html")) {
+                        foundHtml = true;
+                        break;
+                    }
+                }
+            }
+            for (int i = 0; i < mp.getCount(); i++) {
+                // See if we have text and html
+                BodyPart bp = mp.getBodyPart(i);
+                // If there's html, don't bother loading text
+                if (foundHtml && bp.isMimeType("text/plain")) {
+                    continue;
+                }
+                collectParts(bp, viewables, attachments);
+            }
+        } else if (part.getBody() instanceof Message) {
+            // If the part is an embedded message we just continue to process
+            // it, pulling any viewables or attachments into the running list.
+            Message message = (Message)part.getBody();
+            collectParts(message, viewables, attachments);
+        } else if (inline && (mimeType.startsWith("text") || (mimeType.startsWith("image")))) {
+            // We'll treat text and images as viewables
+            viewables.add(part);
+        } else {
+            // Everything else is an attachment.
+            attachments.add(part);
+        }
+    }
+}
diff --git a/src/com/android/phone/common/mail/internet/TextBody.java b/src/com/android/phone/common/mail/internet/TextBody.java
new file mode 100644
index 0000000..77bbd65
--- /dev/null
+++ b/src/com/android/phone/common/mail/internet/TextBody.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.phone.common.mail.internet;
+
+import android.util.Base64;
+
+import com.android.phone.common.mail.Body;
+import com.android.phone.common.mail.MessagingException;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+
+public class TextBody implements Body {
+    String mBody;
+
+    public TextBody(String body) {
+        this.mBody = body;
+    }
+
+    @Override
+    public void writeTo(OutputStream out) throws IOException, MessagingException {
+        byte[] bytes = mBody.getBytes("UTF-8");
+        out.write(Base64.encode(bytes, Base64.CRLF));
+    }
+
+    /**
+     * Get the text of the body in it's unencoded format.
+     * @return
+     */
+    public String getText() {
+        return mBody;
+    }
+
+    /**
+     * Returns an InputStream that reads this body's text in UTF-8 format.
+     */
+    @Override
+    public InputStream getInputStream() throws MessagingException {
+        try {
+            byte[] b = mBody.getBytes("UTF-8");
+            return new ByteArrayInputStream(b);
+        }
+        catch (UnsupportedEncodingException usee) {
+            return null;
+        }
+    }
+}
diff --git a/src/com/android/phone/common/mail/store/ImapConnection.java b/src/com/android/phone/common/mail/store/ImapConnection.java
new file mode 100644
index 0000000..ace7029
--- /dev/null
+++ b/src/com/android/phone/common/mail/store/ImapConnection.java
@@ -0,0 +1,246 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.phone.common.mail.store;
+
+import android.text.TextUtils;
+
+import com.android.phone.common.mail.AuthenticationFailedException;
+import com.android.phone.common.mail.CertificateValidationException;
+import com.android.phone.common.mail.MailTransport;
+import com.android.phone.common.mail.MessagingException;
+import com.android.phone.common.mail.store.imap.ImapConstants;
+import com.android.phone.common.mail.store.imap.ImapResponse;
+import com.android.phone.common.mail.store.imap.ImapResponseParser;
+import com.android.phone.common.mail.store.imap.ImapUtility;
+import com.android.phone.common.mail.utils.LogUtils;
+import com.android.phone.common.mail.store.ImapStore.ImapException;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.net.ssl.SSLException;
+
+/**
+ * A cacheable class that stores the details for a single IMAP connection.
+ */
+public class ImapConnection {
+    private final String TAG = "ImapConnection";
+
+    private String mLoginPhrase;
+    private ImapStore mImapStore;
+    private MailTransport mTransport;
+    private ImapResponseParser mParser;
+
+    static final String IMAP_REDACTED_LOG = "[IMAP command redacted]";
+
+    /**
+     * Next tag to use.  All connections associated to the same ImapStore instance share the same
+     * counter to make tests simpler.
+     * (Some of the tests involve multiple connections but only have a single counter to track the
+     * tag.)
+     */
+    private final AtomicInteger mNextCommandTag = new AtomicInteger(0);
+
+    ImapConnection(ImapStore store) {
+        setStore(store);
+    }
+
+    void setStore(ImapStore store) {
+        // TODO: maybe we should throw an exception if the connection is not closed here,
+        // if it's not currently closed, then we won't reopen it, so if the credentials have
+        // changed, the connection will not be reestablished.
+        mImapStore = store;
+        mLoginPhrase = null;
+    }
+
+    /**
+     * Generates and returns the phrase to be used for authentication. This will be a LOGIN with
+     * username and password.
+     *
+     * @return the login command string to sent to the IMAP server
+     */
+    String getLoginPhrase() {
+        if (mLoginPhrase == null) {
+            if (mImapStore.getUsername() != null && mImapStore.getPassword() != null) {
+                // build the LOGIN string once (instead of over-and-over again.)
+                // apply the quoting here around the built-up password
+                mLoginPhrase = ImapConstants.LOGIN + " " + mImapStore.getUsername() + " "
+                        + ImapUtility.imapQuoted(mImapStore.getPassword());
+            }
+        }
+        return mLoginPhrase;
+    }
+
+    void open() throws IOException, MessagingException {
+        if (mTransport != null && mTransport.isOpen()) {
+            return;
+        }
+
+        try {
+            // copy configuration into a clean transport, if necessary
+            if (mTransport == null) {
+                mTransport = mImapStore.cloneTransport();
+            }
+
+            mTransport.open();
+
+            createParser();
+
+            // LOGIN
+            doLogin();
+        } catch (SSLException e) {
+            LogUtils.d(TAG, "SSLException ", e);
+            throw new CertificateValidationException(e.getMessage(), e);
+        } catch (IOException ioe) {
+            LogUtils.d(TAG, "IOException", ioe);
+            throw ioe;
+        } finally {
+            destroyResponses();
+        }
+    }
+
+    /**
+     * Closes the connection and releases all resources. This connection can not be used again
+     * until {@link #setStore(ImapStore)} is called.
+     */
+    void close() {
+        if (mTransport != null) {
+            mTransport.close();
+            mTransport = null;
+        }
+        destroyResponses();
+        mParser = null;
+        mImapStore = null;
+    }
+
+    /**
+     * Logs into the IMAP server
+     */
+    private void doLogin() throws IOException, MessagingException, AuthenticationFailedException {
+        try {
+            executeSimpleCommand(getLoginPhrase(), true);
+        } catch (ImapException ie) {
+            LogUtils.d(TAG, "ImapException", ie);
+            final String status = ie.getStatus();
+            final String code = ie.getResponseCode();
+            final String alertText = ie.getAlertText();
+
+            // if the response code indicates expired or bad credentials, throw a special exception
+            if (ImapConstants.AUTHENTICATIONFAILED.equals(code) ||
+                    ImapConstants.EXPIRED.equals(code) ||
+                    (ImapConstants.NO.equals(status) && TextUtils.isEmpty(code))) {
+                throw new AuthenticationFailedException(alertText, ie);
+            }
+
+            throw new MessagingException(alertText, ie);
+        }
+    }
+
+    /**
+     * Create an {@link ImapResponseParser} from {@code mTransport.getInputStream()} and
+     * set it to {@link #mParser}.
+     *
+     * If we already have an {@link ImapResponseParser}, we
+     * {@link #destroyResponses()} and throw it away.
+     */
+    private void createParser() {
+        destroyResponses();
+        mParser = new ImapResponseParser(mTransport.getInputStream());
+    }
+
+
+    void destroyResponses() {
+        if (mParser != null) {
+            mParser.destroyResponses();
+        }
+    }
+
+    ImapResponse readResponse() throws IOException, MessagingException {
+        return mParser.readResponse();
+    }
+
+    List<ImapResponse> executeSimpleCommand(String command)
+            throws IOException, MessagingException{
+        return executeSimpleCommand(command, false);
+    }
+
+    /**
+     * Send a single command to the server.  The command will be preceded by an IMAP command
+     * tag and followed by \r\n (caller need not supply them).
+     * Execute a simple command at the server, a simple command being one that is sent in a single
+     * line of text
+     *
+     * @param command the command to send to the server
+     * @param sensitive whether the command should be redacted in logs (used for login)
+     * @return a list of ImapResponses
+     * @throws IOException
+     * @throws MessagingException
+     */
+    List<ImapResponse> executeSimpleCommand(String command, boolean sensitive)
+            throws IOException, MessagingException {
+        // TODO: It may be nice to catch IOExceptions and close the connection here.
+        // Currently, we expect callers to do that, but if they fail to we'll be in a broken state.
+        sendCommand(command, sensitive);
+        return getCommandResponses();
+    }
+
+    String sendCommand(String command, boolean sensitive) throws IOException, MessagingException {
+        open();
+
+        if (mTransport == null) {
+            throw new IOException("Null transport");
+        }
+        String tag = Integer.toString(mNextCommandTag.incrementAndGet());
+        String commandToSend = tag + " " + command;
+        mTransport.writeLine(commandToSend, (sensitive ? IMAP_REDACTED_LOG : command));
+
+        return tag;
+    }
+
+    /**
+     * Read and return all of the responses from the most recent command sent to the server
+     *
+     * @return a list of ImapResponses
+     * @throws IOException
+     * @throws MessagingException
+     */
+    List<ImapResponse> getCommandResponses() throws IOException, MessagingException {
+        final List<ImapResponse> responses = new ArrayList<ImapResponse>();
+        ImapResponse response;
+        do {
+            response = mParser.readResponse();
+            responses.add(response);
+        } while (!response.isTagged());
+
+        if (!response.isOk()) {
+            final String toString = response.toString();
+            final String status = response.getStatusOrEmpty().getString();
+            final String alert = response.getAlertTextOrEmpty().getString();
+            final String responseCode = response.getResponseCodeOrEmpty().getString();
+            destroyResponses();
+
+            // if the response code indicates an error occurred within the server, indicate that
+            if (ImapConstants.UNAVAILABLE.equals(responseCode)) {
+                throw new MessagingException(MessagingException.SERVER_ERROR, alert);
+            }
+
+            throw new ImapException(toString, status, alert, responseCode);
+        }
+        return responses;
+    }
+}
diff --git a/src/com/android/phone/common/mail/store/ImapFolder.java b/src/com/android/phone/common/mail/store/ImapFolder.java
new file mode 100644
index 0000000..faeb93f
--- /dev/null
+++ b/src/com/android/phone/common/mail/store/ImapFolder.java
@@ -0,0 +1,767 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.phone.common.mail.store;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.util.Base64DataException;
+
+import com.android.phone.common.mail.store.ImapStore.ImapException;
+import com.android.phone.common.mail.store.ImapStore.ImapMessage;
+import com.android.phone.common.mail.store.imap.ImapConstants;
+import com.android.phone.common.mail.store.imap.ImapElement;
+import com.android.phone.common.mail.store.imap.ImapList;
+import com.android.phone.common.mail.store.imap.ImapResponse;
+import com.android.phone.common.mail.store.imap.ImapString;
+import com.android.phone.common.mail.store.imap.ImapUtility;
+import com.android.phone.common.mail.AuthenticationFailedException;
+import com.android.phone.common.mail.Body;
+import com.android.phone.common.mail.FetchProfile;
+import com.android.phone.common.mail.Flag;
+import com.android.phone.common.mail.Message;
+import com.android.phone.common.mail.MessagingException;
+import com.android.phone.common.mail.Part;
+import com.android.phone.common.mail.internet.BinaryTempFileBody;
+import com.android.phone.common.mail.internet.MimeBodyPart;
+import com.android.phone.common.mail.internet.MimeHeader;
+import com.android.phone.common.mail.internet.MimeMultipart;
+import com.android.phone.common.mail.internet.MimeUtility;
+import com.android.phone.common.mail.utility.CountingOutputStream;
+import com.android.phone.common.mail.utility.EOLConvertingOutputStream;
+import com.android.phone.common.mail.utils.Utility;
+import com.android.phone.common.mail.utils.LogUtils;
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.phone.common.R;
+
+import org.apache.commons.io.IOUtils;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.TimeZone;
+
+public class ImapFolder {
+    private static final String TAG = "ImapFolder";
+    private final static String[] PERMANENT_FLAGS =
+        { Flag.DELETED, Flag.SEEN, Flag.FLAGGED, Flag.ANSWERED };
+    private static final int COPY_BUFFER_SIZE = 16*1024;
+
+    private final ImapStore mStore;
+    private final String mName;
+    private int mMessageCount = -1;
+    private ImapConnection mConnection;
+    private String mMode;
+    private boolean mExists;
+    /** A set of hashes that can be used to track dirtiness */
+    Object mHash[];
+
+    public static final String MODE_READ_ONLY = "mode_read_only";
+    public static final String MODE_READ_WRITE = "mode_read_write";
+
+    public ImapFolder(ImapStore store, String name) {
+        mStore = store;
+        mName = name;
+    }
+
+    /**
+     * Callback for each message retrieval.
+     */
+    public interface MessageRetrievalListener {
+        public void messageRetrieved(Message message);
+    }
+
+    private void destroyResponses() {
+        if (mConnection != null) {
+            mConnection.destroyResponses();
+        }
+    }
+
+    public void open(String mode) throws MessagingException {
+        try {
+            if (isOpen()) {
+                if (mMode == mode) {
+                    // Make sure the connection is valid.
+                    // If it's not we'll close it down and continue on to get a new one.
+                    try {
+                        mConnection.executeSimpleCommand(ImapConstants.NOOP);
+                        return;
+
+                    } catch (IOException ioe) {
+                        ioExceptionHandler(mConnection, ioe);
+                    } finally {
+                        destroyResponses();
+                    }
+                } else {
+                    // Return the connection to the pool, if exists.
+                    close(false);
+                }
+            }
+            synchronized (this) {
+                mConnection = mStore.getConnection();
+            }
+            // * FLAGS (\Answered \Flagged \Deleted \Seen \Draft NonJunk
+            // $MDNSent)
+            // * OK [PERMANENTFLAGS (\Answered \Flagged \Deleted \Seen \Draft
+            // NonJunk $MDNSent \*)] Flags permitted.
+            // * 23 EXISTS
+            // * 0 RECENT
+            // * OK [UIDVALIDITY 1125022061] UIDs valid
+            // * OK [UIDNEXT 57576] Predicted next UID
+            // 2 OK [READ-WRITE] Select completed.
+            try {
+                doSelect();
+            } catch (IOException ioe) {
+                throw ioExceptionHandler(mConnection, ioe);
+            } finally {
+                destroyResponses();
+            }
+        } catch (AuthenticationFailedException e) {
+            // Don't cache this connection, so we're forced to try connecting/login again
+            mConnection = null;
+            close(false);
+            throw e;
+        } catch (MessagingException e) {
+            mExists = false;
+            close(false);
+            throw e;
+        }
+    }
+
+    public boolean isOpen() {
+        return mExists && mConnection != null;
+    }
+
+    public String getMode() {
+        return mMode;
+    }
+
+    public void close(boolean expunge) {
+        if (expunge) {
+            try {
+                expunge();
+            } catch (MessagingException e) {
+                LogUtils.e(TAG, e, "Messaging Exception");
+            }
+        }
+        mMessageCount = -1;
+        synchronized (this) {
+            mStore.closeConnection();
+            mConnection = null;
+        }
+    }
+
+    public int getMessageCount() {
+        return mMessageCount;
+    }
+
+    String[] getSearchUids(List<ImapResponse> responses) {
+        // S: * SEARCH 2 3 6
+        final ArrayList<String> uids = new ArrayList<String>();
+        for (ImapResponse response : responses) {
+            if (!response.isDataResponse(0, ImapConstants.SEARCH)) {
+                continue;
+            }
+            // Found SEARCH response data
+            for (int i = 1; i < response.size(); i++) {
+                ImapString s = response.getStringOrEmpty(i);
+                if (s.isString()) {
+                    uids.add(s.getString());
+                }
+            }
+        }
+        return uids.toArray(Utility.EMPTY_STRINGS);
+    }
+
+    @VisibleForTesting
+    String[] searchForUids(String searchCriteria) throws MessagingException {
+        checkOpen();
+        try {
+            try {
+                final String command = ImapConstants.UID_SEARCH + " " + searchCriteria;
+                final String[] result = getSearchUids(mConnection.executeSimpleCommand(command));
+                LogUtils.d(TAG, "searchForUids '" + searchCriteria + "' results: " +
+                        result.length);
+                return result;
+            } catch (ImapException me) {
+                LogUtils.d(TAG, "ImapException in search: " + searchCriteria, me);
+                return Utility.EMPTY_STRINGS; // Not found
+            } catch (IOException ioe) {
+                LogUtils.d(TAG, "IOException in search: " + searchCriteria, ioe);
+                throw ioExceptionHandler(mConnection, ioe);
+            }
+        } finally {
+            destroyResponses();
+        }
+    }
+
+
+    public Message getMessage(String uid) throws MessagingException {
+        checkOpen();
+
+        final String[] uids = searchForUids(ImapConstants.UID + " " + uid);
+        for (int i = 0; i < uids.length; i++) {
+            if (uids[i].equals(uid)) {
+                return new ImapMessage(uid, this);
+            }
+        }
+        return null;
+    }
+
+    @VisibleForTesting
+    protected static boolean isAsciiString(String str) {
+        int len = str.length();
+        for (int i = 0; i < len; i++) {
+            char c = str.charAt(i);
+            if (c >= 128) return false;
+        }
+        return true;
+    }
+
+    public Message[] getMessages(String[] uids) throws MessagingException {
+        if (uids == null) {
+            uids = searchForUids("1:* NOT DELETED");
+        }
+        return getMessagesInternal(uids);
+    }
+
+    public Message[] getMessagesInternal(String[] uids) {
+        final ArrayList<Message> messages = new ArrayList<Message>(uids.length);
+        for (int i = 0; i < uids.length; i++) {
+            final String uid = uids[i];
+            final ImapMessage message = new ImapMessage(uid, this);
+            messages.add(message);
+        }
+        return messages.toArray(Message.EMPTY_ARRAY);
+    }
+
+    public void fetch(Message[] messages, FetchProfile fp,
+            MessageRetrievalListener listener) throws MessagingException {
+        try {
+            fetchInternal(messages, fp, listener);
+        } catch (RuntimeException e) { // Probably a parser error.
+            LogUtils.w(TAG, "Exception detected: " + e.getMessage());
+            throw e;
+        }
+    }
+
+    public void fetchInternal(Message[] messages, FetchProfile fp,
+            MessageRetrievalListener listener) throws MessagingException {
+        if (messages.length == 0) {
+            return;
+        }
+        checkOpen();
+        HashMap<String, Message> messageMap = new HashMap<String, Message>();
+        for (Message m : messages) {
+            messageMap.put(m.getUid(), m);
+        }
+
+        /*
+         * Figure out what command we are going to run:
+         * FLAGS     - UID FETCH (FLAGS)
+         * ENVELOPE  - UID FETCH (INTERNALDATE UID RFC822.SIZE FLAGS BODY.PEEK[
+         *                            HEADER.FIELDS (date subject from content-type to cc)])
+         * STRUCTURE - UID FETCH (BODYSTRUCTURE)
+         * BODY_SANE - UID FETCH (BODY.PEEK[]<0.N>) where N = max bytes returned
+         * BODY      - UID FETCH (BODY.PEEK[])
+         * Part      - UID FETCH (BODY.PEEK[ID]) where ID = mime part ID
+         */
+
+        final LinkedHashSet<String> fetchFields = new LinkedHashSet<String>();
+
+        fetchFields.add(ImapConstants.UID);
+        if (fp.contains(FetchProfile.Item.FLAGS)) {
+            fetchFields.add(ImapConstants.FLAGS);
+        }
+        if (fp.contains(FetchProfile.Item.ENVELOPE)) {
+            fetchFields.add(ImapConstants.INTERNALDATE);
+            fetchFields.add(ImapConstants.RFC822_SIZE);
+            fetchFields.add(ImapConstants.FETCH_FIELD_HEADERS);
+        }
+        if (fp.contains(FetchProfile.Item.STRUCTURE)) {
+            fetchFields.add(ImapConstants.BODYSTRUCTURE);
+        }
+
+        if (fp.contains(FetchProfile.Item.BODY_SANE)) {
+            fetchFields.add(ImapConstants.FETCH_FIELD_BODY_PEEK_SANE);
+        }
+        if (fp.contains(FetchProfile.Item.BODY)) {
+            fetchFields.add(ImapConstants.FETCH_FIELD_BODY_PEEK);
+        }
+
+        // TODO Why are we only fetching the first part given?
+        final Part fetchPart = fp.getFirstPart();
+        if (fetchPart != null) {
+            final String[] partIds =
+                    fetchPart.getHeader(MimeHeader.HEADER_ANDROID_ATTACHMENT_STORE_DATA);
+            // TODO Why can a single part have more than one Id? And why should we only fetch
+            // the first id if there are more than one?
+            if (partIds != null) {
+                fetchFields.add(ImapConstants.FETCH_FIELD_BODY_PEEK_BARE
+                        + "[" + partIds[0] + "]");
+            }
+        }
+
+        try {
+            mConnection.sendCommand(String.format(Locale.US,
+                    ImapConstants.UID_FETCH + " %s (%s)", ImapStore.joinMessageUids(messages),
+                    Utility.combine(fetchFields.toArray(new String[fetchFields.size()]), ' ')
+                    ), false);
+            ImapResponse response;
+            do {
+                response = null;
+                try {
+                    response = mConnection.readResponse();
+
+                    if (!response.isDataResponse(1, ImapConstants.FETCH)) {
+                        continue; // Ignore
+                    }
+                    final ImapList fetchList = response.getListOrEmpty(2);
+                    final String uid = fetchList.getKeyedStringOrEmpty(ImapConstants.UID)
+                            .getString();
+                    if (TextUtils.isEmpty(uid)) continue;
+
+                    ImapMessage message = (ImapMessage) messageMap.get(uid);
+                    if (message == null) continue;
+
+                    if (fp.contains(FetchProfile.Item.FLAGS)) {
+                        final ImapList flags =
+                            fetchList.getKeyedListOrEmpty(ImapConstants.FLAGS);
+                        for (int i = 0, count = flags.size(); i < count; i++) {
+                            final ImapString flag = flags.getStringOrEmpty(i);
+                            if (flag.is(ImapConstants.FLAG_DELETED)) {
+                                message.setFlagInternal(Flag.DELETED, true);
+                            } else if (flag.is(ImapConstants.FLAG_ANSWERED)) {
+                                message.setFlagInternal(Flag.ANSWERED, true);
+                            } else if (flag.is(ImapConstants.FLAG_SEEN)) {
+                                message.setFlagInternal(Flag.SEEN, true);
+                            } else if (flag.is(ImapConstants.FLAG_FLAGGED)) {
+                                message.setFlagInternal(Flag.FLAGGED, true);
+                            }
+                        }
+                    }
+                    if (fp.contains(FetchProfile.Item.ENVELOPE)) {
+                        final Date internalDate = fetchList.getKeyedStringOrEmpty(
+                                ImapConstants.INTERNALDATE).getDateOrNull();
+                        final int size = fetchList.getKeyedStringOrEmpty(
+                                ImapConstants.RFC822_SIZE).getNumberOrZero();
+                        final String header = fetchList.getKeyedStringOrEmpty(
+                                ImapConstants.BODY_BRACKET_HEADER, true).getString();
+
+                        message.setInternalDate(internalDate);
+                        message.setSize(size);
+                        message.parse(Utility.streamFromAsciiString(header));
+                    }
+                    if (fp.contains(FetchProfile.Item.STRUCTURE)) {
+                        ImapList bs = fetchList.getKeyedListOrEmpty(
+                                ImapConstants.BODYSTRUCTURE);
+                        if (!bs.isEmpty()) {
+                            try {
+                                parseBodyStructure(bs, message, ImapConstants.TEXT);
+                            } catch (MessagingException e) {
+                                LogUtils.v(TAG, e, "Error handling message");
+                                message.setBody(null);
+                            }
+                        }
+                    }
+                    if (fp.contains(FetchProfile.Item.BODY)
+                            || fp.contains(FetchProfile.Item.BODY_SANE)) {
+                        // Body is keyed by "BODY[]...".
+                        // Previously used "BODY[..." but this can be confused with "BODY[HEADER..."
+                        // TODO Should we accept "RFC822" as well??
+                        ImapString body = fetchList.getKeyedStringOrEmpty("BODY[]", true);
+                        InputStream bodyStream = body.getAsStream();
+                        message.parse(bodyStream);
+                    }
+                    if (fetchPart != null) {
+                        InputStream bodyStream =
+                                fetchList.getKeyedStringOrEmpty("BODY[", true).getAsStream();
+                        String encodings[] = fetchPart.getHeader(
+                                MimeHeader.HEADER_CONTENT_TRANSFER_ENCODING);
+
+                        String contentTransferEncoding = null;
+                        if (encodings != null && encodings.length > 0) {
+                            contentTransferEncoding = encodings[0];
+                        } else {
+                            // According to http://tools.ietf.org/html/rfc2045#section-6.1
+                            // "7bit" is the default.
+                            contentTransferEncoding = "7bit";
+                        }
+
+                        try {
+                            // TODO Don't create 2 temp files.
+                            // decodeBody creates BinaryTempFileBody, but we could avoid this
+                            // if we implement ImapStringBody.
+                            // (We'll need to share a temp file.  Protect it with a ref-count.)
+                            fetchPart.setBody(decodeBody(mStore.getContext(), bodyStream,
+                                    contentTransferEncoding, fetchPart.getSize(), listener));
+                        } catch(Exception e) {
+                            // TODO: Figure out what kinds of exceptions might actually be thrown
+                            // from here. This blanket catch-all is because we're not sure what to
+                            // do if we don't have a contentTransferEncoding, and we don't have
+                            // time to figure out what exceptions might be thrown.
+                            LogUtils.e(TAG, "Error fetching body %s", e);
+                        }
+                    }
+
+                    if (listener != null) {
+                        listener.messageRetrieved(message);
+                    }
+                } finally {
+                    destroyResponses();
+                }
+            } while (!response.isTagged());
+        } catch (IOException ioe) {
+            throw ioExceptionHandler(mConnection, ioe);
+        }
+    }
+
+    /**
+     * Removes any content transfer encoding from the stream and returns a Body.
+     * This code is taken/condensed from MimeUtility.decodeBody
+     */
+    private static Body decodeBody(Context context,InputStream in, String contentTransferEncoding,
+            int size, MessageRetrievalListener listener) throws IOException {
+        // Get a properly wrapped input stream
+        in = MimeUtility.getInputStreamForContentTransferEncoding(in, contentTransferEncoding);
+        BinaryTempFileBody tempBody = new BinaryTempFileBody();
+        OutputStream out = tempBody.getOutputStream();
+        try {
+            byte[] buffer = new byte[COPY_BUFFER_SIZE];
+            int n = 0;
+            int count = 0;
+            while (-1 != (n = in.read(buffer))) {
+                out.write(buffer, 0, n);
+                count += n;
+            }
+        } catch (Base64DataException bde) {
+            String warning = "\n\n" + context.getString(R.string.message_decode_error);
+            out.write(warning.getBytes());
+        } finally {
+            out.close();
+        }
+        return tempBody;
+    }
+
+    public String[] getPermanentFlags() {
+        return PERMANENT_FLAGS;
+    }
+
+    /**
+     * Handle any untagged responses that the caller doesn't care to handle themselves.
+     * @param responses
+     */
+    private void handleUntaggedResponses(List<ImapResponse> responses) {
+        for (ImapResponse response : responses) {
+            handleUntaggedResponse(response);
+        }
+    }
+
+    /**
+     * Handle an untagged response that the caller doesn't care to handle themselves.
+     * @param response
+     */
+    private void handleUntaggedResponse(ImapResponse response) {
+        if (response.isDataResponse(1, ImapConstants.EXISTS)) {
+            mMessageCount = response.getStringOrEmpty(0).getNumberOrZero();
+        }
+    }
+
+    private static void parseBodyStructure(ImapList bs, Part part, String id)
+            throws MessagingException {
+        if (bs.getElementOrNone(0).isList()) {
+            /*
+             * This is a multipart/*
+             */
+            MimeMultipart mp = new MimeMultipart();
+            for (int i = 0, count = bs.size(); i < count; i++) {
+                ImapElement e = bs.getElementOrNone(i);
+                if (e.isList()) {
+                    /*
+                     * For each part in the message we're going to add a new BodyPart and parse
+                     * into it.
+                     */
+                    MimeBodyPart bp = new MimeBodyPart();
+                    if (id.equals(ImapConstants.TEXT)) {
+                        parseBodyStructure(bs.getListOrEmpty(i), bp, Integer.toString(i + 1));
+
+                    } else {
+                        parseBodyStructure(bs.getListOrEmpty(i), bp, id + "." + (i + 1));
+                    }
+                    mp.addBodyPart(bp);
+
+                } else {
+                    if (e.isString()) {
+                        mp.setSubType(bs.getStringOrEmpty(i).getString().toLowerCase(Locale.US));
+                    }
+                    break; // Ignore the rest of the list.
+                }
+            }
+            part.setBody(mp);
+        } else {
+            /*
+             * This is a body. We need to add as much information as we can find out about
+             * it to the Part.
+             */
+
+            /*
+             body type
+             body subtype
+             body parameter parenthesized list
+             body id
+             body description
+             body encoding
+             body size
+             */
+
+            final ImapString type = bs.getStringOrEmpty(0);
+            final ImapString subType = bs.getStringOrEmpty(1);
+            final String mimeType =
+                    (type.getString() + "/" + subType.getString()).toLowerCase(Locale.US);
+
+            final ImapList bodyParams = bs.getListOrEmpty(2);
+            final ImapString cid = bs.getStringOrEmpty(3);
+            final ImapString encoding = bs.getStringOrEmpty(5);
+            final int size = bs.getStringOrEmpty(6).getNumberOrZero();
+
+            if (MimeUtility.mimeTypeMatches(mimeType, MimeUtility.MIME_TYPE_RFC822)) {
+                // A body type of type MESSAGE and subtype RFC822
+                // contains, immediately after the basic fields, the
+                // envelope structure, body structure, and size in
+                // text lines of the encapsulated message.
+                // [MESSAGE, RFC822, [NAME, filename.eml], NIL, NIL, 7BIT, 5974, NIL,
+                //     [INLINE, [FILENAME*0, Fwd: Xxx..., FILENAME*1, filename.eml]], NIL]
+                /*
+                 * This will be caught by fetch and handled appropriately.
+                 */
+                throw new MessagingException("BODYSTRUCTURE " + MimeUtility.MIME_TYPE_RFC822
+                        + " not yet supported.");
+            }
+
+            /*
+             * Set the content type with as much information as we know right now.
+             */
+            final StringBuilder contentType = new StringBuilder(mimeType);
+
+            /*
+             * If there are body params we might be able to get some more information out
+             * of them.
+             */
+            for (int i = 1, count = bodyParams.size(); i < count; i += 2) {
+
+                // TODO We need to convert " into %22, but
+                // because MimeUtility.getHeaderParameter doesn't recognize it,
+                // we can't fix it for now.
+                contentType.append(String.format(";\n %s=\"%s\"",
+                        bodyParams.getStringOrEmpty(i - 1).getString(),
+                        bodyParams.getStringOrEmpty(i).getString()));
+            }
+
+            part.setHeader(MimeHeader.HEADER_CONTENT_TYPE, contentType.toString());
+
+            // Extension items
+            final ImapList bodyDisposition;
+
+            if (type.is(ImapConstants.TEXT) && bs.getElementOrNone(9).isList()) {
+                // If media-type is TEXT, 9th element might be: [body-fld-lines] := number
+                // So, if it's not a list, use 10th element.
+                // (Couldn't find evidence in the RFC if it's ALWAYS 10th element.)
+                bodyDisposition = bs.getListOrEmpty(9);
+            } else {
+                bodyDisposition = bs.getListOrEmpty(8);
+            }
+
+            final StringBuilder contentDisposition = new StringBuilder();
+
+            if (bodyDisposition.size() > 0) {
+                final String bodyDisposition0Str =
+                        bodyDisposition.getStringOrEmpty(0).getString().toLowerCase(Locale.US);
+                if (!TextUtils.isEmpty(bodyDisposition0Str)) {
+                    contentDisposition.append(bodyDisposition0Str);
+                }
+
+                final ImapList bodyDispositionParams = bodyDisposition.getListOrEmpty(1);
+                if (!bodyDispositionParams.isEmpty()) {
+                    /*
+                     * If there is body disposition information we can pull some more
+                     * information about the attachment out.
+                     */
+                    for (int i = 1, count = bodyDispositionParams.size(); i < count; i += 2) {
+
+                        // TODO We need to convert " into %22.  See above.
+                        contentDisposition.append(String.format(Locale.US, ";\n %s=\"%s\"",
+                                bodyDispositionParams.getStringOrEmpty(i - 1)
+                                        .getString().toLowerCase(Locale.US),
+                                bodyDispositionParams.getStringOrEmpty(i).getString()));
+                    }
+                }
+            }
+
+            if ((size > 0)
+                    && (MimeUtility.getHeaderParameter(contentDisposition.toString(), "size")
+                            == null)) {
+                contentDisposition.append(String.format(Locale.US, ";\n size=%d", size));
+            }
+
+            if (contentDisposition.length() > 0) {
+                /*
+                 * Set the content disposition containing at least the size. Attachment
+                 * handling code will use this down the road.
+                 */
+                part.setHeader(MimeHeader.HEADER_CONTENT_DISPOSITION,
+                        contentDisposition.toString());
+            }
+
+            /*
+             * Set the Content-Transfer-Encoding header. Attachment code will use this
+             * to parse the body.
+             */
+            if (!encoding.isEmpty()) {
+                part.setHeader(MimeHeader.HEADER_CONTENT_TRANSFER_ENCODING,
+                        encoding.getString());
+            }
+
+            /*
+             * Set the Content-ID header.
+             */
+            if (!cid.isEmpty()) {
+                part.setHeader(MimeHeader.HEADER_CONTENT_ID, cid.getString());
+            }
+
+            if (size > 0) {
+                if (part instanceof ImapMessage) {
+                    ((ImapMessage) part).setSize(size);
+                } else if (part instanceof MimeBodyPart) {
+                    ((MimeBodyPart) part).setSize(size);
+                } else {
+                    throw new MessagingException("Unknown part type " + part.toString());
+                }
+            }
+            part.setHeader(MimeHeader.HEADER_ANDROID_ATTACHMENT_STORE_DATA, id);
+        }
+
+    }
+
+    public Message[] expunge() throws MessagingException {
+        checkOpen();
+        try {
+            handleUntaggedResponses(mConnection.executeSimpleCommand(ImapConstants.EXPUNGE));
+        } catch (IOException ioe) {
+            throw ioExceptionHandler(mConnection, ioe);
+        } finally {
+            destroyResponses();
+        }
+        return null;
+    }
+
+    public void setFlags(Message[] messages, String[] flags, boolean value)
+            throws MessagingException {
+        checkOpen();
+
+        String allFlags = "";
+        if (flags.length > 0) {
+            StringBuilder flagList = new StringBuilder();
+            for (int i = 0, count = flags.length; i < count; i++) {
+                String flag = flags[i];
+                if (flag == Flag.SEEN) {
+                    flagList.append(" " + ImapConstants.FLAG_SEEN);
+                } else if (flag == Flag.DELETED) {
+                    flagList.append(" " + ImapConstants.FLAG_DELETED);
+                } else if (flag == Flag.FLAGGED) {
+                    flagList.append(" " + ImapConstants.FLAG_FLAGGED);
+                } else if (flag == Flag.ANSWERED) {
+                    flagList.append(" " + ImapConstants.FLAG_ANSWERED);
+                }
+            }
+            allFlags = flagList.substring(1);
+        }
+        try {
+            mConnection.executeSimpleCommand(String.format(Locale.US,
+                    ImapConstants.UID_STORE + " %s %s" + ImapConstants.FLAGS_SILENT + " (%s)",
+                    ImapStore.joinMessageUids(messages),
+                    value ? "+" : "-",
+                    allFlags));
+
+        } catch (IOException ioe) {
+            throw ioExceptionHandler(mConnection, ioe);
+        } finally {
+            destroyResponses();
+        }
+    }
+
+    /**
+     * Selects the folder for use. Before performing any operations on this folder, it
+     * must be selected.
+     */
+    private void doSelect() throws IOException, MessagingException {
+        final List<ImapResponse> responses = mConnection.executeSimpleCommand(
+                String.format(Locale.US, ImapConstants.SELECT + " \"%s\"", mName));
+
+        // Assume the folder is opened read-write; unless we are notified otherwise
+        mMode = MODE_READ_WRITE;
+        int messageCount = -1;
+        for (ImapResponse response : responses) {
+            if (response.isDataResponse(1, ImapConstants.EXISTS)) {
+                messageCount = response.getStringOrEmpty(0).getNumberOrZero();
+            } else if (response.isOk()) {
+                final ImapString responseCode = response.getResponseCodeOrEmpty();
+                if (responseCode.is(ImapConstants.READ_ONLY)) {
+                    mMode = MODE_READ_ONLY;
+                } else if (responseCode.is(ImapConstants.READ_WRITE)) {
+                    mMode = MODE_READ_WRITE;
+                }
+            } else if (response.isTagged()) { // Not OK
+                throw new MessagingException("Can't open mailbox: "
+                        + response.getStatusResponseTextOrEmpty());
+            }
+        }
+        if (messageCount == -1) {
+            throw new MessagingException("Did not find message count during select");
+        }
+        mMessageCount = messageCount;
+        mExists = true;
+    }
+
+    private void checkOpen() throws MessagingException {
+        if (!isOpen()) {
+            throw new MessagingException("Folder " + mName + " is not open.");
+        }
+    }
+
+    private MessagingException ioExceptionHandler(ImapConnection connection, IOException ioe) {
+        LogUtils.d(TAG, "IO Exception detected: ", ioe);
+        connection.close();
+        if (connection == mConnection) {
+            mConnection = null; // To prevent close() from returning the connection to the pool.
+            close(false);
+        }
+        return new MessagingException(MessagingException.IOERROR, "IO Error", ioe);
+    }
+
+    public Message createMessage(String uid) {
+        return new ImapMessage(uid, this);
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/phone/common/mail/store/ImapStore.java b/src/com/android/phone/common/mail/store/ImapStore.java
new file mode 100644
index 0000000..1c91e76
--- /dev/null
+++ b/src/com/android/phone/common/mail/store/ImapStore.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.phone.common.mail.store;
+
+import android.content.Context;
+
+import com.android.phone.common.mail.internet.MimeMessage;
+import com.android.phone.common.mail.MailTransport;
+import com.android.phone.common.mail.Message;
+import com.android.phone.common.mail.MessagingException;
+import com.android.phone.common.mail.store.ImapFolder;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+public class ImapStore {
+    /**
+     * A global suggestion to Store implementors on how much of the body
+     * should be returned on FetchProfile.Item.BODY_SANE requests. We'll use 125k now.
+     */
+    public static final int FETCH_BODY_SANE_SUGGESTED_SIZE = (125 * 1024);
+    private Context mContext;
+    private String mUsername;
+    private String mPassword;
+    private MailTransport mTransport;
+    private ImapConnection mConnection;
+
+    public static final int FLAG_NONE         = 0x00;    // No flags
+    public static final int FLAG_SSL          = 0x01;    // Use SSL
+    public static final int FLAG_TLS          = 0x02;    // Use TLS
+    public static final int FLAG_AUTHENTICATE = 0x04;    // Use name/password for authentication
+    public static final int FLAG_TRUST_ALL    = 0x08;    // Trust all certificates
+    public static final int FLAG_OAUTH        = 0x10;    // Use OAuth for authentication
+
+    /**
+     * Contains all the information necessary to log into an imap server
+     */
+    public ImapStore(Context context, String username, String password, int port,
+            String serverName, int flags) {
+        mContext = context;
+        mUsername = username;
+        mPassword = password;
+        mTransport = new MailTransport(context, serverName, port, flags);
+    }
+
+    public Context getContext() {
+        return mContext;
+    }
+
+    public String getUsername() {
+        return mUsername;
+    }
+
+    public String getPassword() {
+        return mPassword;
+    }
+
+    /** Returns a clone of the transport associated with this store. */
+    MailTransport cloneTransport() {
+        return mTransport.clone();
+    }
+
+    /**
+     * Returns UIDs of Messages joined with "," as the separator.
+     */
+    static String joinMessageUids(Message[] messages) {
+        StringBuilder sb = new StringBuilder();
+        boolean notFirst = false;
+        for (Message m : messages) {
+            if (notFirst) {
+                sb.append(',');
+            }
+            sb.append(m.getUid());
+            notFirst = true;
+        }
+        return sb.toString();
+    }
+
+    static class ImapMessage extends MimeMessage {
+        private ImapFolder mFolder;
+
+        ImapMessage(String uid, ImapFolder folder) {
+            mUid = uid;
+            mFolder = folder;
+        }
+
+        public void setSize(int size) {
+            mSize = size;
+        }
+
+        @Override
+        public void parse(InputStream in) throws IOException, MessagingException {
+            super.parse(in);
+        }
+
+        public void setFlagInternal(String flag, boolean set) throws MessagingException {
+            super.setFlag(flag, set);
+        }
+
+        @Override
+        public void setFlag(String flag, boolean set) throws MessagingException {
+            super.setFlag(flag, set);
+            mFolder.setFlags(new Message[] { this }, new String[] { flag }, set);
+        }
+    }
+
+    static class ImapException extends MessagingException {
+        private static final long serialVersionUID = 1L;
+
+        private final String mStatus;
+        private final String mAlertText;
+        private final String mResponseCode;
+
+        public ImapException(String message, String status, String alertText,
+                String responseCode) {
+            super(message);
+            mStatus = status;
+            mAlertText = alertText;
+            mResponseCode = responseCode;
+        }
+
+        public String getStatus() {
+            return mStatus;
+        }
+
+        public String getAlertText() {
+            return mAlertText;
+        }
+
+        public String getResponseCode() {
+            return mResponseCode;
+        }
+    }
+
+    public void closeConnection() {
+        if (mConnection != null) {
+            mConnection.close();
+            mConnection = null;
+        }
+    }
+
+    public ImapConnection getConnection() {
+        if (mConnection == null) {
+            mConnection = new ImapConnection(this);
+        }
+        return mConnection;
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/phone/common/mail/store/imap/ImapConstants.java b/src/com/android/phone/common/mail/store/imap/ImapConstants.java
new file mode 100644
index 0000000..cde1616
--- /dev/null
+++ b/src/com/android/phone/common/mail/store/imap/ImapConstants.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.phone.common.mail.store.imap;
+
+import com.android.phone.common.mail.store.ImapStore;
+
+import java.util.Locale;
+
+public final class ImapConstants {
+    private ImapConstants() {}
+
+    public static final String FETCH_FIELD_BODY_PEEK_BARE = "BODY.PEEK";
+    public static final String FETCH_FIELD_BODY_PEEK = FETCH_FIELD_BODY_PEEK_BARE + "[]";
+    public static final String FETCH_FIELD_BODY_PEEK_SANE = String.format(
+            Locale.US, "BODY.PEEK[]<0.%d>", ImapStore.FETCH_BODY_SANE_SUGGESTED_SIZE);
+    public static final String FETCH_FIELD_HEADERS =
+            "BODY.PEEK[HEADER.FIELDS (date subject from content-type to cc message-id)]";
+
+    public static final String ALERT = "ALERT";
+    public static final String APPEND = "APPEND";
+    public static final String AUTHENTICATE = "AUTHENTICATE";
+    public static final String BAD = "BAD";
+    public static final String BADCHARSET = "BADCHARSET";
+    public static final String BODY = "BODY";
+    public static final String BODY_BRACKET_HEADER = "BODY[HEADER";
+    public static final String BODYSTRUCTURE = "BODYSTRUCTURE";
+    public static final String BYE = "BYE";
+    public static final String CAPABILITY = "CAPABILITY";
+    public static final String CHECK = "CHECK";
+    public static final String CLOSE = "CLOSE";
+    public static final String COPY = "COPY";
+    public static final String COPYUID = "COPYUID";
+    public static final String CREATE = "CREATE";
+    public static final String DELETE = "DELETE";
+    public static final String EXAMINE = "EXAMINE";
+    public static final String EXISTS = "EXISTS";
+    public static final String EXPUNGE = "EXPUNGE";
+    public static final String FETCH = "FETCH";
+    public static final String FLAG_ANSWERED = "\\ANSWERED";
+    public static final String FLAG_DELETED = "\\DELETED";
+    public static final String FLAG_FLAGGED = "\\FLAGGED";
+    public static final String FLAG_NO_SELECT = "\\NOSELECT";
+    public static final String FLAG_SEEN = "\\SEEN";
+    public static final String FLAGS = "FLAGS";
+    public static final String FLAGS_SILENT = "FLAGS.SILENT";
+    public static final String ID = "ID";
+    public static final String INBOX = "INBOX";
+    public static final String INTERNALDATE = "INTERNALDATE";
+    public static final String LIST = "LIST";
+    public static final String LOGIN = "LOGIN";
+    public static final String LOGOUT = "LOGOUT";
+    public static final String LSUB = "LSUB";
+    public static final String NAMESPACE = "NAMESPACE";
+    public static final String NO = "NO";
+    public static final String NOOP = "NOOP";
+    public static final String OK = "OK";
+    public static final String PARSE = "PARSE";
+    public static final String PERMANENTFLAGS = "PERMANENTFLAGS";
+    public static final String PREAUTH = "PREAUTH";
+    public static final String READ_ONLY = "READ-ONLY";
+    public static final String READ_WRITE = "READ-WRITE";
+    public static final String RENAME = "RENAME";
+    public static final String RFC822_SIZE = "RFC822.SIZE";
+    public static final String SEARCH = "SEARCH";
+    public static final String SELECT = "SELECT";
+    public static final String STARTTLS = "STARTTLS";
+    public static final String STATUS = "STATUS";
+    public static final String STORE = "STORE";
+    public static final String SUBSCRIBE = "SUBSCRIBE";
+    public static final String TEXT = "TEXT";
+    public static final String TRYCREATE = "TRYCREATE";
+    public static final String UID = "UID";
+    public static final String UID_COPY = "UID COPY";
+    public static final String UID_FETCH = "UID FETCH";
+    public static final String UID_SEARCH = "UID SEARCH";
+    public static final String UID_STORE = "UID STORE";
+    public static final String UIDNEXT = "UIDNEXT";
+    public static final String UIDPLUS = "UIDPLUS";
+    public static final String UIDVALIDITY = "UIDVALIDITY";
+    public static final String UNSEEN = "UNSEEN";
+    public static final String UNSUBSCRIBE = "UNSUBSCRIBE";
+    public static final String XOAUTH2 = "XOAUTH2";
+    public static final String APPENDUID = "APPENDUID";
+    public static final String NIL = "NIL";
+
+    /** response codes within IMAP responses */
+    public static final String EXPIRED = "EXPIRED";
+    public static final String AUTHENTICATIONFAILED = "AUTHENTICATIONFAILED";
+    public static final String UNAVAILABLE = "UNAVAILABLE";
+}
\ No newline at end of file
diff --git a/src/com/android/phone/common/mail/store/imap/ImapElement.java b/src/com/android/phone/common/mail/store/imap/ImapElement.java
new file mode 100644
index 0000000..2d1824e
--- /dev/null
+++ b/src/com/android/phone/common/mail/store/imap/ImapElement.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.phone.common.mail.store.imap;
+
+/**
+ * Class representing "element"s in IMAP responses.
+ *
+ * <p>Class hierarchy:
+ * <pre>
+ * ImapElement
+ *   |
+ *   |-- ImapElement.NONE (for 'index out of range')
+ *   |
+ *   |-- ImapList (isList() == true)
+ *   |   |
+ *   |   |-- ImapList.EMPTY
+ *   |   |
+ *   |   --- ImapResponse
+ *   |
+ *   --- ImapString (isString() == true)
+ *       |
+ *       |-- ImapString.EMPTY
+ *       |
+ *       |-- ImapSimpleString
+ *       |
+ *       |-- ImapMemoryLiteral
+ *       |
+ *       --- ImapTempFileLiteral
+ * </pre>
+ */
+public abstract class ImapElement {
+    /**
+     * An element that is returned by {@link ImapList#getElementOrNone} to indicate an index
+     * is out of range.
+     */
+    public static final ImapElement NONE = new ImapElement() {
+        @Override public void destroy() {
+            // Don't call super.destroy().
+            // It's a shared object.  We don't want the mDestroyed to be set on this.
+        }
+
+        @Override public boolean isList() {
+            return false;
+        }
+
+        @Override public boolean isString() {
+            return false;
+        }
+
+        @Override public String toString() {
+            return "[NO ELEMENT]";
+        }
+
+        @Override
+        public boolean equalsForTest(ImapElement that) {
+            return super.equalsForTest(that);
+        }
+    };
+
+    private boolean mDestroyed = false;
+
+    public abstract boolean isList();
+
+    public abstract boolean isString();
+
+    protected boolean isDestroyed() {
+        return mDestroyed;
+    }
+
+    /**
+     * Clean up the resources used by the instance.
+     * It's for removing a temp file used by {@link ImapTempFileLiteral}.
+     */
+    public void destroy() {
+        mDestroyed = true;
+    }
+
+    /**
+     * Throws {@link RuntimeException} if it's already destroyed.
+     */
+    protected final void checkNotDestroyed() {
+        if (mDestroyed) {
+            throw new RuntimeException("Already destroyed");
+        }
+    }
+
+    /**
+     * Return a string that represents this object; it's purely for the debug purpose.  Don't
+     * mistake it for {@link ImapString#getString}.
+     *
+     * Abstract to force subclasses to implement it.
+     */
+    @Override
+    public abstract String toString();
+
+    /**
+     * The equals implementation that is intended to be used only for unit testing.
+     * (Because it may be heavy and has a special sense of "equal" for testing.)
+     */
+    public boolean equalsForTest(ImapElement that) {
+        if (that == null) {
+            return false;
+        }
+        return this.getClass() == that.getClass(); // Has to be the same class.
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/phone/common/mail/store/imap/ImapList.java b/src/com/android/phone/common/mail/store/imap/ImapList.java
new file mode 100644
index 0000000..93adc4f
--- /dev/null
+++ b/src/com/android/phone/common/mail/store/imap/ImapList.java
@@ -0,0 +1,235 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.phone.common.mail.store.imap;
+
+import java.util.ArrayList;
+
+/**
+ * Class represents an IMAP list.
+ */
+public class ImapList extends ImapElement {
+    /**
+     * {@link ImapList} representing an empty list.
+     */
+    public static final ImapList EMPTY = new ImapList() {
+        @Override public void destroy() {
+            // Don't call super.destroy().
+            // It's a shared object.  We don't want the mDestroyed to be set on this.
+        }
+
+        @Override void add(ImapElement e) {
+            throw new RuntimeException();
+        }
+    };
+
+    private ArrayList<ImapElement> mList = new ArrayList<ImapElement>();
+
+    /* package */ void add(ImapElement e) {
+        if (e == null) {
+            throw new RuntimeException("Can't add null");
+        }
+        mList.add(e);
+    }
+
+    @Override
+    public final boolean isString() {
+        return false;
+    }
+
+    @Override
+    public final boolean isList() {
+        return true;
+    }
+
+    public final int size() {
+        return mList.size();
+    }
+
+    public final boolean isEmpty() {
+        return size() == 0;
+    }
+
+    /**
+     * Return true if the element at {@code index} exists, is string, and equals to {@code s}.
+     * (case insensitive)
+     */
+    public final boolean is(int index, String s) {
+        return is(index, s, false);
+    }
+
+    /**
+     * Same as {@link #is(int, String)}, but does the prefix match if {@code prefixMatch}.
+     */
+    public final boolean is(int index, String s, boolean prefixMatch) {
+        if (!prefixMatch) {
+            return getStringOrEmpty(index).is(s);
+        } else {
+            return getStringOrEmpty(index).startsWith(s);
+        }
+    }
+
+    /**
+     * Return the element at {@code index}.
+     * If {@code index} is out of range, returns {@link ImapElement#NONE}.
+     */
+    public final ImapElement getElementOrNone(int index) {
+        return (index >= mList.size()) ? ImapElement.NONE : mList.get(index);
+    }
+
+    /**
+     * Return the element at {@code index} if it's a list.
+     * If {@code index} is out of range or not a list, returns {@link ImapList#EMPTY}.
+     */
+    public final ImapList getListOrEmpty(int index) {
+        ImapElement el = getElementOrNone(index);
+        return el.isList() ? (ImapList) el : EMPTY;
+    }
+
+    /**
+     * Return the element at {@code index} if it's a string.
+     * If {@code index} is out of range or not a string, returns {@link ImapString#EMPTY}.
+     */
+    public final ImapString getStringOrEmpty(int index) {
+        ImapElement el = getElementOrNone(index);
+        return el.isString() ? (ImapString) el : ImapString.EMPTY;
+    }
+
+    /**
+     * Return an element keyed by {@code key}.  Return null if not found.  {@code key} has to be
+     * at an even index.
+     */
+    /* package */ final ImapElement getKeyedElementOrNull(String key, boolean prefixMatch) {
+        for (int i = 1; i < size(); i += 2) {
+            if (is(i-1, key, prefixMatch)) {
+                return mList.get(i);
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Return an {@link ImapList} keyed by {@code key}.
+     * Return {@link ImapList#EMPTY} if not found.
+     */
+    public final ImapList getKeyedListOrEmpty(String key) {
+        return getKeyedListOrEmpty(key, false);
+    }
+
+    /**
+     * Return an {@link ImapList} keyed by {@code key}.
+     * Return {@link ImapList#EMPTY} if not found.
+     */
+    public final ImapList getKeyedListOrEmpty(String key, boolean prefixMatch) {
+        ImapElement e = getKeyedElementOrNull(key, prefixMatch);
+        return (e != null) ? ((ImapList) e) : ImapList.EMPTY;
+    }
+
+    /**
+     * Return an {@link ImapString} keyed by {@code key}.
+     * Return {@link ImapString#EMPTY} if not found.
+     */
+    public final ImapString getKeyedStringOrEmpty(String key) {
+        return getKeyedStringOrEmpty(key, false);
+    }
+
+    /**
+     * Return an {@link ImapString} keyed by {@code key}.
+     * Return {@link ImapString#EMPTY} if not found.
+     */
+    public final ImapString getKeyedStringOrEmpty(String key, boolean prefixMatch) {
+        ImapElement e = getKeyedElementOrNull(key, prefixMatch);
+        return (e != null) ? ((ImapString) e) : ImapString.EMPTY;
+    }
+
+    /**
+     * Return true if it contains {@code s}.
+     */
+    public final boolean contains(String s) {
+        for (int i = 0; i < size(); i++) {
+            if (getStringOrEmpty(i).is(s)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public void destroy() {
+        if (mList != null) {
+            for (ImapElement e : mList) {
+                e.destroy();
+            }
+            mList = null;
+        }
+        super.destroy();
+    }
+
+    @Override
+    public String toString() {
+        return mList.toString();
+    }
+
+    /**
+     * Return the text representations of the contents concatenated with ",".
+     */
+    public final String flatten() {
+        return flatten(new StringBuilder()).toString();
+    }
+
+    /**
+     * Returns text representations (i.e. getString()) of contents joined together with
+     * "," as the separator.
+     *
+     * Only used for building the capability string passed to vendor policies.
+     *
+     * We can't use toString(), because it's for debugging (meaning the format may change any time),
+     * and it won't expand literals.
+     */
+    private final StringBuilder flatten(StringBuilder sb) {
+        sb.append('[');
+        for (int i = 0; i < mList.size(); i++) {
+            if (i > 0) {
+                sb.append(',');
+            }
+            final ImapElement e = getElementOrNone(i);
+            if (e.isList()) {
+                getListOrEmpty(i).flatten(sb);
+            } else if (e.isString()) {
+                sb.append(getStringOrEmpty(i).getString());
+            }
+        }
+        sb.append(']');
+        return sb;
+    }
+
+    @Override
+    public boolean equalsForTest(ImapElement that) {
+        if (!super.equalsForTest(that)) {
+            return false;
+        }
+        ImapList thatList = (ImapList) that;
+        if (size() != thatList.size()) {
+            return false;
+        }
+        for (int i = 0; i < size(); i++) {
+            if (!mList.get(i).equalsForTest(thatList.getElementOrNone(i))) {
+                return false;
+            }
+        }
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/phone/common/mail/store/imap/ImapMemoryLiteral.java b/src/com/android/phone/common/mail/store/imap/ImapMemoryLiteral.java
new file mode 100644
index 0000000..aac66c2
--- /dev/null
+++ b/src/com/android/phone/common/mail/store/imap/ImapMemoryLiteral.java
@@ -0,0 +1,77 @@
+/*
+ * 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.common.mail.store.imap;
+
+import android.util.Log;
+
+import com.android.phone.common.mail.FixedLengthInputStream;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+
+/**
+ * Subclass of {@link ImapString} used for literals backed by an in-memory byte array.
+ */
+public class ImapMemoryLiteral extends ImapString {
+    private final String TAG = "ImapMemoryLiteral";
+    private byte[] mData;
+
+    /* package */ ImapMemoryLiteral(FixedLengthInputStream in) throws IOException {
+        // We could use ByteArrayOutputStream and IOUtils.copy, but it'd perform an unnecessary
+        // copy....
+        mData = new byte[in.getLength()];
+        int pos = 0;
+        while (pos < mData.length) {
+            int read = in.read(mData, pos, mData.length - pos);
+            if (read < 0) {
+                break;
+            }
+            pos += read;
+        }
+        if (pos != mData.length) {
+            Log.w(TAG, "");
+        }
+    }
+
+    @Override
+    public void destroy() {
+        mData = null;
+        super.destroy();
+    }
+
+    @Override
+    public String getString() {
+        try {
+            return new String(mData, "US-ASCII");
+        } catch (UnsupportedEncodingException e) {
+            Log.e(TAG, "Unsupported encoding: ", e);
+        }
+        return null;
+    }
+
+    @Override
+    public InputStream getAsStream() {
+        return new ByteArrayInputStream(mData);
+    }
+
+    @Override
+    public String toString() {
+        return String.format("{%d byte literal(memory)}", mData.length);
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/phone/common/mail/store/imap/ImapResponse.java b/src/com/android/phone/common/mail/store/imap/ImapResponse.java
new file mode 100644
index 0000000..4891966
--- /dev/null
+++ b/src/com/android/phone/common/mail/store/imap/ImapResponse.java
@@ -0,0 +1,158 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.phone.common.mail.store.imap;
+
+/**
+ * Class represents an IMAP response.
+ */
+public class ImapResponse extends ImapList {
+    private final String mTag;
+    private final boolean mIsContinuationRequest;
+
+    /* package */ ImapResponse(String tag, boolean isContinuationRequest) {
+        mTag = tag;
+        mIsContinuationRequest = isContinuationRequest;
+    }
+
+    /* package */ static boolean isStatusResponse(String symbol) {
+        return     ImapConstants.OK.equalsIgnoreCase(symbol)
+                || ImapConstants.NO.equalsIgnoreCase(symbol)
+                || ImapConstants.BAD.equalsIgnoreCase(symbol)
+                || ImapConstants.PREAUTH.equalsIgnoreCase(symbol)
+                || ImapConstants.BYE.equalsIgnoreCase(symbol);
+    }
+
+    /**
+     * @return whether it's a tagged response.
+     */
+    public boolean isTagged() {
+        return mTag != null;
+    }
+
+    /**
+     * @return whether it's a continuation request.
+     */
+    public boolean isContinuationRequest() {
+        return mIsContinuationRequest;
+    }
+
+    public boolean isStatusResponse() {
+        return isStatusResponse(getStringOrEmpty(0).getString());
+    }
+
+    /**
+     * @return whether it's an OK response.
+     */
+    public boolean isOk() {
+        return is(0, ImapConstants.OK);
+    }
+
+    /**
+     * @return whether it's an BAD response.
+     */
+    public boolean isBad() {
+        return is(0, ImapConstants.BAD);
+    }
+
+    /**
+     * @return whether it's an NO response.
+     */
+    public boolean isNo() {
+        return is(0, ImapConstants.NO);
+    }
+
+    /**
+     * @return whether it's an {@code responseType} data response.  (i.e. not tagged).
+     * @param index where {@code responseType} should appear.  e.g. 1 for "FETCH"
+     * @param responseType e.g. "FETCH"
+     */
+    public final boolean isDataResponse(int index, String responseType) {
+        return !isTagged() && getStringOrEmpty(index).is(responseType);
+    }
+
+    /**
+     * @return Response code (RFC 3501 7.1) if it's a status response.
+     *
+     * e.g. "ALERT" for "* OK [ALERT] System shutdown in 10 minutes"
+     */
+    public ImapString getResponseCodeOrEmpty() {
+        if (!isStatusResponse()) {
+            return ImapString.EMPTY; // Not a status response.
+        }
+        return getListOrEmpty(1).getStringOrEmpty(0);
+    }
+
+    /**
+     * @return Alert message it it has ALERT response code.
+     *
+     * e.g. "System shutdown in 10 minutes" for "* OK [ALERT] System shutdown in 10 minutes"
+     */
+    public ImapString getAlertTextOrEmpty() {
+        if (!getResponseCodeOrEmpty().is(ImapConstants.ALERT)) {
+            return ImapString.EMPTY; // Not an ALERT
+        }
+        // The 3rd element contains all the rest of line.
+        return getStringOrEmpty(2);
+    }
+
+    /**
+     * @return Response text in a status response.
+     */
+    public ImapString getStatusResponseTextOrEmpty() {
+        if (!isStatusResponse()) {
+            return ImapString.EMPTY;
+        }
+        return getStringOrEmpty(getElementOrNone(1).isList() ? 2 : 1);
+    }
+
+    public ImapString getStatusOrEmpty() {
+        if (!isStatusResponse()) {
+            return ImapString.EMPTY;
+        }
+        return getStringOrEmpty(0);
+    }
+
+    @Override
+    public String toString() {
+        String tag = mTag;
+        if (isContinuationRequest()) {
+            tag = "+";
+        }
+        return "#" + tag + "# " + super.toString();
+    }
+
+    @Override
+    public boolean equalsForTest(ImapElement that) {
+        if (!super.equalsForTest(that)) {
+            return false;
+        }
+        final ImapResponse thatResponse = (ImapResponse) that;
+        if (mTag == null) {
+            if (thatResponse.mTag != null) {
+                return false;
+            }
+        } else {
+            if (!mTag.equals(thatResponse.mTag)) {
+                return false;
+            }
+        }
+        if (mIsContinuationRequest != thatResponse.mIsContinuationRequest) {
+            return false;
+        }
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/phone/common/mail/store/imap/ImapResponseParser.java b/src/com/android/phone/common/mail/store/imap/ImapResponseParser.java
new file mode 100644
index 0000000..d0413df
--- /dev/null
+++ b/src/com/android/phone/common/mail/store/imap/ImapResponseParser.java
@@ -0,0 +1,434 @@
+/*
+ * 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.common.mail.store.imap;
+
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.android.phone.common.mail.FixedLengthInputStream;
+import com.android.phone.common.mail.MessagingException;
+import com.android.phone.common.mail.PeekableInputStream;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+
+/**
+ * IMAP response parser.
+ */
+public class ImapResponseParser {
+    private static final String TAG = "ImapResponseParser";
+
+    /**
+     * Literal larger than this will be stored in temp file.
+     */
+    public static final int LITERAL_KEEP_IN_MEMORY_THRESHOLD = 2 * 1024 * 1024;
+
+    /** Input stream */
+    private final PeekableInputStream mIn;
+
+    private final int mLiteralKeepInMemoryThreshold;
+
+    /** StringBuilder used by readUntil() */
+    private final StringBuilder mBufferReadUntil = new StringBuilder();
+
+    /** StringBuilder used by parseBareString() */
+    private final StringBuilder mParseBareString = new StringBuilder();
+
+    /**
+     * We store all {@link ImapResponse} in it.  {@link #destroyResponses()} must be called from
+     * time to time to destroy them and clear it.
+     */
+    private final ArrayList<ImapResponse> mResponsesToDestroy = new ArrayList<ImapResponse>();
+
+    /**
+     * Exception thrown when we receive BYE.  It derives from IOException, so it'll be treated
+     * in the same way EOF does.
+     */
+    public static class ByeException extends IOException {
+        public static final String MESSAGE = "Received BYE";
+        public ByeException() {
+            super(MESSAGE);
+        }
+    }
+
+    /**
+     * Public constructor for normal use.
+     */
+    public ImapResponseParser(InputStream in) {
+        this(in, LITERAL_KEEP_IN_MEMORY_THRESHOLD);
+    }
+
+    /**
+     * Constructor for testing to override the literal size threshold.
+     */
+    /* package for test */ ImapResponseParser(InputStream in, int literalKeepInMemoryThreshold) {
+        mIn = new PeekableInputStream(in);
+        mLiteralKeepInMemoryThreshold = literalKeepInMemoryThreshold;
+    }
+
+    private static IOException newEOSException() {
+        final String message = "End of stream reached";
+        if (Log.isLoggable(TAG, Log.DEBUG)) {
+            Log.d(TAG, message);
+        }
+        return new IOException(message);
+    }
+
+    /**
+     * Peek next one byte.
+     *
+     * Throws IOException() if reaches EOF.  As long as logical response lines end with \r\n,
+     * we shouldn't see EOF during parsing.
+     */
+    private int peek() throws IOException {
+        final int next = mIn.peek();
+        if (next == -1) {
+            throw newEOSException();
+        }
+        return next;
+    }
+
+    /**
+     * Read and return one byte from {@link #mIn}, and put it in {@link #mDiscourseLogger}.
+     *
+     * Throws IOException() if reaches EOF.  As long as logical response lines end with \r\n,
+     * we shouldn't see EOF during parsing.
+     */
+    private int readByte() throws IOException {
+        int next = mIn.read();
+        if (next == -1) {
+            throw newEOSException();
+        }
+        return next;
+    }
+
+    /**
+     * Destroy all the {@link ImapResponse}s stored in the internal storage and clear it.
+     *
+     * @see #readResponse()
+     */
+    public void destroyResponses() {
+        for (ImapResponse r : mResponsesToDestroy) {
+            r.destroy();
+        }
+        mResponsesToDestroy.clear();
+    }
+
+    /**
+     * Reads the next response available on the stream and returns an
+     * {@link ImapResponse} object that represents it.
+     *
+     * <p>When this method successfully returns an {@link ImapResponse}, the {@link ImapResponse}
+     * is stored in the internal storage.  When the {@link ImapResponse} is no longer used
+     * {@link #destroyResponses} should be called to destroy all the responses in the array.
+     *
+     * @return the parsed {@link ImapResponse} object.
+     * @exception ByeException when detects BYE.
+     */
+    public ImapResponse readResponse() throws IOException, MessagingException {
+        ImapResponse response = null;
+        try {
+            response = parseResponse();
+            if (Log.isLoggable(TAG, Log.DEBUG)) {
+                Log.d(TAG, "<<< " + response.toString());
+            }
+        } catch (RuntimeException e) {
+            // Parser crash -- log network activities.
+            onParseError(e);
+            throw e;
+        } catch (IOException e) {
+            // Network error, or received an unexpected char.
+            onParseError(e);
+            throw e;
+        }
+
+        // Handle this outside of try-catch.  We don't have to dump protocol log when getting BYE.
+        if (response.is(0, ImapConstants.BYE)) {
+            Log.w(TAG, ByeException.MESSAGE);
+            response.destroy();
+            throw new ByeException();
+        }
+        mResponsesToDestroy.add(response);
+        return response;
+    }
+
+    private void onParseError(Exception e) {
+        // Read a few more bytes, so that the log will contain some more context, even if the parser
+        // crashes in the middle of a response.
+        // This also makes sure the byte in question will be logged, no matter where it crashes.
+        // e.g. when parseAtom() peeks and finds at an unexpected char, it throws an exception
+        // before actually reading it.
+        // However, we don't want to read too much, because then it may get into an email message.
+        try {
+            for (int i = 0; i < 4; i++) {
+                int b = readByte();
+                if (b == -1 || b == '\n') {
+                    break;
+                }
+            }
+        } catch (IOException ignore) {
+        }
+        Log.w(TAG, "Exception detected: " + e.getMessage());
+    }
+
+    /**
+     * Read next byte from stream and throw it away.  If the byte is different from {@code expected}
+     * throw {@link MessagingException}.
+     */
+    /* package for test */ void expect(char expected) throws IOException {
+        final int next = readByte();
+        if (expected != next) {
+            throw new IOException(String.format("Expected %04x (%c) but got %04x (%c)",
+                    (int) expected, expected, next, (char) next));
+        }
+    }
+
+    /**
+     * Read bytes until we find {@code end}, and return all as string.
+     * The {@code end} will be read (rather than peeked) and won't be included in the result.
+     */
+    /* package for test */ String readUntil(char end) throws IOException {
+        mBufferReadUntil.setLength(0);
+        for (;;) {
+            final int ch = readByte();
+            if (ch != end) {
+                mBufferReadUntil.append((char) ch);
+            } else {
+                return mBufferReadUntil.toString();
+            }
+        }
+    }
+
+    /**
+     * Read all bytes until \r\n.
+     */
+    /* package */ String readUntilEol() throws IOException {
+        String ret = readUntil('\r');
+        expect('\n'); // TODO Should this really be error?
+        return ret;
+    }
+
+    /**
+     * Parse and return the response line.
+     */
+    private ImapResponse parseResponse() throws IOException, MessagingException {
+        // We need to destroy the response if we get an exception.
+        // So, we first store the response that's being built in responseToDestroy, until it's
+        // completely built, at which point we copy it into responseToReturn and null out
+        // responseToDestroyt.
+        // If responseToDestroy is not null in finally, we destroy it because that means
+        // we got an exception somewhere.
+        ImapResponse responseToDestroy = null;
+        final ImapResponse responseToReturn;
+
+        try {
+            final int ch = peek();
+            if (ch == '+') { // Continuation request
+                readByte(); // skip +
+                expect(' ');
+                responseToDestroy = new ImapResponse(null, true);
+
+                // If it's continuation request, we don't really care what's in it.
+                responseToDestroy.add(new ImapSimpleString(readUntilEol()));
+
+                // Response has successfully been built.  Let's return it.
+                responseToReturn = responseToDestroy;
+                responseToDestroy = null;
+            } else {
+                // Status response or response data
+                final String tag;
+                if (ch == '*') {
+                    tag = null;
+                    readByte(); // skip *
+                    expect(' ');
+                } else {
+                    tag = readUntil(' ');
+                }
+                responseToDestroy = new ImapResponse(tag, false);
+
+                final ImapString firstString = parseBareString();
+                responseToDestroy.add(firstString);
+
+                // parseBareString won't eat a space after the string, so we need to skip it,
+                // if exists.
+                // If the next char is not ' ', it should be EOL.
+                if (peek() == ' ') {
+                    readByte(); // skip ' '
+
+                    if (responseToDestroy.isStatusResponse()) { // It's a status response
+
+                        // Is there a response code?
+                        final int next = peek();
+                        if (next == '[') {
+                            responseToDestroy.add(parseList('[', ']'));
+                            if (peek() == ' ') { // Skip following space
+                                readByte();
+                            }
+                        }
+
+                        String rest = readUntilEol();
+                        if (!TextUtils.isEmpty(rest)) {
+                            // The rest is free-form text.
+                            responseToDestroy.add(new ImapSimpleString(rest));
+                        }
+                    } else { // It's a response data.
+                        parseElements(responseToDestroy, '\0');
+                    }
+                } else {
+                    expect('\r');
+                    expect('\n');
+                }
+
+                // Response has successfully been built.  Let's return it.
+                responseToReturn = responseToDestroy;
+                responseToDestroy = null;
+            }
+        } finally {
+            if (responseToDestroy != null) {
+                // We get an exception.
+                responseToDestroy.destroy();
+            }
+        }
+
+        return responseToReturn;
+    }
+
+    private ImapElement parseElement() throws IOException, MessagingException {
+        final int next = peek();
+        switch (next) {
+            case '(':
+                return parseList('(', ')');
+            case '[':
+                return parseList('[', ']');
+            case '"':
+                readByte(); // Skip "
+                return new ImapSimpleString(readUntil('"'));
+            case '{':
+                return parseLiteral();
+            case '\r':  // CR
+                readByte(); // Consume \r
+                expect('\n'); // Should be followed by LF.
+                return null;
+            case '\n': // LF // There shouldn't be a bare LF, but just in case.
+                readByte(); // Consume \n
+                return null;
+            default:
+                return parseBareString();
+        }
+    }
+
+    /**
+     * Parses an atom.
+     *
+     * Special case: If an atom contains '[', everything until the next ']' will be considered
+     * a part of the atom.
+     * (e.g. "BODY[HEADER.FIELDS ("DATE" ...)]" will become a single ImapString)
+     *
+     * If the value is "NIL", returns an empty string.
+     */
+    private ImapString parseBareString() throws IOException, MessagingException {
+        mParseBareString.setLength(0);
+        for (;;) {
+            final int ch = peek();
+
+            // TODO Can we clean this up?  (This condition is from the old parser.)
+            if (ch == '(' || ch == ')' || ch == '{' || ch == ' ' ||
+                    // ']' is not part of atom (it's in resp-specials)
+                    ch == ']' ||
+                    // docs claim that flags are \ atom but atom isn't supposed to
+                    // contain
+                    // * and some flags contain *
+                    // ch == '%' || ch == '*' ||
+                    ch == '%' ||
+                    // TODO probably should not allow \ and should recognize
+                    // it as a flag instead
+                    // ch == '"' || ch == '\' ||
+                    ch == '"' || (0x00 <= ch && ch <= 0x1f) || ch == 0x7f) {
+                if (mParseBareString.length() == 0) {
+                    throw new MessagingException("Expected string, none found.");
+                }
+                String s = mParseBareString.toString();
+
+                // NIL will be always converted into the empty string.
+                if (ImapConstants.NIL.equalsIgnoreCase(s)) {
+                    return ImapString.EMPTY;
+                }
+                return new ImapSimpleString(s);
+            } else if (ch == '[') {
+                // Eat all until next ']'
+                mParseBareString.append((char) readByte());
+                mParseBareString.append(readUntil(']'));
+                mParseBareString.append(']'); // readUntil won't include the end char.
+            } else {
+                mParseBareString.append((char) readByte());
+            }
+        }
+    }
+
+    private void parseElements(ImapList list, char end)
+            throws IOException, MessagingException {
+        for (;;) {
+            for (;;) {
+                final int next = peek();
+                if (next == end) {
+                    return;
+                }
+                if (next != ' ') {
+                    break;
+                }
+                // Skip space
+                readByte();
+            }
+            final ImapElement el = parseElement();
+            if (el == null) { // EOL
+                return;
+            }
+            list.add(el);
+        }
+    }
+
+    private ImapList parseList(char opening, char closing)
+            throws IOException, MessagingException {
+        expect(opening);
+        final ImapList list = new ImapList();
+        parseElements(list, closing);
+        expect(closing);
+        return list;
+    }
+
+    private ImapString parseLiteral() throws IOException, MessagingException {
+        expect('{');
+        final int size;
+        try {
+            size = Integer.parseInt(readUntil('}'));
+        } catch (NumberFormatException nfe) {
+            throw new MessagingException("Invalid length in literal");
+        }
+        if (size < 0) {
+            throw new MessagingException("Invalid negative length in literal");
+        }
+        expect('\r');
+        expect('\n');
+        FixedLengthInputStream in = new FixedLengthInputStream(mIn, size);
+        if (size > mLiteralKeepInMemoryThreshold) {
+            return new ImapTempFileLiteral(in);
+        } else {
+            return new ImapMemoryLiteral(in);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/phone/common/mail/store/imap/ImapSimpleString.java b/src/com/android/phone/common/mail/store/imap/ImapSimpleString.java
new file mode 100644
index 0000000..3d5263b
--- /dev/null
+++ b/src/com/android/phone/common/mail/store/imap/ImapSimpleString.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.phone.common.mail.store.imap;
+
+import android.util.Log;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+
+/**
+ * Subclass of {@link ImapString} used for non literals.
+ */
+public class ImapSimpleString extends ImapString {
+    private final String TAG = "ImapSimpleString";
+    private String mString;
+
+    /* package */  ImapSimpleString(String string) {
+        mString = (string != null) ? string : "";
+    }
+
+    @Override
+    public void destroy() {
+        mString = null;
+        super.destroy();
+    }
+
+    @Override
+    public String getString() {
+        return mString;
+    }
+
+    @Override
+    public InputStream getAsStream() {
+        try {
+            return new ByteArrayInputStream(mString.getBytes("US-ASCII"));
+        } catch (UnsupportedEncodingException e) {
+            Log.e(TAG, "Unsupported encoding: ", e);
+        }
+        return null;
+    }
+
+    @Override
+    public String toString() {
+        // Purposefully not return just mString, in order to prevent using it instead of getString.
+        return "\"" + mString + "\"";
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/phone/common/mail/store/imap/ImapString.java b/src/com/android/phone/common/mail/store/imap/ImapString.java
new file mode 100644
index 0000000..f38a993
--- /dev/null
+++ b/src/com/android/phone/common/mail/store/imap/ImapString.java
@@ -0,0 +1,185 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.phone.common.mail.store.imap;
+
+import android.util.Log;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+
+/**
+ * Class represents an IMAP "element" that is not a list.
+ *
+ * An atom, quoted string, literal, are all represented by this.  Values like OK, STATUS are too.
+ * Also, this class class may contain more arbitrary value like "BODY[HEADER.FIELDS ("DATE")]".
+ * See {@link ImapResponseParser}.
+ */
+public abstract class ImapString extends ImapElement {
+    private static final byte[] EMPTY_BYTES = new byte[0];
+
+    public static final ImapString EMPTY = new ImapString() {
+        @Override public void destroy() {
+            // Don't call super.destroy().
+            // It's a shared object.  We don't want the mDestroyed to be set on this.
+        }
+
+        @Override public String getString() {
+            return "";
+        }
+
+        @Override public InputStream getAsStream() {
+            return new ByteArrayInputStream(EMPTY_BYTES);
+        }
+
+        @Override public String toString() {
+            return "";
+        }
+    };
+
+    // This is used only for parsing IMAP's FETCH ENVELOPE command, in which
+    // en_US-like date format is used like "01-Jan-2009 11:20:39 -0800", so this should be
+    // handled by Locale.US
+    private final static SimpleDateFormat DATE_TIME_FORMAT =
+            new SimpleDateFormat("dd-MMM-yyyy HH:mm:ss Z", Locale.US);
+
+    private boolean mIsInteger;
+    private int mParsedInteger;
+    private Date mParsedDate;
+
+    @Override
+    public final boolean isList() {
+        return false;
+    }
+
+    @Override
+    public final boolean isString() {
+        return true;
+    }
+
+    /**
+     * @return true if and only if the length of the string is larger than 0.
+     *
+     * Note: IMAP NIL is considered an empty string. See {@link ImapResponseParser
+     * #parseBareString}.
+     * On the other hand, a quoted/literal string with value NIL (i.e. "NIL" and {3}\r\nNIL) is
+     * treated literally.
+     */
+    public final boolean isEmpty() {
+        return getString().length() == 0;
+    }
+
+    public abstract String getString();
+
+    public abstract InputStream getAsStream();
+
+    /**
+     * @return whether it can be parsed as a number.
+     */
+    public final boolean isNumber() {
+        if (mIsInteger) {
+            return true;
+        }
+        try {
+            mParsedInteger = Integer.parseInt(getString());
+            mIsInteger = true;
+            return true;
+        } catch (NumberFormatException e) {
+            return false;
+        }
+    }
+
+    /**
+     * @return value parsed as a number.
+     */
+    public final int getNumberOrZero() {
+        if (!isNumber()) {
+            return 0;
+        }
+        return mParsedInteger;
+    }
+
+    /**
+     * @return whether it can be parsed as a date using {@link #DATE_TIME_FORMAT}.
+     */
+    public final boolean isDate() {
+        if (mParsedDate != null) {
+            return true;
+        }
+        if (isEmpty()) {
+            return false;
+        }
+        try {
+            mParsedDate = DATE_TIME_FORMAT.parse(getString());
+            return true;
+        } catch (ParseException e) {
+            Log.w("ImapString", getString() + " can't be parsed as a date.");
+            return false;
+        }
+    }
+
+    /**
+     * @return value it can be parsed as a {@link Date}, or null otherwise.
+     */
+    public final Date getDateOrNull() {
+        if (!isDate()) {
+            return null;
+        }
+        return mParsedDate;
+    }
+
+    /**
+     * @return whether the value case-insensitively equals to {@code s}.
+     */
+    public final boolean is(String s) {
+        if (s == null) {
+            return false;
+        }
+        return getString().equalsIgnoreCase(s);
+    }
+
+
+    /**
+     * @return whether the value case-insensitively starts with {@code s}.
+     */
+    public final boolean startsWith(String prefix) {
+        if (prefix == null) {
+            return false;
+        }
+        final String me = this.getString();
+        if (me.length() < prefix.length()) {
+            return false;
+        }
+        return me.substring(0, prefix.length()).equalsIgnoreCase(prefix);
+    }
+
+    // To force subclasses to implement it.
+    @Override
+    public abstract String toString();
+
+    @Override
+    public final boolean equalsForTest(ImapElement that) {
+        if (!super.equalsForTest(that)) {
+            return false;
+        }
+        ImapString thatString = (ImapString) that;
+        return getString().equals(thatString.getString());
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/phone/common/mail/store/imap/ImapTempFileLiteral.java b/src/com/android/phone/common/mail/store/imap/ImapTempFileLiteral.java
new file mode 100644
index 0000000..67d5026
--- /dev/null
+++ b/src/com/android/phone/common/mail/store/imap/ImapTempFileLiteral.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.phone.common.mail.store.imap;
+
+import com.android.phone.common.mail.FixedLengthInputStream;
+import com.android.phone.common.mail.TempDirectory;
+import com.android.phone.common.mail.utils.Utility;
+import com.android.phone.common.mail.utils.LogUtils;
+
+import org.apache.commons.io.IOUtils;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+/**
+ * Subclass of {@link ImapString} used for literals backed by a temp file.
+ */
+public class ImapTempFileLiteral extends ImapString {
+    private final String TAG = "ImapTempFileLiteral";
+
+    /* package for test */ final File mFile;
+
+    /** Size is purely for toString() */
+    private final int mSize;
+
+    /* package */  ImapTempFileLiteral(FixedLengthInputStream stream) throws IOException {
+        mSize = stream.getLength();
+        mFile = File.createTempFile("imap", ".tmp", TempDirectory.getTempDirectory());
+
+        // Unfortunately, we can't really use deleteOnExit(), because temp filenames are random
+        // so it'd simply cause a memory leak.
+        // deleteOnExit() simply adds filenames to a static list and the list will never shrink.
+        // mFile.deleteOnExit();
+        OutputStream out = new FileOutputStream(mFile);
+        IOUtils.copy(stream, out);
+        out.close();
+    }
+
+    /**
+     * Make sure we delete the temp file.
+     *
+     * We should always be calling {@link ImapResponse#destroy()}, but it's here as a last resort.
+     */
+    @Override
+    protected void finalize() throws Throwable {
+        try {
+            destroy();
+        } finally {
+            super.finalize();
+        }
+    }
+
+    @Override
+    public InputStream getAsStream() {
+        checkNotDestroyed();
+        try {
+            return new FileInputStream(mFile);
+        } catch (FileNotFoundException e) {
+            // It's probably possible if we're low on storage and the system clears the cache dir.
+            LogUtils.w(TAG, "ImapTempFileLiteral: Temp file not found");
+
+            // Return 0 byte stream as a dummy...
+            return new ByteArrayInputStream(new byte[0]);
+        }
+    }
+
+    @Override
+    public String getString() {
+        checkNotDestroyed();
+        try {
+            byte[] bytes = IOUtils.toByteArray(getAsStream());
+            // Prevent crash from OOM; we've seen this, but only rarely and not reproducibly
+            if (bytes.length > ImapResponseParser.LITERAL_KEEP_IN_MEMORY_THRESHOLD) {
+                throw new IOException();
+            }
+            return Utility.fromAscii(bytes);
+        } catch (IOException e) {
+            LogUtils.w(TAG, "ImapTempFileLiteral: Error while reading temp file", e);
+            return "";
+        }
+    }
+
+    @Override
+    public void destroy() {
+        try {
+            if (!isDestroyed() && mFile.exists()) {
+                mFile.delete();
+            }
+        } catch (RuntimeException re) {
+            // Just log and ignore.
+            LogUtils.w(TAG, "Failed to remove temp file: " + re.getMessage());
+        }
+        super.destroy();
+    }
+
+    @Override
+    public String toString() {
+        return String.format("{%d byte literal(file)}", mSize);
+    }
+
+    public boolean tempFileExistsForTest() {
+        return mFile.exists();
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/phone/common/mail/store/imap/ImapUtility.java b/src/com/android/phone/common/mail/store/imap/ImapUtility.java
new file mode 100644
index 0000000..8551d44
--- /dev/null
+++ b/src/com/android/phone/common/mail/store/imap/ImapUtility.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.phone.common.mail.store.imap;
+
+import com.android.phone.common.mail.utils.LogUtils;
+
+import java.util.ArrayList;
+
+/**
+ * Utility methods for use with IMAP.
+ */
+public class ImapUtility {
+    public static final String TAG = "ImapUtility";
+    /**
+     * Apply quoting rules per IMAP RFC,
+     * quoted          = DQUOTE *QUOTED-CHAR DQUOTE
+     * QUOTED-CHAR     = <any TEXT-CHAR except quoted-specials> / "\" quoted-specials
+     * quoted-specials = DQUOTE / "\"
+     *
+     * This is used primarily for IMAP login, but might be useful elsewhere.
+     *
+     * NOTE:  Not very efficient - you may wish to preflight this, or perhaps it should check
+     * for trouble chars before calling the replace functions.
+     *
+     * @param s The string to be quoted.
+     * @return A copy of the string, having undergone quoting as described above
+     */
+    public static String imapQuoted(String s) {
+
+        // First, quote any backslashes by replacing \ with \\
+        // regex Pattern:  \\    (Java string const = \\\\)
+        // Substitute:     \\\\  (Java string const = \\\\\\\\)
+        String result = s.replaceAll("\\\\", "\\\\\\\\");
+
+        // Then, quote any double-quotes by replacing " with \"
+        // regex Pattern:  "    (Java string const = \")
+        // Substitute:     \\"  (Java string const = \\\\\")
+        result = result.replaceAll("\"", "\\\\\"");
+
+        // return string with quotes around it
+        return "\"" + result + "\"";
+    }
+
+    /**
+     * Gets all of the values in a sequence set per RFC 3501. Any ranges are expanded into a
+     * list of individual numbers. If the set is invalid, an empty array is returned.
+     * <pre>
+     * sequence-number = nz-number / "*"
+     * sequence-range  = sequence-number ":" sequence-number
+     * sequence-set    = (sequence-number / sequence-range) *("," sequence-set)
+     * </pre>
+     */
+    public static String[] getImapSequenceValues(String set) {
+        ArrayList<String> list = new ArrayList<String>();
+        if (set != null) {
+            String[] setItems = set.split(",");
+            for (String item : setItems) {
+                if (item.indexOf(':') == -1) {
+                    // simple item
+                    try {
+                        Integer.parseInt(item); // Don't need the value; just ensure it's valid
+                        list.add(item);
+                    } catch (NumberFormatException e) {
+                        LogUtils.d(TAG, "Invalid UID value", e);
+                    }
+                } else {
+                    // range
+                    for (String rangeItem : getImapRangeValues(item)) {
+                        list.add(rangeItem);
+                    }
+                }
+            }
+        }
+        String[] stringList = new String[list.size()];
+        return list.toArray(stringList);
+    }
+
+    /**
+     * Expand the given number range into a list of individual numbers. If the range is not valid,
+     * an empty array is returned.
+     * <pre>
+     * sequence-number = nz-number / "*"
+     * sequence-range  = sequence-number ":" sequence-number
+     * sequence-set    = (sequence-number / sequence-range) *("," sequence-set)
+     * </pre>
+     */
+    public static String[] getImapRangeValues(String range) {
+        ArrayList<String> list = new ArrayList<String>();
+        try {
+            if (range != null) {
+                int colonPos = range.indexOf(':');
+                if (colonPos > 0) {
+                    int first  = Integer.parseInt(range.substring(0, colonPos));
+                    int second = Integer.parseInt(range.substring(colonPos + 1));
+                    if (first < second) {
+                        for (int i = first; i <= second; i++) {
+                            list.add(Integer.toString(i));
+                        }
+                    } else {
+                        for (int i = first; i >= second; i--) {
+                            list.add(Integer.toString(i));
+                        }
+                    }
+                }
+            }
+        } catch (NumberFormatException e) {
+            LogUtils.d(TAG, "Invalid range value", e);
+        }
+        String[] stringList = new String[list.size()];
+        return list.toArray(stringList);
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/phone/common/mail/utility/CountingOutputStream.java b/src/com/android/phone/common/mail/utility/CountingOutputStream.java
new file mode 100644
index 0000000..f631c3e
--- /dev/null
+++ b/src/com/android/phone/common/mail/utility/CountingOutputStream.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.phone.common.mail.utility;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+/**
+ * A simple pass-thru OutputStream that also counts how many bytes are written to it and
+ * makes that count available to callers.
+ */
+public class CountingOutputStream extends OutputStream {
+    private long mCount;
+    private final OutputStream mOutputStream;
+
+    public CountingOutputStream(OutputStream outputStream) {
+        mOutputStream = outputStream;
+    }
+
+    public long getCount() {
+        return mCount;
+    }
+
+    @Override
+    public void write(byte[] buffer, int offset, int count) throws IOException {
+        mOutputStream.write(buffer, offset, count);
+        mCount += count;
+    }
+
+    @Override
+    public void write(int oneByte) throws IOException {
+        mOutputStream.write(oneByte);
+        mCount++;
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/phone/common/mail/utility/EOLConvertingOutputStream.java b/src/com/android/phone/common/mail/utility/EOLConvertingOutputStream.java
new file mode 100644
index 0000000..1d55152
--- /dev/null
+++ b/src/com/android/phone/common/mail/utility/EOLConvertingOutputStream.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.phone.common.mail.utility;
+
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+public class EOLConvertingOutputStream extends FilterOutputStream {
+    int lastChar;
+
+    public EOLConvertingOutputStream(OutputStream out) {
+        super(out);
+    }
+
+    @Override
+    public void write(int oneByte) throws IOException {
+        if (oneByte == '\n') {
+            if (lastChar != '\r') {
+                super.write('\r');
+            }
+        }
+        super.write(oneByte);
+        lastChar = oneByte;
+    }
+
+    @Override
+    public void flush() throws IOException {
+        if (lastChar == '\r') {
+            super.write('\n');
+            lastChar = '\n';
+        }
+        super.flush();
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/phone/common/mail/utils/LogUtils.java b/src/com/android/phone/common/mail/utils/LogUtils.java
new file mode 100644
index 0000000..711af9b
--- /dev/null
+++ b/src/com/android/phone/common/mail/utils/LogUtils.java
@@ -0,0 +1,416 @@
+/**
+ * Copyright (c) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.phone.common.mail.utils;
+
+import android.net.Uri;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.android.internal.annotations.VisibleForTesting;
+
+import java.util.List;
+import java.util.regex.Pattern;
+
+public class LogUtils {
+    public static final String TAG = "Email Log";
+
+    // "GMT" + "+" or "-" + 4 digits
+    private static final Pattern DATE_CLEANUP_PATTERN_WRONG_TIMEZONE =
+            Pattern.compile("GMT([-+]\\d{4})$");
+
+    private static final String ACCOUNT_PREFIX = "account:";
+
+    /**
+     * Priority constant for the println method; use LogUtils.v.
+     */
+    public static final int VERBOSE = Log.VERBOSE;
+
+    /**
+     * Priority constant for the println method; use LogUtils.d.
+     */
+    public static final int DEBUG = Log.DEBUG;
+
+    /**
+     * Priority constant for the println method; use LogUtils.i.
+     */
+    public static final int INFO = Log.INFO;
+
+    /**
+     * Priority constant for the println method; use LogUtils.w.
+     */
+    public static final int WARN = Log.WARN;
+
+    /**
+     * Priority constant for the println method; use LogUtils.e.
+     */
+    public static final int ERROR = Log.ERROR;
+
+    /**
+     * Used to enable/disable logging that we don't want included in
+     * production releases.  This should be set to DEBUG for production releases, and VERBOSE for
+     * internal builds.
+     */
+    // STOPSHIP: ship with DEBUG set
+    private static final int MAX_ENABLED_LOG_LEVEL = VERBOSE;
+
+    private static Boolean sDebugLoggingEnabledForTests = null;
+
+    /**
+     * Enable debug logging for unit tests.
+     */
+    @VisibleForTesting
+    public static void setDebugLoggingEnabledForTests(boolean enabled) {
+        setDebugLoggingEnabledForTestsInternal(enabled);
+    }
+
+    protected static void setDebugLoggingEnabledForTestsInternal(boolean enabled) {
+        sDebugLoggingEnabledForTests = Boolean.valueOf(enabled);
+    }
+
+    /**
+     * Returns true if the build configuration prevents debug logging.
+     */
+    @VisibleForTesting
+    public static boolean buildPreventsDebugLogging() {
+        return MAX_ENABLED_LOG_LEVEL > VERBOSE;
+    }
+
+    /**
+     * Returns a boolean indicating whether debug logging is enabled.
+     */
+    protected static boolean isDebugLoggingEnabled(String tag) {
+        if (buildPreventsDebugLogging()) {
+            return false;
+        }
+        if (sDebugLoggingEnabledForTests != null) {
+            return sDebugLoggingEnabledForTests.booleanValue();
+        }
+        return Log.isLoggable(tag, Log.DEBUG) || Log.isLoggable(TAG, Log.DEBUG);
+    }
+
+    /**
+     * Returns a String for the specified content provider uri.  This will do
+     * sanitation of the uri to remove PII if debug logging is not enabled.
+     */
+    public static String contentUriToString(final Uri uri) {
+        return contentUriToString(TAG, uri);
+    }
+
+    /**
+     * Returns a String for the specified content provider uri.  This will do
+     * sanitation of the uri to remove PII if debug logging is not enabled.
+     */
+    public static String contentUriToString(String tag, Uri uri) {
+        if (isDebugLoggingEnabled(tag)) {
+            // Debug logging has been enabled, so log the uri as is
+            return uri.toString();
+        } else {
+            // Debug logging is not enabled, we want to remove the email address from the uri.
+            List<String> pathSegments = uri.getPathSegments();
+
+            Uri.Builder builder = new Uri.Builder()
+                    .scheme(uri.getScheme())
+                    .authority(uri.getAuthority())
+                    .query(uri.getQuery())
+                    .fragment(uri.getFragment());
+
+            // This assumes that the first path segment is the account
+            final String account = pathSegments.get(0);
+
+            builder = builder.appendPath(sanitizeAccountName(account));
+            for (int i = 1; i < pathSegments.size(); i++) {
+                builder.appendPath(pathSegments.get(i));
+            }
+            return builder.toString();
+        }
+    }
+
+    /**
+     * Sanitizes an account name.  If debug logging is not enabled, a sanitized name
+     * is returned.
+     */
+    public static String sanitizeAccountName(String accountName) {
+        if (TextUtils.isEmpty(accountName)) {
+            return "";
+        }
+
+        return ACCOUNT_PREFIX + sanitizeName(TAG, accountName);
+    }
+
+    public static String sanitizeName(final String tag, final String name) {
+        if (TextUtils.isEmpty(name)) {
+            return "";
+        }
+
+        if (isDebugLoggingEnabled(tag)) {
+            return name;
+        }
+
+        return String.valueOf(name.hashCode());
+    }
+
+    /**
+     * Checks to see whether or not a log for the specified tag is loggable at the specified level.
+     */
+    public static boolean isLoggable(String tag, int level) {
+        if (MAX_ENABLED_LOG_LEVEL > level) {
+            return false;
+        }
+        return Log.isLoggable(tag, level) || Log.isLoggable(TAG, level);
+    }
+
+    /**
+     * Send a {@link #VERBOSE} log message.
+     * @param tag Used to identify the source of a log message.  It usually identifies
+     *        the class or activity where the log call occurs.
+     * @param format the format string (see {@link java.util.Formatter#format})
+     * @param args
+     *            the list of arguments passed to the formatter. If there are
+     *            more arguments than required by {@code format},
+     *            additional arguments are ignored.
+     */
+    public static int v(String tag, String format, Object... args) {
+        if (isLoggable(tag, VERBOSE)) {
+            return Log.v(tag, String.format(format, args));
+        }
+        return 0;
+    }
+
+    /**
+     * Send a {@link #VERBOSE} log message.
+     * @param tag Used to identify the source of a log message.  It usually identifies
+     *        the class or activity where the log call occurs.
+     * @param tr An exception to log
+     * @param format the format string (see {@link java.util.Formatter#format})
+     * @param args
+     *            the list of arguments passed to the formatter. If there are
+     *            more arguments than required by {@code format},
+     *            additional arguments are ignored.
+     */
+    public static int v(String tag, Throwable tr, String format, Object... args) {
+        if (isLoggable(tag, VERBOSE)) {
+            return Log.v(tag, String.format(format, args), tr);
+        }
+        return 0;
+    }
+
+    /**
+     * Send a {@link #DEBUG} log message.
+     * @param tag Used to identify the source of a log message.  It usually identifies
+     *        the class or activity where the log call occurs.
+     * @param format the format string (see {@link java.util.Formatter#format})
+     * @param args
+     *            the list of arguments passed to the formatter. If there are
+     *            more arguments than required by {@code format},
+     *            additional arguments are ignored.
+     */
+    public static int d(String tag, String format, Object... args) {
+        if (isLoggable(tag, DEBUG)) {
+            return Log.d(tag, String.format(format, args));
+        }
+        return 0;
+    }
+
+    /**
+     * Send a {@link #DEBUG} log message.
+     * @param tag Used to identify the source of a log message.  It usually identifies
+     *        the class or activity where the log call occurs.
+     * @param tr An exception to log
+     * @param format the format string (see {@link java.util.Formatter#format})
+     * @param args
+     *            the list of arguments passed to the formatter. If there are
+     *            more arguments than required by {@code format},
+     *            additional arguments are ignored.
+     */
+    public static int d(String tag, Throwable tr, String format, Object... args) {
+        if (isLoggable(tag, DEBUG)) {
+            return Log.d(tag, String.format(format, args), tr);
+        }
+        return 0;
+    }
+
+    /**
+     * Send a {@link #INFO} log message.
+     * @param tag Used to identify the source of a log message.  It usually identifies
+     *        the class or activity where the log call occurs.
+     * @param format the format string (see {@link java.util.Formatter#format})
+     * @param args
+     *            the list of arguments passed to the formatter. If there are
+     *            more arguments than required by {@code format},
+     *            additional arguments are ignored.
+     */
+    public static int i(String tag, String format, Object... args) {
+        if (isLoggable(tag, INFO)) {
+            return Log.i(tag, String.format(format, args));
+        }
+        return 0;
+    }
+
+    /**
+     * Send a {@link #INFO} log message.
+     * @param tag Used to identify the source of a log message.  It usually identifies
+     *        the class or activity where the log call occurs.
+     * @param tr An exception to log
+     * @param format the format string (see {@link java.util.Formatter#format})
+     * @param args
+     *            the list of arguments passed to the formatter. If there are
+     *            more arguments than required by {@code format},
+     *            additional arguments are ignored.
+     */
+    public static int i(String tag, Throwable tr, String format, Object... args) {
+        if (isLoggable(tag, INFO)) {
+            return Log.i(tag, String.format(format, args), tr);
+        }
+        return 0;
+    }
+
+    /**
+     * Send a {@link #WARN} log message.
+     * @param tag Used to identify the source of a log message.  It usually identifies
+     *        the class or activity where the log call occurs.
+     * @param format the format string (see {@link java.util.Formatter#format})
+     * @param args
+     *            the list of arguments passed to the formatter. If there are
+     *            more arguments than required by {@code format},
+     *            additional arguments are ignored.
+     */
+    public static int w(String tag, String format, Object... args) {
+        if (isLoggable(tag, WARN)) {
+            return Log.w(tag, String.format(format, args));
+        }
+        return 0;
+    }
+
+    /**
+     * Send a {@link #WARN} log message.
+     * @param tag Used to identify the source of a log message.  It usually identifies
+     *        the class or activity where the log call occurs.
+     * @param tr An exception to log
+     * @param format the format string (see {@link java.util.Formatter#format})
+     * @param args
+     *            the list of arguments passed to the formatter. If there are
+     *            more arguments than required by {@code format},
+     *            additional arguments are ignored.
+     */
+    public static int w(String tag, Throwable tr, String format, Object... args) {
+        if (isLoggable(tag, WARN)) {
+            return Log.w(tag, String.format(format, args), tr);
+        }
+        return 0;
+    }
+
+    /**
+     * Send a {@link #ERROR} log message.
+     * @param tag Used to identify the source of a log message.  It usually identifies
+     *        the class or activity where the log call occurs.
+     * @param format the format string (see {@link java.util.Formatter#format})
+     * @param args
+     *            the list of arguments passed to the formatter. If there are
+     *            more arguments than required by {@code format},
+     *            additional arguments are ignored.
+     */
+    public static int e(String tag, String format, Object... args) {
+        if (isLoggable(tag, ERROR)) {
+            return Log.e(tag, String.format(format, args));
+        }
+        return 0;
+    }
+
+    /**
+     * Send a {@link #ERROR} log message.
+     * @param tag Used to identify the source of a log message.  It usually identifies
+     *        the class or activity where the log call occurs.
+     * @param tr An exception to log
+     * @param format the format string (see {@link java.util.Formatter#format})
+     * @param args
+     *            the list of arguments passed to the formatter. If there are
+     *            more arguments than required by {@code format},
+     *            additional arguments are ignored.
+     */
+    public static int e(String tag, Throwable tr, String format, Object... args) {
+        if (isLoggable(tag, ERROR)) {
+            return Log.e(tag, String.format(format, args), tr);
+        }
+        return 0;
+    }
+
+    /**
+     * What a Terrible Failure: Report a condition that should never happen.
+     * The error will always be logged at level ASSERT with the call stack.
+     * Depending on system configuration, a report may be added to the
+     * {@link android.os.DropBoxManager} and/or the process may be terminated
+     * immediately with an error dialog.
+     * @param tag Used to identify the source of a log message.  It usually identifies
+     *        the class or activity where the log call occurs.
+     * @param format the format string (see {@link java.util.Formatter#format})
+     * @param args
+     *            the list of arguments passed to the formatter. If there are
+     *            more arguments than required by {@code format},
+     *            additional arguments are ignored.
+     */
+    public static int wtf(String tag, String format, Object... args) {
+        return Log.wtf(tag, String.format(format, args), new Error());
+    }
+
+    /**
+     * What a Terrible Failure: Report a condition that should never happen.
+     * The error will always be logged at level ASSERT with the call stack.
+     * Depending on system configuration, a report may be added to the
+     * {@link android.os.DropBoxManager} and/or the process may be terminated
+     * immediately with an error dialog.
+     * @param tag Used to identify the source of a log message.  It usually identifies
+     *        the class or activity where the log call occurs.
+     * @param tr An exception to log
+     * @param format the format string (see {@link java.util.Formatter#format})
+     * @param args
+     *            the list of arguments passed to the formatter. If there are
+     *            more arguments than required by {@code format},
+     *            additional arguments are ignored.
+     */
+    public static int wtf(String tag, Throwable tr, String format, Object... args) {
+        return Log.wtf(tag, String.format(format, args), tr);
+    }
+
+
+    /**
+     * Try to make a date MIME(RFC 2822/5322)-compliant.
+     *
+     * It fixes:
+     * - "Thu, 10 Dec 09 15:08:08 GMT-0700" to "Thu, 10 Dec 09 15:08:08 -0700"
+     *   (4 digit zone value can't be preceded by "GMT")
+     *   We got a report saying eBay sends a date in this format
+     */
+    public static String cleanUpMimeDate(String date) {
+        if (TextUtils.isEmpty(date)) {
+            return date;
+        }
+        date = DATE_CLEANUP_PATTERN_WRONG_TIMEZONE.matcher(date).replaceFirst("$1");
+        return date;
+    }
+
+
+    public static String byteToHex(int b) {
+        return byteToHex(new StringBuilder(), b).toString();
+    }
+
+    public static StringBuilder byteToHex(StringBuilder sb, int b) {
+        b &= 0xFF;
+        sb.append("0123456789ABCDEF".charAt(b >> 4));
+        sb.append("0123456789ABCDEF".charAt(b & 0xF));
+        return sb;
+    }
+
+}
\ No newline at end of file
diff --git a/src/com/android/phone/common/mail/utils/Utility.java b/src/com/android/phone/common/mail/utils/Utility.java
new file mode 100644
index 0000000..d71b25e
--- /dev/null
+++ b/src/com/android/phone/common/mail/utils/Utility.java
@@ -0,0 +1,80 @@
+/**
+ * Copyright (c) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.phone.common.mail.utils;
+
+import java.io.ByteArrayInputStream;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.Charset;
+
+/**
+ * Simple utility methods used in email functions.
+ */
+public class Utility {
+    public static final Charset ASCII = Charset.forName("US-ASCII");
+
+    public static final String[] EMPTY_STRINGS = new String[0];
+
+    /**
+     * Returns a concatenated string containing the output of every Object's
+     * toString() method, each separated by the given separator character.
+     */
+    public static String combine(Object[] parts, char separator) {
+        if (parts == null) {
+            return null;
+        }
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < parts.length; i++) {
+            sb.append(parts[i].toString());
+            if (i < parts.length - 1) {
+                sb.append(separator);
+            }
+        }
+        return sb.toString();
+    }
+
+    /** Converts a String to ASCII bytes */
+    public static byte[] toAscii(String s) {
+        return encode(ASCII, s);
+    }
+
+    /** Builds a String from ASCII bytes */
+    public static String fromAscii(byte[] b) {
+        return decode(ASCII, b);
+    }
+
+    private static byte[] encode(Charset charset, String s) {
+        if (s == null) {
+            return null;
+        }
+        final ByteBuffer buffer = charset.encode(CharBuffer.wrap(s));
+        final byte[] bytes = new byte[buffer.limit()];
+        buffer.get(bytes);
+        return bytes;
+    }
+
+    private static String decode(Charset charset, byte[] b) {
+        if (b == null) {
+            return null;
+        }
+        final CharBuffer cb = charset.decode(ByteBuffer.wrap(b));
+        return new String(cb.array(), 0, cb.length());
+    }
+
+    public static ByteArrayInputStream streamFromAsciiString(String ascii) {
+        return new ByteArrayInputStream(toAscii(ascii));
+    }
+}
diff --git a/src/com/android/phone/settings/AccessibilitySettingsActivity.java b/src/com/android/phone/settings/AccessibilitySettingsActivity.java
new file mode 100644
index 0000000..769ef61
--- /dev/null
+++ b/src/com/android/phone/settings/AccessibilitySettingsActivity.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.phone.settings;
+
+import android.os.Bundle;
+import android.preference.PreferenceActivity;
+import android.view.MenuItem;
+
+import com.android.phone.R;
+
+public class AccessibilitySettingsActivity extends PreferenceActivity {
+
+   @Override
+    protected void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        getActionBar().setTitle(R.string.accessibility_settings_activity_title);
+        getFragmentManager().beginTransaction().replace(
+                android.R.id.content, new AccessibilitySettingsFragment()).commit();
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            onBackPressed();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+}
diff --git a/src/com/android/phone/settings/AccessibilitySettingsFragment.java b/src/com/android/phone/settings/AccessibilitySettingsFragment.java
new file mode 100644
index 0000000..fdb0cd5
--- /dev/null
+++ b/src/com/android/phone/settings/AccessibilitySettingsFragment.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.phone.settings;
+
+import android.content.Context;
+import android.media.AudioManager;
+import android.os.Bundle;
+import android.preference.CheckBoxPreference;
+import android.preference.Preference;
+import android.preference.PreferenceFragment;
+import android.preference.PreferenceScreen;
+import android.provider.Settings;
+import android.telecom.TelecomManager;
+import android.telephony.PhoneStateListener;
+import android.telephony.TelephonyManager;
+import android.util.Log;
+
+import com.android.ims.ImsManager;
+import com.android.phone.PhoneGlobals;
+import com.android.phone.R;
+import com.android.phone.settings.TtyModeListPreference;
+
+public class AccessibilitySettingsFragment extends PreferenceFragment {
+    private static final String LOG_TAG = AccessibilitySettingsFragment.class.getSimpleName();
+    private static final boolean DBG = (PhoneGlobals.DBG_LEVEL >= 2);
+
+    private static final String BUTTON_TTY_KEY = "button_tty_mode_key";
+    private static final String BUTTON_HAC_KEY = "button_hac_key";
+
+    private final PhoneStateListener mPhoneStateListener = new PhoneStateListener() {
+        /**
+         * Disable the TTY setting when in/out of a call (and if carrier doesn't
+         * support VoLTE with TTY).
+         * @see android.telephony.PhoneStateListener#onCallStateChanged(int,
+         * java.lang.String)
+         */
+        @Override
+        public void onCallStateChanged(int state, String incomingNumber) {
+            if (DBG) Log.d(LOG_TAG, "PhoneStateListener.onCallStateChanged: state=" + state);
+            Preference pref = getPreferenceScreen().findPreference(BUTTON_TTY_KEY);
+            if (pref != null) {
+                pref.setEnabled(state == TelephonyManager.CALL_STATE_IDLE);
+            }
+        }
+    };
+
+    private Context mContext;
+    private AudioManager mAudioManager;
+
+    private TtyModeListPreference mButtonTty;
+    private CheckBoxPreference mButtonHac;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mContext = getActivity().getApplicationContext();
+        mAudioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+
+        addPreferencesFromResource(R.xml.accessibility_settings);
+
+        mButtonTty = (TtyModeListPreference) findPreference(
+                getResources().getString(R.string.tty_mode_key));
+        mButtonHac = (CheckBoxPreference) findPreference(BUTTON_HAC_KEY);
+
+        if (PhoneGlobals.getInstance().phoneMgr.isTtyModeSupported()) {
+            mButtonTty.init();
+        } else {
+            getPreferenceScreen().removePreference(mButtonTty);
+            mButtonTty = null;
+        }
+
+        if (PhoneGlobals.getInstance().phoneMgr.isHearingAidCompatibilitySupported()) {
+            int hac = Settings.System.getInt(mContext.getContentResolver(),
+                    Settings.System.HEARING_AID, SettingsConstants.HAC_DISABLED);
+            mButtonHac.setChecked(hac == SettingsConstants.HAC_ENABLED);
+        } else {
+            getPreferenceScreen().removePreference(mButtonHac);
+            mButtonHac = null;
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        if (ImsManager.isVolteEnabledByPlatform(mContext) &&
+                !mContext.getResources().getBoolean(
+                        com.android.internal.R.bool.config_carrier_volte_tty_supported)) {
+            TelephonyManager tm =
+                    (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
+            tm.listen(mPhoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);
+        }
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+
+        if (ImsManager.isVolteEnabledByPlatform(mContext) &&
+                !mContext.getResources().getBoolean(
+                        com.android.internal.R.bool.config_carrier_volte_tty_supported)) {
+            TelephonyManager tm =
+                    (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
+            tm.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
+        }
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
+        if (preference == mButtonTty) {
+            return true;
+        } else if (preference == mButtonHac) {
+            int hac = mButtonHac.isChecked()
+                    ? SettingsConstants.HAC_ENABLED : SettingsConstants.HAC_DISABLED;
+            // Update HAC value in Settings database.
+            Settings.System.putInt(mContext.getContentResolver(), Settings.System.HEARING_AID, hac);
+
+            // Update HAC Value in AudioManager.
+            mAudioManager.setParameter(SettingsConstants.HAC_KEY,
+                    hac == SettingsConstants.HAC_ENABLED
+                            ? SettingsConstants.HAC_VAL_ON : SettingsConstants.HAC_VAL_OFF);
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/src/com/android/phone/settings/PhoneAccountSettingsFragment.java b/src/com/android/phone/settings/PhoneAccountSettingsFragment.java
index 6ca146c..a4fd187 100644
--- a/src/com/android/phone/settings/PhoneAccountSettingsFragment.java
+++ b/src/com/android/phone/settings/PhoneAccountSettingsFragment.java
@@ -3,6 +3,11 @@
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.graphics.Bitmap;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
 import android.net.sip.SipManager;
 import android.os.Bundle;
 import android.os.UserHandle;
@@ -11,6 +16,7 @@
 import android.preference.Preference;
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceFragment;
+import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
 import android.telephony.SubscriptionInfo;
@@ -24,6 +30,9 @@
 import com.android.services.telephony.sip.SipSharedPreferences;
 import com.android.services.telephony.sip.SipUtil;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 public class PhoneAccountSettingsFragment extends PreferenceFragment
@@ -51,6 +60,7 @@
     private String LOG_TAG = PhoneAccountSettingsFragment.class.getSimpleName();
 
     private TelecomManager mTelecomManager;
+    private TelephonyManager mTelephonyManager;
     private SubscriptionManager mSubscriptionManager;
 
     private PreferenceCategory mAccountList;
@@ -68,6 +78,7 @@
         super.onCreate(icicle);
 
         mTelecomManager = TelecomManager.from(getActivity());
+        mTelephonyManager = TelephonyManager.from(getActivity());
         mSubscriptionManager = SubscriptionManager.from(getActivity());
     }
 
@@ -81,28 +92,22 @@
 
         addPreferencesFromResource(R.xml.phone_account_settings);
 
-        TelephonyManager telephonyManager =
-                (TelephonyManager) getActivity().getSystemService(Context.TELEPHONY_SERVICE);
         mAccountList = (PreferenceCategory) getPreferenceScreen().findPreference(
                 ACCOUNTS_LIST_CATEGORY_KEY);
-        TtyModeListPreference ttyModeListPreference =
-                (TtyModeListPreference) getPreferenceScreen().findPreference(
-                        getResources().getString(R.string.tty_mode_key));
-        if (telephonyManager.isMultiSimEnabled()) {
+        if (shouldShowConnectionServiceList()) {
             initAccountList();
-            ttyModeListPreference.init();
+
+            mDefaultOutgoingAccount = (AccountSelectionPreference)
+                    getPreferenceScreen().findPreference(DEFAULT_OUTGOING_ACCOUNT_KEY);
+            mDefaultOutgoingAccount.setListener(this);
+            if (mTelecomManager.getCallCapablePhoneAccounts().size() > 1) {
+                updateDefaultOutgoingAccountsModel();
+            } else {
+                getPreferenceScreen().removePreference(mDefaultOutgoingAccount);
+            }
+
         } else {
             getPreferenceScreen().removePreference(mAccountList);
-            getPreferenceScreen().removePreference(ttyModeListPreference);
-        }
-
-        mDefaultOutgoingAccount = (AccountSelectionPreference)
-                getPreferenceScreen().findPreference(DEFAULT_OUTGOING_ACCOUNT_KEY);
-        if (mTelecomManager.hasMultipleCallCapableAccounts()) {
-            mDefaultOutgoingAccount.setListener(this);
-            updateDefaultOutgoingAccountsModel();
-        } else {
-            getPreferenceScreen().removePreference(mDefaultOutgoingAccount);
         }
 
         List<PhoneAccountHandle> simCallManagers = mTelecomManager.getSimCallManagers();
@@ -287,8 +292,7 @@
      */
     public void updateCallAssistantModel() {
         mSelectCallAssistant.setModel(
-                mTelecomManager,
-                mTelecomManager.getSimCallManagers(),
+                mTelecomManager, mTelecomManager.getSimCallManagers(),
                 mTelecomManager.getSimCallManager(),
                 getString(R.string.wifi_calling_call_assistant_none));
     }
@@ -311,19 +315,103 @@
     }
 
     private void initAccountList() {
-        List<SubscriptionInfo> sil = mSubscriptionManager.getActiveSubscriptionInfoList();
-        if (sil == null) {
-            return;
+        // Obtain the list of phone accounts.
+        List<PhoneAccount> accounts = new ArrayList<>();
+        for (PhoneAccountHandle handle : mTelecomManager.getCallCapablePhoneAccounts()) {
+            PhoneAccount account = mTelecomManager.getPhoneAccount(handle);
+            if (account != null) {
+                accounts.add(account);
+            }
         }
-        for (SubscriptionInfo subscription : sil) {
-            CharSequence label = subscription.getDisplayName();
-            Intent intent = new Intent(TelecomManager.ACTION_SHOW_CALL_SETTINGS);
-            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-            SubscriptionInfoHelper.addExtrasToIntent(intent, subscription);
 
+        // Sort the accounts according to how we want to display them.
+        Collections.sort(accounts, new Comparator<PhoneAccount>() {
+            @Override
+            public int compare(PhoneAccount account1, PhoneAccount account2) {
+                int retval = 0;
+
+                // SIM accounts go first
+                boolean isSim1 = (account1.getCapabilities() &
+                        PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION) != 0;
+                boolean isSim2 = (account2.getCapabilities() &
+                        PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION) != 0;
+                if (isSim1 != isSim2) {
+                    retval = isSim1 ? -1 : 1;
+                }
+
+                // Then order by package
+                if (retval == 0) {
+                    String pkg1 = account1.getAccountHandle().getComponentName().getPackageName();
+                    String pkg2 = account2.getAccountHandle().getComponentName().getPackageName();
+                    retval = pkg1.compareTo(pkg2);
+                }
+
+                // Finally, order by label
+                if (retval == 0) {
+                    String label1 = nullToEmpty(account1.getLabel().toString());
+                    String label2 = nullToEmpty(account2.getLabel().toString());
+                    retval = label1.compareTo(label2);
+                }
+
+                // Then by hashcode
+                if (retval == 0) {
+                    retval = account1.hashCode() - account2.hashCode();
+                }
+                return retval;
+            }
+        });
+
+        // Add an entry for each account.
+        for (PhoneAccount account : accounts) {
+            PhoneAccountHandle handle = account.getAccountHandle();
+            Intent intent = null;
+            boolean isSimAccount = false;
+
+            // SIM phone accounts use a different setting intent and are thus handled differently.
+            if ((PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION & account.getCapabilities()) != 0) {
+                isSimAccount = true;
+                SubscriptionInfo subInfo = mSubscriptionManager.getActiveSubscriptionInfo(
+                        mTelephonyManager.getSubIdForPhoneAccount(account));
+
+                if (subInfo != null) {
+                    intent = new Intent(TelecomManager.ACTION_SHOW_CALL_SETTINGS);
+                    intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                    SubscriptionInfoHelper.addExtrasToIntent(intent, subInfo);
+                }
+            } else {
+                // Build the settings intent.
+                intent = new Intent(TelecomManager.ACTION_CONNECTION_SERVICE_CONFIGURE);
+                intent.setPackage(handle.getComponentName().getPackageName());
+                intent.addCategory(Intent.CATEGORY_DEFAULT);
+                intent.putExtra(TelecomManager.EXTRA_PHONE_ACCOUNT_HANDLE, handle);
+
+                // Check to see that the phone account package can handle the setting intent.
+                PackageManager pm = getActivity().getPackageManager();
+                List<ResolveInfo> resolutions = pm.queryIntentActivities(intent, 0);
+                if (resolutions.size() == 0) {
+                    intent = null;  // set no intent if the package cannot handle it.
+                }
+            }
+
+            // Create the preference & add the label
             Preference accountPreference = new Preference(getActivity());
-            accountPreference.setTitle(label);
-            accountPreference.setIntent(intent);
+            accountPreference.setTitle(account.getLabel());
+
+            // Add an icon.
+            Drawable icon = account.createIconDrawable(getActivity());
+            if (isSimAccount && !mTelephonyManager.isMultiSimEnabled()) {
+                // If a device is not multi-SIM enabled, then it is unlikely the icon has any
+                // color to it.  In these cases, add a default gray tint.
+                icon.setTint(getResources().getColor(R.color.default_sim_icon_tint_color));
+                icon.setTintMode(PorterDuff.Mode.SRC_ATOP);
+            }
+            accountPreference.setIcon(icon);
+
+            // Add an intent to send the user to the account's settings.
+            if (intent != null) {
+                accountPreference.setIntent(intent);
+            }
+
             mAccountList.addPreference(accountPreference);
         }
     }
@@ -340,4 +428,13 @@
         }
         return null;
     }
+
+    private boolean shouldShowConnectionServiceList() {
+        return mTelephonyManager.isMultiSimEnabled() ||
+                mTelecomManager.getCallCapablePhoneAccounts().size() > 1;
+    }
+
+    private String nullToEmpty(String str) {
+        return str == null ? "" : str;
+    }
 }
diff --git a/src/com/android/phone/settings/SettingsConstants.java b/src/com/android/phone/settings/SettingsConstants.java
new file mode 100644
index 0000000..c17e6df
--- /dev/null
+++ b/src/com/android/phone/settings/SettingsConstants.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.phone.settings;
+
+/**
+ * Constants related to settings which are shared by two or more classes.
+ */
+public class SettingsConstants {
+    // Dtmf tone type setting value for CDMA phone
+    public static final int DTMF_TONE_TYPE_NORMAL = 0;
+    public static final int DTMF_TONE_TYPE_LONG   = 1;
+
+    // Hearing Aid Compatability settings values.
+    public static final String HAC_KEY = "HACSetting";
+    public static final int HAC_DISABLED = 0;
+    public static final int HAC_ENABLED = 1;
+    public static final String HAC_VAL_ON = "ON";
+    public static final String HAC_VAL_OFF = "OFF";
+}
diff --git a/src/com/android/phone/settings/VoicemailDialogUtil.java b/src/com/android/phone/settings/VoicemailDialogUtil.java
index 0a9e4bc..32cb37a 100644
--- a/src/com/android/phone/settings/VoicemailDialogUtil.java
+++ b/src/com/android/phone/settings/VoicemailDialogUtil.java
@@ -21,7 +21,6 @@
 import android.app.ProgressDialog;
 import android.view.WindowManager;
 
-import com.android.phone.CallFeaturesSetting;
 import com.android.phone.R;
 
 public class VoicemailDialogUtil {
@@ -35,11 +34,12 @@
     public static final int VM_FWD_SAVING_DIALOG = 601;
     public static final int VM_FWD_READING_DIALOG = 602;
     public static final int VM_REVERTING_DIALOG = 603;
+    public static final int TTY_SET_RESPONSE_ERROR = 800;
 
-    public static Dialog getDialog(CallFeaturesSetting parent, int id) {
+    public static Dialog getDialog(VoicemailSettingsActivity parent, int id) {
         if ((id == VM_RESPONSE_ERROR_DIALOG) || (id == VM_NOCHANGE_ERROR_DIALOG) ||
             (id == FWD_SET_RESPONSE_ERROR_DIALOG) || (id == FWD_GET_RESPONSE_ERROR_DIALOG) ||
-                (id == VM_CONFIRM_DIALOG)) {
+                (id == VM_CONFIRM_DIALOG) || (id == TTY_SET_RESPONSE_ERROR)) {
 
             AlertDialog.Builder b = new AlertDialog.Builder(parent);
 
@@ -75,6 +75,12 @@
                     b.setPositiveButton(R.string.alert_dialog_yes, parent);
                     b.setNegativeButton(R.string.alert_dialog_no, parent);
                     break;
+                case TTY_SET_RESPONSE_ERROR:
+                    titleId = R.string.tty_mode_option_title;
+                    msgId = R.string.tty_mode_not_allowed_video_call;
+                    b.setIconAttribute(android.R.attr.alertDialogIcon);
+                    b.setPositiveButton(R.string.ok, parent);
+                    break;
                 default:
                     msgId = R.string.exception_error;
                     // Set Button 3, tells the activity that the error is
diff --git a/src/com/android/phone/settings/VoicemailProviderListPreference.java b/src/com/android/phone/settings/VoicemailProviderListPreference.java
index 44a1c7c..d9f1a55 100644
--- a/src/com/android/phone/settings/VoicemailProviderListPreference.java
+++ b/src/com/android/phone/settings/VoicemailProviderListPreference.java
@@ -30,7 +30,6 @@
 import android.util.Log;
 
 import com.android.internal.telephony.Phone;
-import com.android.phone.CallFeaturesSetting;
 import com.android.phone.PhoneGlobals;
 import com.android.phone.R;
 
@@ -95,12 +94,14 @@
         if (DBG) log("initVoicemailProviders()");
 
         String providerToIgnore = null;
-        if (activityIntent.getAction().equals(CallFeaturesSetting.ACTION_ADD_VOICEMAIL)
-                && activityIntent.hasExtra(CallFeaturesSetting.IGNORE_PROVIDER_EXTRA)) {
+        String action = activityIntent.getAction();
+        if (!TextUtils.isEmpty(action)
+                && action.equals(VoicemailSettingsActivity.ACTION_ADD_VOICEMAIL)
+                && activityIntent.hasExtra(VoicemailSettingsActivity.IGNORE_PROVIDER_EXTRA)) {
             // Remove this provider from the list.
             if (DBG) log("Found ACTION_ADD_VOICEMAIL.");
             providerToIgnore =
-                    activityIntent.getStringExtra(CallFeaturesSetting.IGNORE_PROVIDER_EXTRA);
+                    activityIntent.getStringExtra(VoicemailSettingsActivity.IGNORE_PROVIDER_EXTRA);
             VoicemailProviderSettingsUtil.delete(mPhone.getContext(), providerToIgnore);
         }
 
@@ -119,7 +120,7 @@
 
         // Add other voicemail providers.
         PackageManager pm = mPhone.getContext().getPackageManager();
-        Intent intent = new Intent(CallFeaturesSetting.ACTION_CONFIGURE_VOICEMAIL);
+        Intent intent = new Intent(VoicemailSettingsActivity.ACTION_CONFIGURE_VOICEMAIL);
         List<ResolveInfo> resolveInfos = pm.queryIntentActivities(intent, 0);
         for (int i = 0; i < resolveInfos.size(); i++) {
             final ResolveInfo ri= resolveInfos.get(i);
@@ -137,7 +138,7 @@
             }
             String nameForDisplay = (label != null) ? label.toString() : "";
             Intent providerIntent = new Intent();
-            providerIntent.setAction(CallFeaturesSetting.ACTION_CONFIGURE_VOICEMAIL);
+            providerIntent.setAction(VoicemailSettingsActivity.ACTION_CONFIGURE_VOICEMAIL);
             providerIntent.setClassName(currentActivityInfo.packageName, currentActivityInfo.name);
             VoicemailProvider vmProvider = new VoicemailProvider(nameForDisplay, providerIntent);
 
diff --git a/src/com/android/phone/settings/VoicemailSettingsActivity.java b/src/com/android/phone/settings/VoicemailSettingsActivity.java
index a94c27a..f017836 100644
--- a/src/com/android/phone/settings/VoicemailSettingsActivity.java
+++ b/src/com/android/phone/settings/VoicemailSettingsActivity.java
@@ -16,21 +16,268 @@
 
 package com.android.phone.settings;
 
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.database.Cursor;
+import android.os.AsyncResult;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.preference.CheckBoxPreference;
+import android.preference.Preference;
 import android.preference.PreferenceActivity;
+import android.preference.PreferenceScreen;
+import android.provider.ContactsContract.CommonDataKinds;
+import android.text.TextUtils;
+import android.util.Log;
 import android.view.MenuItem;
+import android.widget.ListAdapter;
 
+import com.android.internal.telephony.CallForwardInfo;
+import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.PhoneConstants;
 import com.android.phone.R;
+import com.android.phone.EditPhoneNumberPreference;
+import com.android.phone.PhoneGlobals;
+import com.android.phone.SubscriptionInfoHelper;
 
-public class VoicemailSettingsActivity extends PreferenceActivity {
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+
+public class VoicemailSettingsActivity extends PreferenceActivity
+        implements DialogInterface.OnClickListener,
+                Preference.OnPreferenceChangeListener,
+                EditPhoneNumberPreference.OnDialogClosedListener,
+                EditPhoneNumberPreference.GetDefaultNumberListener {
+    private static final String LOG_TAG = VoicemailSettingsActivity.class.getSimpleName();
+    private static final boolean DBG = (PhoneGlobals.DBG_LEVEL >= 2);
+
+    /**
+     * Intent action to bring up Voicemail Provider settings
+     * DO NOT RENAME. There are existing apps which use this intent value.
+     */
+    public static final String ACTION_ADD_VOICEMAIL =
+            "com.android.phone.CallFeaturesSetting.ADD_VOICEMAIL";
+
+    /**
+     * Intent action to bring up the {@code VoicemailSettingsActivity}.
+     * DO NOT RENAME. There are existing apps which use this intent value.
+     */
+    public static final String ACTION_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
+    public static final String FWD_NUMBER_EXTRA = "com.android.phone.ForwardingNumber";
+    // Extra put in the return from VM provider config containing call forwarding number to set
+    public static final String FWD_NUMBER_TIME_EXTRA = "com.android.phone.ForwardingNumberTime";
+    // If the VM provider returns non null value in this extra we will force the user to
+    // choose another VM provider
+    public static final String SIGNOUT_EXTRA = "com.android.phone.Signout";
+
+    /**
+     * 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";
+
+    /**
+     * String Extra put into ACTION_ADD_VOICEMAIL to indicate that the voicemail setup screen should
+     * be opened.
+     */
+    public static final String SETUP_VOICEMAIL_EXTRA = "com.android.phone.SetupVoicemail";
+
+    // TODO: Define these preference keys in XML.
+    private static final String BUTTON_VOICEMAIL_KEY = "button_voicemail_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";
+
+    /** Event for Async voicemail change call */
+    private static final int EVENT_VOICEMAIL_CHANGED        = 500;
+    private static final int EVENT_FORWARDING_CHANGED       = 501;
+    private static final int EVENT_FORWARDING_GET_COMPLETED = 502;
+
+    /** Handle to voicemail pref */
+    private static final int VOICEMAIL_PREF_ID = 1;
+    private static final int VOICEMAIL_PROVIDER_CFG_ID = 2;
+
+    /**
+     * Results of reading forwarding settings
+     */
+    private CallForwardInfo[] mForwardingReadResults = null;
+
+    /**
+     * Result of forwarding number change.
+     * Keys are reasons (eg. unconditional forwarding).
+     */
+    private Map<Integer, AsyncResult> mForwardingChangeResults = null;
+
+    /**
+     * Expected CF read result types.
+     * This set keeps track of the CF types for which we've issued change
+     * commands so we can tell when we've received all of the responses.
+     */
+    private Collection<Integer> mExpectedChangeResultReasons = null;
+
+    /**
+     * Result of vm number change
+     */
+    private AsyncResult mVoicemailChangeResult = null;
+
+    /**
+     * Previous VM provider setting so we can return to it in case of failure.
+     */
+    private String mPreviousVMProviderKey = null;
+
+    /**
+     * Id of the dialog being currently shown.
+     */
+    private int mCurrentDialogId = 0;
+
+    /**
+     * Flag indicating that we are invoking settings for the voicemail provider programmatically
+     * due to vm provider change.
+     */
+    private boolean mVMProviderSettingsForced = false;
+
+    /**
+     * Flag indicating that we are making changes to vm or fwd numbers
+     * due to vm provider change.
+     */
+    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.
+     */
+    private boolean mVMChangeCompletedSuccessfully = false;
+
+    /**
+     * True if we had full or partial failure setting forwarding numbers and so need to roll them
+     * back.
+     */
+    private boolean mFwdChangesRequireRollback = false;
+
+    /**
+     * Id of error msg to display to user once we are done reverting the VM provider to the previous
+     * one.
+     */
+    private int mVMOrFwdSetError = 0;
+
+    /** string to hold old voicemail number as it is being updated. */
+    private String mOldVmNumber;
+
+    // New call forwarding settings and vm number we will be setting
+    // Need to save these since before we get to saving we need to asynchronously
+    // query the existing forwarding settings.
+    private CallForwardInfo[] mNewFwdSettings;
+    private String mNewVMNumber;
+
+    /**
+     * Used to indicate that the voicemail preference should be shown.
+     */
+    private boolean mShowVoicemailPreference = false;
+
+    private boolean mForeground;
+    private Phone mPhone;
+    private SubscriptionInfoHelper mSubscriptionInfoHelper;
+
+    private EditPhoneNumberPreference mSubMenuVoicemailSettings;
+    private VoicemailProviderListPreference mVoicemailProviders;
+    private PreferenceScreen mVoicemailSettings;
+    private VoicemailRingtonePreference mVoicemailNotificationRingtone;
+    private CheckBoxPreference mVoicemailNotificationVibrate;
+
+
+    //*********************************************************************************************
+    // Preference Activity Methods
+    //*********************************************************************************************
 
     @Override
     protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
-        getActionBar().setTitle(R.string.voicemail);
-        getFragmentManager().beginTransaction().replace(
-                android.R.id.content, new VoicemailSettingsFragment()).commit();
+        // Show the voicemail preference in onResume if the calling intent specifies the
+        // ACTION_ADD_VOICEMAIL action.
+        mShowVoicemailPreference = (icicle == null) &&
+                TextUtils.equals(getIntent().getAction(), ACTION_ADD_VOICEMAIL);
+
+        mSubscriptionInfoHelper = new SubscriptionInfoHelper(this, getIntent());
+        mSubscriptionInfoHelper.setActionBarTitle(
+                getActionBar(), getResources(), R.string.voicemail_settings_with_label);
+        mPhone = mSubscriptionInfoHelper.getPhone();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        mForeground = true;
+
+        PreferenceScreen preferenceScreen = getPreferenceScreen();
+        if (preferenceScreen != null) {
+            preferenceScreen.removeAll();
+        }
+
+        addPreferencesFromResource(R.xml.voicemail_settings);
+
+        PreferenceScreen prefSet = getPreferenceScreen();
+        mSubMenuVoicemailSettings = (EditPhoneNumberPreference) findPreference(BUTTON_VOICEMAIL_KEY);
+        mSubMenuVoicemailSettings.setParentActivity(this, VOICEMAIL_PREF_ID, this);
+        mSubMenuVoicemailSettings.setDialogOnClosedListener(this);
+        mSubMenuVoicemailSettings.setDialogTitle(R.string.voicemail_settings_number_label);
+
+        mVoicemailProviders = (VoicemailProviderListPreference) findPreference(
+                BUTTON_VOICEMAIL_PROVIDER_KEY);
+        mVoicemailProviders.init(mPhone, getIntent());
+        mVoicemailProviders.setOnPreferenceChangeListener(this);
+        mPreviousVMProviderKey = mVoicemailProviders.getValue();
+
+        mVoicemailSettings = (PreferenceScreen) findPreference(BUTTON_VOICEMAIL_SETTING_KEY);
+
+        mVoicemailNotificationRingtone = (VoicemailRingtonePreference) findPreference(
+                getResources().getString(R.string.voicemail_notification_ringtone_key));
+        mVoicemailNotificationRingtone.init(mPhone);
+
+        mVoicemailNotificationVibrate = (CheckBoxPreference) findPreference(
+                getResources().getString(R.string.voicemail_notification_vibrate_key));
+        mVoicemailNotificationVibrate.setOnPreferenceChangeListener(this);
+
+        updateVMPreferenceWidgets(mVoicemailProviders.getValue());
+
+        // check the intent that started this activity and pop up the voicemail
+        // dialog if we've been asked to.
+        // If we have at least one non default VM provider registered then bring up
+        // the selection for the VM provider, otherwise bring up a VM number dialog.
+        // We only bring up the dialog the first time we are called (not after orientation change)
+        if (mShowVoicemailPreference) {
+            if (DBG) log("ACTION_ADD_VOICEMAIL Intent is thrown");
+            if (mVoicemailProviders.hasMoreThanOneVoicemailProvider()) {
+                if (DBG) log("Voicemail data has more than one provider.");
+                simulatePreferenceClick(mVoicemailProviders);
+            } else {
+                onPreferenceChange(mVoicemailProviders, VoicemailProviderListPreference.DEFAULT_KEY);
+                mVoicemailProviders.setValue(VoicemailProviderListPreference.DEFAULT_KEY);
+            }
+            mShowVoicemailPreference = false;
+        }
+
+        updateVoiceNumberField();
+        mVMProviderSettingsForced = false;
+
+        mVoicemailNotificationVibrate.setChecked(
+                VoicemailNotificationSettingsUtil.isVibrationEnabled(mPhone));
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mForeground = false;
     }
 
     @Override
@@ -41,4 +288,813 @@
         }
         return super.onOptionsItemSelected(item);
     }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
+        if (preference == mSubMenuVoicemailSettings) {
+            return true;
+        } else if (preference.getKey().equals(mVoicemailSettings.getKey())) {
+            // Check key instead of comparing reference because closing the voicemail notification
+            // ringtone dialog invokes onResume(), but leaves the old preference screen up,
+            // TODO: Revert to checking reference after migrating voicemail to its own activity.
+            if (DBG) log("onPreferenceTreeClick: Voicemail Settings Preference is clicked.");
+
+            final Dialog dialog = ((PreferenceScreen) preference).getDialog();
+            if (dialog != null) {
+                dialog.getActionBar().setDisplayHomeAsUpEnabled(false);
+            }
+
+            if (preference.getIntent() != null) {
+                if (DBG) log("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; use default behavior in xml.");
+
+                // onActivityResult() will not be called, so reset variables here.
+                mPreviousVMProviderKey = VoicemailProviderListPreference.DEFAULT_KEY;
+                mVMProviderSettingsForced = false;
+                return false;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Implemented to support onPreferenceChangeListener to look for preference changes.
+     *
+     * @param preference is the preference to be changed
+     * @param objValue should be the value of the selection, NOT its localized
+     * display value.
+     */
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object objValue) {
+        if (DBG) log("onPreferenceChange: \"" + preference + "\" changed to \"" + objValue + "\"");
+
+        if (preference == mVoicemailProviders) {
+            final String newProviderKey = (String) objValue;
+
+            // 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 is made to the VM provider setting.");
+                return true;
+            }
+            updateVMPreferenceWidgets(newProviderKey);
+
+            final VoicemailProviderSettings newProviderSettings =
+                    VoicemailProviderSettingsUtil.load(this, newProviderKey);
+
+            // If the user switches to a voice mail provider and we have numbers stored for it we
+            // will automatically change the phone's voice mail and forwarding number to the stored
+            // ones. Otherwise we will bring up provider's configuration UI.
+            if (newProviderSettings == null) {
+                // Force the user into a configuration of the chosen provider
+                Log.w(LOG_TAG, "Saved preferences not found - invoking config");
+                mVMProviderSettingsForced = true;
+                simulatePreferenceClick(mVoicemailSettings);
+            } else {
+                if (DBG) log("Saved preferences found - switching to them");
+                // Set this flag so if we get a failure we revert to previous provider
+                mChangingVMorFwdDueToProviderChange = true;
+                saveVoiceMailAndForwardingNumber(newProviderKey, newProviderSettings);
+            }
+        } else if (preference.getKey().equals(mVoicemailNotificationVibrate.getKey())) {
+            // Check key instead of comparing reference because closing the voicemail notification
+            // ringtone dialog invokes onResume(), but leaves the old preference screen up,
+            // TODO: Revert to checking reference after migrating voicemail to its own activity.
+            VoicemailNotificationSettingsUtil.setVibrationEnabled(
+                    mPhone, Boolean.TRUE.equals(objValue));
+        }
+
+        // Always let the preference setting proceed.
+        return true;
+    }
+
+    /**
+     * Implemented for EditPhoneNumberPreference.GetDefaultNumberListener.
+     * 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
+            // mSubMenuVoicemailSettings itself, so we should return null.
+            if (DBG) log("updating default for voicemail dialog");
+            updateVoiceNumberField();
+            return null;
+        }
+
+        String vmDisplay = mPhone.getVoiceMailNumber();
+        if (TextUtils.isEmpty(vmDisplay)) {
+            // if there is no voicemail number, we just return null to
+            // indicate no contribution.
+            return null;
+        }
+
+        // Return the voicemail number prepended with "VM: "
+        if (DBG) log("updating default for call forwarding dialogs");
+        return getString(R.string.voicemail_abbreviated) + " " + vmDisplay;
+    }
+
+    @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) {
+            boolean failure = false;
+
+            // No matter how the processing of result goes lets clear the flag
+            if (DBG) log("mVMProviderSettingsForced: " + mVMProviderSettingsForced);
+            final boolean isVMProviderSettingsForced = mVMProviderSettingsForced;
+            mVMProviderSettingsForced = false;
+
+            String vmNum = null;
+            if (resultCode != RESULT_OK) {
+                if (DBG) log("onActivityResult: vm provider cfg result not OK.");
+                failure = true;
+            } else {
+                if (data == null) {
+                    if (DBG) log("onActivityResult: vm provider cfg result has no data");
+                    failure = true;
+                } else {
+                    if (data.getBooleanExtra(SIGNOUT_EXTRA, false)) {
+                        if (DBG) log("Provider requested signout");
+                        if (isVMProviderSettingsForced) {
+                            if (DBG) log("Going back to previous provider on signout");
+                            switchToPreviousVoicemailProvider();
+                        } else {
+                            final String victim = mVoicemailProviders.getKey();
+                            if (DBG) log("Relaunching activity and ignoring " + victim);
+                            Intent i = new Intent(ACTION_ADD_VOICEMAIL);
+                            i.putExtra(IGNORE_PROVIDER_EXTRA, victim);
+                            i.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                            this.startActivity(i);
+                        }
+                        return;
+                    }
+                    vmNum = data.getStringExtra(VM_NUMBER_EXTRA);
+                    if (vmNum == null || vmNum.length() == 0) {
+                        if (DBG) log("onActivityResult: vm provider cfg result has no vmnum");
+                        failure = true;
+                    }
+                }
+            }
+            if (failure) {
+                if (DBG) log("Failure in return from voicemail provider.");
+                if (isVMProviderSettingsForced) {
+                    switchToPreviousVoicemailProvider();
+                }
+
+                return;
+            }
+            mChangingVMorFwdDueToProviderChange = isVMProviderSettingsForced;
+            final String fwdNum = data.getStringExtra(FWD_NUMBER_EXTRA);
+
+            // TODO: It would be nice to load the current network setting for this and
+            // send it to the provider when it's config is invoked so it can use this as default
+            final int fwdNumTime = data.getIntExtra(FWD_NUMBER_TIME_EXTRA, 20);
+
+            if (DBG) log("onActivityResult: cfg result has forwarding number " + fwdNum);
+            saveVoiceMailAndForwardingNumber(mVoicemailProviders.getKey(),
+                    new VoicemailProviderSettings(vmNum, fwdNum, fwdNumTime));
+            return;
+        }
+
+        if (requestCode == VOICEMAIL_PREF_ID) {
+            if (resultCode != RESULT_OK) {
+                if (DBG) log("onActivityResult: contact picker result not OK.");
+                return;
+            }
+
+            Cursor cursor = null;
+            try {
+                cursor = getContentResolver().query(data.getData(),
+                    new String[] { CommonDataKinds.Phone.NUMBER }, 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;
+            } finally {
+                if (cursor != null) {
+                    cursor.close();
+                }
+            }
+        }
+
+        super.onActivityResult(requestCode, resultCode, data);
+    }
+
+    /**
+     * Simulates user clicking on a passed preference.
+     * Usually needed when the preference is a dialog preference and we want to invoke
+     * a dialog for this preference programmatically.
+     * TODO: figure out if there is a cleaner way to cause preference dlg to come up
+     */
+    private void simulatePreferenceClick(Preference preference) {
+        // Go through settings until we find our setting
+        // and then simulate a click on it to bring up the dialog
+        final ListAdapter adapter = getPreferenceScreen().getRootAdapter();
+        for (int idx = 0; idx < adapter.getCount(); idx++) {
+            if (adapter.getItem(idx) == preference) {
+                getPreferenceScreen().onItemClick(this.getListView(),
+                        null, idx, adapter.getItemId(idx));
+                break;
+            }
+        }
+    }
+
+
+    //*********************************************************************************************
+    // Activity Dialog Methods
+    //*********************************************************************************************
+
+    @Override
+    protected void onPrepareDialog(int id, Dialog dialog) {
+        super.onPrepareDialog(id, dialog);
+        mCurrentDialogId = id;
+    }
+
+    // dialog creation method, called by showDialog()
+    @Override
+    protected Dialog onCreateDialog(int dialogId) {
+        return VoicemailDialogUtil.getDialog(this, dialogId);
+    }
+
+    @Override
+    public void onDialogClosed(EditPhoneNumberPreference preference, int buttonClicked) {
+        if (DBG) log("onDialogClosed: Button clicked is " + buttonClicked);
+
+        if (buttonClicked == DialogInterface.BUTTON_NEGATIVE) {
+            return;
+        }
+
+        if (preference == mSubMenuVoicemailSettings) {
+            VoicemailProviderSettings newSettings = new VoicemailProviderSettings(
+                    mSubMenuVoicemailSettings.getPhoneNumber(),
+                    VoicemailProviderSettings.NO_FORWARDING);
+            saveVoiceMailAndForwardingNumber(mVoicemailProviders.getKey(), newSettings);
+        }
+    }
+
+    /**
+     * Wrapper around showDialog() that will silently do nothing if we're
+     * not in the foreground.
+     *
+     * This is useful here because most of the dialogs we display from
+     * this class are triggered by asynchronous events (like
+     * success/failure messages from the telephony layer) and it's
+     * possible for those events to come in even after the user has gone
+     * to a different screen.
+     */
+    // TODO: this is too brittle: it's still easy to accidentally add new
+    // code here that calls showDialog() directly (which will result in a
+    // WindowManager$BadTokenException if called after the activity has
+    // been stopped.)
+    //
+    // It would be cleaner to do the "if (mForeground)" check in one
+    // central place, maybe by using a single Handler for all asynchronous
+    // events (and have *that* discard events if we're not in the
+    // foreground.)
+    //
+    // Unfortunately it's not that simple, since we sometimes need to do
+    // actual work to handle these events whether or not we're in the
+    // foreground (see the Handler code in mSetOptionComplete for
+    // example.)
+    //
+    // TODO: It's a bit worrisome that we don't do anything in error cases when we're not in the
+    // foreground. Consider displaying a toast instead.
+    private void showDialogIfForeground(int id) {
+        if (mForeground) {
+            showDialog(id);
+        }
+    }
+
+    private void dismissDialogSafely(int id) {
+        try {
+            dismissDialog(id);
+        } catch (IllegalArgumentException e) {
+            // This is expected in the case where we were in the background
+            // at the time we would normally have shown the dialog, so we didn't
+            // show it.
+        }
+    }
+
+    // This is a method implemented for DialogInterface.OnClickListener.
+    // Used with the error dialog to close the app, voicemail dialog to just dismiss.
+    // Close button is mapped to BUTTON_POSITIVE for the errors that close the activity,
+    // while those that are mapped to BUTTON_NEUTRAL only move the preference focus.
+    public void onClick(DialogInterface dialog, int which) {
+        if (DBG) log("onClick: button clicked is " + which);
+
+        dialog.dismiss();
+        switch (which){
+            case DialogInterface.BUTTON_NEGATIVE:
+                if (mCurrentDialogId == VoicemailDialogUtil.FWD_GET_RESPONSE_ERROR_DIALOG) {
+                    // We failed to get current forwarding settings and the user
+                    // does not wish to continue.
+                    switchToPreviousVoicemailProvider();
+                }
+                break;
+            case DialogInterface.BUTTON_POSITIVE:
+                if (mCurrentDialogId == VoicemailDialogUtil.FWD_GET_RESPONSE_ERROR_DIALOG) {
+                    // We failed to get current forwarding settings but the user
+                    // wishes to continue changing settings to the new vm provider
+                    setVoicemailNumberWithCarrier();
+                } else {
+                    finish();
+                }
+                return;
+            default:
+                // just let the dialog close and go back to the input
+        }
+
+        // In all dialogs, all buttons except BUTTON_POSITIVE lead to the end of user interaction
+        // with settings UI. If we were called to explicitly configure voice mail then
+        // we finish the settings activity here to come back to whatever the user was doing.
+        final String action = getIntent() != null ? getIntent().getAction() : null;
+        if (ACTION_ADD_VOICEMAIL.equals(action)) {
+            finish();
+        }
+    }
+
+
+    //*********************************************************************************************
+    // Voicemail Methods
+    //*********************************************************************************************
+
+    /**
+     * TODO: Refactor to make it easier to understand what's done in the different stages.
+     */
+    private void saveVoiceMailAndForwardingNumber(
+            String key, VoicemailProviderSettings newSettings) {
+        if (DBG) log("saveVoiceMailAndForwardingNumber: " + newSettings.toString());
+        mNewVMNumber = newSettings.getVoicemailNumber();
+        mNewVMNumber = (mNewVMNumber == null) ? "" : mNewVMNumber;
+        mNewFwdSettings = newSettings.getForwardingSettings();
+
+        // Call forwarding is not suppported on CDMA.
+        if (mPhone.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA) {
+            if (DBG) log("Ignoring forwarding setting since this is CDMA phone");
+            mNewFwdSettings = VoicemailProviderSettings.NO_FORWARDING;
+        }
+
+        // Throw a warning if the voicemail is the same and we did not change forwarding.
+        if (mNewVMNumber.equals(mOldVmNumber)
+                && mNewFwdSettings == VoicemailProviderSettings.NO_FORWARDING) {
+            showDialogIfForeground(VoicemailDialogUtil.VM_NOCHANGE_ERROR_DIALOG);
+            return;
+        }
+
+        VoicemailProviderSettingsUtil.save(this, key, newSettings);
+        mVMChangeCompletedSuccessfully = false;
+        mFwdChangesRequireRollback = false;
+        mVMOrFwdSetError = 0;
+
+        if (mNewFwdSettings == VoicemailProviderSettings.NO_FORWARDING
+                || key.equals(mPreviousVMProviderKey)) {
+            if (DBG) log("Set voicemail number. No changes to forwarding number.");
+            setVoicemailNumberWithCarrier();
+        } else {
+            if (DBG) log("Reading current forwarding settings.");
+            int numSettingsReasons = VoicemailProviderSettings.FORWARDING_SETTINGS_REASONS.length;
+            mForwardingReadResults = new CallForwardInfo[numSettingsReasons];
+            for (int i = 0; i < mForwardingReadResults.length; i++) {
+                mPhone.getCallForwardingOption(
+                        VoicemailProviderSettings.FORWARDING_SETTINGS_REASONS[i],
+                        mGetOptionComplete.obtainMessage(EVENT_FORWARDING_GET_COMPLETED, i, 0));
+            }
+            showDialogIfForeground(VoicemailDialogUtil.VM_FWD_READING_DIALOG);
+        }
+
+        PhoneGlobals.getInstance().refreshMwiIndicator(mSubscriptionInfoHelper.getSubId());
+    }
+
+    private final Handler mGetOptionComplete = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            AsyncResult result = (AsyncResult) msg.obj;
+            switch (msg.what) {
+                case EVENT_FORWARDING_GET_COMPLETED:
+                    handleForwardingSettingsReadResult(result, msg.arg1);
+                    break;
+            }
+        }
+    };
+
+    private void handleForwardingSettingsReadResult(AsyncResult ar, int idx) {
+        if (DBG) Log.d(LOG_TAG, "handleForwardingSettingsReadResult: " + idx);
+
+        Throwable error = null;
+        if (ar.exception != null) {
+            error = ar.exception;
+            if (DBG) Log.d(LOG_TAG, "FwdRead: ar.exception=" + error.getMessage());
+        }
+        if (ar.userObj instanceof Throwable) {
+            error = (Throwable) ar.userObj;
+            if (DBG) Log.d(LOG_TAG, "FwdRead: userObj=" + error.getMessage());
+        }
+
+        // We may have already gotten an error and decided to ignore the other results.
+        if (mForwardingReadResults == null) {
+            if (DBG) Log.d(LOG_TAG, "Ignoring fwd reading result: " + idx);
+            return;
+        }
+
+        // In case of error ignore other results, show an error dialog
+        if (error != null) {
+            if (DBG) Log.d(LOG_TAG, "Error discovered for fwd read : " + idx);
+            mForwardingReadResults = null;
+            dismissDialogSafely(VoicemailDialogUtil.VM_FWD_READING_DIALOG);
+            showDialogIfForeground(VoicemailDialogUtil.FWD_GET_RESPONSE_ERROR_DIALOG);
+            return;
+        }
+
+        // Get the forwarding info.
+        mForwardingReadResults[idx] = CallForwardInfoUtil.getCallForwardInfo(
+                (CallForwardInfo[]) ar.result,
+                VoicemailProviderSettings.FORWARDING_SETTINGS_REASONS[idx]);
+
+        // Check if we got all the results already
+        boolean done = true;
+        for (int i = 0; i < mForwardingReadResults.length; i++) {
+            if (mForwardingReadResults[i] == null) {
+                done = false;
+                break;
+            }
+        }
+
+        if (done) {
+            if (DBG) Log.d(LOG_TAG, "Done receiving fwd info");
+            dismissDialogSafely(VoicemailDialogUtil.VM_FWD_READING_DIALOG);
+
+            if (mPreviousVMProviderKey.equals(VoicemailProviderListPreference.DEFAULT_KEY)) {
+                VoicemailProviderSettingsUtil.save(mPhone.getContext(),
+                        VoicemailProviderListPreference.DEFAULT_KEY,
+                        new VoicemailProviderSettings(mOldVmNumber, mForwardingReadResults));
+            }
+            saveVoiceMailAndForwardingNumberStage2();
+        }
+    }
+
+    private void resetForwardingChangeState() {
+        mForwardingChangeResults = new HashMap<Integer, AsyncResult>();
+        mExpectedChangeResultReasons = new HashSet<Integer>();
+    }
+
+    // Called after we are done saving the previous forwarding settings if we needed.
+    private void saveVoiceMailAndForwardingNumberStage2() {
+        mForwardingChangeResults = null;
+        mVoicemailChangeResult = null;
+
+        resetForwardingChangeState();
+        for (int i = 0; i < mNewFwdSettings.length; i++) {
+            CallForwardInfo fi = mNewFwdSettings[i];
+            CallForwardInfo fiForReason =
+                    CallForwardInfoUtil.infoForReason(mForwardingReadResults, fi.reason);
+            final boolean doUpdate = CallForwardInfoUtil.isUpdateRequired(fiForReason, fi);
+
+            if (doUpdate) {
+                if (DBG) log("Setting fwd #: " + i + ": " + fi.toString());
+                mExpectedChangeResultReasons.add(i);
+
+                CallForwardInfoUtil.setCallForwardingOption(mPhone, fi,
+                        mSetOptionComplete.obtainMessage(
+                                EVENT_FORWARDING_CHANGED, fi.reason, 0));
+            }
+        }
+        showDialogIfForeground(VoicemailDialogUtil.VM_FWD_SAVING_DIALOG);
+    }
+
+
+    /**
+     * Callback to handle option update completions
+     */
+    private final Handler mSetOptionComplete = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            AsyncResult result = (AsyncResult) msg.obj;
+            boolean done = false;
+            switch (msg.what) {
+                case EVENT_VOICEMAIL_CHANGED:
+                    mVoicemailChangeResult = result;
+                    mVMChangeCompletedSuccessfully = isVmChangeSuccess();
+                    done = true;
+                    break;
+                case EVENT_FORWARDING_CHANGED:
+                    mForwardingChangeResults.put(msg.arg1, result);
+                    if (result.exception != null) {
+                        Log.w(LOG_TAG, "Error in setting fwd# " + msg.arg1 + ": " +
+                                result.exception.getMessage());
+                    }
+                    if (isForwardingCompleted()) {
+                        if (isFwdChangeSuccess()) {
+                            if (DBG) log("Overall fwd changes completed ok, starting vm change");
+                            setVoicemailNumberWithCarrier();
+                        } else {
+                            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();
+                            while (it.hasNext()) {
+                                Map.Entry<Integer,AsyncResult> entry = it.next();
+                                if (entry.getValue().exception == null) {
+                                    // If at least one succeeded we have to revert
+                                    Log.i(LOG_TAG, "Rollback will be required");
+                                    mFwdChangesRequireRollback = true;
+                                    break;
+                                }
+                            }
+                            if (!mFwdChangesRequireRollback) {
+                                Log.i(LOG_TAG, "No rollback needed.");
+                            }
+                            done = true;
+                        }
+                    }
+                    break;
+                default:
+                    // TODO: should never reach this, may want to throw exception
+            }
+
+            if (done) {
+                if (DBG) log("All VM provider related changes done");
+                if (mForwardingChangeResults != null) {
+                    dismissDialogSafely(VoicemailDialogUtil.VM_FWD_SAVING_DIALOG);
+                }
+                handleSetVmOrFwdMessage();
+            }
+        }
+    };
+
+    /**
+     * Callback to handle option revert completions
+     */
+    private final Handler mRevertOptionComplete = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            AsyncResult result = (AsyncResult) msg.obj;
+            switch (msg.what) {
+                case EVENT_VOICEMAIL_CHANGED:
+                    if (DBG) log("VM revert complete msg");
+                    mVoicemailChangeResult = result;
+                    break;
+
+                case EVENT_FORWARDING_CHANGED:
+                    if (DBG) log("FWD revert complete msg ");
+                    mForwardingChangeResults.put(msg.arg1, result);
+                    if (result.exception != null) {
+                        if (DBG) log("Error in reverting fwd# " + msg.arg1 + ": " +
+                                result.exception.getMessage());
+                    }
+                    break;
+
+                default:
+                    // TODO: should never reach this, may want to throw exception
+            }
+
+            final boolean done = (!mVMChangeCompletedSuccessfully || mVoicemailChangeResult != null)
+                    && (!mFwdChangesRequireRollback || isForwardingCompleted());
+            if (done) {
+                if (DBG) log("All VM reverts done");
+                dismissDialogSafely(VoicemailDialogUtil.VM_REVERTING_DIALOG);
+                onRevertDone();
+            }
+        }
+    };
+
+    private void setVoicemailNumberWithCarrier() {
+        if (DBG) log("save voicemail #: " + mNewVMNumber);
+
+        mVoicemailChangeResult = null;
+        mPhone.setVoiceMailNumber(
+                mPhone.getVoiceMailAlphaTag().toString(),
+                mNewVMNumber,
+                Message.obtain(mSetOptionComplete, EVENT_VOICEMAIL_CHANGED));
+    }
+
+    private void switchToPreviousVoicemailProvider() {
+        if (DBG) log("switchToPreviousVoicemailProvider " + mPreviousVMProviderKey);
+
+        if (mPreviousVMProviderKey == null) {
+            return;
+        }
+
+        if (mVMChangeCompletedSuccessfully || mFwdChangesRequireRollback) {
+            showDialogIfForeground(VoicemailDialogUtil.VM_REVERTING_DIALOG);
+            final VoicemailProviderSettings prevSettings =
+                    VoicemailProviderSettingsUtil.load(this, mPreviousVMProviderKey);
+            if (prevSettings == null) {
+                Log.e(LOG_TAG, "VoicemailProviderSettings for the key \""
+                        + mPreviousVMProviderKey + "\" is null but should be loaded.");
+            }
+
+            if (mVMChangeCompletedSuccessfully) {
+                mNewVMNumber = prevSettings.getVoicemailNumber();
+                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) {
+                Log.i(LOG_TAG, "Requested to rollback forwarding changes.");
+
+                final CallForwardInfo[] prevFwdSettings = prevSettings.getForwardingSettings();
+                if (prevFwdSettings != null) {
+                    Map<Integer, AsyncResult> results = mForwardingChangeResults;
+                    resetForwardingChangeState();
+                    for (int i = 0; i < prevFwdSettings.length; i++) {
+                        CallForwardInfo fi = prevFwdSettings[i];
+                        if (DBG) log("Reverting fwd #: " + i + ": " + fi.toString());
+                        // Only revert the settings for which the update succeeded.
+                        AsyncResult result = results.get(fi.reason);
+                        if (result != null && result.exception == null) {
+                            mExpectedChangeResultReasons.add(fi.reason);
+                            CallForwardInfoUtil.setCallForwardingOption(mPhone, fi,
+                                    mRevertOptionComplete.obtainMessage(
+                                            EVENT_FORWARDING_CHANGED, i, 0));
+                        }
+                    }
+                }
+            }
+        } else {
+            if (DBG) log("No need to revert");
+            onRevertDone();
+        }
+    }
+
+
+    //*********************************************************************************************
+    // Voicemail Handler Helpers
+    //*********************************************************************************************
+
+    /**
+     * Updates the look of the VM preference widgets based on current VM provider settings.
+     * Note that the provider name is loaded fxrorm the found activity via loadLabel in
+     * {@link VoicemailProviderListPreference#initVoiceMailProviders()} in order for it to be
+     * localizable.
+     */
+    private void updateVMPreferenceWidgets(String currentProviderSetting) {
+        final String key = currentProviderSetting;
+        final VoicemailProviderListPreference.VoicemailProvider provider =
+                mVoicemailProviders.getVoicemailProvider(key);
+
+        /* This is the case when we are coming up on a freshly wiped phone and there is no
+         persisted value for the list preference mVoicemailProviders.
+         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: key: " + key + " -> null.");
+
+            mVoicemailProviders.setSummary(getString(R.string.sum_voicemail_choose_provider));
+            mVoicemailSettings.setEnabled(false);
+            mVoicemailSettings.setIntent(null);
+            mVoicemailNotificationVibrate.setEnabled(false);
+        } else {
+            if (DBG) log("updateVMPreferenceWidget: key: " + key + " -> " + provider.toString());
+
+            final String providerName = provider.name;
+            mVoicemailProviders.setSummary(providerName);
+            mVoicemailSettings.setEnabled(true);
+            mVoicemailSettings.setIntent(provider.intent);
+            mVoicemailNotificationVibrate.setEnabled(true);
+        }
+    }
+
+    /**
+     * Update the voicemail number from what we've recorded on the sim.
+     */
+    private void updateVoiceNumberField() {
+        if (DBG) log("updateVoiceNumberField()");
+
+        mOldVmNumber = mPhone.getVoiceMailNumber();
+        if (TextUtils.isEmpty(mOldVmNumber)) {
+            mSubMenuVoicemailSettings.setPhoneNumber("");
+            mSubMenuVoicemailSettings.setSummary(getString(R.string.voicemail_number_not_set));
+        } else {
+            mSubMenuVoicemailSettings.setPhoneNumber(mOldVmNumber);
+            mSubMenuVoicemailSettings.setSummary(mOldVmNumber);
+        }
+    }
+
+    private void handleSetVmOrFwdMessage() {
+        if (DBG) log("handleSetVMMessage: set VM request complete");
+
+        if (!isFwdChangeSuccess()) {
+            handleVmOrFwdSetError(VoicemailDialogUtil.FWD_SET_RESPONSE_ERROR_DIALOG);
+        } else if (!isVmChangeSuccess()) {
+            handleVmOrFwdSetError(VoicemailDialogUtil.VM_RESPONSE_ERROR_DIALOG);
+        } else {
+            handleVmAndFwdSetSuccess(VoicemailDialogUtil.VM_CONFIRM_DIALOG);
+        }
+    }
+
+    /**
+     * Called when Voicemail Provider or its forwarding settings failed. Rolls back partly made
+     * changes to those settings and show "failure" dialog.
+     *
+     * @param dialogId ID of the dialog to show for the specific error case. Either
+     *     {@link #FWD_SET_RESPONSE_ERROR_DIALOG} or {@link #VM_RESPONSE_ERROR_DIALOG}
+     */
+    private void handleVmOrFwdSetError(int dialogId) {
+        if (mChangingVMorFwdDueToProviderChange) {
+            mVMOrFwdSetError = dialogId;
+            mChangingVMorFwdDueToProviderChange = false;
+            switchToPreviousVoicemailProvider();
+            return;
+        }
+        mChangingVMorFwdDueToProviderChange = false;
+        showDialogIfForeground(dialogId);
+        updateVoiceNumberField();
+    }
+
+    /**
+     * 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 dialogId) {
+        if (DBG) log("handleVmAndFwdSetSuccess: key is " + mVoicemailProviders.getKey());
+
+        mPreviousVMProviderKey = mVoicemailProviders.getKey();
+        mChangingVMorFwdDueToProviderChange = false;
+        showDialogIfForeground(dialogId);
+        updateVoiceNumberField();
+    }
+
+    private void onRevertDone() {
+        if (DBG) log("onRevertDone: Changing provider key back to " + mPreviousVMProviderKey);
+
+        updateVMPreferenceWidgets(mPreviousVMProviderKey);
+        updateVoiceNumberField();
+        if (mVMOrFwdSetError != 0) {
+            showDialogIfForeground(mVMOrFwdSetError);
+            mVMOrFwdSetError = 0;
+        }
+    }
+
+
+    //*********************************************************************************************
+    // Voicemail State Helpers
+    //*********************************************************************************************
+
+    /**
+     * Return true if there is a change result for every reason for which we expect a result.
+     */
+    private boolean isForwardingCompleted() {
+        if (mForwardingChangeResults == null) {
+            return true;
+        }
+
+        for (Integer reason : mExpectedChangeResultReasons) {
+            if (mForwardingChangeResults.get(reason) == null) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    private boolean isFwdChangeSuccess() {
+        if (mForwardingChangeResults == null) {
+            return true;
+        }
+
+        for (AsyncResult result : mForwardingChangeResults.values()) {
+            Throwable exception = result.exception;
+            if (exception != null) {
+                String msg = exception.getMessage();
+                msg = (msg != null) ? msg : "";
+                Log.w(LOG_TAG, "Failed to change forwarding setting. Reason: " + msg);
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private boolean isVmChangeSuccess() {
+        if (mVoicemailChangeResult.exception != null) {
+            String msg = mVoicemailChangeResult.exception.getMessage();
+            msg = (msg != null) ? msg : "";
+            Log.w(LOG_TAG, "Failed to change voicemail. Reason: " + msg);
+            return false;
+        }
+        return true;
+    }
+
+    private static void log(String msg) {
+        Log.d(LOG_TAG, msg);
+    }
 }
diff --git a/src/com/android/phone/settings/VoicemailSettingsFragment.java b/src/com/android/phone/settings/VoicemailSettingsFragment.java
deleted file mode 100644
index fef3e8c..0000000
--- a/src/com/android/phone/settings/VoicemailSettingsFragment.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.phone.settings;
-
-import android.os.Bundle;
-import android.preference.PreferenceFragment;
-
-import com.android.phone.R;
-
-public class VoicemailSettingsFragment extends PreferenceFragment {
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        addPreferencesFromResource(R.xml.voicemail_settings);
-    }
-}
diff --git a/src/com/android/phone/settings/fdn/GetPin2Screen.java b/src/com/android/phone/settings/fdn/GetPin2Screen.java
index 5959a51..2394a69 100644
--- a/src/com/android/phone/settings/fdn/GetPin2Screen.java
+++ b/src/com/android/phone/settings/fdn/GetPin2Screen.java
@@ -25,6 +25,7 @@
 import android.text.method.DigitsKeyListener;
 import android.util.Log;
 import android.view.KeyEvent;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
@@ -60,6 +61,15 @@
         mOkButton.setOnClickListener(mClicked);
     }
 
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            onBackPressed();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
     private String getPin2() {
         return mPin2Field.getText().toString();
     }
diff --git a/src/com/android/phone/vvm/omtp/OmtpConstants.java b/src/com/android/phone/vvm/omtp/OmtpConstants.java
new file mode 100644
index 0000000..971d2d6
--- /dev/null
+++ b/src/com/android/phone/vvm/omtp/OmtpConstants.java
@@ -0,0 +1,191 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+package com.android.phone.vvm.omtp;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Wrapper class to hold relevant OMTP constants as defined in the OMTP spec.
+ * <p>
+ * In essence this is a programmatic representation of the relevant portions of OMTP spec.
+ */
+public class OmtpConstants {
+    public static final String SMS_FIELD_SEPARATOR = ";";
+    public static final String SMS_KEY_VALUE_SEPARATOR = "=";
+    public static final String SMS_PREFIX_SEPARATOR = ":";
+
+    public static final String CLIENT_PREFIX = "//VVM";
+    public static final String SYNC_SMS_PREFIX = CLIENT_PREFIX + ":SYNC:";
+    public static final String STATUS_SMS_PREFIX = CLIENT_PREFIX + ":STATUS:";
+
+    // This is the format designated by the OMTP spec.
+    public static final String DATE_TIME_FORMAT = "dd/MM/yyyy HH:mm Z";
+
+    /** OMTP protocol versions. */
+    public static final String PROTOCOL_VERSION1_1 = "11";
+    public static final String PROTOCOL_VERSION1_2 = "12";
+    public static final String PROTOCOL_VERSION1_3 = "13";
+
+    ///////////////////////// Client/Mobile originated SMS //////////////////////
+
+    /** Mobile Originated requests */
+    public static final String ACTIVATE_REQUEST = "Activate";
+    public static final String DEACTIVATE_REQUEST = "Deactivate";
+    public static final String STATUS_REQUEST = "Status";
+
+    /** fields that can be present in a Mobile Originated OMTP SMS */
+    public static final String CLIENT_TYPE = "ct";
+    public static final String APPLICATION_PORT = "pt";
+    public static final String PROTOCOL_VERSION = "pv";
+
+
+    //////////////////////////////// Sync SMS fields ////////////////////////////
+
+    /**
+     * Sync SMS fields.
+     * <p>
+     * Each string constant is the field's key in the SMS body which is used by the parser to
+     * identify the field's value, if present, in the SMS body.
+     */
+
+    /**
+     * The event that triggered this SYNC SMS.
+     * See {@link OmtpConstants#SYNC_TRIGGER_EVENT_VALUES}
+     */
+    public static final String SYNC_TRIGGER_EVENT = "ev";
+    public static final String MESSAGE_UID = "id";
+    public static final String MESSAGE_LENGTH = "l";
+    public static final String NUM_MESSAGE_COUNT = "c";
+    /** See {@link OmtpConstants#CONTENT_TYPE_VALUES} */
+    public static final String CONTENT_TYPE = "t";
+    public static final String SENDER = "s";
+    public static final String TIME = "dt";
+
+    /**
+     * SYNC message trigger events.
+     * <p>
+     * These are the possible values of {@link OmtpConstants#SYNC_TRIGGER_EVENT}.
+     */
+    public static final String NEW_MESSAGE = "NM";
+    public static final String MAILBOX_UPDATE = "MBU";
+    public static final String GREETINGS_UPDATE = "GU";
+
+    public static final String[] SYNC_TRIGGER_EVENT_VALUES = {
+        NEW_MESSAGE,
+        MAILBOX_UPDATE,
+        GREETINGS_UPDATE
+    };
+
+    /**
+     * Content types supported by OMTP VVM.
+     * <p>
+     * These are the possible values of {@link OmtpConstants#CONTENT_TYPE}.
+     */
+    public static final String VOICE = "v";
+    public static final String VIDEO = "o";
+    public static final String FAX = "f";
+    /** Voice message deposited by an external application */
+    public static final String INFOTAINMENT = "i";
+    /** Empty Call Capture - i.e. voicemail with no voice message. */
+    public static final String ECC = "e";
+
+    public static final String[] CONTENT_TYPE_VALUES = {VOICE, VIDEO, FAX, INFOTAINMENT, ECC};
+
+    ////////////////////////////// Status SMS fields ////////////////////////////
+
+    /**
+     * Status SMS fields.
+     * <p>
+     * Each string constant is the field's key in the SMS body which is used by the parser to
+     * identify the field's value, if present, in the SMS body.
+     */
+    /** See {@link OmtpConstants#PROVISIONING_STATUS_VALUES} */
+    public static final String PROVISIONING_STATUS = "st";
+    /** See {@link OmtpConstants#RETURN_CODE_VALUES} */
+    public static final String RETURN_CODE = "rc";
+    /** URL to send users to for activation VVM */
+    public static final String SUBSCRIPTION_URL = "rs";
+    /** IMAP4/SMTP server IP address or fully qualified domain name */
+    public static final String SERVER_ADDRESS = "srv";
+    /** Phone number to access voicemails through Telephony User Interface */
+    public static final String TUI_ACCESS_NUMBER = "tui";
+    /** Number to send client origination SMS */
+    public static final String CLIENT_SMS_DESTINATION_NUMBER = "dn";
+    public static final String IMAP_PORT = "ipt";
+    public static final String IMAP_USER_NAME = "u";
+    public static final String IMAP_PASSWORD = "pw";
+    public static final String SMTP_PORT = "spt";
+    public static final String SMTP_USER_NAME = "smtp_u";
+    public static final String SMTP_PASSWORD = "smtp_pw";
+
+    /**
+     * User provisioning status values.
+     * <p>
+     * Referred by {@link OmtpConstants#PROVISIONING_STATUS}.
+     */
+    // TODO: As per the spec the code could be either be with or w/o quotes  = "N"/N). Currently
+    // this only handles the w/o quotes values.
+    public static final String SUBSCRIBER_NEW = "N";
+    public static final String SUBSCRIBER_READY = "R";
+    public static final String SUBSCRIBER_PROVISIONED = "P";
+    public static final String SUBSCRIBER_UNKNOWN = "U";
+    public static final String SUBSCRIBER_BLOCKED = "B";
+
+    public static final String[] PROVISIONING_STATUS_VALUES = {
+        SUBSCRIBER_NEW,
+        SUBSCRIBER_READY,
+        SUBSCRIBER_PROVISIONED,
+        SUBSCRIBER_UNKNOWN,
+        SUBSCRIBER_BLOCKED
+    };
+
+    /**
+     * The return code included in a status message.
+     * <p>
+     * These are the possible values of {@link OmtpConstants#RETURN_CODE}.
+     */
+    public static final String SUCCESS = "0";
+    public static final String SYSTEM_ERROR = "1";
+    public static final String SUBSCRIBER_ERROR = "2";
+    public static final String MAILBOX_UNKNOWN = "3";
+    public static final String VVM_NOT_ACTIVATED = "4";
+    public static final String VVM_NOT_PROVISIONED = "5";
+    public static final String VVM_CLIENT_UKNOWN = "6";
+    public static final String VVM_MAILBOX_NOT_INITIALIZED = "7";
+
+    public static final String[] RETURN_CODE_VALUES = {
+        SUCCESS,
+        SYSTEM_ERROR,
+        SUBSCRIBER_ERROR,
+        MAILBOX_UNKNOWN,
+        VVM_NOT_ACTIVATED,
+        VVM_NOT_PROVISIONED,
+        VVM_CLIENT_UKNOWN,
+        VVM_MAILBOX_NOT_INITIALIZED,
+    };
+
+    /**
+     * A map of all the field keys to the possible values they can have.
+     */
+    public static final Map<String, String[]> possibleValuesMap = new HashMap<String, String[]>() {{
+        put(SYNC_TRIGGER_EVENT, SYNC_TRIGGER_EVENT_VALUES);
+        put(CONTENT_TYPE, CONTENT_TYPE_VALUES);
+        put(PROVISIONING_STATUS, PROVISIONING_STATUS_VALUES);
+        put(RETURN_CODE, RETURN_CODE_VALUES);
+    }};
+
+}
diff --git a/src/com/android/phone/vvm/omtp/OmtpVvmSyncAccountManager.java b/src/com/android/phone/vvm/omtp/OmtpVvmSyncAccountManager.java
new file mode 100644
index 0000000..b891c70
--- /dev/null
+++ b/src/com/android/phone/vvm/omtp/OmtpVvmSyncAccountManager.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+package com.android.phone.vvm.omtp;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.provider.VoicemailContract;
+import android.telecom.PhoneAccountHandle;
+import android.telephony.SubscriptionManager;
+import android.util.Log;
+
+import com.android.phone.PhoneUtils;
+import com.android.phone.vvm.omtp.sms.StatusMessage;
+
+/**
+ * A singleton class designed to assist in OMTP visual voicemail sync behavior.
+ */
+public class OmtpVvmSyncAccountManager {
+    public static final String TAG = "OmtpVvmSyncAccountManager";
+    // Constants
+    // The authority for the sync adapter's content provider
+    public static final String AUTHORITY = "com.android.voicemail";
+    // An account type, in the form of a domain name
+    public static final String ACCOUNT_TYPE = "com.android.phone.vvm.omtp";
+
+    private static OmtpVvmSyncAccountManager sInstance = new OmtpVvmSyncAccountManager();
+
+    private Context mContext;
+    private SubscriptionManager mSubscriptionManager;
+    private AccountManager mAccountManager;
+
+    /**
+     * Private constructor. Instance should only be acquired through getInstance().
+     */
+    private OmtpVvmSyncAccountManager() {}
+
+    public static OmtpVvmSyncAccountManager getInstance(Context context) {
+        sInstance.setup(context);
+        return sInstance;
+    }
+
+    /**
+     * Set the context and system services so they do not need to be retrieved every time.
+     * @param context The context to get the account manager and subscription manager for.
+     */
+    private void setup(Context context) {
+        if (mContext == null) {
+            mContext = context;
+            mSubscriptionManager = SubscriptionManager.from(context);
+            mAccountManager = AccountManager.get(context);
+        }
+    }
+
+    /**
+     * Register a sync account. There should be a one to one mapping of sync account to voicemail
+     * source. These sync accounts primarily service the purpose of keeping track of how many OMTP
+     * voicemail sources are active and which phone accounts they correspond to.
+     *
+     * @param account The account to register
+     */
+    public void createSyncAccount(Account account) {
+        // Add the account and account type, no password or user data
+        if (mAccountManager.addAccountExplicitly(account, null, null)) {
+             ContentResolver.setIsSyncable(account, AUTHORITY, 1);
+             ContentResolver.setSyncAutomatically(account, AUTHORITY, true);
+        } else {
+            Log.w(TAG, "Attempted to re-register existing account.");
+        }
+    }
+
+    /**
+     * When a voicemail source is removed, we don't always know which one was removed. Check the
+     * list of registered sync accounts against the active subscriptions list and remove the
+     * inactive accounts.
+     */
+    public void removeInactiveAccounts() {
+        Account[] registeredAccounts = mAccountManager.getAccountsByType(ACCOUNT_TYPE);
+        for (int i = 0; i < registeredAccounts.length; i++) {
+            PhoneAccountHandle handle = PhoneUtils.makePstnPhoneAccountHandle(
+                    registeredAccounts[i].name);
+            if (!PhoneUtils.isPhoneAccountActive(mSubscriptionManager, handle)) {
+                mAccountManager.removeAccount(registeredAccounts[i], null, null, null);
+                VoicemailContract.Status.setStatus(mContext, handle,
+                        VoicemailContract.Status.CONFIGURATION_STATE_NOT_CONFIGURED,
+                        VoicemailContract.Status.DATA_CHANNEL_STATE_NO_CONNECTION,
+                        VoicemailContract.Status.NOTIFICATION_CHANNEL_STATE_NO_CONNECTION);
+            }
+        }
+    }
+
+    /**
+     * Check if a certain account is registered.
+     *
+     * @param account The account to look for.
+     * @return {@code true} if the account is in the list of registered OMTP voicemail sync
+     * accounts. {@code false} otherwise.
+     */
+    public boolean isAccountRegistered(Account account) {
+        Account[] accounts = mAccountManager.getAccountsByType(ACCOUNT_TYPE);
+        for (int i = 0; i < accounts.length; i++) {
+            if (account.equals(accounts[i])) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Set the IMAP credentials as extra fields in the account.
+     *
+     * @param account The account to add credentials to.
+     * @param message The status message to extract the fields from.
+     */
+    public void setAccountCredentialsFromStatusMessage(Account account, StatusMessage message) {
+        mAccountManager.setUserData(account, OmtpConstants.IMAP_PORT, message.getImapPort());
+        mAccountManager.setUserData(account, OmtpConstants.SERVER_ADDRESS,
+                message.getServerAddress());
+        mAccountManager.setUserData(account, OmtpConstants.IMAP_USER_NAME,
+                message.getImapUserName());
+        mAccountManager.setUserData(account, OmtpConstants.IMAP_PASSWORD,
+                message.getImapPassword());
+    }
+}
diff --git a/src/com/android/phone/vvm/omtp/OmtpVvmSyncService.java b/src/com/android/phone/vvm/omtp/OmtpVvmSyncService.java
new file mode 100644
index 0000000..fc444ba
--- /dev/null
+++ b/src/com/android/phone/vvm/omtp/OmtpVvmSyncService.java
@@ -0,0 +1,178 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+/**
+ * A {@link Service} which runs the internal implementation of {@link AbstractThreadedSyncAdapter},
+ * syncing voicemails to and from a visual voicemail server.
+ */
+
+package com.android.phone.vvm.omtp;
+
+import android.accounts.Account;
+import android.app.Service;
+import android.content.AbstractThreadedSyncAdapter;
+import android.content.ContentProviderClient;
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SyncResult;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.provider.VoicemailContract;
+import android.provider.VoicemailContract.Voicemails;
+import android.telecom.Voicemail;
+
+import com.android.phone.vvm.omtp.imap.ImapHelper;
+import com.android.phone.vvm.omtp.sync.DirtyVoicemailQuery;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A service to run the VvmSyncAdapter.
+ */
+public class OmtpVvmSyncService extends Service {
+    // Storage for an instance of the sync adapter
+    private static OmtpVvmSyncAdapter sSyncAdapter = null;
+    // Object to use as a thread-safe lock
+    private static final Object sSyncAdapterLock = new Object();
+
+    @Override
+    public void onCreate() {
+        synchronized (sSyncAdapterLock) {
+            if (sSyncAdapter == null) {
+                sSyncAdapter = new OmtpVvmSyncAdapter(getApplicationContext(), true);
+            }
+        }
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return sSyncAdapter.getSyncAdapterBinder();
+    }
+
+    public class OmtpVvmSyncAdapter extends AbstractThreadedSyncAdapter {
+        /**
+         * Sync triggers should pass this extra to clear the database and freshly populate from the
+         * server.
+         */
+        public static final String SYNC_EXTRAS_CLEAR_AND_RELOAD = "extra_clear_and_reload";
+
+        private Context mContext;
+        private ContentResolver mContentResolver;
+
+        public OmtpVvmSyncAdapter(Context context, boolean autoInitialize) {
+            super(context, autoInitialize);
+            mContext = context;
+            mContentResolver = context.getContentResolver();
+        }
+
+        @Override
+        public void onPerformSync(Account account, Bundle extras, String authority,
+                ContentProviderClient provider, SyncResult syncResult) {
+            ImapHelper imapHelper = new ImapHelper(mContext, account);
+
+            if (extras.getBoolean(ContentResolver.SYNC_EXTRAS_UPLOAD, false)) {
+                List<Voicemail> readVoicemails = new ArrayList<Voicemail>();
+                List<Voicemail> deletedVoicemails = new ArrayList<Voicemail>();
+
+                Cursor cursor = DirtyVoicemailQuery.getDirtyVoicemails(mContext);
+                if (cursor == null) {
+                    return;
+                }
+                try {
+                    while (cursor.moveToNext()) {
+                        final long id = cursor.getLong(DirtyVoicemailQuery._ID);
+                        final String sourceData = cursor.getString(DirtyVoicemailQuery.SOURCE_DATA);
+                        final boolean isRead = cursor.getInt(DirtyVoicemailQuery.IS_READ) == 1;
+                        final boolean deleted = cursor.getInt(DirtyVoicemailQuery.DELETED) == 1;
+                        Voicemail voicemail = Voicemail.createForUpdate(id, sourceData).build();
+                        if (deleted) {
+                            // Check deleted first because if the voicemail is deleted, there's no
+                            // need to mark as read.
+                            deletedVoicemails.add(voicemail);
+                        } else if (isRead) {
+                            readVoicemails.add(voicemail);
+                        }
+                    }
+                } finally {
+                    cursor.close();
+                }
+                if (imapHelper.markMessagesAsDeleted(deletedVoicemails)) {
+                    // We want to delete selectively instead of all the voicemails for this provider
+                    // in case the state changed since the IMAP query was completed.
+                    deleteFromDatabase(deletedVoicemails);
+                }
+
+                if (imapHelper.markMessagesAsRead(readVoicemails)) {
+                    markReadInDatabase(readVoicemails);
+                }
+            }
+
+            if (extras.getBoolean(SYNC_EXTRAS_CLEAR_AND_RELOAD, false)) {
+                // Fetch voicemails first before deleting local copy, the fetching may take awhile.
+                List<Voicemail> voicemails = imapHelper.fetchAllVoicemails();
+
+                // Deleting current local messages ensure that we start with a fresh copy
+                // and also don't need to deal with comparing between local and server.
+                VoicemailContract.Voicemails.deleteAll(mContext);
+
+                if (voicemails != null) {
+                    VoicemailContract.Voicemails.insert(mContext, voicemails);
+                }
+            }
+        }
+
+        /**
+         * Deletes a list of voicemails from the voicemail content provider.
+         *
+         * @param voicemails The list of voicemails to delete
+         * @return The number of voicemails deleted
+         */
+        public int deleteFromDatabase(List<Voicemail> voicemails) {
+            int count = voicemails.size();
+            for (int i = 0; i < count; i++) {
+                mContentResolver.delete(Voicemails.CONTENT_URI, Voicemails._ID + "=?",
+                        new String[] { Long.toString(voicemails.get(i).getId()) });
+            }
+            return count;
+        }
+
+        /**
+         * Sends an update command to the voicemail content provider for a list of voicemails.
+         * From the view of the provider, since the updater is the owner of the entry, a blank
+         * "update" means that the voicemail source is indicating that the server has up-to-date
+         * information on the voicemail. This flips the "dirty" bit to "0".
+         *
+         * @param voicemails The list of voicemails to update
+         * @return The number of voicemails updated
+         */
+        public int markReadInDatabase(List<Voicemail> voicemails) {
+            int count = voicemails.size();
+            for (int i = 0; i < count; i++) {
+                Uri uri = ContentUris.withAppendedId(
+                        VoicemailContract.Voicemails.buildSourceUri(mContext.getPackageName()),
+                        voicemails.get(i).getId());
+                mContentResolver.update(uri, new ContentValues(), null, null);
+            }
+            return count;
+        }
+    }
+}
diff --git a/src/com/android/phone/vvm/omtp/SimChangeReceiver.java b/src/com/android/phone/vvm/omtp/SimChangeReceiver.java
new file mode 100644
index 0000000..ec8e45e
--- /dev/null
+++ b/src/com/android/phone/vvm/omtp/SimChangeReceiver.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+package com.android.phone.vvm.omtp;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SmsManager;
+import android.telephony.SubscriptionManager;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.android.internal.telephony.IccCardConstants;
+import com.android.internal.telephony.PhoneConstants;
+import com.android.internal.telephony.TelephonyIntents;
+import com.android.phone.vvm.omtp.sms.OmtpMessageSender;
+
+/**
+ * This class listens to the {@link CarrierConfigManager#ACTION_CARRIER_CONFIG_CHANGED} and
+ * {@link TelephonyIntents#ACTION_SIM_STATE_CHANGED} to determine when a SIM is added, replaced,
+ * or removed.
+ *
+ * When a SIM is added, send an activate SMS. When a SIM is removed, remove the sync accounts and
+ * change the status in the voicemail_status table.
+ */
+public class SimChangeReceiver extends BroadcastReceiver {
+    private final String TAG = "SimChangeReceiver";
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        final String action = intent.getAction();
+        if (action == null) {
+            Log.w(TAG, "Null action for intent.");
+            return;
+        }
+
+        switch (action) {
+            case TelephonyIntents.ACTION_SIM_STATE_CHANGED:
+                if (IccCardConstants.INTENT_VALUE_ICC_ABSENT.equals(
+                        intent.getStringExtra(IccCardConstants.INTENT_KEY_ICC_STATE))) {
+                    Log.i(TAG, "Sim removed, removing inactive accounts");
+                    OmtpVvmSyncAccountManager.getInstance(context).removeInactiveAccounts();
+                }
+                break;
+            case CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED:
+                handleCarrierConfigChange(context, intent);
+                break;
+        }
+    }
+
+    private void handleCarrierConfigChange(Context context, Intent intent) {
+        int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,
+                SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+        if (!SubscriptionManager.isValidSubscriptionId(subId)) {
+            Log.w(TAG, "Invalid subscriptionId or subscriptionId not provided in intent.");
+            return;
+        }
+
+        CarrierConfigManager carrierConfigManager = (CarrierConfigManager)
+                context.getSystemService(Context.CARRIER_CONFIG_SERVICE);
+        if (carrierConfigManager == null) {
+            Log.w(TAG, "No carrier config service found.");
+            return;
+        }
+
+        Bundle carrierConfig = carrierConfigManager.getConfigForSubId(subId);
+        if (carrierConfig == null) {
+            Log.w(TAG, "Empty carrier config.");
+            return;
+        }
+        String vvmType = carrierConfig.getString(
+                CarrierConfigManager.STRING_VVM_TYPE, null);
+
+        if (!CarrierConfigManager.VVM_TYPE_OMTP.equals(vvmType)) {
+            // This is not an OMTP visual voicemail compatible carrier.
+            return;
+        }
+
+        int applicationPort = carrierConfig.getInt(
+                CarrierConfigManager.INT_VVM_PORT_NUMBER, 0);
+        String destinationNumber = carrierConfig.getString(
+                CarrierConfigManager.STRING_VVM_DESTINATION_NUMBER);
+        if (TextUtils.isEmpty(destinationNumber)) {
+            Log.w(TAG, "No destination number for this carrier.");
+            return;
+        }
+
+        Log.i(TAG, "Requesting VVM activation for subId: " + subId);
+        SmsManager smsManager = SmsManager.getSmsManagerForSubscriptionId(subId);
+        OmtpMessageSender messageSender = new OmtpMessageSender(smsManager,
+                (short) applicationPort, destinationNumber, null,
+                OmtpConstants.PROTOCOL_VERSION1_1, null);
+        messageSender.requestVvmActivation(null);
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/phone/vvm/omtp/imap/ImapHelper.java b/src/com/android/phone/vvm/omtp/imap/ImapHelper.java
new file mode 100644
index 0000000..eae6cac
--- /dev/null
+++ b/src/com/android/phone/vvm/omtp/imap/ImapHelper.java
@@ -0,0 +1,376 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+package com.android.phone.vvm.omtp.imap;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.content.Context;
+import android.telecom.Voicemail;
+
+import android.util.Base64;
+
+import com.android.phone.common.mail.Address;
+import com.android.phone.common.mail.Body;
+import com.android.phone.common.mail.BodyPart;
+import com.android.phone.common.mail.FetchProfile;
+import com.android.phone.common.mail.Flag;
+import com.android.phone.common.mail.Message;
+import com.android.phone.common.mail.MessagingException;
+import com.android.phone.common.mail.Multipart;
+import com.android.phone.common.mail.TempDirectory;
+import com.android.phone.common.mail.internet.MimeMessage;
+import com.android.phone.common.mail.store.ImapFolder;
+import com.android.phone.common.mail.store.ImapStore;
+import com.android.phone.common.mail.store.imap.ImapConstants;
+import com.android.phone.common.mail.utils.LogUtils;
+import com.android.phone.vvm.omtp.OmtpConstants;
+import com.android.phone.vvm.omtp.sync.VoicemailFetchedCallback;
+
+import libcore.io.IoUtils;
+
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * A helper interface to abstract commands sent across IMAP interface for a given account.
+ */
+public class ImapHelper {
+    private final String TAG = "ImapHelper";
+
+    private ImapFolder mFolder;
+    private ImapStore mImapStore;
+    private Context mContext;
+
+    public ImapHelper(Context context, Account account) {
+        try {
+            mContext = context;
+            TempDirectory.setTempDirectory(context);
+
+            AccountManager accountManager = AccountManager.get(context);
+            String username = accountManager.getUserData(account, OmtpConstants.IMAP_USER_NAME);
+            String password = accountManager.getUserData(account, OmtpConstants.IMAP_PASSWORD);
+            String serverName = accountManager.getUserData(account, OmtpConstants.SERVER_ADDRESS);
+            int port = Integer.parseInt(
+                    accountManager.getUserData(account, OmtpConstants.IMAP_PORT));
+            // TODO: determine the security protocol (e.g. ssl, tls, none, etc.)
+            mImapStore = new ImapStore(
+                    context, username, password, port, serverName, ImapStore.FLAG_NONE);
+        } catch (NumberFormatException e) {
+            LogUtils.e(TAG, e, "Could not parse port number");
+        }
+    }
+
+    /** The caller thread will block until the method returns. */
+    public boolean markMessagesAsRead(List<Voicemail> voicemails) {
+        return setFlags(voicemails, Flag.SEEN);
+    }
+
+    /** The caller thread will block until the method returns. */
+    public boolean markMessagesAsDeleted(List<Voicemail> voicemails) {
+        return setFlags(voicemails, Flag.DELETED);
+    }
+
+    /**
+     * Set flags on the server for a given set of voicemails.
+     *
+     * @param voicemails The voicemails to set flags for.
+     * @param flags The flags to set on the voicemails.
+     * @return {@code true} if the operation completes successfully, {@code false} otherwise.
+     */
+    private boolean setFlags(List<Voicemail> voicemails, String... flags) {
+        if (voicemails.size() == 0) {
+            return false;
+        }
+        try {
+            mFolder = openImapFolder(ImapFolder.MODE_READ_WRITE);
+            if (mFolder != null) {
+                mFolder.setFlags(convertToImapMessages(voicemails), flags, true);
+                return true;
+            }
+            return false;
+        } catch (MessagingException e) {
+            LogUtils.e(TAG, e, "Messaging exception");
+            return false;
+        } finally {
+            closeImapFolder();
+        }
+    }
+
+    /**
+     * Fetch a list of voicemails from the server.
+     *
+     * @return A list of voicemail objects containing data about voicemails stored on the server.
+     */
+    public List<Voicemail> fetchAllVoicemails() {
+        List<Voicemail> result = new ArrayList<Voicemail>();
+        Message[] messages;
+        try {
+            mFolder = openImapFolder(ImapFolder.MODE_READ_WRITE);
+            if (mFolder == null) {
+                // This means we were unable to successfully open the folder.
+                return null;
+            }
+
+            // This method retrieves lightweight messages containing only the uid of the message.
+            messages = mFolder.getMessages(null);
+
+            for (Message message : messages) {
+                // Get the voicemail details.
+                Voicemail voicemail = fetchVoicemail(message);
+                if (voicemail != null) {
+                    result.add(voicemail);
+                }
+            }
+            return result;
+        } catch (MessagingException e) {
+            LogUtils.e(TAG, e, "Messaging Exception");
+            return null;
+        } finally {
+            closeImapFolder();
+        }
+    }
+
+    /**
+     * Fetches the structure of the given message and returns the voicemail parsed from it.
+     *
+     * @throws MessagingException if fetching the structure of the message fails
+     */
+    private Voicemail fetchVoicemail(Message message)
+            throws MessagingException {
+        LogUtils.d(TAG, "Fetching message structure for " + message.getUid());
+
+        MessageStructureFetchedListener listener = new MessageStructureFetchedListener();
+
+        FetchProfile fetchProfile = new FetchProfile();
+        fetchProfile.addAll(Arrays.asList(FetchProfile.Item.FLAGS, FetchProfile.Item.ENVELOPE,
+                FetchProfile.Item.STRUCTURE));
+
+        // The IMAP folder fetch method will call "messageRetrieved" on the listener when the
+        // message is successfully retrieved.
+        mFolder.fetch(new Message[] {message}, fetchProfile, listener);
+        return listener.getVoicemail();
+    }
+
+
+    public void fetchVoicemailPayload(VoicemailFetchedCallback callback, final String uid) {
+        Message message;
+        try {
+            mFolder = openImapFolder(ImapFolder.MODE_READ_WRITE);
+            if (mFolder == null) {
+                // This means we were unable to successfully open the folder.
+                return;
+            }
+            message = mFolder.getMessage(uid);
+            VoicemailPayload voicemailPayload = fetchVoicemailPayload(message);
+            callback.setVoicemailContent(voicemailPayload);
+        } catch (MessagingException e) {
+        } finally {
+            closeImapFolder();
+        }
+    }
+
+    /**
+     * Fetches the body of the given message and returns the parsed voicemail payload.
+     *
+     * @throws MessagingException if fetching the body of the message fails
+     */
+    private VoicemailPayload fetchVoicemailPayload(Message message)
+            throws MessagingException {
+        LogUtils.d(TAG, "Fetching message body for " + message.getUid());
+
+        MessageBodyFetchedListener listener = new MessageBodyFetchedListener();
+
+        FetchProfile fetchProfile = new FetchProfile();
+        fetchProfile.add(FetchProfile.Item.BODY);
+
+        mFolder.fetch(new Message[] {message}, fetchProfile, listener);
+        return listener.getVoicemailPayload();
+    }
+
+    /**
+     * Listener for the message structure being fetched.
+     */
+    private final class MessageStructureFetchedListener
+            implements ImapFolder.MessageRetrievalListener {
+        private Voicemail mVoicemail;
+
+        public MessageStructureFetchedListener() {
+        }
+
+        public Voicemail getVoicemail() {
+            return mVoicemail;
+        }
+
+        @Override
+        public void messageRetrieved(Message message) {
+            LogUtils.d(TAG, "Fetched message structure for " + message.getUid());
+            LogUtils.d(TAG, "Message retrieved: " + message);
+            try {
+                mVoicemail = getVoicemailFromMessage(message);
+                if (mVoicemail == null) {
+                    LogUtils.d(TAG, "This voicemail does not have an attachment...");
+                    return;
+                }
+            } catch (MessagingException e) {
+                LogUtils.e(TAG, e, "Messaging Exception");
+                closeImapFolder();
+            }
+        }
+
+        /**
+         * Convert an IMAP message to a voicemail object.
+         *
+         * @param message The IMAP message.
+         * @return The voicemail object corresponding to an IMAP message.
+         * @throws MessagingException
+         */
+        private Voicemail getVoicemailFromMessage(Message message) throws MessagingException {
+            if (!message.getMimeType().startsWith("multipart/")) {
+                LogUtils.w(TAG, "Ignored non multi-part message");
+                return null;
+            }
+
+            Multipart multipart = (Multipart) message.getBody();
+            for (int i = 0; i < multipart.getCount(); ++i) {
+                BodyPart bodyPart = multipart.getBodyPart(i);
+                String bodyPartMimeType = bodyPart.getMimeType().toLowerCase();
+                LogUtils.d(TAG, "bodyPart mime type: " + bodyPartMimeType);
+
+                if (bodyPartMimeType.startsWith("audio/")) {
+                    // Found an audio attachment, this is a valid voicemail.
+                    long time = message.getSentDate().getTime();
+                    String number = getNumber(message.getFrom());
+                    boolean isRead = Arrays.asList(message.getFlags()).contains(Flag.SEEN);
+
+                    return Voicemail.createForInsertion(time, number)
+                            .setSourcePackage(mContext.getPackageName())
+                            .setSourceData(message.getUid())
+                            .setIsRead(isRead)
+                            .build();
+                }
+            }
+            // No attachment found, this is not a voicemail.
+            return null;
+        }
+
+        /**
+         * The "from" field of a visual voicemail IMAP message is the number of the caller who left
+         * the message. Extract this number from the list of "from" addresses.
+         *
+         * @param fromAddresses A list of addresses that comprise the "from" line.
+         * @return The number of the voicemail sender.
+         */
+        private String getNumber(Address[] fromAddresses) {
+            if (fromAddresses != null && fromAddresses.length > 0) {
+                if (fromAddresses.length != 1) {
+                    LogUtils.w(TAG, "More than one from addresses found. Using the first one.");
+                }
+                String sender = fromAddresses[0].getAddress();
+                int atPos = sender.indexOf('@');
+                if (atPos != -1) {
+                    // Strip domain part of the address.
+                    sender = sender.substring(0, atPos);
+                }
+                return sender;
+            }
+            return null;
+        }
+    }
+
+    /**
+     * Listener for the message body being fetched.
+     */
+    private final class MessageBodyFetchedListener implements ImapFolder.MessageRetrievalListener {
+        private VoicemailPayload mVoicemailPayload;
+
+        /** Returns the fetch voicemail payload. */
+        public VoicemailPayload getVoicemailPayload() {
+            return mVoicemailPayload;
+        }
+
+        @Override
+        public void messageRetrieved(Message message) {
+            LogUtils.d(TAG, "Fetched message body for " + message.getUid());
+            LogUtils.d(TAG, "Message retrieved: " + message);
+            try {
+                mVoicemailPayload = getVoicemailPayloadFromMessage(message);
+            } catch (MessagingException e) {
+                LogUtils.e(TAG, "Messaging Exception:", e);
+            } catch (IOException e) {
+                LogUtils.e(TAG, "IO Exception:", e);
+            }
+        }
+
+        private VoicemailPayload getVoicemailPayloadFromMessage(Message message)
+                throws MessagingException, IOException {
+            Multipart multipart = (Multipart) message.getBody();
+            for (int i = 0; i < multipart.getCount(); ++i) {
+                BodyPart bodyPart = multipart.getBodyPart(i);
+                String bodyPartMimeType = bodyPart.getMimeType().toLowerCase();
+                LogUtils.d(TAG, "bodyPart mime type: " + bodyPartMimeType);
+
+                if (bodyPartMimeType.startsWith("audio/")) {
+                    byte[] bytes = getAudioDataFromBody(bodyPart.getBody());
+                    LogUtils.d(TAG, String.format("Fetched %s bytes of data", bytes.length));
+                    return new VoicemailPayload(bodyPartMimeType, bytes);
+                }
+            }
+            LogUtils.e(TAG, "No audio attachment found on this voicemail");
+            return null;
+        }
+
+        private byte[] getAudioDataFromBody(Body body) throws IOException, MessagingException {
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            BufferedOutputStream bufferedOut = new BufferedOutputStream(out);
+            try {
+                body.writeTo(bufferedOut);
+            } finally {
+                IoUtils.closeQuietly(bufferedOut);
+            }
+            return Base64.decode(out.toByteArray(), Base64.DEFAULT);
+        }
+    }
+
+    private ImapFolder openImapFolder(String modeReadWrite) {
+        try {
+            ImapFolder folder = new ImapFolder(mImapStore, ImapConstants.INBOX);
+            folder.open(modeReadWrite);
+            return folder;
+        } catch (MessagingException e) {
+            LogUtils.e(TAG, e, "Messaging Exception");
+        }
+        return null;
+    }
+
+    private Message[] convertToImapMessages(List<Voicemail> voicemails) {
+        Message[] messages = new Message[voicemails.size()];
+        for (int i = 0; i < voicemails.size(); ++i) {
+            messages[i] = new MimeMessage();
+            messages[i].setUid(voicemails.get(i).getSourceData());
+        }
+        return messages;
+    }
+
+    private void closeImapFolder() {
+        if (mFolder != null) {
+            mFolder.close(true);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/phone/vvm/omtp/imap/VoicemailPayload.java b/src/com/android/phone/vvm/omtp/imap/VoicemailPayload.java
new file mode 100644
index 0000000..0ffa018
--- /dev/null
+++ b/src/com/android/phone/vvm/omtp/imap/VoicemailPayload.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.phone.vvm.omtp.imap;
+
+/**
+ * The payload for a voicemail, usually audio data.
+ */
+public class VoicemailPayload {
+    private final String mMimeType;
+    private final byte[] mBytes;
+
+    public VoicemailPayload(String mimeType, byte[] bytes) {
+        mMimeType = mimeType;
+        mBytes = bytes;
+    }
+
+    public byte[] getBytes() {
+        return mBytes;
+    }
+
+    public String getMimeType() {
+        return mMimeType;
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/phone/vvm/omtp/sms/OmtpMessageReceiver.java b/src/com/android/phone/vvm/omtp/sms/OmtpMessageReceiver.java
new file mode 100644
index 0000000..57979ff
--- /dev/null
+++ b/src/com/android/phone/vvm/omtp/sms/OmtpMessageReceiver.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+package com.android.phone.vvm.omtp.sms;
+
+import android.accounts.Account;
+import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.provider.Telephony;
+import android.provider.VoicemailContract;
+import android.telecom.PhoneAccountHandle;
+import android.telecom.Voicemail;
+import android.telephony.SmsMessage;
+import android.util.Log;
+
+import com.android.internal.telephony.PhoneConstants;
+import com.android.phone.PhoneUtils;
+import com.android.phone.vvm.omtp.OmtpConstants;
+import com.android.phone.vvm.omtp.OmtpVvmSyncAccountManager;
+import com.android.phone.vvm.omtp.OmtpVvmSyncService.OmtpVvmSyncAdapter;
+
+import java.io.UnsupportedEncodingException;
+
+/**
+ * Receive SMS messages and send for processing by the OMTP visual voicemail source.
+ */
+public class OmtpMessageReceiver extends BroadcastReceiver {
+    private static final String TAG = "OmtpMessageReceiver";
+
+    private Context mContext;
+    private PhoneAccountHandle mPhoneAccount;
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        mContext = context;
+        mPhoneAccount = PhoneUtils.makePstnPhoneAccountHandle(
+                intent.getExtras().getInt(PhoneConstants.PHONE_KEY));
+
+        SmsMessage[] messages = Telephony.Sms.Intents.getMessagesFromIntent(intent);
+        StringBuilder messageBody = new StringBuilder();
+
+        for (int i = 0; i < messages.length; i++) {
+            messageBody.append(messages[i].getMessageBody());
+        }
+
+        WrappedMessageData messageData = OmtpSmsParser.parse(messageBody.toString());
+        if (messageData != null) {
+            if (messageData.getPrefix() == OmtpConstants.SYNC_SMS_PREFIX) {
+                SyncMessage message = new SyncMessage(messageData);
+                processSync(message);
+            } else if (messageData.getPrefix() == OmtpConstants.STATUS_SMS_PREFIX) {
+                StatusMessage message = new StatusMessage(messageData);
+                updateAccount(message);
+            } else {
+                Log.e(TAG, "This should never have happened");
+            }
+        }
+        // Let this fall through: this is not a message we're interested in.
+    }
+
+    /**
+     * A sync message has two purposes: to signal a new voicemail message, and to indicate the
+     * voicemails on the server have changed remotely (usually through the TUI). Save the new
+     * message to the voicemail provider if it is the former case and perform a full sync in the
+     * latter case.
+     *
+     * @param message The sync message to extract data from.
+     */
+    private void processSync(SyncMessage message) {
+        switch (message.getSyncTriggerEvent()) {
+            case OmtpConstants.NEW_MESSAGE:
+                Voicemail voicemail = Voicemail.createForInsertion(
+                        message.getTimestampMillis(), message.getSender())
+                        .setSourceData(message.getId())
+                        .setDuration(message.getLength())
+                        .setSourcePackage(mContext.getPackageName())
+                        .build();
+
+                VoicemailContract.Voicemails.insert(mContext, voicemail);
+                break;
+            case OmtpConstants.MAILBOX_UPDATE:
+                // Needs a total resync
+                Bundle bundle = new Bundle();
+                bundle.putBoolean(OmtpVvmSyncAdapter.SYNC_EXTRAS_CLEAR_AND_RELOAD, true);
+                ContentResolver.requestSync(
+                        new Account(mPhoneAccount.getId(), OmtpVvmSyncAccountManager.ACCOUNT_TYPE),
+                        VoicemailContract.AUTHORITY, bundle);
+                break;
+            case OmtpConstants.GREETINGS_UPDATE:
+                // Not implemented in V1
+                break;
+           default:
+               Log.e(TAG, "Unrecognized sync trigger event: "+message.getSyncTriggerEvent());
+               break;
+        }
+    }
+
+    private void updateAccount(StatusMessage message) {
+        OmtpVvmSyncAccountManager vvmAccountSyncManager =
+                OmtpVvmSyncAccountManager.getInstance(mContext);
+        Account account = new Account(mPhoneAccount.getId(),
+                OmtpVvmSyncAccountManager.ACCOUNT_TYPE);
+
+        if (!vvmAccountSyncManager.isAccountRegistered(account)) {
+            // If the account has not been previously registered, it means that this STATUS sms
+            // is a result of the ACTIVATE sms, so register the voicemail source.
+            vvmAccountSyncManager.createSyncAccount(account);
+            VoicemailContract.Status.setStatus(mContext, mPhoneAccount,
+                    VoicemailContract.Status.CONFIGURATION_STATE_OK,
+                    VoicemailContract.Status.DATA_CHANNEL_STATE_OK,
+                    VoicemailContract.Status.NOTIFICATION_CHANNEL_STATE_OK);
+
+            Bundle bundle = new Bundle();
+            bundle.putBoolean(OmtpVvmSyncAdapter.SYNC_EXTRAS_CLEAR_AND_RELOAD, true);
+            bundle.putBoolean(ContentResolver.SYNC_EXTRAS_UPLOAD, true);
+            ContentResolver.requestSync(account, VoicemailContract.AUTHORITY, bundle);
+        }
+
+        // Save the IMAP credentials in the corresponding account object so they are
+        // persistent and can be retrieved.
+        vvmAccountSyncManager.setAccountCredentialsFromStatusMessage(account, message);
+    }
+}
diff --git a/src/com/android/phone/vvm/omtp/sms/OmtpMessageSender.java b/src/com/android/phone/vvm/omtp/sms/OmtpMessageSender.java
new file mode 100644
index 0000000..0011ac3
--- /dev/null
+++ b/src/com/android/phone/vvm/omtp/sms/OmtpMessageSender.java
@@ -0,0 +1,173 @@
+/*
+ * Copyright (C) 2015 Google Inc. All Rights Reserved.
+ *
+ * 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.vvm.omtp.sms;
+
+import android.annotation.Nullable;
+import android.app.PendingIntent;
+import android.telephony.SmsManager;
+import android.text.TextUtils;
+
+import com.android.phone.vvm.omtp.OmtpConstants;
+import com.android.services.telephony.Log;
+
+import java.io.UnsupportedEncodingException;
+
+/**
+ * Send client originated OMTP messages to the OMTP server.
+ * <p>
+ * Uses {@link PendingIntent} instead of a call back to notify when the message is
+ * sent. This is primarily to keep the implementation simple and reuse what the underlying
+ * {@link SmsManager} interface provides.
+ * <p>
+ * Provides simple APIs to send different types of mobile originated OMTP SMS to the VVM server.
+ */
+public class OmtpMessageSender {
+    private static final String TAG = "OmtpMessageSender";
+    private final SmsManager mSmsManager;
+    private final short mApplicationPort;
+    private final String mDestinationNumber;
+    private final String mClientType;
+    private final String mProtocolVersion;
+    private final String mClientPrefix;
+
+    /**
+     * Creates a new instance of OmtpMessageSenderImpl.
+     *
+     * @param smsManager SMS sending library. There is a different SmsManager for each SIM.
+     * @param applicationPort If set to a value > 0 then a binary sms is sent to this port number.
+     *            Otherwise, a standard text SMS is sent.
+     * @param destinationNumber Destination number to be used.
+     * @param clientType The "ct" field to be set in the MO message. This is the value used by the
+     *            VVM server to identify the client. Certain VVM servers require a specific agreed
+     *            value for this field.
+     * @param protocolVersion OMTP protocol version.
+     * @param clientPrefix The client prefix requested to be used by the server in its MT messages.
+     */
+    public OmtpMessageSender(SmsManager smsManager, short applicationPort,
+            String destinationNumber, String clientType, String protocolVersion,
+            String clientPrefix) {
+        mSmsManager = smsManager;
+        mApplicationPort = applicationPort;
+        mDestinationNumber = destinationNumber;
+        mClientType = clientType;
+        mProtocolVersion = protocolVersion;
+        mClientPrefix = clientPrefix;
+    }
+
+
+    // Activate message:
+    // V1.1: Activate:pv=<value>;ct=<value>
+    // V1.2: Activate:pv=<value>;ct=<value>;pt=<value>;<Clientprefix>
+    // V1.3: Activate:pv=<value>;ct=<value>;pt=<value>;<Clientprefix>
+    /**
+     * Sends a request to the VVM server to activate VVM for the current subscriber.
+     *
+     * @param sentIntent If not NULL this PendingIntent is broadcast when the message is
+     *            successfully sent, or failed.
+     */
+    public void requestVvmActivation(@Nullable PendingIntent sentIntent) {
+        StringBuilder sb = new StringBuilder().append(OmtpConstants.ACTIVATE_REQUEST);
+
+        appendProtocolVersionAndClientType(sb);
+        if (TextUtils.equals(mProtocolVersion, OmtpConstants.PROTOCOL_VERSION1_2) ||
+                TextUtils.equals(mProtocolVersion, OmtpConstants.PROTOCOL_VERSION1_3)) {
+            appendApplicationPort(sb);
+            appendClientPrefix(sb);
+        }
+
+        sendSms(sb.toString(), sentIntent);
+    }
+
+    // Deactivate message:
+    // V1.1: Deactivate:pv=<value>;ct=<string>
+    // V1.2: Deactivate:pv=<value>;ct=<string>
+    // V1.3: Deactivate:pv=<value>;ct=<string>
+    /**
+     * Sends a request to the VVM server to deactivate VVM for the current subscriber.
+     *
+     * @param sentIntent If not NULL this PendingIntent is broadcast when the message is
+     *            successfully sent, or failed.
+     */
+    public void requestVvmDeactivation(@Nullable PendingIntent sentIntent) {
+        StringBuilder sb = new StringBuilder().append(OmtpConstants.DEACTIVATE_REQUEST);
+        appendProtocolVersionAndClientType(sb);
+
+        sendSms(sb.toString(), sentIntent);
+    }
+
+    // Status message:
+    // V1.1: STATUS
+    // V1.2: STATUS
+    // V1.3: STATUS:pv=<value>;ct=<value>;pt=<value>;<Clientprefix>
+    /**
+     * Send a request to the VVM server to get account status of the current subscriber.
+     *
+     * @param sentIntent If not NULL this PendingIntent is broadcast when the message is
+     *            successfully sent, or failed.
+     */
+    public void requestVvmStatus(@Nullable PendingIntent sentIntent) {
+        StringBuilder sb = new StringBuilder().append(OmtpConstants.STATUS_REQUEST);
+
+        if (TextUtils.equals(mProtocolVersion, OmtpConstants.PROTOCOL_VERSION1_3)) {
+            appendProtocolVersionAndClientType(sb);
+            appendApplicationPort(sb);
+            appendClientPrefix(sb);
+        }
+
+        sendSms(sb.toString(), sentIntent);
+    }
+
+    private void sendSms(String text, PendingIntent sentIntent) {
+        // If application port is set to 0 then send simple text message, else send data message.
+        if (mApplicationPort == 0) {
+            Log.v(TAG, String.format("Sending TEXT sms '%s' to %s", text, mDestinationNumber));
+            mSmsManager.sendTextMessageWithSelfPermissions(mDestinationNumber, null, text,
+                    sentIntent, null);
+        } else {
+            byte[] data;
+            try {
+                data = text.getBytes("UTF-8");
+            } catch (UnsupportedEncodingException e) {
+                throw new IllegalStateException("Failed to encode: " + text);
+            }
+            Log.v(TAG, String.format("Sending BINARY sms '%s' to %s:%d", text, mDestinationNumber,
+                    mApplicationPort));
+            mSmsManager.sendDataMessageWithSelfPermissions(mDestinationNumber, null,
+                    mApplicationPort, data, sentIntent, null);
+        }
+    }
+
+    private void appendProtocolVersionAndClientType(StringBuilder sb) {
+        sb.append(OmtpConstants.SMS_PREFIX_SEPARATOR);
+        appendField(sb, OmtpConstants.PROTOCOL_VERSION, mProtocolVersion);
+        sb.append(OmtpConstants.SMS_FIELD_SEPARATOR);
+        appendField(sb, OmtpConstants.CLIENT_TYPE, mClientType);
+    }
+
+    private void appendApplicationPort(StringBuilder sb) {
+        sb.append(OmtpConstants.SMS_FIELD_SEPARATOR);
+        appendField(sb, OmtpConstants.APPLICATION_PORT, mApplicationPort);
+    }
+
+    private void appendClientPrefix(StringBuilder sb) {
+        sb.append(OmtpConstants.SMS_FIELD_SEPARATOR);
+        sb.append(mClientPrefix);
+    }
+
+    private void appendField(StringBuilder sb, String field, Object value) {
+        sb.append(field).append(OmtpConstants.SMS_KEY_VALUE_SEPARATOR).append(value);
+    }
+}
diff --git a/src/com/android/phone/vvm/omtp/sms/OmtpSmsParser.java b/src/com/android/phone/vvm/omtp/sms/OmtpSmsParser.java
new file mode 100644
index 0000000..54a2a02
--- /dev/null
+++ b/src/com/android/phone/vvm/omtp/sms/OmtpSmsParser.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+package com.android.phone.vvm.omtp.sms;
+
+import android.util.ArrayMap;
+import android.util.Log;
+
+import com.android.phone.vvm.omtp.OmtpConstants;
+
+import java.util.Map;
+
+/**
+ * OMTP SMS parser interface, for parsing SYNC and STATUS SMS sent by OMTP visual voicemail server.
+ */
+public class OmtpSmsParser {
+    private static String TAG = "OmtpSmsParser";
+    /**
+     * Parses the supplied SMS body and returns back a structured OMTP message.
+     * Returns null if unable to parse the SMS body.
+     */
+    public static WrappedMessageData parse(String smsBody) {
+        if (smsBody == null) {
+            return null;
+        }
+
+        WrappedMessageData messageData = null;
+        if (smsBody.startsWith(OmtpConstants.SYNC_SMS_PREFIX)) {
+            messageData = new WrappedMessageData(OmtpConstants.SYNC_SMS_PREFIX,
+                    parseSmsBody(smsBody.substring(OmtpConstants.SYNC_SMS_PREFIX.length())));
+            // Check for a mandatory field.
+            String triggerEvent = messageData.extractString(OmtpConstants.SYNC_TRIGGER_EVENT);
+            if (triggerEvent == null) {
+                Log.e(TAG, "Missing mandatory field: " + OmtpConstants.SYNC_TRIGGER_EVENT);
+                return null;
+            }
+        } else if (smsBody.startsWith(OmtpConstants.STATUS_SMS_PREFIX)) {
+            messageData = new WrappedMessageData(OmtpConstants.STATUS_SMS_PREFIX,
+                    parseSmsBody(smsBody.substring(OmtpConstants.STATUS_SMS_PREFIX.length())));
+        }
+
+        return messageData;
+    }
+
+    /**
+     * Converts a String of key/value pairs into a Map object. The WrappedMessageData object
+     * contains helper functions to retrieve the values.
+     *
+     * e.g. "//VVM:STATUS:st=R;rc=0;srv=1;dn=1;ipt=1;spt=0;u=eg@example.com;pw=1"
+     * => "WrappedMessageData [mFields={st=R, ipt=1, srv=1, dn=1, u=eg@example.com, pw=1, rc=0}]"
+     *
+     * @param message The sms string with the prefix removed.
+     * @return A WrappedMessageData object containing the map.
+     */
+    private static Map<String, String> parseSmsBody(String message) {
+        Map<String, String> keyValues = new ArrayMap<String, String>();
+        String[] entries = message.split(OmtpConstants.SMS_FIELD_SEPARATOR);
+        for (String entry : entries) {
+            String[] keyValue = entry.split(OmtpConstants.SMS_KEY_VALUE_SEPARATOR);
+            if (keyValue.length != 2) {
+                continue;
+            }
+            keyValues.put(keyValue[0].trim(), keyValue[1].trim());
+        }
+
+        return keyValues;
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/phone/vvm/omtp/sms/StatusMessage.java b/src/com/android/phone/vvm/omtp/sms/StatusMessage.java
new file mode 100644
index 0000000..7e4faac
--- /dev/null
+++ b/src/com/android/phone/vvm/omtp/sms/StatusMessage.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+package com.android.phone.vvm.omtp.sms;
+
+import android.telecom.Log;
+
+import com.android.phone.vvm.omtp.OmtpConstants;
+
+/**
+ * Structured data representation of OMTP STATUS message.
+ *
+ * The getters will return null if the field was not set in the message body or it could not be
+ * parsed.
+ */
+public class StatusMessage {
+    // NOTE: Following Status SMS fields are not yet parsed, as they do not seem
+    // to be useful for initial omtp source implementation.
+    // lang, g_len, vs_len, pw_len, pm, gm, vtc, vt
+
+    private final String mProvisioningStatus;
+    private final String mStatusReturnCode;
+    private final String mSubscriptionUrl;
+    private final String mServerAddress;
+    private final String mTuiAccessNumber;
+    private final String mClientSmsDestinationNumber;
+    private final String mImapPort;
+    private final String mImapUserName;
+    private final String mImapPassword;
+    private final String mSmtpPort;
+    private final String mSmtpUserName;
+    private final String mSmtpPassword;
+
+    @Override
+    public String toString() {
+        return "StatusMessage [mProvisioningStatus=" + mProvisioningStatus
+                + ", mStatusReturnCode=" + mStatusReturnCode
+                + ", mSubscriptionUrl=" + mSubscriptionUrl
+                + ", mServerAddress=" + mServerAddress
+                + ", mTuiAccessNumber=" + mTuiAccessNumber
+                + ", mClientSmsDestinationNumber=" + mClientSmsDestinationNumber
+                + ", mImapPort=" + mImapPort
+                + ", mImapUserName=" + mImapUserName
+                + ", mImapPassword=" + Log.pii(mImapPassword)
+                + ", mSmtpPort=" + mSmtpPort
+                + ", mSmtpUserName=" + mSmtpUserName
+                + ", mSmtpPassword=" + Log.pii(mSmtpPassword) + "]";
+    }
+
+    public StatusMessage(WrappedMessageData wrappedData) {
+        mProvisioningStatus = wrappedData.extractString(OmtpConstants.PROVISIONING_STATUS);
+        mStatusReturnCode = wrappedData.extractString(OmtpConstants.RETURN_CODE);
+        mSubscriptionUrl = wrappedData.extractString(OmtpConstants.SUBSCRIPTION_URL);
+        mServerAddress = wrappedData.extractString(OmtpConstants.SERVER_ADDRESS);
+        mTuiAccessNumber = wrappedData.extractString(OmtpConstants.TUI_ACCESS_NUMBER);
+        mClientSmsDestinationNumber = wrappedData.extractString(
+                OmtpConstants.CLIENT_SMS_DESTINATION_NUMBER);
+        mImapPort = wrappedData.extractString(OmtpConstants.IMAP_PORT);
+        mImapUserName = wrappedData.extractString(OmtpConstants.IMAP_USER_NAME);
+        mImapPassword = wrappedData.extractString(OmtpConstants.IMAP_PASSWORD);
+        mSmtpPort = wrappedData.extractString(OmtpConstants.SMTP_PORT);
+        mSmtpUserName = wrappedData.extractString(OmtpConstants.SMTP_USER_NAME);
+        mSmtpPassword = wrappedData.extractString(OmtpConstants.SMTP_PASSWORD);
+    }
+
+    /**
+     * @return the subscriber's VVM provisioning status.
+     */
+    public String getProvisioningStatus() {
+        return mProvisioningStatus;
+    }
+
+    /**
+     * @return the return-code of the status SMS.
+     */
+    public String getReturnCode() {
+        return mStatusReturnCode;
+    }
+
+    /**
+     * @return the URL of the voicemail server. This is the URL to send the users to for subscribing
+     * to the visual voicemail service.
+     */
+    public String getSubscriptionUrl() {
+        return mSubscriptionUrl;
+    }
+
+    /**
+     * @return the voicemail server address. Either server IP address or fully qualified domain
+     * name.
+     */
+    public String getServerAddress() {
+        return mServerAddress;
+    }
+
+    /**
+     * @return the Telephony User Interface number to call to access voicemails directly from the
+     * IVR.
+     */
+    public String getTuiAccessNumber() {
+        return mTuiAccessNumber;
+    }
+
+    /**
+     * @return the number to which client originated SMSes should be sent to.
+     */
+    public String getClientSmsDestinationNumber() {
+        return mClientSmsDestinationNumber;
+    }
+
+    /**
+     * @return the IMAP server port to talk to.
+     */
+    public String getImapPort() {
+        return mImapPort;
+    }
+
+    /**
+     * @return the IMAP user name to be used for authentication.
+     */
+    public String getImapUserName() {
+        return mImapUserName;
+    }
+
+    /**
+     * @return the IMAP password to be used for authentication.
+     */
+    public String getImapPassword() {
+        return mImapPassword;
+    }
+
+    /**
+     * @return the SMTP server port to talk to.
+     */
+    public String getSmtpPort() {
+        return mSmtpPort;
+    }
+
+    /**
+     * @return the SMTP user name to be used for SMTP authentication.
+     */
+    public String getSmtpUserName() {
+        return mSmtpUserName;
+    }
+
+    /**
+     * @return the SMTP password to be used for SMTP authentication.
+     */
+    public String getSmtpPassword() {
+        return mSmtpPassword;
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/phone/vvm/omtp/sms/SyncMessage.java b/src/com/android/phone/vvm/omtp/sms/SyncMessage.java
new file mode 100644
index 0000000..9a78a6d
--- /dev/null
+++ b/src/com/android/phone/vvm/omtp/sms/SyncMessage.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+package com.android.phone.vvm.omtp.sms;
+
+import com.android.phone.vvm.omtp.OmtpConstants;
+
+/**
+ * Structured data representation of an OMTP SYNC message.
+ *
+ * Getters will return null if the field was not set in the message body or it could not be parsed.
+ */
+public class SyncMessage {
+    // Sync event that triggered this message.
+    private final String mSyncTriggerEvent;
+    // Total number of new messages on the server.
+    private final Integer mNewMessageCount;
+    // UID of the new message.
+    private final String mMessageId;
+    // Length of the message.
+    private final Integer mMessageLength;
+    // Content type (voice, video, fax...) of the new message.
+    private final String mContentType;
+    // Sender of the new message.
+    private final String mSender;
+    // Timestamp (in millis) of the new message.
+    private final Long mMsgTimeMillis;
+
+    @Override
+    public String toString() {
+        return "SyncMessage [mSyncTriggerEvent=" + mSyncTriggerEvent
+                + ", mNewMessageCount=" + mNewMessageCount
+                + ", mMessageId=" + mMessageId
+                + ", mMessageLength=" + mMessageLength
+                + ", mContentType=" + mContentType
+                + ", mSender=" + mSender
+                + ", mMsgTimeMillis=" + mMsgTimeMillis + "]";
+    }
+
+    public SyncMessage(WrappedMessageData wrappedData) {
+        mSyncTriggerEvent = wrappedData.extractString(OmtpConstants.SYNC_TRIGGER_EVENT);
+        mMessageId = wrappedData.extractString(OmtpConstants.MESSAGE_UID);
+        mMessageLength = wrappedData.extractInteger(OmtpConstants.MESSAGE_LENGTH);
+        mContentType = wrappedData.extractString(OmtpConstants.CONTENT_TYPE);
+        mSender = wrappedData.extractString(OmtpConstants.SENDER);
+        mNewMessageCount = wrappedData.extractInteger(OmtpConstants.NUM_MESSAGE_COUNT);
+        mMsgTimeMillis = wrappedData.extractTime(OmtpConstants.TIME);
+    }
+
+    /**
+     * @return the event that triggered the sync message. This is a mandatory field and must always
+     * be set.
+     */
+    public String getSyncTriggerEvent() {
+        return mSyncTriggerEvent;
+    }
+
+    /**
+     * @return the number of new messages stored on the voicemail server.
+     */
+    public int getNewMessageCount() {
+        return mNewMessageCount;
+    }
+
+    /**
+     * @return the message ID of the new message.
+     * <p>
+     * Expected to be set only for
+     * {@link com.android.phone.vvm.omtp.OmtpConstants#NEW_MESSAGE}
+     */
+    public String getId() {
+        return mMessageId;
+    }
+
+    /**
+     * @return the content type of the new message.
+     * <p>
+     * Expected to be set only for
+     * {@link com.android.phone.vvm.omtp.OmtpConstants#NEW_MESSAGE}
+     */
+    public String getContentType() {
+        return mContentType;
+    }
+
+    /**
+     * @return the message length of the new message.
+     * <p>
+     * Expected to be set only for
+     * {@link com.android.phone.vvm.omtp.OmtpConstants#NEW_MESSAGE}
+     */
+    public int getLength() {
+        return mMessageLength;
+    }
+
+    /**
+     * @return the sender's phone number of the new message specified as MSISDN.
+     * <p>
+     * Expected to be set only for
+     * {@link com.android.phone.vvm.omtp.OmtpConstants#NEW_MESSAGE}
+     */
+    public String getSender() {
+        return mSender;
+    }
+
+    /**
+     * @return the timestamp as milliseconds for the new message.
+     * <p>
+     * Expected to be set only for
+     * {@link com.android.phone.vvm.omtp.OmtpConstants#NEW_MESSAGE}
+     */
+    public long getTimestampMillis() {
+        return mMsgTimeMillis;
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/phone/vvm/omtp/sms/WrappedMessageData.java b/src/com/android/phone/vvm/omtp/sms/WrappedMessageData.java
new file mode 100644
index 0000000..109dfb2
--- /dev/null
+++ b/src/com/android/phone/vvm/omtp/sms/WrappedMessageData.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+package com.android.phone.vvm.omtp.sms;
+
+import android.text.TextUtils;
+import android.util.ArrayMap;
+import android.util.Log;
+
+import com.android.phone.vvm.omtp.OmtpConstants;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * Class wrapping the raw OMTP message data, internally represented as as map of all key-value pairs
+ * found in the SMS body.
+ * <p>
+ * Provides convenience methods to extract parse fields of different types.
+ * <p>
+ * All the methods return null if either the field was not present or it could not be parsed.
+ */
+public class WrappedMessageData {
+    private final String TAG = "WrappedMessageData";
+    private final String mPrefix;
+    private final Map<String, String> mFields;
+
+    @Override
+    public String toString() {
+        return "WrappedMessageData [mFields=" + mFields + "]";
+    }
+
+    WrappedMessageData(String prefix, Map<String, String> keyValues) {
+        mPrefix = prefix;
+        mFields = new ArrayMap<String, String>();
+        mFields.putAll(keyValues);
+    }
+
+    /**
+     * @return The String prefix of the message, designating whether this is the message data of a
+     * STATUS or SYNC sms.
+     */
+    String getPrefix() {
+        return mPrefix;
+    }
+
+    /**
+     * Extracts the requested field from underlying data and returns the String value as is.
+     *
+     * @param field The requested field.
+     * @return the parsed string value, or null if the field was not present or not valid.
+     */
+    String extractString(final String field) {
+        String value = mFields.get(field);
+        String[] possibleValues = OmtpConstants.possibleValuesMap.get(field);
+        if (possibleValues == null) {
+            return value;
+        }
+        for (int i = 0; i < possibleValues.length; i++) {
+            if (TextUtils.equals(value, possibleValues[i])) {
+                return value;
+            }
+        }
+        Log.e(TAG, "extractString - value \"" + value +
+                "\" of field \"" + field + "\" is not allowed.");
+        return null;
+    }
+
+    /**
+     * Extracts the requested field from underlying data and parses it as an {@link Integer}.
+     *
+     * @param field The requested field.
+     * @return the parsed integer value, or null if the field was not present.
+     */
+    Integer extractInteger(final String field) {
+        String value = mFields.get(field);
+        if (value == null) {
+            return null;
+        }
+
+        try {
+            return Integer.decode(value);
+        } catch (NumberFormatException e) {
+            Log.e(TAG, "extractInteger - could not parse integer: " + value);
+            return null;
+        }
+    }
+
+    /**
+     * Extracts the requested field from underlying data and parses it as a date/time represented in
+     * {@link OmtpConstants#DATE_TIME_FORMAT} format.
+     *
+     * @param field The requested field.
+     * @return the parsed string value, or null if the field was not present.
+     */
+    Long extractTime(final String field) {
+        String value = mFields.get(field);
+        if (value == null) {
+            return null;
+        }
+
+        try {
+            return new SimpleDateFormat(
+                    OmtpConstants.DATE_TIME_FORMAT, Locale.US).parse(value).getTime();
+        } catch (ParseException e) {
+            Log.e(TAG, "extractTime - could not parse time: " + value);
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/phone/vvm/omtp/sync/DirtyVoicemailQuery.java b/src/com/android/phone/vvm/omtp/sync/DirtyVoicemailQuery.java
new file mode 100644
index 0000000..8c70372
--- /dev/null
+++ b/src/com/android/phone/vvm/omtp/sync/DirtyVoicemailQuery.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+package com.android.phone.vvm.omtp.sync;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+import android.provider.VoicemailContract;
+import android.provider.VoicemailContract.Voicemails;
+
+/**
+ * Construct a query to get dirty voicemails.
+ */
+public class DirtyVoicemailQuery {
+    final static String[] PROJECTION = new String[] {
+            Voicemails._ID,              // 0
+            Voicemails.SOURCE_DATA,      // 1
+            Voicemails.IS_READ,          // 2
+            Voicemails.DELETED,          // 3
+    };
+
+    public static final int _ID = 0;
+    public static final int SOURCE_DATA = 1;
+    public static final int IS_READ = 2;
+    public static final int DELETED = 3;
+
+    final static String SELECTION = Voicemails.DIRTY + "=1";
+
+    /**
+     * Get all the locally modified voicemails that have not been synced to the server.
+     *
+     * @param context The context from the package calling the method. This will be the source.
+     * @return A list of all locally modified voicemails.
+     */
+    public static Cursor getDirtyVoicemails(Context context) {
+        ContentResolver contentResolver = context.getContentResolver();
+        Uri sourceUri = VoicemailContract.Voicemails.buildSourceUri(context.getPackageName());
+        return contentResolver.query(sourceUri, PROJECTION, SELECTION, null, null);
+    }
+}
diff --git a/src/com/android/phone/vvm/omtp/sync/FetchVoicemailReceiver.java b/src/com/android/phone/vvm/omtp/sync/FetchVoicemailReceiver.java
new file mode 100644
index 0000000..88d6983
--- /dev/null
+++ b/src/com/android/phone/vvm/omtp/sync/FetchVoicemailReceiver.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+package com.android.phone.vvm.omtp.sync;
+
+import android.accounts.Account;
+import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.database.Cursor;
+import android.net.Uri;
+import android.provider.VoicemailContract;
+import android.provider.VoicemailContract.Voicemails;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.android.phone.vvm.omtp.OmtpVvmSyncAccountManager;
+import com.android.phone.vvm.omtp.imap.ImapHelper;
+
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+
+public class FetchVoicemailReceiver extends BroadcastReceiver {
+    private static final String TAG = "FetchVoicemailReceiver";
+
+    final static String[] PROJECTION = new String[] {
+        Voicemails.SOURCE_DATA,      // 0
+        Voicemails.PHONE_ACCOUNT_ID, // 1
+    };
+
+    public static final int SOURCE_DATA = 0;
+    public static final int PHONE_ACCOUNT_ID = 1;
+
+    private ContentResolver mContentResolver;
+    private Uri mUri;
+
+    @Override
+    public void onReceive(final Context context, Intent intent) {
+        if (VoicemailContract.ACTION_FETCH_VOICEMAIL.equals(intent.getAction())) {
+            mContentResolver = context.getContentResolver();
+            mUri = intent.getData();
+
+            if (mUri == null) {
+                Log.w(TAG, VoicemailContract.ACTION_FETCH_VOICEMAIL + " intent sent with no data");
+                return;
+            }
+
+            if (!context.getPackageName().equals(
+                    mUri.getQueryParameter(VoicemailContract.PARAM_KEY_SOURCE_PACKAGE))) {
+                // Ignore if the fetch request is for a voicemail not from this package.
+                return;
+            }
+
+            Cursor cursor = mContentResolver.query(mUri, PROJECTION, null, null, null);
+            if (cursor == null) {
+                return;
+            }
+            try {
+                if (cursor.moveToFirst()) {
+                    final String uid = cursor.getString(SOURCE_DATA);
+                    String accountId = cursor.getString(PHONE_ACCOUNT_ID);
+                    if (TextUtils.isEmpty(accountId)) {
+                        TelephonyManager telephonyManager = (TelephonyManager)
+                                context.getSystemService(Context.TELEPHONY_SERVICE);
+                        accountId = telephonyManager.getSimSerialNumber();
+
+                        if (TextUtils.isEmpty(accountId)) {
+                            Log.e(TAG, "Account null and no default sim found.");
+                            return;
+                        }
+                    }
+                    final Account account = new Account(accountId,
+                            OmtpVvmSyncAccountManager.ACCOUNT_TYPE);
+
+                    if (!OmtpVvmSyncAccountManager.getInstance(context)
+                            .isAccountRegistered(account)) {
+                        Log.w(TAG, "Account not registered - cannot retrieve message.");
+                        return;
+                    }
+
+                    Executor executor = Executors.newCachedThreadPool();
+                    executor.execute(new Runnable() {
+                        @Override
+                        public void run() {
+                            new ImapHelper(context, account).fetchVoicemailPayload(
+                                    new VoicemailFetchedCallback(context, mUri), uid);
+                        }
+                    });
+                }
+            } finally {
+                cursor.close();
+            }
+        }
+    }
+}
diff --git a/src/com/android/phone/vvm/omtp/sync/VoicemailFetchedCallback.java b/src/com/android/phone/vvm/omtp/sync/VoicemailFetchedCallback.java
new file mode 100644
index 0000000..006e83f
--- /dev/null
+++ b/src/com/android/phone/vvm/omtp/sync/VoicemailFetchedCallback.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+package com.android.phone.vvm.omtp.sync;
+
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.Context;
+import android.net.Uri;
+import android.provider.VoicemailContract.Voicemails;
+import android.util.Log;
+
+import com.android.phone.vvm.omtp.imap.VoicemailPayload;
+
+import libcore.io.IoUtils;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+/**
+ * Callback for when a voicemail payload is fetched. It copies the returned stream to the data
+ * file corresponding to the voicemail.
+ */
+public class VoicemailFetchedCallback {
+    private static final String TAG = "VoicemailFetchedCallback";
+
+    private ContentResolver mContentResolver;
+    private Uri mUri;
+
+    VoicemailFetchedCallback(Context context, Uri uri) {
+        mContentResolver = context.getContentResolver();
+        mUri = uri;
+    }
+
+    /**
+     * Saves the voicemail payload data into the voicemail provider then sets the "has_content" bit
+     * of the voicemail to "1".
+     *
+     * @param voicemailPayload The object containing the content data for the voicemail
+     */
+    public void setVoicemailContent(VoicemailPayload voicemailPayload) {
+        Log.d(TAG, String.format("Writing new voicemail content: %s", mUri));
+        OutputStream outputStream = null;
+
+        try {
+            outputStream = mContentResolver.openOutputStream(mUri);
+            byte[] inputBytes = voicemailPayload.getBytes();
+            if (inputBytes != null) {
+                outputStream.write(inputBytes);
+            }
+        } catch (IOException e) {
+            Log.e(TAG, "Error writing to file: ", e);
+        } finally {
+            IoUtils.closeQuietly(outputStream);
+        }
+
+        // Update mime_type & has_content after we are done with file update.
+        ContentValues values = new ContentValues();
+        values.put(Voicemails.MIME_TYPE, voicemailPayload.getMimeType());
+        values.put(Voicemails.HAS_CONTENT, true);
+        int updatedCount = mContentResolver.update(mUri, values, null, null);
+        if (updatedCount != 1) {
+            Log.e(TAG, "Updating voicemail should have updated 1 row, was: " + updatedCount);
+        }
+    }
+}
diff --git a/src/com/android/services/telephony/CdmaConference.java b/src/com/android/services/telephony/CdmaConference.java
index fdd2110..3423a3e 100755
--- a/src/com/android/services/telephony/CdmaConference.java
+++ b/src/com/android/services/telephony/CdmaConference.java
@@ -18,9 +18,11 @@
 
 import android.content.Context;
 import android.content.res.Resources;
+import android.os.Bundle;
 import android.telecom.Conference;
 import android.telecom.Connection;
 import android.telecom.PhoneAccountHandle;
+import android.telephony.CarrierConfigManager;
 
 import com.android.internal.telephony.Call;
 import com.android.internal.telephony.CallStateException;
@@ -42,7 +44,7 @@
 
     public void updateCapabilities(int capabilities) {
         capabilities |= Connection.CAPABILITY_MUTE | Connection.CAPABILITY_GENERIC_CONFERENCE;
-        setCapabilities(capabilities);
+        setConnectionCapabilities(capabilities);
     }
 
     /**
@@ -165,9 +167,11 @@
         Context context = PhoneGlobals.getInstance();
 
         if (context != null) {
-            Resources r = context.getResources();
-            if (r != null) {
-                supportSwapAfterMerge = r.getBoolean(R.bool.support_swap_after_merge);
+            CarrierConfigManager configManager = (CarrierConfigManager) context.getSystemService(
+                    Context.CARRIER_CONFIG_SERVICE);
+            Bundle b = configManager.getConfig();
+            if (b != null) {
+                supportSwapAfterMerge = b.getBoolean(CarrierConfigManager.BOOL_SUPPORT_SWAP_AFTER_MERGE);
                 Log.d(this, "Current network support swap after call merged capability is "
                         + supportSwapAfterMerge);
             }
diff --git a/src/com/android/services/telephony/CdmaConnection.java b/src/com/android/services/telephony/CdmaConnection.java
index 0baa3cc..d2250d4 100644
--- a/src/com/android/services/telephony/CdmaConnection.java
+++ b/src/com/android/services/telephony/CdmaConnection.java
@@ -27,7 +27,7 @@
 import com.android.internal.telephony.CallStateException;
 import com.android.internal.telephony.Connection;
 import com.android.internal.telephony.Phone;
-import com.android.phone.Constants;
+import com.android.phone.settings.SettingsConstants;
 
 import java.util.LinkedList;
 import java.util.Queue;
@@ -155,13 +155,16 @@
         mIsCallWaiting = originalConnection != null &&
                 originalConnection.getState() == Call.State.WAITING;
 
-        if (state == android.telecom.Connection.STATE_DIALING) {
-            if (isEmergency()) {
-                mEmergencyTonePlayer.start();
+        if (mEmergencyTonePlayer != null) {
+            if (state == android.telecom.Connection.STATE_DIALING) {
+                if (isEmergency()) {
+                    mEmergencyTonePlayer.start();
+                }
+            } else {
+                // No need to check if it is an emergency call, since it is a no-op if it
+                // isn't started.
+                mEmergencyTonePlayer.stop();
             }
-        } else {
-            // No need to check if it is an emergency call, since it is a no-op if it isn't started.
-            mEmergencyTonePlayer.stop();
         }
 
         super.onStateChanged(state);
@@ -234,8 +237,8 @@
         int dtmfTypeSetting = Settings.System.getInt(
                 getPhone().getContext().getContentResolver(),
                 Settings.System.DTMF_TONE_TYPE_WHEN_DIALING,
-                Constants.DTMF_TONE_TYPE_NORMAL);
-        return dtmfTypeSetting == Constants.DTMF_TONE_TYPE_NORMAL;
+                SettingsConstants.DTMF_TONE_TYPE_NORMAL);
+        return dtmfTypeSetting == SettingsConstants.DTMF_TONE_TYPE_NORMAL;
     }
 
     private void sendShortDtmfToNetwork(char digit) {
diff --git a/src/com/android/services/telephony/DisconnectCauseUtil.java b/src/com/android/services/telephony/DisconnectCauseUtil.java
index 0e9c0d0..aaaf7db 100644
--- a/src/com/android/services/telephony/DisconnectCauseUtil.java
+++ b/src/com/android/services/telephony/DisconnectCauseUtil.java
@@ -22,6 +22,7 @@
 
 import com.android.phone.PhoneGlobals;
 import com.android.phone.common.R;
+import com.android.phone.ImsUtil;
 
 public class DisconnectCauseUtil {
 
@@ -254,15 +255,18 @@
                 break;
 
             case android.telephony.DisconnectCause.POWER_OFF:
-                // Radio is explictly powered off, presumably because the
-                // device is in airplane mode.
-                //
-                // TODO: For now this UI is ultra-simple: we simply display
-                // a message telling the user to turn off airplane mode.
-                // But it might be nicer for the dialog to offer the option
-                // to turn the radio on right there (and automatically retry
-                // the call once network registration is complete.)
-                resourceId = R.string.incall_error_power_off;
+                // Radio is explictly powered off because the device is in airplane mode.
+
+                // TODO: Offer the option to turn the radio on, and automatically retry the call
+                // once network registration is complete.
+
+                if (ImsUtil.isWfcModeWifiOnly(context)) {
+                    resourceId = R.string.incall_error_wfc_only_no_wireless_network;
+                } else if (ImsUtil.isWfcEnabled(context)) {
+                    resourceId = R.string.incall_error_power_off_wfc;
+                } else {
+                    resourceId = R.string.incall_error_power_off;
+                }
                 break;
 
             case android.telephony.DisconnectCause.EMERGENCY_ONLY:
@@ -273,7 +277,13 @@
 
             case android.telephony.DisconnectCause.OUT_OF_SERVICE:
                 // No network connection.
-                resourceId = R.string.incall_error_out_of_service;
+                if (ImsUtil.isWfcModeWifiOnly(context)) {
+                    resourceId = R.string.incall_error_wfc_only_no_wireless_network;
+                } else if (ImsUtil.isWfcEnabled(context)) {
+                    resourceId = R.string.incall_error_out_of_service_wfc;
+                } else {
+                    resourceId = R.string.incall_error_out_of_service;
+                }
                 break;
 
             case android.telephony.DisconnectCause.NO_PHONE_NUMBER_SUPPLIED:
diff --git a/src/com/android/services/telephony/ImsConference.java b/src/com/android/services/telephony/ImsConference.java
index e692a30..e7a02ec 100644
--- a/src/com/android/services/telephony/ImsConference.java
+++ b/src/com/android/services/telephony/ImsConference.java
@@ -16,18 +16,26 @@
 
 package com.android.services.telephony;
 
+import android.content.ComponentName;
+import android.content.Context;
 import android.net.Uri;
+import android.telecom.Conference.Listener;
 import android.telecom.Conference;
 import android.telecom.ConferenceParticipant;
+import android.telecom.Connection.VideoProvider;
 import android.telecom.Connection;
 import android.telecom.DisconnectCause;
+import android.telecom.Log;
 import android.telecom.PhoneAccountHandle;
+import android.telecom.StatusHints;
+import android.telecom.VideoProfile;
 
 import com.android.internal.telephony.Call;
 import com.android.internal.telephony.CallStateException;
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.imsphone.ImsPhoneConnection;
 import com.android.phone.PhoneUtils;
+import com.android.phone.R;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -145,6 +153,34 @@
             TelephonyConnection telephonyConnection = (TelephonyConnection) c;
             handleConferenceParticipantsUpdate(telephonyConnection, participants);
         }
+
+        @Override
+        public void onVideoStateChanged(android.telecom.Connection c, int videoState) {
+            Log.d(this, "onVideoStateChanged video state %d", videoState);
+            setVideoState(c, videoState);
+        }
+
+        @Override
+        public void onVideoProviderChanged(android.telecom.Connection c,
+                Connection.VideoProvider videoProvider) {
+            Log.d(this, "onVideoProviderChanged: Connection: %s, VideoProvider: %s", c,
+                    videoProvider);
+            setVideoProvider(c, videoProvider);
+        }
+
+        @Override
+        public void onConnectionCapabilitiesChanged(Connection c, int connectionCapabilities) {
+            Log.d(this, "onCallCapabilitiesChanged: Connection: %s, callCapabilities: %s", c,
+                    connectionCapabilities);
+            int capabilites = ImsConference.this.getConnectionCapabilities();
+            setConnectionCapabilities(applyVideoCapabilities(capabilites, connectionCapabilities));
+        }
+
+        @Override
+        public void onStatusHintsChanged(Connection c, StatusHints statusHints) {
+            Log.v(this, "onStatusHintsChanged");
+            updateStatusHints();
+        }
     };
 
     /**
@@ -176,7 +212,10 @@
     public ImsConference(TelephonyConnectionService telephonyConnectionService,
             TelephonyConnection conferenceHost) {
 
-        super(null);
+        super((conferenceHost != null && conferenceHost.getCall() != null &&
+                        conferenceHost.getCall().getPhone() != null) ?
+                PhoneUtils.makePstnPhoneAccountHandle(
+                        conferenceHost.getCall().getPhone()) : null);
 
         // Specify the connection time of the conference to be the connection time of the original
         // connection.
@@ -184,18 +223,40 @@
 
         mTelephonyConnectionService = telephonyConnectionService;
         setConferenceHost(conferenceHost);
-        if (conferenceHost != null && conferenceHost.getCall() != null
-                && conferenceHost.getCall().getPhone() != null) {
-            mPhoneAccount = PhoneUtils.makePstnPhoneAccountHandle(
-                    conferenceHost.getCall().getPhone());
-            Log.v(this, "set phacc to " + mPhoneAccount);
+
+        int capabilities = Connection.CAPABILITY_SUPPORT_HOLD | Connection.CAPABILITY_HOLD |
+                Connection.CAPABILITY_MUTE;
+
+        capabilities = applyVideoCapabilities(capabilities, mConferenceHost.getConnectionCapabilities());
+        setConnectionCapabilities(capabilities);
+
+    }
+
+    private int applyVideoCapabilities(int conferenceCapabilities, int capabilities) {
+        if (can(capabilities, Connection.CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL)) {
+            conferenceCapabilities = applyCapability(conferenceCapabilities,
+                    Connection.CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL);
+        } else {
+            conferenceCapabilities = removeCapability(conferenceCapabilities,
+                    Connection.CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL);
         }
 
-        setConnectionCapabilities(
-                Connection.CAPABILITY_SUPPORT_HOLD |
-                Connection.CAPABILITY_HOLD |
-                Connection.CAPABILITY_MUTE
-        );
+        if (can(capabilities, Connection.CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL)) {
+            conferenceCapabilities = applyCapability(conferenceCapabilities,
+                    Connection.CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL);
+        } else {
+            conferenceCapabilities = removeCapability(conferenceCapabilities,
+                    Connection.CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL);
+        }
+
+        if (can(capabilities, Connection.CAPABILITY_CAN_UPGRADE_TO_VIDEO)) {
+            conferenceCapabilities = applyCapability(conferenceCapabilities,
+                    Connection.CAPABILITY_CAN_UPGRADE_TO_VIDEO);
+        } else {
+            conferenceCapabilities = removeCapability(conferenceCapabilities,
+                    Connection.CAPABILITY_CAN_UPGRADE_TO_VIDEO);
+        }
+        return conferenceCapabilities;
     }
 
     /**
@@ -209,6 +270,32 @@
     }
 
     /**
+     * Returns VideoProvider of the conference. This can be null.
+     *
+     * @hide
+     */
+    @Override
+    public VideoProvider getVideoProvider() {
+        if (mConferenceHost != null) {
+            return mConferenceHost.getVideoProvider();
+        }
+        return null;
+    }
+
+    /**
+     * Returns video state of conference
+     *
+     * @hide
+     */
+    @Override
+    public int getVideoState() {
+        if (mConferenceHost != null) {
+            return mConferenceHost.getVideoState();
+        }
+        return VideoProfile.VideoState.AUDIO_ONLY;
+    }
+
+    /**
      * Invoked when the Conference and all its {@link Connection}s should be disconnected.
      * <p>
      * Hangs up the call via the conference host connection.  When the host connection has been
@@ -321,6 +408,36 @@
         // No-op
     }
 
+    private int applyCapability(int capabilities, int capability) {
+        int newCapabilities = capabilities | capability;
+        return newCapabilities;
+    }
+
+    private int removeCapability(int capabilities, int capability) {
+        int newCapabilities = capabilities & ~capability;
+        return newCapabilities;
+    }
+
+    /**
+     * Determines if this conference is hosted on the current device or the peer device.
+     *
+     * @return {@code true} if this conference is hosted on the current device, {@code false} if it
+     *      is hosted on the peer device.
+     */
+    public boolean isConferenceHost() {
+        if (mConferenceHost == null) {
+            return false;
+        }
+        com.android.internal.telephony.Connection originalConnection =
+                mConferenceHost.getOriginalConnection();
+        if (!(originalConnection instanceof ImsPhoneConnection)) {
+            return false;
+        }
+
+        ImsPhoneConnection imsPhoneConnection = (ImsPhoneConnection) originalConnection;
+        return imsPhoneConnection.isMultiparty() && imsPhoneConnection.isConferenceHost();
+    }
+
     /**
      * Updates the manage conference capability of the conference.  Where there are one or more
      * conference event package participants, the conference management is permitted.  Where there
@@ -356,6 +473,8 @@
         mConferenceHost = conferenceHost;
         mConferenceHost.addConnectionListener(mConferenceHostListener);
         mConferenceHost.addTelephonyConnectionListener(mTelephonyConnectionListener);
+        setState(mConferenceHost.getState());
+        updateStatusHints();
     }
 
     /**
@@ -517,6 +636,8 @@
             setDisconnected(new DisconnectCause(DisconnectCause.OTHER));
             destroy();
         }
+
+        updateStatusHints();
     }
 
     /**
@@ -554,6 +675,27 @@
         }
     }
 
+    private void updateStatusHints() {
+        if (mConferenceHost == null) {
+            setStatusHints(null);
+            return;
+        }
+
+        if (mConferenceHost.isWifi()) {
+            Phone phone = mConferenceHost.getPhone();
+            if (phone != null) {
+                Context context = phone.getContext();
+                setStatusHints(new StatusHints(
+                        new ComponentName(context, TelephonyConnectionService.class),
+                        context.getString(R.string.status_hint_label_wifi_call),
+                        R.drawable.ic_signal_wifi_4_bar_24dp,
+                        null /* extras */));
+            }
+        } else {
+            setStatusHints(null);
+        }
+    }
+
     /**
      * Builds a string representation of the {@link ImsConference}.
      *
diff --git a/src/com/android/services/telephony/ImsConferenceController.java b/src/com/android/services/telephony/ImsConferenceController.java
index e93ebd4..b266b81 100644
--- a/src/com/android/services/telephony/ImsConferenceController.java
+++ b/src/com/android/services/telephony/ImsConferenceController.java
@@ -16,12 +16,14 @@
 
 package com.android.services.telephony;
 
+import com.android.internal.telephony.imsphone.ImsPhoneConnection;
+
 import android.net.Uri;
 import android.telecom.Conference;
 import android.telecom.Connection;
 import android.telecom.ConnectionService;
 import android.telecom.DisconnectCause;
-import android.telecom.IConferenceable;
+import android.telecom.Conferenceable;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -146,8 +148,8 @@
      */
     private void recalculateConferenceable() {
         Log.v(this, "recalculateConferenceable : %d", mTelephonyConnections.size());
-        List<IConferenceable> activeConnections = new ArrayList<>(mTelephonyConnections.size());
-        List<IConferenceable> backgroundConnections = new ArrayList<>(mTelephonyConnections.size());
+        List<Conferenceable> activeConnections = new ArrayList<>(mTelephonyConnections.size());
+        List<Conferenceable> backgroundConnections = new ArrayList<>(mTelephonyConnections.size());
 
         // Loop through and collect all calls which are active or holding
         for (Connection connection : mTelephonyConnections) {
@@ -155,6 +157,15 @@
                 Log.d(this, "recalc - %s %s", connection.getState(), connection);
             }
 
+            // If this connection is a member of a conference hosted on another device, it is not
+            // conferenceable with any other connections.
+            if (isMemberOfPeerConference(connection)) {
+                if (Log.VERBOSE) {
+                    Log.v(this, "Skipping connection in peer conference: %s", connection);
+                }
+                continue;
+            }
+
             switch (connection.getState()) {
                 case Connection.STATE_ACTIVE:
                     activeConnections.add(connection);
@@ -168,11 +179,18 @@
             connection.setConferenceableConnections(Collections.<Connection>emptyList());
         }
 
-        for (Conference conference : mImsConferences) {
+        for (ImsConference conference : mImsConferences) {
             if (Log.DEBUG) {
                 Log.d(this, "recalc - %s %s", conference.getState(), conference);
             }
 
+            if (!conference.isConferenceHost()) {
+                if (Log.VERBOSE) {
+                    Log.v(this, "skipping conference (not hosted on this device): %s", conference);
+                }
+                continue;
+            }
+
             switch (conference.getState()) {
                 case Connection.STATE_ACTIVE:
                     activeConnections.add(conference);
@@ -190,7 +208,7 @@
 
         // Go through all the active connections and set the background connections as
         // conferenceable.
-        for (IConferenceable conferenceable : activeConnections) {
+        for (Conferenceable conferenceable : activeConnections) {
             if (conferenceable instanceof Connection) {
                 Connection connection = (Connection) conferenceable;
                 connection.setConferenceables(backgroundConnections);
@@ -199,7 +217,7 @@
 
         // Go through all the background connections and set the active connections as
         // conferenceable.
-        for (IConferenceable conferenceable : backgroundConnections) {
+        for (Conferenceable conferenceable : backgroundConnections) {
             if (conferenceable instanceof Connection) {
                 Connection connection = (Connection) conferenceable;
                 connection.setConferenceables(activeConnections);
@@ -209,6 +227,16 @@
 
         // Set the conference as conferenceable with all the connections
         for (ImsConference conference : mImsConferences) {
+            // If this conference is not being hosted on the current device, we cannot conference it
+            // with any other connections.
+            if (!conference.isConferenceHost()) {
+                if (Log.VERBOSE) {
+                    Log.v(this, "skipping conference (not hosted on this device): %s",
+                            conference);
+                }
+                continue;
+            }
+
             List<Connection> nonConferencedConnections =
                 new ArrayList<>(mTelephonyConnections.size());
             for (Connection c : mTelephonyConnections) {
@@ -224,6 +252,27 @@
     }
 
     /**
+     * Determines if a connection is a member of a conference hosted on another device.
+     *
+     * @param connection The connection.
+     * @return {@code true} if the connection is a member of a conference hosted on another device.
+     */
+    private boolean isMemberOfPeerConference(Connection connection) {
+        if (!(connection instanceof TelephonyConnection)) {
+            return false;
+        }
+        TelephonyConnection telephonyConnection = (TelephonyConnection) connection;
+        com.android.internal.telephony.Connection originalConnection =
+                telephonyConnection.getOriginalConnection();
+        if (!(originalConnection instanceof ImsPhoneConnection)) {
+            return false;
+        }
+
+        ImsPhoneConnection imsPhoneConnection = (ImsPhoneConnection) originalConnection;
+        return imsPhoneConnection.isMultiparty() && !imsPhoneConnection.isConferenceHost();
+    }
+
+    /**
      * Starts a new ImsConference for a connection which just entered a multiparty state.
      */
     private void recalculateConference() {
diff --git a/src/com/android/services/telephony/PstnPhoneCapabilitiesNotifier.java b/src/com/android/services/telephony/PstnPhoneCapabilitiesNotifier.java
new file mode 100644
index 0000000..7a2adf1
--- /dev/null
+++ b/src/com/android/services/telephony/PstnPhoneCapabilitiesNotifier.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.services.telephony;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.AsyncResult;
+import android.os.Handler;
+import android.os.Message;
+import android.telecom.PhoneAccount;
+import android.telecom.PhoneAccountHandle;
+import android.telecom.TelecomManager;
+
+import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.PhoneConstants;
+import com.android.internal.telephony.PhoneProxy;
+import com.android.internal.telephony.TelephonyIntents;
+import com.android.internal.util.Preconditions;
+import com.android.phone.PhoneUtils;
+
+/**
+ * Listens to phone's capabilities changed event and notifies Telecomm. One instance of these exists
+ * for each of the telephony-based call services.
+ */
+final class PstnPhoneCapabilitiesNotifier {
+    private static final int EVENT_VIDEO_CAPABILITIES_CHANGED = 1;
+
+    /**
+     * Listener called when video capabilities have changed.
+     */
+    public interface Listener {
+        public void onVideoCapabilitiesChanged(boolean isVideoCapable);
+    }
+
+    private final PhoneProxy mPhoneProxy;
+    private final Listener mListener;
+    private Phone mPhoneBase;
+
+    private final Handler mHandler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+                case EVENT_VIDEO_CAPABILITIES_CHANGED:
+                    handleVideoCapabilitesChanged((AsyncResult) msg.obj);
+                    break;
+                default:
+                    break;
+            }
+        }
+    };
+
+    private final BroadcastReceiver mRatReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            if (TelephonyIntents.ACTION_RADIO_TECHNOLOGY_CHANGED.equals(action)) {
+                String newPhone = intent.getStringExtra(PhoneConstants.PHONE_NAME_KEY);
+                Log.d(this, "Radio technology switched. Now %s is active.", newPhone);
+
+                registerForNotifications();
+            }
+        }
+    };
+
+    /*package*/
+    PstnPhoneCapabilitiesNotifier(PhoneProxy phoneProxy, Listener listener) {
+        Preconditions.checkNotNull(phoneProxy);
+
+        mPhoneProxy = phoneProxy;
+        mListener = listener;
+
+        registerForNotifications();
+
+        IntentFilter intentFilter =
+                new IntentFilter(TelephonyIntents.ACTION_RADIO_TECHNOLOGY_CHANGED);
+        mPhoneProxy.getContext().registerReceiver(mRatReceiver, intentFilter);
+    }
+
+    /*package*/
+    void teardown() {
+        unregisterForNotifications();
+        mPhoneProxy.getContext().unregisterReceiver(mRatReceiver);
+    }
+
+    private void registerForNotifications() {
+        Phone newPhone = mPhoneProxy.getActivePhone();
+        if (newPhone != mPhoneBase) {
+            unregisterForNotifications();
+
+            if (newPhone != null) {
+                Log.d(this, "Registering: " + newPhone);
+                mPhoneBase = newPhone;
+                mPhoneBase.registerForVideoCapabilityChanged(
+                        mHandler, EVENT_VIDEO_CAPABILITIES_CHANGED, null);
+            }
+        }
+    }
+
+    private void unregisterForNotifications() {
+        if (mPhoneBase != null) {
+            Log.d(this, "Unregistering: " + mPhoneBase);
+            mPhoneBase.unregisterForVideoCapabilityChanged(mHandler);
+        }
+    }
+
+    private void handleVideoCapabilitesChanged(AsyncResult ar) {
+        try {
+            boolean isVideoCapable = (Boolean) ar.result;
+            Log.d(this, "handleVideoCapabilitesChanged. Video capability - " + isVideoCapable);
+            PhoneAccountHandle accountHandle =
+                    PhoneUtils.makePstnPhoneAccountHandle(mPhoneProxy);
+
+            TelecomManager telecomMgr = TelecomManager.from(mPhoneProxy.getContext());
+            PhoneAccount oldPhoneAccount = telecomMgr.getPhoneAccount(accountHandle);
+            PhoneAccount.Builder builder = new PhoneAccount.Builder(oldPhoneAccount);
+
+            int capabilites = newCapabilities(oldPhoneAccount.getCapabilities(),
+                    PhoneAccount.CAPABILITY_VIDEO_CALLING, isVideoCapable);
+
+            builder.setCapabilities(capabilites);
+            telecomMgr.registerPhoneAccount(builder.build());
+            mListener.onVideoCapabilitiesChanged(isVideoCapable);
+        } catch (Exception e) {
+            Log.d(this, "handleVideoCapabilitesChanged. Exception=" + e);
+        }
+    }
+
+    private int newCapabilities(int capabilities, int capability, boolean set) {
+        if (set) {
+            capabilities |= capability;
+        } else {
+            capabilities &= ~capability;
+        }
+        return capabilities;
+    }
+}
diff --git a/src/com/android/services/telephony/TelecomAccountRegistry.java b/src/com/android/services/telephony/TelecomAccountRegistry.java
index 1cb6442..0a78180 100644
--- a/src/com/android/services/telephony/TelecomAccountRegistry.java
+++ b/src/com/android/services/telephony/TelecomAccountRegistry.java
@@ -18,6 +18,7 @@
 
 import android.content.ComponentName;
 import android.content.Context;
+import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
@@ -53,10 +54,13 @@
     // is not supported, i.e. SubscriptionManager.INVALID_SLOT_ID or the 5th SIM in a phone.
     private final static int defaultPhoneAccountIcon =  R.drawable.ic_multi_sim;
 
-    private final class AccountEntry {
+    final class AccountEntry implements PstnPhoneCapabilitiesNotifier.Listener {
         private final Phone mPhone;
         private final PhoneAccount mAccount;
         private final PstnIncomingCallNotifier mIncomingCallNotifier;
+        private final PstnPhoneCapabilitiesNotifier mPhoneCapabilitiesNotifier;
+        private boolean mIsVideoCapable;
+        private boolean mIsVideoPauseSupported;
 
         AccountEntry(Phone phone, boolean isEmergency, boolean isDummy) {
             mPhone = phone;
@@ -64,10 +68,13 @@
             Log.d(this, "Registered phoneAccount: %s with handle: %s",
                     mAccount, mAccount.getAccountHandle());
             mIncomingCallNotifier = new PstnIncomingCallNotifier((PhoneProxy) mPhone);
+            mPhoneCapabilitiesNotifier = new PstnPhoneCapabilitiesNotifier((PhoneProxy) mPhone,
+                    this);
         }
 
         void teardown() {
             mIncomingCallNotifier.teardown();
+            mPhoneCapabilitiesNotifier.teardown();
         }
 
         /**
@@ -98,6 +105,11 @@
             String description;
             Bitmap iconBitmap = null;
 
+            // We can only get the real slotId from the SubInfoRecord, we can't calculate the
+            // slotId from the subId or the phoneId in all instances.
+            SubscriptionInfo record =
+                    mSubscriptionManager.getActiveSubscriptionInfo(subId);
+
             if (isEmergency) {
                 label = mContext.getResources().getString(R.string.sim_label_emergency_calls);
                 description =
@@ -108,10 +120,7 @@
                 description = label = mTelephonyManager.getNetworkOperatorName();
             } else {
                 CharSequence subDisplayName = null;
-                // We can only get the real slotId from the SubInfoRecord, we can't calculate the
-                // slotId from the subId or the phoneId in all instances.
-                SubscriptionInfo record =
-                        mSubscriptionManager.getActiveSubscriptionInfo(subId);
+
                 if (record != null) {
                     subDisplayName = record.getDisplayName();
                     slotId = record.getSimSlotIndex();
@@ -146,6 +155,14 @@
                     PhoneAccount.CAPABILITY_PLACE_EMERGENCY_CALLS |
                     PhoneAccount.CAPABILITY_MULTI_USER;
 
+            mIsVideoCapable = mPhone.isVideoEnabled();
+            if (mIsVideoCapable) {
+                capabilities |= PhoneAccount.CAPABILITY_VIDEO_CALLING;
+            }
+            if (record != null) {
+                updateVideoPauseSupport(record);
+            }
+
             if (iconBitmap == null) {
                 iconBitmap = BitmapFactory.decodeResource(
                         mContext.getResources(),
@@ -172,6 +189,56 @@
         public PhoneAccountHandle getPhoneAccountHandle() {
             return mAccount != null ? mAccount.getAccountHandle() : null;
         }
+
+        /**
+         * Updates indicator for this {@link AccountEntry} to determine if the carrier supports
+         * pause/resume signalling for IMS video calls.  The carrier setting is stored in MNC/MCC
+         * configuration files.
+         *
+         * @param subscriptionInfo The subscription info.
+         */
+        private void updateVideoPauseSupport(SubscriptionInfo subscriptionInfo) {
+            // Get the configuration for the MNC/MCC specified in the current subscription info.
+            Configuration configuration = new Configuration();
+            if (subscriptionInfo.getMcc() == 0 && subscriptionInfo.getMnc() == 0) {
+                Configuration config = mContext.getResources().getConfiguration();
+                configuration.mcc = config.mcc;
+                configuration.mnc = config.mnc;
+                Log.i(this, "updateVideoPauseSupport -- no mcc/mnc for sub: " + subscriptionInfo +
+                        " using mcc/mnc from main context: " + configuration.mcc + "/" +
+                        configuration.mnc);
+            } else {
+                Log.i(this, "updateVideoPauseSupport -- mcc/mnc for sub: " + subscriptionInfo);
+
+                configuration.mcc = subscriptionInfo.getMcc();
+                configuration.mnc = subscriptionInfo.getMnc();
+            }
+
+            // Load the MNC/MCC specific configuration.
+            Context subContext = mContext.createConfigurationContext(configuration);
+            mIsVideoPauseSupported = subContext.getResources().getBoolean(
+                    R.bool.support_pause_ims_video_calls);
+        }
+
+        /**
+         * Receives callback from {@link PstnPhoneCapabilitiesNotifier} when the video capabilities
+         * have changed.
+         *
+         * @param isVideoCapable {@code true} if video is capable.
+         */
+        @Override
+        public void onVideoCapabilitiesChanged(boolean isVideoCapable) {
+            mIsVideoCapable = isVideoCapable;
+        }
+
+        /**
+         * Indicates whether this account supports pausing video calls.
+         * @return {@code true} if the account supports pausing video calls, {@code false}
+         * otherwise.
+         */
+        public boolean isVideoPauseSupported() {
+            return mIsVideoCapable && mIsVideoPauseSupported;
+        }
     }
 
     private OnSubscriptionsChangedListener mOnSubscriptionsChangedListener =
@@ -231,6 +298,22 @@
     }
 
     /**
+     * Determines if the {@link AccountEntry} associated with a {@link PhoneAccountHandle} supports
+     * pausing video calls.
+     *
+     * @param handle The {@link PhoneAccountHandle}.
+     * @return {@code True} if video pausing is supported.
+     */
+    boolean isVideoPauseSupported(PhoneAccountHandle handle) {
+        for (AccountEntry entry : mAccounts) {
+            if (entry.getPhoneAccountHandle().equals(handle)) {
+                return entry.isVideoPauseSupported();
+            }
+        }
+        return false;
+    }
+
+    /**
      * Sets up all the phone accounts for SIMs on first boot.
      */
     void setupOnBoot() {
@@ -248,6 +331,7 @@
         // because this could signal a removal or addition of a SIM in a single SIM phone.
         mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_SERVICE_STATE);
     }
+
     /**
      * Determines if the list of {@link AccountEntry}(s) contains an {@link AccountEntry} with a
      * specified {@link PhoneAccountHandle}.
diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index 73bfe8c..3beabf4 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -16,6 +16,8 @@
 
 package com.android.services.telephony;
 
+import android.content.ComponentName;
+import android.content.Context;
 import android.net.Uri;
 import android.os.AsyncResult;
 import android.os.Handler;
@@ -24,12 +26,14 @@
 import android.telecom.ConferenceParticipant;
 import android.telecom.Connection;
 import android.telecom.PhoneAccount;
+import android.telecom.StatusHints;
 
 import com.android.internal.telephony.Call;
 import com.android.internal.telephony.CallStateException;
 import com.android.internal.telephony.Connection.PostDialListener;
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.imsphone.ImsPhoneConnection;
+import com.android.phone.R;
 
 import java.lang.Override;
 import java.util.Collections;
@@ -109,7 +113,7 @@
         public void onPostDialChar(char c) {
             Log.v(TelephonyConnection.this, "onPostDialChar: %s", c);
             if (mOriginalConnection != null) {
-                setNextPostDialWaitChar(c);
+                setNextPostDialChar(c);
             }
         }
     };
@@ -158,6 +162,17 @@
         }
 
         /**
+         * Used by {@link com.android.internal.telephony.Connection} to report a change in whether
+         * the call is being made over a wifi network.
+         *
+         * @param isWifi True if call is made over wifi.
+         */
+        @Override
+        public void onWifiChanged(boolean isWifi) {
+            setWifi(isWifi);
+        }
+
+        /**
          * Used by the {@link com.android.internal.telephony.Connection} to report a change in the
          * audio quality for the current call.
          *
@@ -167,7 +182,6 @@
         public void onAudioQualityChanged(int audioQuality) {
             setAudioQuality(audioQuality);
         }
-
         /**
          * Handles a change in the state of conference participant(s), as reported by the
          * {@link com.android.internal.telephony.Connection}.
@@ -210,11 +224,24 @@
     private boolean mRemoteVideoCapable;
 
     /**
-     * Determines the current audio quality for the {@link TelephonyConnection}.
+     * Determines if the {@link TelephonyConnection} is using wifi.
+     * This is used when {@link TelephonyConnection#updateConnectionCapabilities} is called to
+     * indicate wheter a call has the {@link Connection#CAPABILITY_WIFI} capability.
+     */
+    private boolean mIsWifi;
+
+    /**
+     * Determines the audio quality is high for the {@link TelephonyConnection}.
      * This is used when {@link TelephonyConnection#updateConnectionCapabilities}} is called to
      * indicate whether a call has the {@link Connection#CAPABILITY_HIGH_DEF_AUDIO} capability.
      */
-    private int mAudioQuality;
+    private boolean mHasHighDefAudio;
+
+    /**
+     * For video calls, indicates whether the outgoing video for the call can be paused using
+     * the {@link android.telecom.VideoProfile.VideoState#PAUSED} VideoState.
+     */
+    private boolean mIsVideoPauseSupported;
 
     /**
      * Listeners to our TelephonyConnection specific callbacks
@@ -246,6 +273,7 @@
     @Override
     public void onStateChanged(int state) {
         Log.v(this, "onStateChanged, state: " + Connection.stateToString(state));
+        updateStatusHints();
     }
 
     @Override
@@ -428,13 +456,29 @@
                 callCapabilities |= CAPABILITY_HOLD;
             }
         }
+
+        // If the phone is in ECM mode, mark the call to indicate that the callback number should be
+        // shown.
+        Phone phone = getPhone();
+        if (phone != null && phone.isInEcm()) {
+            callCapabilities |= CAPABILITY_SHOW_CALLBACK_NUMBER;
+        }
         return callCapabilities;
     }
 
     protected final void updateConnectionCapabilities() {
         int newCapabilities = buildConnectionCapabilities();
-        newCapabilities = applyVideoCapabilities(newCapabilities);
-        newCapabilities = applyAudioQualityCapabilities(newCapabilities);
+
+        newCapabilities = changeCapability(newCapabilities,
+                CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL, mRemoteVideoCapable);
+        newCapabilities = changeCapability(newCapabilities,
+                CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL, mLocalVideoCapable);
+        newCapabilities = changeCapability(newCapabilities,
+                CAPABILITY_HIGH_DEF_AUDIO, mHasHighDefAudio);
+        newCapabilities = changeCapability(newCapabilities, CAPABILITY_WIFI, mIsWifi);
+        newCapabilities = changeCapability(newCapabilities, CAPABILITY_CAN_PAUSE_VIDEO,
+                mIsVideoPauseSupported && mRemoteVideoCapable && mLocalVideoCapable);
+
         newCapabilities = applyConferenceTerminationCapabilities(newCapabilities);
 
         if (getConnectionCapabilities() != newCapabilities) {
@@ -483,8 +527,10 @@
 
         // Set video state and capabilities
         setVideoState(mOriginalConnection.getVideoState());
+        updateState();
         setLocalVideoCapable(mOriginalConnection.isLocalVideoCapable());
         setRemoteVideoCapable(mOriginalConnection.isRemoteVideoCapable());
+        setWifi(mOriginalConnection.isWifi());
         setVideoProvider(mOriginalConnection.getVideoProvider());
         setAudioQuality(mOriginalConnection.getAudioQuality());
 
@@ -640,6 +686,7 @@
                     break;
             }
         }
+        updateStatusHints();
         updateConnectionCapabilities();
         updateAddress();
         updateMultiparty();
@@ -699,52 +746,6 @@
     }
 
     /**
-     * Applies the video capability states to the CallCapabilities bit-mask.
-     *
-     * @param capabilities The CallCapabilities bit-mask.
-     * @return The capabilities with video capabilities applied.
-     */
-    private int applyVideoCapabilities(int capabilities) {
-        int currentCapabilities = capabilities;
-        if (mRemoteVideoCapable) {
-            currentCapabilities = applyCapability(currentCapabilities,
-                    CAPABILITY_SUPPORTS_VT_REMOTE);
-        } else {
-            currentCapabilities = removeCapability(currentCapabilities,
-                    CAPABILITY_SUPPORTS_VT_REMOTE);
-        }
-
-        if (mLocalVideoCapable) {
-            currentCapabilities = applyCapability(currentCapabilities,
-                    CAPABILITY_SUPPORTS_VT_LOCAL);
-        } else {
-            currentCapabilities = removeCapability(currentCapabilities,
-                    CAPABILITY_SUPPORTS_VT_LOCAL);
-        }
-        return currentCapabilities;
-    }
-
-    /**
-     * Applies the audio capabilities to the {@code CallCapabilities} bit-mask.  A call with high
-     * definition audio is considered to have the {@code HIGH_DEF_AUDIO} call capability.
-     *
-     * @param capabilities The {@code CallCapabilities} bit-mask.
-     * @return The capabilities with the audio capabilities applied.
-     */
-    private int applyAudioQualityCapabilities(int capabilities) {
-        int currentCapabilities = capabilities;
-
-        if (mAudioQuality ==
-                com.android.internal.telephony.Connection.AUDIO_QUALITY_HIGH_DEFINITION) {
-            currentCapabilities = applyCapability(currentCapabilities, CAPABILITY_HIGH_DEF_AUDIO);
-        } else {
-            currentCapabilities = removeCapability(currentCapabilities, CAPABILITY_HIGH_DEF_AUDIO);
-        }
-
-        return currentCapabilities;
-    }
-
-    /**
      * Applies capabilities specific to conferences termination to the
      * {@code CallCapabilities} bit-mask.
      *
@@ -805,23 +806,34 @@
     }
 
     /**
-     * Sets the current call audio quality.  Used during rebuild of the capabilities
+     * Sets whether the call is using wifi. Used when rebuilding the capabilities to set or unset
+     * the {@link Connection#CAPABILITY_WIFI} capability.
+     */
+    public void setWifi(boolean isWifi) {
+        mIsWifi = isWifi;
+        updateConnectionCapabilities();
+        updateStatusHints();
+    }
+
+    /**
+     * Whether the call is using wifi.
+     */
+    boolean isWifi() {
+        return mIsWifi;
+    }
+
+    /**
+     * Sets the current call audio quality. Used during rebuild of the capabilities
      * to set or unset the {@link Connection#CAPABILITY_HIGH_DEF_AUDIO} capability.
      *
      * @param audioQuality The audio quality.
      */
     public void setAudioQuality(int audioQuality) {
-        mAudioQuality = audioQuality;
+        mHasHighDefAudio = audioQuality ==
+                com.android.internal.telephony.Connection.AUDIO_QUALITY_HIGH_DEFINITION;
         updateConnectionCapabilities();
     }
 
-    /**
-     * Obtains the current call audio quality.
-     */
-    public int getAudioQuality() {
-        return mAudioQuality;
-    }
-
     void resetStateForConference() {
         if (getState() == Connection.STATE_HOLDING) {
             if (mOriginalConnection.getState() == Call.State.ACTIVE) {
@@ -839,6 +851,16 @@
     }
 
     /**
+     * For video calls, sets whether this connection supports pausing the outgoing video for the
+     * call using the {@link android.telecom.VideoProfile.VideoState#PAUSED} VideoState.
+     *
+     * @param isVideoPauseSupported {@code true} if pause state supported, {@code false} otherwise.
+     */
+    public void setVideoPauseSupported(boolean isVideoPauseSupported) {
+        mIsVideoPauseSupported = isVideoPauseSupported;
+    }
+
+    /**
      * Whether the original connection is an IMS connection.
      * @return {@code True} if the original connection is an IMS connection, {@code false}
      *     otherwise.
@@ -865,27 +887,37 @@
     }
 
     /**
-     * Applies a capability to a capabilities bit-mask.
+     * Changes a capabilities bit-mask to add or remove a capability.
      *
      * @param capabilities The capabilities bit-mask.
-     * @param capability The capability to apply.
-     * @return The capabilities bit-mask with the capability applied.
+     * @param capability The capability to change.
+     * @param enabled Whether the capability should be set or removed.
+     * @return The capabilities bit-mask with the capability changed.
      */
-    private int applyCapability(int capabilities, int capability) {
-        int newCapabilities = capabilities | capability;
-        return newCapabilities;
+    private int changeCapability(int capabilities, int capability, boolean enabled) {
+        if (enabled) {
+            return capabilities | capability;
+        } else {
+            return capabilities & ~capability;
+        }
     }
 
-    /**
-     * Removes a capability from a capabilities bit-mask.
-     *
-     * @param capabilities The capabilities bit-mask.
-     * @param capability The capability to remove.
-     * @return The capabilities bit-mask with the capability removed.
-     */
-    private int removeCapability(int capabilities, int capability) {
-        int newCapabilities = capabilities & ~capability;
-        return newCapabilities;
+    private void updateStatusHints() {
+        boolean isIncoming = isValidRingingCall();
+        if (mIsWifi && (isIncoming || getState() == STATE_ACTIVE)) {
+            int labelId = isIncoming
+                    ? R.string.status_hint_label_incoming_wifi_call
+                    : R.string.status_hint_label_wifi_call;
+
+            Context context = getPhone().getContext();
+            setStatusHints(new StatusHints(
+                    new ComponentName(context, TelephonyConnectionService.class),
+                    context.getString(labelId),
+                    R.drawable.ic_signal_wifi_4_bar_24dp,
+                    null /* extras */));
+        } else {
+            setStatusHints(null);
+        }
     }
 
     /**
diff --git a/src/com/android/services/telephony/TelephonyConnectionService.java b/src/com/android/services/telephony/TelephonyConnectionService.java
index 456f5d5..7826ce0 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -43,6 +43,7 @@
 import com.android.internal.telephony.SubscriptionController;
 import com.android.internal.telephony.cdma.CDMAPhone;
 import com.android.phone.MMIDialogActivity;
+import com.android.phone.PhoneUtils;
 import com.android.phone.R;
 
 import java.util.ArrayList;
@@ -212,7 +213,7 @@
         boolean useEmergencyCallHelper = false;
 
         if (isEmergencyNumber) {
-            if (state == ServiceState.STATE_POWER_OFF) {
+            if (!phone.isRadioOn()) {
                 useEmergencyCallHelper = true;
             }
         } else {
@@ -240,7 +241,7 @@
         }
 
         final TelephonyConnection connection =
-                createConnectionFor(phone, null, true /* isOutgoing */);
+                createConnectionFor(phone, null, true /* isOutgoing */, request.getAccountHandle());
         if (connection == null) {
             return Connection.createFailedConnection(
                     DisconnectCauseUtil.toTelecomDisconnectCause(
@@ -313,9 +314,9 @@
         }
 
         Connection connection =
-                createConnectionFor(phone, originalConnection, false /* isOutgoing */);
+                createConnectionFor(phone, originalConnection, false /* isOutgoing */,
+                        request.getAccountHandle());
         if (connection == null) {
-            connection = Connection.createCanceledConnection();
             return Connection.createCanceledConnection();
         } else {
             return connection;
@@ -363,7 +364,8 @@
 
         TelephonyConnection connection =
                 createConnectionFor(phone, unknownConnection,
-                        !unknownConnection.isIncoming() /* isOutgoing */);
+                        !unknownConnection.isIncoming() /* isOutgoing */,
+                        request.getAccountHandle());
 
         if (connection == null) {
             return Connection.createCanceledConnection();
@@ -392,9 +394,12 @@
             originalConnection = phone.dial(number, request.getVideoState());
         } catch (CallStateException e) {
             Log.e(this, e, "placeOutgoingConnection, phone.dial exception: " + e);
+            int cause = android.telephony.DisconnectCause.OUTGOING_FAILURE;
+            if (e.getError() == CallStateException.ERROR_DISCONNECTED) {
+                cause = android.telephony.DisconnectCause.OUT_OF_SERVICE;
+            }
             connection.setDisconnected(DisconnectCauseUtil.toTelecomDisconnectCause(
-                    android.telephony.DisconnectCause.OUTGOING_FAILURE,
-                    e.getMessage()));
+                    cause, e.getMessage()));
             return;
         }
 
@@ -420,7 +425,8 @@
     private TelephonyConnection createConnectionFor(
             Phone phone,
             com.android.internal.telephony.Connection originalConnection,
-            boolean isOutgoing) {
+            boolean isOutgoing,
+            PhoneAccountHandle phoneAccountHandle) {
         TelephonyConnection returnConnection = null;
         int phoneType = phone.getPhoneType();
         if (phoneType == TelephonyManager.PHONE_TYPE_GSM) {
@@ -433,6 +439,9 @@
         if (returnConnection != null) {
             // Listen to Telephony specific callbacks from the connection
             returnConnection.addTelephonyConnectionListener(mTelephonyConnectionListener);
+            returnConnection.setVideoPauseSupported(
+                    TelecomAccountRegistry.getInstance(this).isVideoPauseSupported(
+                            phoneAccountHandle));
         }
         return returnConnection;
     }
@@ -451,22 +460,14 @@
     }
 
     private Phone getPhoneForAccount(PhoneAccountHandle accountHandle, boolean isEmergency) {
-        if (Objects.equals(mExpectedComponentName, accountHandle.getComponentName())) {
-            if (accountHandle.getId() != null) {
-                try {
-                    int phoneId = SubscriptionController.getInstance().getPhoneId(
-                            Integer.parseInt(accountHandle.getId()));
-                    return PhoneFactory.getPhone(phoneId);
-                } catch (NumberFormatException e) {
-                    Log.w(this, "Could not get subId from account: " + accountHandle.getId());
-                }
-            }
+        if (isEmergency) {
+            return PhoneFactory.getDefaultPhone();
         }
 
-        if (isEmergency) {
-            // If this is an emergency number and we've been asked to dial it using a PhoneAccount
-            // which does not exist, then default to whatever subscription is available currently.
-            return getFirstPhoneForEmergencyCall();
+        int subId = PhoneUtils.getSubIdForPhoneAccountHandle(accountHandle);
+        if (subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+            int phoneId = SubscriptionController.getInstance().getPhoneId(subId);
+            return PhoneFactory.getPhone(phoneId);
         }
 
         return null;
diff --git a/src/com/android/services/telephony/activation/Activator.java b/src/com/android/services/telephony/activation/Activator.java
new file mode 100644
index 0000000..7dee5b3
--- /dev/null
+++ b/src/com/android/services/telephony/activation/Activator.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.services.telephony.activation;
+
+/**
+ * SIM Activation implementation generic interface.
+ */
+public interface Activator {
+    void onActivate();
+}
diff --git a/src/com/android/services/telephony/activation/OtaspActivator.java b/src/com/android/services/telephony/activation/OtaspActivator.java
new file mode 100644
index 0000000..11ba726
--- /dev/null
+++ b/src/com/android/services/telephony/activation/OtaspActivator.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.services.telephony.activation;
+
+/**
+ * Over-The-Air SIM Provisioning (OTASP) activation implementation.
+ *
+ * Handles OTASP activation requests and returns status updates as activation progresses.
+ */
+public class OtaspActivator implements Activator {
+    @Override
+    public void onActivate() {
+        // TODO: handle otasp activation
+    }
+}
diff --git a/src/com/android/services/telephony/activation/SimActivationActivity.java b/src/com/android/services/telephony/activation/SimActivationActivity.java
new file mode 100644
index 0000000..ae11a3f
--- /dev/null
+++ b/src/com/android/services/telephony/activation/SimActivationActivity.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.services.telephony.activation;
+
+import android.app.Activity;
+import android.app.PendingIntent;
+import android.app.PendingIntent.CanceledException;
+import android.content.Intent;
+import android.os.Bundle;
+import android.telephony.TelephonyManager;
+
+import com.android.phone.PhoneGlobals;
+import com.android.services.telephony.Log;
+
+/**
+ * Invisible activity that handles the android.intent.action.SIM_ACTIVATION_REQUEST intent.
+ * This activity is protected by the android.permission.PERFORM_SIM_ACTIVATION permission.
+ */
+public class SimActivationActivity extends Activity {
+    @Override
+    protected void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        Log.i(this, "onCreate");
+
+        Intent intent = getIntent();
+        if (Intent.ACTION_SIM_ACTIVATION_REQUEST.equals(intent.getAction())) {
+            Log.i(this, "Activation requested " + intent);
+
+            runActivation(intent);
+        }
+        finish();
+    }
+
+    private void runActivation(Intent intent) {
+        final PendingIntent response =
+                intent.getParcelableExtra(Intent.EXTRA_SIM_ACTIVATION_RESPONSE);
+
+        Log.i(this, "Running activation w/ response " + response);
+
+        PhoneGlobals app = PhoneGlobals.getInstance();
+        app.simActivationManager.runActivation(SimActivationManager.Triggers.EXPLICIT_REQUEST,
+                new SimActivationManager.Response() {
+                    @Override
+                    public void onResponse(int status) {
+                        if (response != null) {
+                            try {
+                                response.send();
+                            } catch (CanceledException e) {
+                                Log.w(this, "Could not respond to SIM Activation.");
+                            }
+                        }
+                    }
+                });
+
+        // TODO: Set this status to the return value of runActivation
+        // Return the response as an activity result and the pending intent.
+        setResult(TelephonyManager.SIM_ACTIVATION_RESULT_IN_PROGRESS);
+    }
+}
diff --git a/src/com/android/services/telephony/activation/SimActivationManager.java b/src/com/android/services/telephony/activation/SimActivationManager.java
new file mode 100644
index 0000000..ce9e508
--- /dev/null
+++ b/src/com/android/services/telephony/activation/SimActivationManager.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.services.telephony.activation;
+
+import android.app.PendingIntent;
+import android.telephony.TelephonyManager;
+
+/**
+ * Handles SIM activation requests and runs the appropriate activation process until it completes
+ * or fails. When done, sends back a response if needed.
+ */
+public class SimActivationManager {
+    public static final class Triggers {
+        public static final int SYSTEM_START = 1;
+        public static final int EXPLICIT_REQUEST = 2;
+    }
+
+    public interface Response {
+        /**
+         * @param status See {@link android.telephony.TelephonyManager} for SIM_ACTIVATION_RESULT_*
+         *               constants.
+         */
+        void onResponse(int status);
+    }
+
+    public void runActivation(int trigger, Response response) {
+        Activator activator = selectActivator(trigger);
+
+        activator.onActivate();
+
+        // TODO: Specify some way to determine if activation is even necessary.
+
+        // TODO: specify some way to return the result.
+
+        if (response != null) {
+            response.onResponse(TelephonyManager.SIM_ACTIVATION_RESULT_COMPLETE);
+        }
+    }
+
+    private Activator selectActivator(int trigger) {
+        // TODO: Select among all activator types
+
+        // For now, pick a do-nothing activator
+        return new Activator() {
+
+            /** ${inheritDoc} */
+                @Override
+            public void onActivate() {
+                // do something
+            }
+        };
+    }
+}
diff --git a/src/org/apache/commons/io/IOUtils.java b/src/org/apache/commons/io/IOUtils.java
new file mode 100644
index 0000000..b414507
--- /dev/null
+++ b/src/org/apache/commons/io/IOUtils.java
@@ -0,0 +1,1202 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 org.apache.commons.io;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.CharArrayWriter;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.io.Reader;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * General IO stream manipulation utilities.
+ * <p>
+ * This class provides static utility methods for input/output operations.
+ * <ul>
+ * <li>closeQuietly - these methods close a stream ignoring nulls and exceptions
+ * <li>toXxx/read - these methods read data from a stream
+ * <li>write - these methods write data to a stream
+ * <li>copy - these methods copy all the data from one stream to another
+ * <li>contentEquals - these methods compare the content of two streams
+ * </ul>
+ * <p>
+ * The byte-to-char methods and char-to-byte methods involve a conversion step.
+ * Two methods are provided in each case, one that uses the platform default
+ * encoding and the other which allows you to specify an encoding. You are
+ * encouraged to always specify an encoding because relying on the platform
+ * default can lead to unexpected results, for example when moving from
+ * development to production.
+ * <p>
+ * All the methods in this class that read a stream are buffered internally.
+ * This means that there is no cause to use a <code>BufferedInputStream</code>
+ * or <code>BufferedReader</code>. The default buffer size of 4K has been shown
+ * to be efficient in tests.
+ * <p>
+ * Wherever possible, the methods in this class do <em>not</em> flush or close
+ * the stream. This is to avoid making non-portable assumptions about the
+ * streams' origin and further use. Thus the caller is still responsible for
+ * closing streams after use.
+ * <p>
+ * Origin of code: Excalibur.
+ *
+ * @author Peter Donald
+ * @author Jeff Turner
+ * @author Matthew Hawthorne
+ * @author Stephen Colebourne
+ * @author Gareth Davis
+ * @author Ian Springer
+ * @author Niall Pemberton
+ * @author Sandy McArthur
+ * @version $Id: IOUtils.java 481854 2006-12-03 18:30:07Z scolebourne $
+ */
+public class IOUtils {
+    // NOTE: This class is focussed on InputStream, OutputStream, Reader and
+    // Writer. Each method should take at least one of these as a parameter,
+    // or return one of them.
+
+    /**
+     * The Unix directory separator character.
+     */
+    public static final char DIR_SEPARATOR_UNIX = '/';
+    /**
+     * The Windows directory separator character.
+     */
+    public static final char DIR_SEPARATOR_WINDOWS = '\\';
+    /**
+     * The system directory separator character.
+     */
+    public static final char DIR_SEPARATOR = File.separatorChar;
+    /**
+     * The Unix line separator string.
+     */
+    public static final String LINE_SEPARATOR_UNIX = "\n";
+    /**
+     * The Windows line separator string.
+     */
+    public static final String LINE_SEPARATOR_WINDOWS = "\r\n";
+    /**
+     * The system line separator string.
+     */
+    public static final String LINE_SEPARATOR;
+    static {
+        // avoid security issues
+        StringWriter buf = new StringWriter(4);
+        PrintWriter out = new PrintWriter(buf);
+        out.println();
+        LINE_SEPARATOR = buf.toString();
+    }
+
+    /**
+     * The default buffer size to use.
+     */
+    private static final int DEFAULT_BUFFER_SIZE = 1024 * 4;
+
+    /**
+     * Instances should NOT be constructed in standard programming.
+     */
+    public IOUtils() {
+        super();
+    }
+
+    //-----------------------------------------------------------------------
+    /**
+     * Unconditionally close an <code>Reader</code>.
+     * <p>
+     * Equivalent to {@link Reader#close()}, except any exceptions will be ignored.
+     * This is typically used in finally blocks.
+     *
+     * @param input  the Reader to close, may be null or already closed
+     */
+    public static void closeQuietly(Reader input) {
+        try {
+            if (input != null) {
+                input.close();
+            }
+        } catch (IOException ioe) {
+            // ignore
+        }
+    }
+
+    /**
+     * Unconditionally close a <code>Writer</code>.
+     * <p>
+     * Equivalent to {@link Writer#close()}, except any exceptions will be ignored.
+     * This is typically used in finally blocks.
+     *
+     * @param output  the Writer to close, may be null or already closed
+     */
+    public static void closeQuietly(Writer output) {
+        try {
+            if (output != null) {
+                output.close();
+            }
+        } catch (IOException ioe) {
+            // ignore
+        }
+    }
+
+    /**
+     * Unconditionally close an <code>InputStream</code>.
+     * <p>
+     * Equivalent to {@link InputStream#close()}, except any exceptions will be ignored.
+     * This is typically used in finally blocks.
+     *
+     * @param input  the InputStream to close, may be null or already closed
+     */
+    public static void closeQuietly(InputStream input) {
+        try {
+            if (input != null) {
+                input.close();
+            }
+        } catch (IOException ioe) {
+            // ignore
+        }
+    }
+
+    /**
+     * Unconditionally close an <code>OutputStream</code>.
+     * <p>
+     * Equivalent to {@link OutputStream#close()}, except any exceptions will be ignored.
+     * This is typically used in finally blocks.
+     *
+     * @param output  the OutputStream to close, may be null or already closed
+     */
+    public static void closeQuietly(OutputStream output) {
+        try {
+            if (output != null) {
+                output.close();
+            }
+        } catch (IOException ioe) {
+            // ignore
+        }
+    }
+
+    // read toByteArray
+    //-----------------------------------------------------------------------
+    /**
+     * Get the contents of an <code>InputStream</code> as a <code>byte[]</code>.
+     * <p>
+     * This method buffers the input internally, so there is no need to use a
+     * <code>BufferedInputStream</code>.
+     *
+     * @param input  the <code>InputStream</code> to read from
+     * @return the requested byte array
+     * @throws NullPointerException if the input is null
+     * @throws IOException if an I/O error occurs
+     */
+    public static byte[] toByteArray(InputStream input) throws IOException {
+        ByteArrayOutputStream output = new ByteArrayOutputStream();
+        copy(input, output);
+        return output.toByteArray();
+    }
+
+    /**
+     * Get the contents of a <code>Reader</code> as a <code>byte[]</code>
+     * using the default character encoding of the platform.
+     * <p>
+     * This method buffers the input internally, so there is no need to use a
+     * <code>BufferedReader</code>.
+     *
+     * @param input  the <code>Reader</code> to read from
+     * @return the requested byte array
+     * @throws NullPointerException if the input is null
+     * @throws IOException if an I/O error occurs
+     */
+    public static byte[] toByteArray(Reader input) throws IOException {
+        ByteArrayOutputStream output = new ByteArrayOutputStream();
+        copy(input, output);
+        return output.toByteArray();
+    }
+
+    /**
+     * Get the contents of a <code>Reader</code> as a <code>byte[]</code>
+     * using the specified character encoding.
+     * <p>
+     * Character encoding names can be found at
+     * <a href="http://www.iana.org/assignments/character-sets">IANA</a>.
+     * <p>
+     * This method buffers the input internally, so there is no need to use a
+     * <code>BufferedReader</code>.
+     *
+     * @param input  the <code>Reader</code> to read from
+     * @param encoding  the encoding to use, null means platform default
+     * @return the requested byte array
+     * @throws NullPointerException if the input is null
+     * @throws IOException if an I/O error occurs
+     * @since Commons IO 1.1
+     */
+    public static byte[] toByteArray(Reader input, String encoding)
+            throws IOException {
+        ByteArrayOutputStream output = new ByteArrayOutputStream();
+        copy(input, output, encoding);
+        return output.toByteArray();
+    }
+
+    /**
+     * Get the contents of a <code>String</code> as a <code>byte[]</code>
+     * using the default character encoding of the platform.
+     * <p>
+     * This is the same as {@link String#getBytes()}.
+     *
+     * @param input  the <code>String</code> to convert
+     * @return the requested byte array
+     * @throws NullPointerException if the input is null
+     * @throws IOException if an I/O error occurs (never occurs)
+     * @deprecated Use {@link String#getBytes()}
+     */
+    @Deprecated
+    public static byte[] toByteArray(String input) throws IOException {
+        return input.getBytes();
+    }
+
+    // read char[]
+    //-----------------------------------------------------------------------
+    /**
+     * Get the contents of an <code>InputStream</code> as a character array
+     * using the default character encoding of the platform.
+     * <p>
+     * This method buffers the input internally, so there is no need to use a
+     * <code>BufferedInputStream</code>.
+     *
+     * @param is  the <code>InputStream</code> to read from
+     * @return the requested character array
+     * @throws NullPointerException if the input is null
+     * @throws IOException if an I/O error occurs
+     * @since Commons IO 1.1
+     */
+    public static char[] toCharArray(InputStream is) throws IOException {
+        CharArrayWriter output = new CharArrayWriter();
+        copy(is, output);
+        return output.toCharArray();
+    }
+
+    /**
+     * Get the contents of an <code>InputStream</code> as a character array
+     * using the specified character encoding.
+     * <p>
+     * Character encoding names can be found at
+     * <a href="http://www.iana.org/assignments/character-sets">IANA</a>.
+     * <p>
+     * This method buffers the input internally, so there is no need to use a
+     * <code>BufferedInputStream</code>.
+     *
+     * @param is  the <code>InputStream</code> to read from
+     * @param encoding  the encoding to use, null means platform default
+     * @return the requested character array
+     * @throws NullPointerException if the input is null
+     * @throws IOException if an I/O error occurs
+     * @since Commons IO 1.1
+     */
+    public static char[] toCharArray(InputStream is, String encoding)
+            throws IOException {
+        CharArrayWriter output = new CharArrayWriter();
+        copy(is, output, encoding);
+        return output.toCharArray();
+    }
+
+    /**
+     * Get the contents of a <code>Reader</code> as a character array.
+     * <p>
+     * This method buffers the input internally, so there is no need to use a
+     * <code>BufferedReader</code>.
+     *
+     * @param input  the <code>Reader</code> to read from
+     * @return the requested character array
+     * @throws NullPointerException if the input is null
+     * @throws IOException if an I/O error occurs
+     * @since Commons IO 1.1
+     */
+    public static char[] toCharArray(Reader input) throws IOException {
+        CharArrayWriter sw = new CharArrayWriter();
+        copy(input, sw);
+        return sw.toCharArray();
+    }
+
+    // read toString
+    //-----------------------------------------------------------------------
+    /**
+     * Get the contents of an <code>InputStream</code> as a String
+     * using the default character encoding of the platform.
+     * <p>
+     * This method buffers the input internally, so there is no need to use a
+     * <code>BufferedInputStream</code>.
+     *
+     * @param input  the <code>InputStream</code> to read from
+     * @return the requested String
+     * @throws NullPointerException if the input is null
+     * @throws IOException if an I/O error occurs
+     */
+    public static String toString(InputStream input) throws IOException {
+        StringWriter sw = new StringWriter();
+        copy(input, sw);
+        return sw.toString();
+    }
+
+    /**
+     * Get the contents of an <code>InputStream</code> as a String
+     * using the specified character encoding.
+     * <p>
+     * Character encoding names can be found at
+     * <a href="http://www.iana.org/assignments/character-sets">IANA</a>.
+     * <p>
+     * This method buffers the input internally, so there is no need to use a
+     * <code>BufferedInputStream</code>.
+     *
+     * @param input  the <code>InputStream</code> to read from
+     * @param encoding  the encoding to use, null means platform default
+     * @return the requested String
+     * @throws NullPointerException if the input is null
+     * @throws IOException if an I/O error occurs
+     */
+    public static String toString(InputStream input, String encoding)
+            throws IOException {
+        StringWriter sw = new StringWriter();
+        copy(input, sw, encoding);
+        return sw.toString();
+    }
+
+    /**
+     * Get the contents of a <code>Reader</code> as a String.
+     * <p>
+     * This method buffers the input internally, so there is no need to use a
+     * <code>BufferedReader</code>.
+     *
+     * @param input  the <code>Reader</code> to read from
+     * @return the requested String
+     * @throws NullPointerException if the input is null
+     * @throws IOException if an I/O error occurs
+     */
+    public static String toString(Reader input) throws IOException {
+        StringWriter sw = new StringWriter();
+        copy(input, sw);
+        return sw.toString();
+    }
+
+    /**
+     * Get the contents of a <code>byte[]</code> as a String
+     * using the default character encoding of the platform.
+     *
+     * @param input the byte array to read from
+     * @return the requested String
+     * @throws NullPointerException if the input is null
+     * @throws IOException if an I/O error occurs (never occurs)
+     * @deprecated Use {@link String#String(byte[])}
+     */
+    @Deprecated
+    public static String toString(byte[] input) throws IOException {
+        return new String(input);
+    }
+
+    /**
+     * Get the contents of a <code>byte[]</code> as a String
+     * using the specified character encoding.
+     * <p>
+     * Character encoding names can be found at
+     * <a href="http://www.iana.org/assignments/character-sets">IANA</a>.
+     *
+     * @param input the byte array to read from
+     * @param encoding  the encoding to use, null means platform default
+     * @return the requested String
+     * @throws NullPointerException if the input is null
+     * @throws IOException if an I/O error occurs (never occurs)
+     * @deprecated Use {@link String#String(byte[],String)}
+     */
+    @Deprecated
+    public static String toString(byte[] input, String encoding)
+            throws IOException {
+        if (encoding == null) {
+            return new String(input);
+        } else {
+            return new String(input, encoding);
+        }
+    }
+
+    // readLines
+    //-----------------------------------------------------------------------
+    /**
+     * Get the contents of an <code>InputStream</code> as a list of Strings,
+     * one entry per line, using the default character encoding of the platform.
+     * <p>
+     * This method buffers the input internally, so there is no need to use a
+     * <code>BufferedInputStream</code>.
+     *
+     * @param input  the <code>InputStream</code> to read from, not null
+     * @return the list of Strings, never null
+     * @throws NullPointerException if the input is null
+     * @throws IOException if an I/O error occurs
+     * @since Commons IO 1.1
+     */
+    public static List<String> readLines(InputStream input) throws IOException {
+        InputStreamReader reader = new InputStreamReader(input);
+        return readLines(reader);
+    }
+
+    /**
+     * Get the contents of an <code>InputStream</code> as a list of Strings,
+     * one entry per line, using the specified character encoding.
+     * <p>
+     * Character encoding names can be found at
+     * <a href="http://www.iana.org/assignments/character-sets">IANA</a>.
+     * <p>
+     * This method buffers the input internally, so there is no need to use a
+     * <code>BufferedInputStream</code>.
+     *
+     * @param input  the <code>InputStream</code> to read from, not null
+     * @param encoding  the encoding to use, null means platform default
+     * @return the list of Strings, never null
+     * @throws NullPointerException if the input is null
+     * @throws IOException if an I/O error occurs
+     * @since Commons IO 1.1
+     */
+    public static List<String> readLines(InputStream input, String encoding) throws IOException {
+        if (encoding == null) {
+            return readLines(input);
+        } else {
+            InputStreamReader reader = new InputStreamReader(input, encoding);
+            return readLines(reader);
+        }
+    }
+
+    /**
+     * Get the contents of a <code>Reader</code> as a list of Strings,
+     * one entry per line.
+     * <p>
+     * This method buffers the input internally, so there is no need to use a
+     * <code>BufferedReader</code>.
+     *
+     * @param input  the <code>Reader</code> to read from, not null
+     * @return the list of Strings, never null
+     * @throws NullPointerException if the input is null
+     * @throws IOException if an I/O error occurs
+     * @since Commons IO 1.1
+     */
+    public static List<String> readLines(Reader input) throws IOException {
+        BufferedReader reader = new BufferedReader(input);
+        List<String> list = new ArrayList<String>();
+        String line = reader.readLine();
+        while (line != null) {
+            list.add(line);
+            line = reader.readLine();
+        }
+        return list;
+    }
+
+    //-----------------------------------------------------------------------
+    /**
+     * Convert the specified string to an input stream, encoded as bytes
+     * using the default character encoding of the platform.
+     *
+     * @param input the string to convert
+     * @return an input stream
+     * @since Commons IO 1.1
+     */
+    public static InputStream toInputStream(String input) {
+        byte[] bytes = input.getBytes();
+        return new ByteArrayInputStream(bytes);
+    }
+
+    /**
+     * Convert the specified string to an input stream, encoded as bytes
+     * using the specified character encoding.
+     * <p>
+     * Character encoding names can be found at
+     * <a href="http://www.iana.org/assignments/character-sets">IANA</a>.
+     *
+     * @param input the string to convert
+     * @param encoding the encoding to use, null means platform default
+     * @throws IOException if the encoding is invalid
+     * @return an input stream
+     * @since Commons IO 1.1
+     */
+    public static InputStream toInputStream(String input, String encoding) throws IOException {
+        byte[] bytes = encoding != null ? input.getBytes(encoding) : input.getBytes();
+        return new ByteArrayInputStream(bytes);
+    }
+
+    // write byte[]
+    //-----------------------------------------------------------------------
+    /**
+     * Writes bytes from a <code>byte[]</code> to an <code>OutputStream</code>.
+     *
+     * @param data  the byte array to write, do not modify during output,
+     * null ignored
+     * @param output  the <code>OutputStream</code> to write to
+     * @throws NullPointerException if output is null
+     * @throws IOException if an I/O error occurs
+     * @since Commons IO 1.1
+     */
+    public static void write(byte[] data, OutputStream output)
+            throws IOException {
+        if (data != null) {
+            output.write(data);
+        }
+    }
+
+    /**
+     * Writes bytes from a <code>byte[]</code> to chars on a <code>Writer</code>
+     * using the default character encoding of the platform.
+     * <p>
+     * This method uses {@link String#String(byte[])}.
+     *
+     * @param data  the byte array to write, do not modify during output,
+     * null ignored
+     * @param output  the <code>Writer</code> to write to
+     * @throws NullPointerException if output is null
+     * @throws IOException if an I/O error occurs
+     * @since Commons IO 1.1
+     */
+    public static void write(byte[] data, Writer output) throws IOException {
+        if (data != null) {
+            output.write(new String(data));
+        }
+    }
+
+    /**
+     * Writes bytes from a <code>byte[]</code> to chars on a <code>Writer</code>
+     * using the specified character encoding.
+     * <p>
+     * Character encoding names can be found at
+     * <a href="http://www.iana.org/assignments/character-sets">IANA</a>.
+     * <p>
+     * This method uses {@link String#String(byte[], String)}.
+     *
+     * @param data  the byte array to write, do not modify during output,
+     * null ignored
+     * @param output  the <code>Writer</code> to write to
+     * @param encoding  the encoding to use, null means platform default
+     * @throws NullPointerException if output is null
+     * @throws IOException if an I/O error occurs
+     * @since Commons IO 1.1
+     */
+    public static void write(byte[] data, Writer output, String encoding)
+            throws IOException {
+        if (data != null) {
+            if (encoding == null) {
+                write(data, output);
+            } else {
+                output.write(new String(data, encoding));
+            }
+        }
+    }
+
+    // write char[]
+    //-----------------------------------------------------------------------
+    /**
+     * Writes chars from a <code>char[]</code> to a <code>Writer</code>
+     * using the default character encoding of the platform.
+     *
+     * @param data  the char array to write, do not modify during output,
+     * null ignored
+     * @param output  the <code>Writer</code> to write to
+     * @throws NullPointerException if output is null
+     * @throws IOException if an I/O error occurs
+     * @since Commons IO 1.1
+     */
+    public static void write(char[] data, Writer output) throws IOException {
+        if (data != null) {
+            output.write(data);
+        }
+    }
+
+    /**
+     * Writes chars from a <code>char[]</code> to bytes on an
+     * <code>OutputStream</code>.
+     * <p>
+     * This method uses {@link String#String(char[])} and
+     * {@link String#getBytes()}.
+     *
+     * @param data  the char array to write, do not modify during output,
+     * null ignored
+     * @param output  the <code>OutputStream</code> to write to
+     * @throws NullPointerException if output is null
+     * @throws IOException if an I/O error occurs
+     * @since Commons IO 1.1
+     */
+    public static void write(char[] data, OutputStream output)
+            throws IOException {
+        if (data != null) {
+            output.write(new String(data).getBytes());
+        }
+    }
+
+    /**
+     * Writes chars from a <code>char[]</code> to bytes on an
+     * <code>OutputStream</code> using the specified character encoding.
+     * <p>
+     * Character encoding names can be found at
+     * <a href="http://www.iana.org/assignments/character-sets">IANA</a>.
+     * <p>
+     * This method uses {@link String#String(char[])} and
+     * {@link String#getBytes(String)}.
+     *
+     * @param data  the char array to write, do not modify during output,
+     * null ignored
+     * @param output  the <code>OutputStream</code> to write to
+     * @param encoding  the encoding to use, null means platform default
+     * @throws NullPointerException if output is null
+     * @throws IOException if an I/O error occurs
+     * @since Commons IO 1.1
+     */
+    public static void write(char[] data, OutputStream output, String encoding)
+            throws IOException {
+        if (data != null) {
+            if (encoding == null) {
+                write(data, output);
+            } else {
+                output.write(new String(data).getBytes(encoding));
+            }
+        }
+    }
+
+    // write String
+    //-----------------------------------------------------------------------
+    /**
+     * Writes chars from a <code>String</code> to a <code>Writer</code>.
+     *
+     * @param data  the <code>String</code> to write, null ignored
+     * @param output  the <code>Writer</code> to write to
+     * @throws NullPointerException if output is null
+     * @throws IOException if an I/O error occurs
+     * @since Commons IO 1.1
+     */
+    public static void write(String data, Writer output) throws IOException {
+        if (data != null) {
+            output.write(data);
+        }
+    }
+
+    /**
+     * Writes chars from a <code>String</code> to bytes on an
+     * <code>OutputStream</code> using the default character encoding of the
+     * platform.
+     * <p>
+     * This method uses {@link String#getBytes()}.
+     *
+     * @param data  the <code>String</code> to write, null ignored
+     * @param output  the <code>OutputStream</code> to write to
+     * @throws NullPointerException if output is null
+     * @throws IOException if an I/O error occurs
+     * @since Commons IO 1.1
+     */
+    public static void write(String data, OutputStream output)
+            throws IOException {
+        if (data != null) {
+            output.write(data.getBytes());
+        }
+    }
+
+    /**
+     * Writes chars from a <code>String</code> to bytes on an
+     * <code>OutputStream</code> using the specified character encoding.
+     * <p>
+     * Character encoding names can be found at
+     * <a href="http://www.iana.org/assignments/character-sets">IANA</a>.
+     * <p>
+     * This method uses {@link String#getBytes(String)}.
+     *
+     * @param data  the <code>String</code> to write, null ignored
+     * @param output  the <code>OutputStream</code> to write to
+     * @param encoding  the encoding to use, null means platform default
+     * @throws NullPointerException if output is null
+     * @throws IOException if an I/O error occurs
+     * @since Commons IO 1.1
+     */
+    public static void write(String data, OutputStream output, String encoding)
+            throws IOException {
+        if (data != null) {
+            if (encoding == null) {
+                write(data, output);
+            } else {
+                output.write(data.getBytes(encoding));
+            }
+        }
+    }
+
+    // write StringBuffer
+    //-----------------------------------------------------------------------
+    /**
+     * Writes chars from a <code>StringBuffer</code> to a <code>Writer</code>.
+     *
+     * @param data  the <code>StringBuffer</code> to write, null ignored
+     * @param output  the <code>Writer</code> to write to
+     * @throws NullPointerException if output is null
+     * @throws IOException if an I/O error occurs
+     * @since Commons IO 1.1
+     */
+    public static void write(StringBuffer data, Writer output)
+            throws IOException {
+        if (data != null) {
+            output.write(data.toString());
+        }
+    }
+
+    /**
+     * Writes chars from a <code>StringBuffer</code> to bytes on an
+     * <code>OutputStream</code> using the default character encoding of the
+     * platform.
+     * <p>
+     * This method uses {@link String#getBytes()}.
+     *
+     * @param data  the <code>StringBuffer</code> to write, null ignored
+     * @param output  the <code>OutputStream</code> to write to
+     * @throws NullPointerException if output is null
+     * @throws IOException if an I/O error occurs
+     * @since Commons IO 1.1
+     */
+    public static void write(StringBuffer data, OutputStream output)
+            throws IOException {
+        if (data != null) {
+            output.write(data.toString().getBytes());
+        }
+    }
+
+    /**
+     * Writes chars from a <code>StringBuffer</code> to bytes on an
+     * <code>OutputStream</code> using the specified character encoding.
+     * <p>
+     * Character encoding names can be found at
+     * <a href="http://www.iana.org/assignments/character-sets">IANA</a>.
+     * <p>
+     * This method uses {@link String#getBytes(String)}.
+     *
+     * @param data  the <code>StringBuffer</code> to write, null ignored
+     * @param output  the <code>OutputStream</code> to write to
+     * @param encoding  the encoding to use, null means platform default
+     * @throws NullPointerException if output is null
+     * @throws IOException if an I/O error occurs
+     * @since Commons IO 1.1
+     */
+    public static void write(StringBuffer data, OutputStream output,
+            String encoding) throws IOException {
+        if (data != null) {
+            if (encoding == null) {
+                write(data, output);
+            } else {
+                output.write(data.toString().getBytes(encoding));
+            }
+        }
+    }
+
+    // writeLines
+    //-----------------------------------------------------------------------
+    /**
+     * Writes the <code>toString()</code> value of each item in a collection to
+     * an <code>OutputStream</code> line by line, using the default character
+     * encoding of the platform and the specified line ending.
+     *
+     * @param lines  the lines to write, null entries produce blank lines
+     * @param lineEnding  the line separator to use, null is system default
+     * @param output  the <code>OutputStream</code> to write to, not null, not closed
+     * @throws NullPointerException if the output is null
+     * @throws IOException if an I/O error occurs
+     * @since Commons IO 1.1
+     */
+    public static void writeLines(Collection<Object> lines, String lineEnding,
+            OutputStream output) throws IOException {
+        if (lines == null) {
+            return;
+        }
+        if (lineEnding == null) {
+            lineEnding = LINE_SEPARATOR;
+        }
+        for (Iterator<Object> it = lines.iterator(); it.hasNext(); ) {
+            Object line = it.next();
+            if (line != null) {
+                output.write(line.toString().getBytes());
+            }
+            output.write(lineEnding.getBytes());
+        }
+    }
+
+    /**
+     * Writes the <code>toString()</code> value of each item in a collection to
+     * an <code>OutputStream</code> line by line, using the specified character
+     * encoding and the specified line ending.
+     * <p>
+     * Character encoding names can be found at
+     * <a href="http://www.iana.org/assignments/character-sets">IANA</a>.
+     *
+     * @param lines  the lines to write, null entries produce blank lines
+     * @param lineEnding  the line separator to use, null is system default
+     * @param output  the <code>OutputStream</code> to write to, not null, not closed
+     * @param encoding  the encoding to use, null means platform default
+     * @throws NullPointerException if the output is null
+     * @throws IOException if an I/O error occurs
+     * @since Commons IO 1.1
+     */
+    public static void writeLines(Collection<Object> lines, String lineEnding,
+            OutputStream output, String encoding) throws IOException {
+        if (encoding == null) {
+            writeLines(lines, lineEnding, output);
+        } else {
+            if (lines == null) {
+                return;
+            }
+            if (lineEnding == null) {
+                lineEnding = LINE_SEPARATOR;
+            }
+            for (Iterator<Object> it = lines.iterator(); it.hasNext(); ) {
+                Object line = it.next();
+                if (line != null) {
+                    output.write(line.toString().getBytes(encoding));
+                }
+                output.write(lineEnding.getBytes(encoding));
+            }
+        }
+    }
+
+    /**
+     * Writes the <code>toString()</code> value of each item in a collection to
+     * a <code>Writer</code> line by line, using the specified line ending.
+     *
+     * @param lines  the lines to write, null entries produce blank lines
+     * @param lineEnding  the line separator to use, null is system default
+     * @param writer  the <code>Writer</code> to write to, not null, not closed
+     * @throws NullPointerException if the input is null
+     * @throws IOException if an I/O error occurs
+     * @since Commons IO 1.1
+     */
+    public static void writeLines(Collection<Object> lines, String lineEnding,
+            Writer writer) throws IOException {
+        if (lines == null) {
+            return;
+        }
+        if (lineEnding == null) {
+            lineEnding = LINE_SEPARATOR;
+        }
+        for (Iterator<Object> it = lines.iterator(); it.hasNext(); ) {
+            Object line = it.next();
+            if (line != null) {
+                writer.write(line.toString());
+            }
+            writer.write(lineEnding);
+        }
+    }
+
+    // copy from InputStream
+    //-----------------------------------------------------------------------
+    /**
+     * Copy bytes from an <code>InputStream</code> to an
+     * <code>OutputStream</code>.
+     * <p>
+     * This method buffers the input internally, so there is no need to use a
+     * <code>BufferedInputStream</code>.
+     * <p>
+     * Large streams (over 2GB) will return a bytes copied value of
+     * <code>-1</code> after the copy has completed since the correct
+     * number of bytes cannot be returned as an int. For large streams
+     * use the <code>copyLarge(InputStream, OutputStream)</code> method.
+     *
+     * @param input  the <code>InputStream</code> to read from
+     * @param output  the <code>OutputStream</code> to write to
+     * @return the number of bytes copied
+     * @throws NullPointerException if the input or output is null
+     * @throws IOException if an I/O error occurs
+     * @throws ArithmeticException if the byte count is too large
+     * @since Commons IO 1.1
+     */
+    public static int copy(InputStream input, OutputStream output) throws IOException {
+        long count = copyLarge(input, output);
+        if (count > Integer.MAX_VALUE) {
+            return -1;
+        }
+        return (int) count;
+    }
+
+    /**
+     * Copy bytes from a large (over 2GB) <code>InputStream</code> to an
+     * <code>OutputStream</code>.
+     * <p>
+     * This method buffers the input internally, so there is no need to use a
+     * <code>BufferedInputStream</code>.
+     *
+     * @param input  the <code>InputStream</code> to read from
+     * @param output  the <code>OutputStream</code> to write to
+     * @return the number of bytes copied
+     * @throws NullPointerException if the input or output is null
+     * @throws IOException if an I/O error occurs
+     * @since Commons IO 1.3
+     */
+    public static long copyLarge(InputStream input, OutputStream output)
+            throws IOException {
+        byte[] buffer = new byte[DEFAULT_BUFFER_SIZE];
+        long count = 0;
+        int n = 0;
+        while (-1 != (n = input.read(buffer))) {
+            output.write(buffer, 0, n);
+            count += n;
+        }
+        return count;
+    }
+
+    /**
+     * Copy bytes from an <code>InputStream</code> to chars on a
+     * <code>Writer</code> using the default character encoding of the platform.
+     * <p>
+     * This method buffers the input internally, so there is no need to use a
+     * <code>BufferedInputStream</code>.
+     * <p>
+     * This method uses {@link InputStreamReader}.
+     *
+     * @param input  the <code>InputStream</code> to read from
+     * @param output  the <code>Writer</code> to write to
+     * @throws NullPointerException if the input or output is null
+     * @throws IOException if an I/O error occurs
+     * @since Commons IO 1.1
+     */
+    public static void copy(InputStream input, Writer output)
+            throws IOException {
+        InputStreamReader in = new InputStreamReader(input);
+        copy(in, output);
+    }
+
+    /**
+     * Copy bytes from an <code>InputStream</code> to chars on a
+     * <code>Writer</code> using the specified character encoding.
+     * <p>
+     * This method buffers the input internally, so there is no need to use a
+     * <code>BufferedInputStream</code>.
+     * <p>
+     * Character encoding names can be found at
+     * <a href="http://www.iana.org/assignments/character-sets">IANA</a>.
+     * <p>
+     * This method uses {@link InputStreamReader}.
+     *
+     * @param input  the <code>InputStream</code> to read from
+     * @param output  the <code>Writer</code> to write to
+     * @param encoding  the encoding to use, null means platform default
+     * @throws NullPointerException if the input or output is null
+     * @throws IOException if an I/O error occurs
+     * @since Commons IO 1.1
+     */
+    public static void copy(InputStream input, Writer output, String encoding)
+            throws IOException {
+        if (encoding == null) {
+            copy(input, output);
+        } else {
+            InputStreamReader in = new InputStreamReader(input, encoding);
+            copy(in, output);
+        }
+    }
+
+    // copy from Reader
+    //-----------------------------------------------------------------------
+    /**
+     * Copy chars from a <code>Reader</code> to a <code>Writer</code>.
+     * <p>
+     * This method buffers the input internally, so there is no need to use a
+     * <code>BufferedReader</code>.
+     * <p>
+     * Large streams (over 2GB) will return a chars copied value of
+     * <code>-1</code> after the copy has completed since the correct
+     * number of chars cannot be returned as an int. For large streams
+     * use the <code>copyLarge(Reader, Writer)</code> method.
+     *
+     * @param input  the <code>Reader</code> to read from
+     * @param output  the <code>Writer</code> to write to
+     * @return the number of characters copied
+     * @throws NullPointerException if the input or output is null
+     * @throws IOException if an I/O error occurs
+     * @throws ArithmeticException if the character count is too large
+     * @since Commons IO 1.1
+     */
+    public static int copy(Reader input, Writer output) throws IOException {
+        long count = copyLarge(input, output);
+        if (count > Integer.MAX_VALUE) {
+            return -1;
+        }
+        return (int) count;
+    }
+
+    /**
+     * Copy chars from a large (over 2GB) <code>Reader</code> to a <code>Writer</code>.
+     * <p>
+     * This method buffers the input internally, so there is no need to use a
+     * <code>BufferedReader</code>.
+     *
+     * @param input  the <code>Reader</code> to read from
+     * @param output  the <code>Writer</code> to write to
+     * @return the number of characters copied
+     * @throws NullPointerException if the input or output is null
+     * @throws IOException if an I/O error occurs
+     * @since Commons IO 1.3
+     */
+    public static long copyLarge(Reader input, Writer output) throws IOException {
+        char[] buffer = new char[DEFAULT_BUFFER_SIZE];
+        long count = 0;
+        int n = 0;
+        while (-1 != (n = input.read(buffer))) {
+            output.write(buffer, 0, n);
+            count += n;
+        }
+        return count;
+    }
+
+    /**
+     * Copy chars from a <code>Reader</code> to bytes on an
+     * <code>OutputStream</code> using the default character encoding of the
+     * platform, and calling flush.
+     * <p>
+     * This method buffers the input internally, so there is no need to use a
+     * <code>BufferedReader</code>.
+     * <p>
+     * Due to the implementation of OutputStreamWriter, this method performs a
+     * flush.
+     * <p>
+     * This method uses {@link OutputStreamWriter}.
+     *
+     * @param input  the <code>Reader</code> to read from
+     * @param output  the <code>OutputStream</code> to write to
+     * @throws NullPointerException if the input or output is null
+     * @throws IOException if an I/O error occurs
+     * @since Commons IO 1.1
+     */
+    public static void copy(Reader input, OutputStream output)
+            throws IOException {
+        OutputStreamWriter out = new OutputStreamWriter(output);
+        copy(input, out);
+        // XXX Unless anyone is planning on rewriting OutputStreamWriter, we
+        // have to flush here.
+        out.flush();
+    }
+
+    /**
+     * Copy chars from a <code>Reader</code> to bytes on an
+     * <code>OutputStream</code> using the specified character encoding, and
+     * calling flush.
+     * <p>
+     * This method buffers the input internally, so there is no need to use a
+     * <code>BufferedReader</code>.
+     * <p>
+     * Character encoding names can be found at
+     * <a href="http://www.iana.org/assignments/character-sets">IANA</a>.
+     * <p>
+     * Due to the implementation of OutputStreamWriter, this method performs a
+     * flush.
+     * <p>
+     * This method uses {@link OutputStreamWriter}.
+     *
+     * @param input  the <code>Reader</code> to read from
+     * @param output  the <code>OutputStream</code> to write to
+     * @param encoding  the encoding to use, null means platform default
+     * @throws NullPointerException if the input or output is null
+     * @throws IOException if an I/O error occurs
+     * @since Commons IO 1.1
+     */
+    public static void copy(Reader input, OutputStream output, String encoding)
+            throws IOException {
+        if (encoding == null) {
+            copy(input, output);
+        } else {
+            OutputStreamWriter out = new OutputStreamWriter(output, encoding);
+            copy(input, out);
+            // XXX Unless anyone is planning on rewriting OutputStreamWriter,
+            // we have to flush here.
+            out.flush();
+        }
+    }
+
+    // content equals
+    //-----------------------------------------------------------------------
+    /**
+     * Compare the contents of two Streams to determine if they are equal or
+     * not.
+     * <p>
+     * This method buffers the input internally using
+     * <code>BufferedInputStream</code> if they are not already buffered.
+     *
+     * @param input1  the first stream
+     * @param input2  the second stream
+     * @return true if the content of the streams are equal or they both don't
+     * exist, false otherwise
+     * @throws NullPointerException if either input is null
+     * @throws IOException if an I/O error occurs
+     */
+    public static boolean contentEquals(InputStream input1, InputStream input2)
+            throws IOException {
+        if (!(input1 instanceof BufferedInputStream)) {
+            input1 = new BufferedInputStream(input1);
+        }
+        if (!(input2 instanceof BufferedInputStream)) {
+            input2 = new BufferedInputStream(input2);
+        }
+
+        int ch = input1.read();
+        while (-1 != ch) {
+            int ch2 = input2.read();
+            if (ch != ch2) {
+                return false;
+            }
+            ch = input1.read();
+        }
+
+        int ch2 = input2.read();
+        return (ch2 == -1);
+    }
+
+    /**
+     * Compare the contents of two Readers to determine if they are equal or
+     * not.
+     * <p>
+     * This method buffers the input internally using
+     * <code>BufferedReader</code> if they are not already buffered.
+     *
+     * @param input1  the first reader
+     * @param input2  the second reader
+     * @return true if the content of the readers are equal or they both don't
+     * exist, false otherwise
+     * @throws NullPointerException if either input is null
+     * @throws IOException if an I/O error occurs
+     * @since Commons IO 1.1
+     */
+    public static boolean contentEquals(Reader input1, Reader input2)
+            throws IOException {
+        if (!(input1 instanceof BufferedReader)) {
+            input1 = new BufferedReader(input1);
+        }
+        if (!(input2 instanceof BufferedReader)) {
+            input2 = new BufferedReader(input2);
+        }
+
+        int ch = input1.read();
+        while (-1 != ch) {
+            int ch2 = input2.read();
+            if (ch != ch2) {
+                return false;
+            }
+            ch = input1.read();
+        }
+
+        int ch2 = input2.read();
+        return (ch2 == -1);
+    }
+
+}
diff --git a/src/org/apache/james/mime4j/BodyDescriptor.java b/src/org/apache/james/mime4j/BodyDescriptor.java
new file mode 100644
index 0000000..867c43d
--- /dev/null
+++ b/src/org/apache/james/mime4j/BodyDescriptor.java
@@ -0,0 +1,392 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you 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 org.apache.james.mime4j;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Encapsulates the values of the MIME-specific header fields
+ * (which starts with <code>Content-</code>).
+ *
+ *
+ * @version $Id: BodyDescriptor.java,v 1.4 2005/02/11 10:08:37 ntherning Exp $
+ */
+public class BodyDescriptor {
+    private static Log log = LogFactory.getLog(BodyDescriptor.class);
+
+    private String mimeType = "text/plain";
+    private String boundary = null;
+    private String charset = "us-ascii";
+    private String transferEncoding = "7bit";
+    private Map<String, String> parameters = new HashMap<String, String>();
+    private boolean contentTypeSet = false;
+    private boolean contentTransferEncSet = false;
+
+    /**
+     * Creates a new root <code>BodyDescriptor</code> instance.
+     */
+    public BodyDescriptor() {
+        this(null);
+    }
+
+    /**
+     * Creates a new <code>BodyDescriptor</code> instance.
+     *
+     * @param parent the descriptor of the parent or <code>null</code> if this
+     *        is the root descriptor.
+     */
+    public BodyDescriptor(BodyDescriptor parent) {
+        if (parent != null && parent.isMimeType("multipart/digest")) {
+            mimeType = "message/rfc822";
+        } else {
+            mimeType = "text/plain";
+        }
+    }
+
+    /**
+     * Should be called for each <code>Content-</code> header field of
+     * a MIME message or part.
+     *
+     * @param name the field name.
+     * @param value the field value.
+     */
+    public void addField(String name, String value) {
+
+        name = name.trim().toLowerCase();
+
+        if (name.equals("content-transfer-encoding") && !contentTransferEncSet) {
+            contentTransferEncSet = true;
+
+            value = value.trim().toLowerCase();
+            if (value.length() > 0) {
+                transferEncoding = value;
+            }
+
+        } else if (name.equals("content-type") && !contentTypeSet) {
+            contentTypeSet = true;
+
+            value = value.trim();
+
+            /*
+             * Unfold Content-Type value
+             */
+            StringBuffer sb = new StringBuffer();
+            for (int i = 0; i < value.length(); i++) {
+                char c = value.charAt(i);
+                if (c == '\r' || c == '\n') {
+                    continue;
+                }
+                sb.append(c);
+            }
+
+            Map<String, String> params = getHeaderParams(sb.toString());
+
+            String main = params.get("");
+            if (main != null) {
+                main = main.toLowerCase().trim();
+                int index = main.indexOf('/');
+                boolean valid = false;
+                if (index != -1) {
+                    String type = main.substring(0, index).trim();
+                    String subtype = main.substring(index + 1).trim();
+                    if (type.length() > 0 && subtype.length() > 0) {
+                        main = type + "/" + subtype;
+                        valid = true;
+                    }
+                }
+
+                if (!valid) {
+                    main = null;
+                }
+            }
+            String b = params.get("boundary");
+
+            if (main != null
+                    && ((main.startsWith("multipart/") && b != null)
+                            || !main.startsWith("multipart/"))) {
+
+                mimeType = main;
+            }
+
+            if (isMultipart()) {
+                boundary = b;
+            }
+
+            String c = params.get("charset");
+            if (c != null) {
+                c = c.trim();
+                if (c.length() > 0) {
+                    charset = c.toLowerCase();
+                }
+            }
+
+            /*
+             * Add all other parameters to parameters.
+             */
+            parameters.putAll(params);
+            parameters.remove("");
+            parameters.remove("boundary");
+            parameters.remove("charset");
+        }
+    }
+
+    private Map<String, String> getHeaderParams(String headerValue) {
+        Map<String, String> result = new HashMap<String, String>();
+
+        // split main value and parameters
+        String main;
+        String rest;
+        if (headerValue.indexOf(";") == -1) {
+            main = headerValue;
+            rest = null;
+        } else {
+            main = headerValue.substring(0, headerValue.indexOf(";"));
+            rest = headerValue.substring(main.length() + 1);
+        }
+
+        result.put("", main);
+        if (rest != null) {
+            char[] chars = rest.toCharArray();
+            StringBuffer paramName = new StringBuffer();
+            StringBuffer paramValue = new StringBuffer();
+
+            final byte READY_FOR_NAME = 0;
+            final byte IN_NAME = 1;
+            final byte READY_FOR_VALUE = 2;
+            final byte IN_VALUE = 3;
+            final byte IN_QUOTED_VALUE = 4;
+            final byte VALUE_DONE = 5;
+            final byte ERROR = 99;
+
+            byte state = READY_FOR_NAME;
+            boolean escaped = false;
+            for (int i = 0; i < chars.length; i++) {
+                char c = chars[i];
+
+                switch (state) {
+                    case ERROR:
+                        if (c == ';')
+                            state = READY_FOR_NAME;
+                        break;
+
+                    case READY_FOR_NAME:
+                        if (c == '=') {
+                            log.error("Expected header param name, got '='");
+                            state = ERROR;
+                            break;
+                        }
+
+                        paramName = new StringBuffer();
+                        paramValue = new StringBuffer();
+
+                        state = IN_NAME;
+                        // $FALL-THROUGH$
+
+                    case IN_NAME:
+                        if (c == '=') {
+                            if (paramName.length() == 0)
+                                state = ERROR;
+                            else
+                                state = READY_FOR_VALUE;
+                            break;
+                        }
+
+                        // not '='... just add to name
+                        paramName.append(c);
+                        break;
+
+                    case READY_FOR_VALUE:
+                        boolean fallThrough = false;
+                        switch (c) {
+                            case ' ':
+                            case '\t':
+                                break;  // ignore spaces, especially before '"'
+
+                            case '"':
+                                state = IN_QUOTED_VALUE;
+                                break;
+
+                            default:
+                                state = IN_VALUE;
+                                fallThrough = true;
+                                break;
+                        }
+                        if (!fallThrough)
+                            break;
+
+                        // $FALL-THROUGH$
+
+                    case IN_VALUE:
+                        fallThrough = false;
+                        switch (c) {
+                            case ';':
+                            case ' ':
+                            case '\t':
+                                result.put(
+                                   paramName.toString().trim().toLowerCase(),
+                                   paramValue.toString().trim());
+                                state = VALUE_DONE;
+                                fallThrough = true;
+                                break;
+                            default:
+                                paramValue.append(c);
+                                break;
+                        }
+                        if (!fallThrough)
+                            break;
+
+                        // $FALL-THROUGH$
+
+                    case VALUE_DONE:
+                        switch (c) {
+                            case ';':
+                                state = READY_FOR_NAME;
+                                break;
+
+                            case ' ':
+                            case '\t':
+                                break;
+
+                            default:
+                                state = ERROR;
+                                break;
+                        }
+                        break;
+
+                    case IN_QUOTED_VALUE:
+                        switch (c) {
+                            case '"':
+                                if (!escaped) {
+                                    // don't trim quoted strings; the spaces could be intentional.
+                                    result.put(
+                                            paramName.toString().trim().toLowerCase(),
+                                            paramValue.toString());
+                                    state = VALUE_DONE;
+                                } else {
+                                    escaped = false;
+                                    paramValue.append(c);
+                                }
+                                break;
+
+                            case '\\':
+                                if (escaped) {
+                                    paramValue.append('\\');
+                                }
+                                escaped = !escaped;
+                                break;
+
+                            default:
+                                if (escaped) {
+                                    paramValue.append('\\');
+                                }
+                                escaped = false;
+                                paramValue.append(c);
+                                break;
+                        }
+                        break;
+
+                }
+            }
+
+            // done looping.  check if anything is left over.
+            if (state == IN_VALUE) {
+                result.put(
+                        paramName.toString().trim().toLowerCase(),
+                        paramValue.toString().trim());
+            }
+        }
+
+        return result;
+    }
+
+
+    public boolean isMimeType(String mimeType) {
+        return this.mimeType.equals(mimeType.toLowerCase());
+    }
+
+    /**
+     * Return true if the BodyDescriptor belongs to a message
+     */
+    public boolean isMessage() {
+        return mimeType.equals("message/rfc822");
+    }
+
+    /**
+     * Return true if the BodyDescripotro belongs to a multipart
+     */
+    public boolean isMultipart() {
+        return mimeType.startsWith("multipart/");
+    }
+
+    /**
+     * Return the MimeType
+     */
+    public String getMimeType() {
+        return mimeType;
+    }
+
+    /**
+     * Return the boundary
+     */
+    public String getBoundary() {
+        return boundary;
+    }
+
+    /**
+     * Return the charset
+     */
+    public String getCharset() {
+        return charset;
+    }
+
+    /**
+     * Return all parameters for the BodyDescriptor
+     */
+    public Map<String, String> getParameters() {
+        return parameters;
+    }
+
+    /**
+     * Return the TransferEncoding
+     */
+    public String getTransferEncoding() {
+        return transferEncoding;
+    }
+
+    /**
+     * Return true if it's base64 encoded
+     */
+    public boolean isBase64Encoded() {
+        return "base64".equals(transferEncoding);
+    }
+
+    /**
+     * Return true if it's quoted-printable
+     */
+    public boolean isQuotedPrintableEncoded() {
+        return "quoted-printable".equals(transferEncoding);
+    }
+
+    @Override
+    public String toString() {
+        return mimeType;
+    }
+}
\ No newline at end of file
diff --git a/src/org/apache/james/mime4j/CloseShieldInputStream.java b/src/org/apache/james/mime4j/CloseShieldInputStream.java
new file mode 100644
index 0000000..d9f3b07
--- /dev/null
+++ b/src/org/apache/james/mime4j/CloseShieldInputStream.java
@@ -0,0 +1,129 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you 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 org.apache.james.mime4j;
+
+import java.io.InputStream;
+import java.io.IOException;
+
+/**
+ * InputStream that shields its underlying input stream from
+ * being closed.
+ *
+ *
+ * @version $Id: CloseShieldInputStream.java,v 1.2 2004/10/02 12:41:10 ntherning Exp $
+ */
+public class CloseShieldInputStream extends InputStream {
+
+    /**
+     * Underlying InputStream
+     */
+    private InputStream is;
+
+    public CloseShieldInputStream(InputStream is) {
+        this.is = is;
+    }
+
+    public InputStream getUnderlyingStream() {
+        return is;
+    }
+
+    /**
+     * @see java.io.InputStream#read()
+     */
+    public int read() throws IOException {
+        checkIfClosed();
+        return is.read();
+    }
+
+    /**
+     * @see java.io.InputStream#available()
+     */
+    public int available() throws IOException {
+        checkIfClosed();
+        return is.available();
+    }
+
+
+    /**
+     * Set the underlying InputStream to null
+     */
+    public void close() throws IOException {
+        is = null;
+    }
+
+    /**
+     * @see java.io.FilterInputStream#reset()
+     */
+    public synchronized void reset() throws IOException {
+        checkIfClosed();
+        is.reset();
+    }
+
+    /**
+     * @see java.io.FilterInputStream#markSupported()
+     */
+    public boolean markSupported() {
+        if (is == null)
+            return false;
+        return is.markSupported();
+    }
+
+    /**
+     * @see java.io.FilterInputStream#mark(int)
+     */
+    public synchronized void mark(int readlimit) {
+        if (is != null)
+            is.mark(readlimit);
+    }
+
+    /**
+     * @see java.io.FilterInputStream#skip(long)
+     */
+    public long skip(long n) throws IOException {
+        checkIfClosed();
+        return is.skip(n);
+    }
+
+    /**
+     * @see java.io.FilterInputStream#read(byte[])
+     */
+    public int read(byte b[]) throws IOException {
+        checkIfClosed();
+        return is.read(b);
+    }
+
+    /**
+     * @see java.io.FilterInputStream#read(byte[], int, int)
+     */
+    public int read(byte b[], int off, int len) throws IOException {
+        checkIfClosed();
+        return is.read(b, off, len);
+    }
+
+    /**
+     * Check if the underlying InputStream is null. If so throw an Exception
+     *
+     * @throws IOException if the underlying InputStream is null
+     */
+    private void checkIfClosed() throws IOException {
+        if (is == null)
+            throw new IOException("Stream is closed");
+    }
+}
\ No newline at end of file
diff --git a/src/org/apache/james/mime4j/ContentHandler.java b/src/org/apache/james/mime4j/ContentHandler.java
new file mode 100644
index 0000000..b437e73
--- /dev/null
+++ b/src/org/apache/james/mime4j/ContentHandler.java
@@ -0,0 +1,177 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you 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 org.apache.james.mime4j;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * <p>
+ * Receives notifications of the content of a plain RFC822 or MIME message.
+ * Implement this interface and register an instance of that implementation
+ * with a <code>MimeStreamParser</code> instance using its
+ * {@link org.apache.james.mime4j.MimeStreamParser#setContentHandler(ContentHandler)}
+ * method. The parser uses the <code>ContentHandler</code> instance to report
+ * basic message-related events like the start and end of the body of a
+ * part in a multipart MIME entity.
+ * </p>
+ * <p>
+ * Events will be generated in the order the corresponding elements occur in
+ * the message stream parsed by the parser. E.g.:
+ * <pre>
+ *      startMessage()
+ *          startHeader()
+ *              field(...)
+ *              field(...)
+ *              ...
+ *          endHeader()
+ *          startMultipart()
+ *              preamble(...)
+ *              startBodyPart()
+ *                  startHeader()
+ *                      field(...)
+ *                      field(...)
+ *                      ...
+ *                  endHeader()
+ *                  body()
+ *              endBodyPart()
+ *              startBodyPart()
+ *                  startHeader()
+ *                      field(...)
+ *                      field(...)
+ *                      ...
+ *                  endHeader()
+ *                  body()
+ *              endBodyPart()
+ *              epilogue(...)
+ *          endMultipart()
+ *      endMessage()
+ * </pre>
+ * The above shows an example of a MIME message consisting of a multipart
+ * body containing two body parts.
+ * </p>
+ * <p>
+ * See MIME RFCs 2045-2049 for more information on the structure of MIME
+ * messages and RFC 822 and 2822 for the general structure of Internet mail
+ * messages.
+ * </p>
+ *
+ *
+ * @version $Id: ContentHandler.java,v 1.3 2004/10/02 12:41:10 ntherning Exp $
+ */
+public interface ContentHandler {
+    /**
+     * Called when a new message starts (a top level message or an embedded
+     * rfc822 message).
+     */
+    void startMessage();
+
+    /**
+     * Called when a message ends.
+     */
+    void endMessage();
+
+    /**
+     * Called when a new body part starts inside a
+     * <code>multipart/*</code> entity.
+     */
+    void startBodyPart();
+
+    /**
+     * Called when a body part ends.
+     */
+    void endBodyPart();
+
+    /**
+     * Called when a header (of a message or body part) is about to be parsed.
+     */
+    void startHeader();
+
+    /**
+     * Called for each field of a header.
+     *
+     * @param fieldData the raw contents of the field
+     *        (<code>Field-Name: field value</code>). The value will not be
+     *        unfolded.
+     */
+    void field(String fieldData);
+
+    /**
+     * Called when there are no more header fields in a message or body part.
+     */
+    void endHeader();
+
+    /**
+     * Called for the preamble (whatever comes before the first body part)
+     * of a <code>multipart/*</code> entity.
+     *
+     * @param is used to get the contents of the preamble.
+     * @throws IOException should be thrown on I/O errors.
+     */
+    void preamble(InputStream is) throws IOException;
+
+    /**
+     * Called for the epilogue (whatever comes after the final body part)
+     * of a <code>multipart/*</code> entity.
+     *
+     * @param is used to get the contents of the epilogue.
+     * @throws IOException should be thrown on I/O errors.
+     */
+    void epilogue(InputStream is) throws IOException;
+
+    /**
+     * Called when the body of a multipart entity is about to be parsed.
+     *
+     * @param bd encapsulates the values (either read from the
+     *        message stream or, if not present, determined implictly
+     *        as described in the
+     *        MIME rfc:s) of the <code>Content-Type</code> and
+     *        <code>Content-Transfer-Encoding</code> header fields.
+     */
+    void startMultipart(BodyDescriptor bd);
+
+    /**
+     * Called when the body of an entity has been parsed.
+     */
+    void endMultipart();
+
+    /**
+     * Called when the body of a discrete (non-multipart) entity is about to
+     * be parsed.
+     *
+     * @param bd see {@link #startMultipart(BodyDescriptor)}
+     * @param is the contents of the body. NOTE: this is the raw body contents
+     *           - it will not be decoded if encoded. The <code>bd</code>
+     *           parameter should be used to determine how the stream data
+     *           should be decoded.
+     * @throws IOException should be thrown on I/O errors.
+     */
+    void body(BodyDescriptor bd, InputStream is) throws IOException;
+
+    /**
+     * Called when a new entity (message or body part) starts and the
+     * parser is in <code>raw</code> mode.
+     *
+     * @param is the raw contents of the entity.
+     * @throws IOException should be thrown on I/O errors.
+     * @see MimeStreamParser#setRaw(boolean)
+     */
+    void raw(InputStream is) throws IOException;
+}
\ No newline at end of file
diff --git a/src/org/apache/james/mime4j/EOLConvertingInputStream.java b/src/org/apache/james/mime4j/EOLConvertingInputStream.java
new file mode 100644
index 0000000..d6ef706
--- /dev/null
+++ b/src/org/apache/james/mime4j/EOLConvertingInputStream.java
@@ -0,0 +1,139 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you 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 org.apache.james.mime4j;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PushbackInputStream;
+
+/**
+ * InputStream which converts <code>\r</code>
+ * bytes not followed by <code>\n</code> and <code>\n</code> not
+ * preceded by <code>\r</code> to <code>\r\n</code>.
+ *
+ *
+ * @version $Id: EOLConvertingInputStream.java,v 1.4 2004/11/29 13:15:42 ntherning Exp $
+ */
+public class EOLConvertingInputStream extends InputStream {
+    /** Converts single '\r' to '\r\n' */
+    public static final int CONVERT_CR   = 1;
+    /** Converts single '\n' to '\r\n' */
+    public static final int CONVERT_LF   = 2;
+    /** Converts single '\r' and '\n' to '\r\n' */
+    public static final int CONVERT_BOTH = 3;
+
+    private PushbackInputStream in = null;
+    private int previous = 0;
+    private int flags = CONVERT_BOTH;
+    private int size = 0;
+    private int pos = 0;
+    private int nextTenPctPos;
+    private int tenPctSize;
+    private Callback callback;
+
+    public interface Callback {
+        public void report(int bytesRead);
+    }
+
+    /**
+     * Creates a new <code>EOLConvertingInputStream</code>
+     * instance converting bytes in the given <code>InputStream</code>.
+     * The flag <code>CONVERT_BOTH</code> is the default.
+     *
+     * @param in the <code>InputStream</code> to read from.
+     */
+    public EOLConvertingInputStream(InputStream _in) {
+        super();
+        in = new PushbackInputStream(_in, 2);
+    }
+
+    /**
+     * Creates a new <code>EOLConvertingInputStream</code>
+     * instance converting bytes in the given <code>InputStream</code>.
+     *
+     * @param _in the <code>InputStream</code> to read from.
+     * @param _size the size of the input stream (need not be exact)
+     * @param _callback a callback reporting when each 10% of stream's size is reached
+     */
+    public EOLConvertingInputStream(InputStream _in, int _size, Callback _callback) {
+        this(_in);
+        size = _size;
+        tenPctSize = size / 10;
+        nextTenPctPos = tenPctSize;
+        callback = _callback;
+    }
+
+    /**
+     * Closes the underlying stream.
+     *
+     * @throws IOException on I/O errors.
+     */
+    public void close() throws IOException {
+        in.close();
+    }
+
+    private int readByte() throws IOException {
+        int b = in.read();
+        if (b != -1) {
+            if (callback != null && pos++ == nextTenPctPos) {
+                nextTenPctPos += tenPctSize;
+                if (callback != null) {
+                    callback.report(pos);
+                }
+            }
+        }
+        return b;
+    }
+
+    private void unreadByte(int c) throws IOException {
+        in.unread(c);
+        pos--;
+    }
+
+    /**
+     * @see java.io.InputStream#read()
+     */
+    public int read() throws IOException {
+        int b = readByte();
+
+        if (b == -1) {
+            pos = size;
+            return -1;
+        }
+
+        if ((flags & CONVERT_CR) != 0 && b == '\r') {
+            int c = readByte();
+            if (c != -1) {
+                unreadByte(c);
+            }
+            if (c != '\n') {
+                unreadByte('\n');
+            }
+        } else if ((flags & CONVERT_LF) != 0 && b == '\n' && previous != '\r') {
+            b = '\r';
+            unreadByte('\n');
+        }
+
+        previous = b;
+
+        return b;
+    }
+
+}
\ No newline at end of file
diff --git a/src/org/apache/james/mime4j/Log.java b/src/org/apache/james/mime4j/Log.java
new file mode 100644
index 0000000..5eeead5
--- /dev/null
+++ b/src/org/apache/james/mime4j/Log.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * 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 org.apache.james.mime4j;
+
+/**
+ * Empty stub for the apache logging library.
+ */
+public class Log {
+    private static final String LOG_TAG = "Email Log";
+
+    public Log(Class mClazz) {
+    }
+
+    public boolean isDebugEnabled() {
+        return false;
+    }
+
+    public boolean isErrorEnabled() {
+        return true;
+    }
+
+    public boolean isFatalEnabled() {
+        return true;
+    }
+
+    public boolean isInfoEnabled() {
+        return false;
+    }
+
+    public boolean isTraceEnabled() {
+        return false;
+    }
+
+    public boolean isWarnEnabled() {
+        return true;
+    }
+
+    public void trace(Object message) {
+        if (!isTraceEnabled()) return;
+        android.util.Log.v(LOG_TAG, toString(message, null));
+    }
+
+    public void trace(Object message, Throwable t) {
+        if (!isTraceEnabled()) return;
+        android.util.Log.v(LOG_TAG, toString(message, t));
+    }
+
+    public void debug(Object message) {
+        if (!isDebugEnabled()) return;
+        android.util.Log.d(LOG_TAG, toString(message, null));
+    }
+
+    public void debug(Object message, Throwable t) {
+        if (!isDebugEnabled()) return;
+        android.util.Log.d(LOG_TAG, toString(message, t));
+    }
+
+    public void info(Object message) {
+        if (!isInfoEnabled()) return;
+        android.util.Log.i(LOG_TAG, toString(message, null));
+    }
+
+    public void info(Object message, Throwable t) {
+        if (!isInfoEnabled()) return;
+        android.util.Log.i(LOG_TAG, toString(message, t));
+    }
+
+    public void warn(Object message) {
+        android.util.Log.w(LOG_TAG, toString(message, null));
+    }
+
+    public void warn(Object message, Throwable t) {
+        android.util.Log.w(LOG_TAG, toString(message, t));
+    }
+
+    public void error(Object message) {
+        android.util.Log.e(LOG_TAG, toString(message, null));
+    }
+
+    public void error(Object message, Throwable t) {
+        android.util.Log.e(LOG_TAG, toString(message, t));
+    }
+
+    public void fatal(Object message) {
+        android.util.Log.e(LOG_TAG, toString(message, null));
+    }
+
+    public void fatal(Object message, Throwable t) {
+        android.util.Log.e(LOG_TAG, toString(message, t));
+    }
+
+    private static String toString(Object o, Throwable t) {
+        String m = (o == null) ? "(null)" : o.toString();
+        if (t == null) {
+            return m;
+        } else {
+            return m + " " + t.getMessage();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/org/apache/james/mime4j/LogFactory.java b/src/org/apache/james/mime4j/LogFactory.java
new file mode 100644
index 0000000..ed6e3de
--- /dev/null
+++ b/src/org/apache/james/mime4j/LogFactory.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * 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 org.apache.james.mime4j;
+
+/**
+ * Empty stub for the apache logging library.
+ */
+public final class LogFactory {
+    private LogFactory() {
+    }
+
+    public static Log getLog(Class clazz) {
+        return new Log(clazz);
+    }
+}
\ No newline at end of file
diff --git a/src/org/apache/james/mime4j/MimeBoundaryInputStream.java b/src/org/apache/james/mime4j/MimeBoundaryInputStream.java
new file mode 100644
index 0000000..c6d6f24
--- /dev/null
+++ b/src/org/apache/james/mime4j/MimeBoundaryInputStream.java
@@ -0,0 +1,184 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you 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 org.apache.james.mime4j;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PushbackInputStream;
+
+/**
+ * Stream that constrains itself to a single MIME body part.
+ * After the stream ends (i.e. read() returns -1) {@link #hasMoreParts()}
+ * can be used to determine if a final boundary has been seen or not.
+ * If {@link #parentEOF()} is <code>true</code> an unexpected end of stream
+ * has been detected in the parent stream.
+ *
+ *
+ *
+ * @version $Id: MimeBoundaryInputStream.java,v 1.2 2004/11/29 13:15:42 ntherning Exp $
+ */
+public class MimeBoundaryInputStream extends InputStream {
+
+    private PushbackInputStream s = null;
+    private byte[] boundary = null;
+    private boolean first = true;
+    private boolean eof = false;
+    private boolean parenteof = false;
+    private boolean moreParts = true;
+
+    /**
+     * Creates a new MimeBoundaryInputStream.
+     * @param s The underlying stream.
+     * @param boundary Boundary string (not including leading hyphens).
+     */
+    public MimeBoundaryInputStream(InputStream s, String boundary)
+            throws IOException {
+
+        this.s = new PushbackInputStream(s, boundary.length() + 4);
+
+        boundary = "--" + boundary;
+        this.boundary = new byte[boundary.length()];
+        for (int i = 0; i < this.boundary.length; i++) {
+            this.boundary[i] = (byte) boundary.charAt(i);
+        }
+
+        /*
+         * By reading one byte we will update moreParts to be as expected
+         * before any bytes have been read.
+         */
+        int b = read();
+        if (b != -1) {
+            this.s.unread(b);
+        }
+    }
+
+    /**
+     * Closes the underlying stream.
+     *
+     * @throws IOException on I/O errors.
+     */
+    public void close() throws IOException {
+        s.close();
+    }
+
+    /**
+     * Determines if the underlying stream has more parts (this stream has
+     * not seen an end boundary).
+     *
+     * @return <code>true</code> if there are more parts in the underlying
+     *         stream, <code>false</code> otherwise.
+     */
+    public boolean hasMoreParts() {
+        return moreParts;
+    }
+
+    /**
+     * Determines if the parent stream has reached EOF
+     *
+     * @return <code>true</code>  if EOF has been reached for the parent stream,
+     *         <code>false</code> otherwise.
+     */
+    public boolean parentEOF() {
+        return parenteof;
+    }
+
+    /**
+     * Consumes all unread bytes of this stream. After a call to this method
+     * this stream will have reached EOF.
+     *
+     * @throws IOException on I/O errors.
+     */
+    public void consume() throws IOException {
+        while (read() != -1) {
+        }
+    }
+
+    /**
+     * @see java.io.InputStream#read()
+     */
+    public int read() throws IOException {
+        if (eof) {
+            return -1;
+        }
+
+        if (first) {
+            first = false;
+            if (matchBoundary()) {
+                return -1;
+            }
+        }
+
+        int b1 = s.read();
+        int b2 = s.read();
+
+        if (b1 == '\r' && b2 == '\n') {
+            if (matchBoundary()) {
+                return -1;
+            }
+        }
+
+        if (b2 != -1) {
+            s.unread(b2);
+        }
+
+        parenteof = b1 == -1;
+        eof = parenteof;
+
+        return b1;
+    }
+
+    private boolean matchBoundary() throws IOException {
+
+        for (int i = 0; i < boundary.length; i++) {
+            int b = s.read();
+            if (b != boundary[i]) {
+                if (b != -1) {
+                    s.unread(b);
+                }
+                for (int j = i - 1; j >= 0; j--) {
+                    s.unread(boundary[j]);
+                }
+                return false;
+            }
+        }
+
+        /*
+         * We have a match. Is it an end boundary?
+         */
+        int prev = s.read();
+        int curr = s.read();
+        moreParts = !(prev == '-' && curr == '-');
+        do {
+            if (curr == '\n' && prev == '\r') {
+                break;
+            }
+            prev = curr;
+        } while ((curr = s.read()) != -1);
+
+        if (curr == -1) {
+            moreParts = false;
+            parenteof = true;
+        }
+
+        eof = true;
+
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/src/org/apache/james/mime4j/MimeStreamParser.java b/src/org/apache/james/mime4j/MimeStreamParser.java
new file mode 100644
index 0000000..a8aad5a
--- /dev/null
+++ b/src/org/apache/james/mime4j/MimeStreamParser.java
@@ -0,0 +1,324 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you 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 org.apache.james.mime4j;
+
+import org.apache.james.mime4j.decoder.Base64InputStream;
+import org.apache.james.mime4j.decoder.QuotedPrintableInputStream;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.BitSet;
+import java.util.LinkedList;
+
+/**
+ * <p>
+ * Parses MIME (or RFC822) message streams of bytes or characters and reports
+ * parsing events to a <code>ContentHandler</code> instance.
+ * </p>
+ * <p>
+ * Typical usage:<br/>
+ * <pre>
+ *      ContentHandler handler = new MyHandler();
+ *      MimeStreamParser parser = new MimeStreamParser();
+ *      parser.setContentHandler(handler);
+ *      parser.parse(new BufferedInputStream(new FileInputStream("mime.msg")));
+ * </pre>
+ * <strong>NOTE:</strong> All lines must end with CRLF
+ * (<code>\r\n</code>). If you are unsure of the line endings in your stream
+ * you should wrap it in a {@link org.apache.james.mime4j.EOLConvertingInputStream} instance.
+ *
+ *
+ * @version $Id: MimeStreamParser.java,v 1.8 2005/02/11 10:12:02 ntherning Exp $
+ */
+public class MimeStreamParser {
+    private static final Log log = LogFactory.getLog(MimeStreamParser.class);
+
+    private static BitSet fieldChars = null;
+
+    private RootInputStream rootStream = null;
+    private LinkedList<BodyDescriptor> bodyDescriptors = new LinkedList<BodyDescriptor>();
+    private ContentHandler handler = null;
+    private boolean raw = false;
+    private boolean prematureEof = false;
+
+    static {
+        fieldChars = new BitSet();
+        for (int i = 0x21; i <= 0x39; i++) {
+            fieldChars.set(i);
+        }
+        for (int i = 0x3b; i <= 0x7e; i++) {
+            fieldChars.set(i);
+        }
+    }
+
+    /**
+     * Creates a new <code>MimeStreamParser</code> instance.
+     */
+    public MimeStreamParser() {
+    }
+
+    /**
+     * Parses a stream of bytes containing a MIME message.
+     *
+     * @param is the stream to parse.
+     * @throws IOException on I/O errors.
+     */
+    public void parse(InputStream is) throws IOException {
+        rootStream = new RootInputStream(is);
+        parseMessage(rootStream);
+    }
+
+    /**
+     * Determines if this parser is currently in raw mode.
+     *
+     * @return <code>true</code> if in raw mode, <code>false</code>
+     *         otherwise.
+     * @see #setRaw(boolean)
+     */
+    public boolean isRaw() {
+        return raw;
+    }
+
+    /**
+     * Enables or disables raw mode. In raw mode all future entities
+     * (messages or body parts) in the stream will be reported to the
+     * {@link ContentHandler#raw(InputStream)} handler method only.
+     * The stream will contain the entire unparsed entity contents
+     * including header fields and whatever is in the body.
+     *
+     * @param raw <code>true</code> enables raw mode, <code>false</code>
+     *        disables it.
+     */
+    public void setRaw(boolean raw) {
+        this.raw = raw;
+    }
+
+    /**
+     * Finishes the parsing and stops reading lines.
+     * NOTE: No more lines will be parsed but the parser
+     * will still call
+     * {@link ContentHandler#endMultipart()},
+     * {@link ContentHandler#endBodyPart()},
+     * {@link ContentHandler#endMessage()}, etc to match previous calls
+     * to
+     * {@link ContentHandler#startMultipart(BodyDescriptor)},
+     * {@link ContentHandler#startBodyPart()},
+     * {@link ContentHandler#startMessage()}, etc.
+     */
+    public void stop() {
+        rootStream.truncate();
+    }
+
+    /**
+     * Parses an entity which consists of a header followed by a body containing
+     * arbitrary data, body parts or an embedded message.
+     *
+     * @param is the stream to parse.
+     * @throws IOException on I/O errors.
+     */
+    private void parseEntity(InputStream is) throws IOException {
+        BodyDescriptor bd = parseHeader(is);
+
+        if (bd.isMultipart()) {
+            bodyDescriptors.addFirst(bd);
+
+            handler.startMultipart(bd);
+
+            MimeBoundaryInputStream tempIs =
+                new MimeBoundaryInputStream(is, bd.getBoundary());
+            handler.preamble(new CloseShieldInputStream(tempIs));
+            tempIs.consume();
+
+            while (tempIs.hasMoreParts()) {
+                tempIs = new MimeBoundaryInputStream(is, bd.getBoundary());
+                parseBodyPart(tempIs);
+                tempIs.consume();
+                if (tempIs.parentEOF()) {
+                    prematureEof = true;
+//                    if (log.isWarnEnabled()) {
+//                        log.warn("Line " + rootStream.getLineNumber()
+//                                + ": Body part ended prematurely. "
+//                                + "Higher level boundary detected or "
+//                                + "EOF reached.");
+//                    }
+                    break;
+                }
+            }
+
+            handler.epilogue(new CloseShieldInputStream(is));
+
+            handler.endMultipart();
+
+            bodyDescriptors.removeFirst();
+
+        } else if (bd.isMessage()) {
+            if (bd.isBase64Encoded()) {
+                log.warn("base64 encoded message/rfc822 detected");
+                is = new EOLConvertingInputStream(
+                        new Base64InputStream(is));
+            } else if (bd.isQuotedPrintableEncoded()) {
+                log.warn("quoted-printable encoded message/rfc822 detected");
+                is = new EOLConvertingInputStream(
+                        new QuotedPrintableInputStream(is));
+            }
+            bodyDescriptors.addFirst(bd);
+            parseMessage(is);
+            bodyDescriptors.removeFirst();
+        } else {
+            handler.body(bd, new CloseShieldInputStream(is));
+        }
+
+        /*
+         * Make sure the stream has been consumed.
+         */
+        while (is.read() != -1) {
+        }
+    }
+
+    private void parseMessage(InputStream is) throws IOException {
+        if (raw) {
+            handler.raw(new CloseShieldInputStream(is));
+        } else {
+            handler.startMessage();
+            parseEntity(is);
+            handler.endMessage();
+        }
+    }
+
+    public boolean getPrematureEof() {
+        return prematureEof;
+    }
+
+    private void parseBodyPart(InputStream is) throws IOException {
+        if (raw) {
+            handler.raw(new CloseShieldInputStream(is));
+        } else {
+            handler.startBodyPart();
+            parseEntity(is);
+            handler.endBodyPart();
+        }
+    }
+
+    /**
+     * Parses a header.
+     *
+     * @param is the stream to parse.
+     * @return a <code>BodyDescriptor</code> describing the body following
+     *         the header.
+     */
+    private BodyDescriptor parseHeader(InputStream is) throws IOException {
+        BodyDescriptor bd = new BodyDescriptor(bodyDescriptors.isEmpty()
+                        ? null : (BodyDescriptor) bodyDescriptors.getFirst());
+
+        handler.startHeader();
+
+        int lineNumber = rootStream.getLineNumber();
+
+        StringBuffer sb = new StringBuffer();
+        int curr = 0;
+        int prev = 0;
+        while ((curr = is.read()) != -1) {
+            if (curr == '\n' && (prev == '\n' || prev == 0)) {
+                /*
+                 * [\r]\n[\r]\n or an immediate \r\n have been seen.
+                 */
+                sb.deleteCharAt(sb.length() - 1);
+                break;
+            }
+            sb.append((char) curr);
+            prev = curr == '\r' ? prev : curr;
+        }
+
+//        if (curr == -1 && log.isWarnEnabled()) {
+//            log.warn("Line " + rootStream.getLineNumber()
+//                    + ": Unexpected end of headers detected. "
+//                    + "Boundary detected in header or EOF reached.");
+//        }
+
+        int start = 0;
+        int pos = 0;
+        int startLineNumber = lineNumber;
+        while (pos < sb.length()) {
+            while (pos < sb.length() && sb.charAt(pos) != '\r') {
+                pos++;
+            }
+            if (pos < sb.length() - 1 && sb.charAt(pos + 1) != '\n') {
+                pos++;
+                continue;
+            }
+
+            if (pos >= sb.length() - 2 || fieldChars.get(sb.charAt(pos + 2))) {
+
+                /*
+                 * field should be the complete field data excluding the
+                 * trailing \r\n.
+                 */
+                String field = sb.substring(start, pos);
+                start = pos + 2;
+
+                /*
+                 * Check for a valid field.
+                 */
+                int index = field.indexOf(':');
+                boolean valid = false;
+                if (index != -1 && fieldChars.get(field.charAt(0))) {
+                    valid = true;
+                    String fieldName = field.substring(0, index).trim();
+                    for (int i = 0; i < fieldName.length(); i++) {
+                        if (!fieldChars.get(fieldName.charAt(i))) {
+                            valid = false;
+                            break;
+                        }
+                    }
+
+                    if (valid) {
+                        handler.field(field);
+                        bd.addField(fieldName, field.substring(index + 1));
+                    }
+                }
+
+                if (!valid && log.isWarnEnabled()) {
+                    log.warn("Line " + startLineNumber
+                            + ": Ignoring invalid field: '" + field.trim() + "'");
+                }
+
+                startLineNumber = lineNumber;
+            }
+
+            pos += 2;
+            lineNumber++;
+        }
+
+        handler.endHeader();
+
+        return bd;
+    }
+
+    /**
+     * Sets the <code>ContentHandler</code> to use when reporting
+     * parsing events.
+     *
+     * @param h the <code>ContentHandler</code>.
+     */
+    public void setContentHandler(ContentHandler h) {
+        this.handler = h;
+    }
+
+}
\ No newline at end of file
diff --git a/src/org/apache/james/mime4j/RootInputStream.java b/src/org/apache/james/mime4j/RootInputStream.java
new file mode 100644
index 0000000..cc8b241
--- /dev/null
+++ b/src/org/apache/james/mime4j/RootInputStream.java
@@ -0,0 +1,111 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you 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 org.apache.james.mime4j;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * <code>InputStream</code> used by the parser to wrap the original user
+ * supplied stream. This stream keeps track of the current line number and
+ * can also be truncated. When truncated the stream will appear to have
+ * reached end of file. This is used by the parser's
+ * {@link org.apache.james.mime4j.MimeStreamParser#stop()} method.
+ *
+ *
+ * @version $Id: RootInputStream.java,v 1.2 2004/10/02 12:41:10 ntherning Exp $
+ */
+class RootInputStream extends InputStream {
+    private InputStream is = null;
+    private int lineNumber = 1;
+    private int prev = -1;
+    private boolean truncated = false;
+
+    /**
+     * Creates a new <code>RootInputStream</code>.
+     *
+     * @param in the stream to read from.
+     */
+    public RootInputStream(InputStream is) {
+        this.is = is;
+    }
+
+    /**
+     * Gets the current line number starting at 1
+     * (the number of <code>\r\n</code> read so far plus 1).
+     *
+     * @return the current line number.
+     */
+    public int getLineNumber() {
+        return lineNumber;
+    }
+
+    /**
+     * Truncates this <code>InputStream</code>. After this call any
+     * call to {@link #read()}, {@link #read(byte[]) or
+     * {@link #read(byte[], int, int)} will return
+     * -1 as if end-of-file had been reached.
+     */
+    public void truncate() {
+        this.truncated = true;
+    }
+
+    /**
+     * @see java.io.InputStream#read()
+     */
+    public int read() throws IOException {
+        if (truncated) {
+            return -1;
+        }
+
+        int b = is.read();
+        if (prev == '\r' && b == '\n') {
+            lineNumber++;
+        }
+        prev = b;
+        return b;
+    }
+
+    /**
+     *
+     * @see java.io.InputStream#read(byte[], int, int)
+     */
+    public int read(byte[] b, int off, int len) throws IOException {
+        if (truncated) {
+            return -1;
+        }
+
+        int n = is.read(b, off, len);
+        for (int i = off; i < off + n; i++) {
+            if (prev == '\r' && b[i] == '\n') {
+                lineNumber++;
+            }
+            prev = b[i];
+        }
+        return n;
+    }
+
+    /**
+     * @see java.io.InputStream#read(byte[])
+     */
+    public int read(byte[] b) throws IOException {
+        return read(b, 0, b.length);
+    }
+}
\ No newline at end of file
diff --git a/src/org/apache/james/mime4j/codec/EncoderUtil.java b/src/org/apache/james/mime4j/codec/EncoderUtil.java
new file mode 100644
index 0000000..6841bc9
--- /dev/null
+++ b/src/org/apache/james/mime4j/codec/EncoderUtil.java
@@ -0,0 +1,630 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you 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 org.apache.james.mime4j.codec;
+
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+import java.util.BitSet;
+import java.util.Locale;
+
+import org.apache.james.mime4j.util.CharsetUtil;
+
+/**
+ * ANDROID:  THIS CLASS IS COPIED FROM A NEWER VERSION OF MIME4J
+ */
+
+/**
+ * Static methods for encoding header field values. This includes encoded-words
+ * as defined in <a href='http://www.faqs.org/rfcs/rfc2047.html'>RFC 2047</a>
+ * or display-names of an e-mail address, for example.
+ * 
+ */
+public class EncoderUtil {
+
+    // This array is a lookup table that translates 6-bit positive integer index
+    // values into their "Base64 Alphabet" equivalents as specified in Table 1
+    // of RFC 2045.
+    // ANDROID:  THIS TABLE IS COPIED FROM BASE64OUTPUTSTREAM
+    static final byte[] BASE64_TABLE = { 'A', 'B', 'C', 'D', 'E', 'F',
+            'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S',
+            'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f',
+            'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's',
+            't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5',
+            '6', '7', '8', '9', '+', '/' };
+
+    // Byte used to pad output.
+    private static final byte BASE64_PAD = '=';
+
+    private static final BitSet Q_REGULAR_CHARS = initChars("=_?");
+
+    private static final BitSet Q_RESTRICTED_CHARS = initChars("=_?\"#$%&'(),.:;<>@[\\]^`{|}~");
+
+    private static final int MAX_USED_CHARACTERS = 50;
+
+    private static final String ENC_WORD_PREFIX = "=?";
+    private static final String ENC_WORD_SUFFIX = "?=";
+
+    private static final int ENCODED_WORD_MAX_LENGTH = 75; // RFC 2047
+
+    private static final BitSet TOKEN_CHARS = initChars("()<>@,;:\\\"/[]?=");
+
+    private static final BitSet ATEXT_CHARS = initChars("()<>@.,;:\\\"[]");
+
+    private static BitSet initChars(String specials) {
+        BitSet bs = new BitSet(128);
+        for (char ch = 33; ch < 127; ch++) {
+            if (specials.indexOf(ch) == -1) {
+                bs.set(ch);
+            }
+        }
+        return bs;
+    }
+
+    /**
+     * Selects one of the two encodings specified in RFC 2047.
+     */
+    public enum Encoding {
+        /** The B encoding (identical to base64 defined in RFC 2045). */
+        B,
+        /** The Q encoding (similar to quoted-printable defined in RFC 2045). */
+        Q
+    }
+
+    /**
+     * Indicates the intended usage of an encoded word.
+     */
+    public enum Usage {
+        /**
+         * Encoded word is used to replace a 'text' token in any Subject or
+         * Comments header field.
+         */
+        TEXT_TOKEN,
+        /**
+         * Encoded word is used to replace a 'word' entity within a 'phrase',
+         * for example, one that precedes an address in a From, To, or Cc
+         * header.
+         */
+        WORD_ENTITY
+    }
+
+    private EncoderUtil() {
+    }
+
+    /**
+     * Encodes the display-name portion of an address. See <a
+     * href='http://www.faqs.org/rfcs/rfc5322.html'>RFC 5322</a> section 3.4
+     * and <a href='http://www.faqs.org/rfcs/rfc2047.html'>RFC 2047</a> section
+     * 5.3. The specified string should not be folded.
+     * 
+     * @param displayName
+     *            display-name to encode.
+     * @return encoded display-name.
+     */
+    public static String encodeAddressDisplayName(String displayName) {
+        // display-name = phrase
+        // phrase = 1*( encoded-word / word )
+        // word = atom / quoted-string
+        // atom = [CFWS] 1*atext [CFWS]
+        // CFWS = comment or folding white space
+
+        if (isAtomPhrase(displayName)) {
+            return displayName;
+        } else if (hasToBeEncoded(displayName, 0)) {
+            return encodeEncodedWord(displayName, Usage.WORD_ENTITY);
+        } else {
+            return quote(displayName);
+        }
+    }
+
+    /**
+     * Encodes the local part of an address specification as described in RFC
+     * 5322 section 3.4.1. Leading and trailing CFWS should have been removed
+     * before calling this method. The specified string should not contain any
+     * illegal (control or non-ASCII) characters.
+     * 
+     * @param localPart
+     *            the local part to encode
+     * @return the encoded local part.
+     */
+    public static String encodeAddressLocalPart(String localPart) {
+        // local-part = dot-atom / quoted-string
+        // dot-atom = [CFWS] dot-atom-text [CFWS]
+        // CFWS = comment or folding white space
+
+        if (isDotAtomText(localPart)) {
+            return localPart;
+        } else {
+            return quote(localPart);
+        }
+    }
+
+    /**
+     * Encodes the specified strings into a header parameter as described in RFC
+     * 2045 section 5.1 and RFC 2183 section 2. The specified strings should not
+     * contain any illegal (control or non-ASCII) characters.
+     * 
+     * @param name
+     *            parameter name.
+     * @param value
+     *            parameter value.
+     * @return encoded result.
+     */
+    public static String encodeHeaderParameter(String name, String value) {
+        name = name.toLowerCase(Locale.US);
+
+        // value := token / quoted-string
+        if (isToken(value)) {
+            return name + "=" + value;
+        } else {
+            return name + "=" + quote(value);
+        }
+    }
+
+    /**
+     * Shortcut method that encodes the specified text into an encoded-word if
+     * the text has to be encoded.
+     * 
+     * @param text
+     *            text to encode.
+     * @param usage
+     *            whether the encoded-word is to be used to replace a text token
+     *            or a word entity (see RFC 822).
+     * @param usedCharacters
+     *            number of characters already used up (<code>0 <= usedCharacters <= 50</code>).
+     * @return the specified text if encoding is not necessary or an encoded
+     *         word or a sequence of encoded words otherwise.
+     */
+    public static String encodeIfNecessary(String text, Usage usage,
+            int usedCharacters) {
+        if (hasToBeEncoded(text, usedCharacters))
+            return encodeEncodedWord(text, usage, usedCharacters);
+        else
+            return text;
+    }
+
+    /**
+     * Determines if the specified string has to encoded into an encoded-word.
+     * Returns <code>true</code> if the text contains characters that don't
+     * fall into the printable ASCII character set or if the text contains a
+     * 'word' (sequence of non-whitespace characters) longer than 77 characters
+     * (including characters already used up in the line).
+     * 
+     * @param text
+     *            text to analyze.
+     * @param usedCharacters
+     *            number of characters already used up (<code>0 <= usedCharacters <= 50</code>).
+     * @return <code>true</code> if the specified text has to be encoded into
+     *         an encoded-word, <code>false</code> otherwise.
+     */
+    public static boolean hasToBeEncoded(String text, int usedCharacters) {
+        if (text == null)
+            throw new IllegalArgumentException();
+        if (usedCharacters < 0 || usedCharacters > MAX_USED_CHARACTERS)
+            throw new IllegalArgumentException();
+
+        int nonWhiteSpaceCount = usedCharacters;
+
+        for (int idx = 0; idx < text.length(); idx++) {
+            char ch = text.charAt(idx);
+            if (ch == '\t' || ch == ' ') {
+                nonWhiteSpaceCount = 0;
+            } else {
+                nonWhiteSpaceCount++;
+                if (nonWhiteSpaceCount > 77) {
+                    // Line cannot be folded into multiple lines with no more
+                    // than 78 characters each. Encoding as encoded-words makes
+                    // that possible. One character has to be reserved for
+                    // folding white space; that leaves 77 characters.
+                    return true;
+                }
+
+                if (ch < 32 || ch >= 127) {
+                    // non-printable ascii character has to be encoded
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Encodes the specified text into an encoded word or a sequence of encoded
+     * words separated by space. The text is separated into a sequence of
+     * encoded words if it does not fit in a single one.
+     * <p>
+     * The charset to encode the specified text into a byte array and the
+     * encoding to use for the encoded-word are detected automatically.
+     * <p>
+     * This method assumes that zero characters have already been used up in the
+     * current line.
+     * 
+     * @param text
+     *            text to encode.
+     * @param usage
+     *            whether the encoded-word is to be used to replace a text token
+     *            or a word entity (see RFC 822).
+     * @return the encoded word (or sequence of encoded words if the given text
+     *         does not fit in a single encoded word).
+     * @see #hasToBeEncoded(String, int)
+     */
+    public static String encodeEncodedWord(String text, Usage usage) {
+        return encodeEncodedWord(text, usage, 0, null, null);
+    }
+
+    /**
+     * Encodes the specified text into an encoded word or a sequence of encoded
+     * words separated by space. The text is separated into a sequence of
+     * encoded words if it does not fit in a single one.
+     * <p>
+     * The charset to encode the specified text into a byte array and the
+     * encoding to use for the encoded-word are detected automatically.
+     * 
+     * @param text
+     *            text to encode.
+     * @param usage
+     *            whether the encoded-word is to be used to replace a text token
+     *            or a word entity (see RFC 822).
+     * @param usedCharacters
+     *            number of characters already used up (<code>0 <= usedCharacters <= 50</code>).
+     * @return the encoded word (or sequence of encoded words if the given text
+     *         does not fit in a single encoded word).
+     * @see #hasToBeEncoded(String, int)
+     */
+    public static String encodeEncodedWord(String text, Usage usage,
+            int usedCharacters) {
+        return encodeEncodedWord(text, usage, usedCharacters, null, null);
+    }
+
+    /**
+     * Encodes the specified text into an encoded word or a sequence of encoded
+     * words separated by space. The text is separated into a sequence of
+     * encoded words if it does not fit in a single one.
+     * 
+     * @param text
+     *            text to encode.
+     * @param usage
+     *            whether the encoded-word is to be used to replace a text token
+     *            or a word entity (see RFC 822).
+     * @param usedCharacters
+     *            number of characters already used up (<code>0 <= usedCharacters <= 50</code>).
+     * @param charset
+     *            the Java charset that should be used to encode the specified
+     *            string into a byte array. A suitable charset is detected
+     *            automatically if this parameter is <code>null</code>.
+     * @param encoding
+     *            the encoding to use for the encoded-word (either B or Q). A
+     *            suitable encoding is automatically chosen if this parameter is
+     *            <code>null</code>.
+     * @return the encoded word (or sequence of encoded words if the given text
+     *         does not fit in a single encoded word).
+     * @see #hasToBeEncoded(String, int)
+     */
+    public static String encodeEncodedWord(String text, Usage usage,
+            int usedCharacters, Charset charset, Encoding encoding) {
+        if (text == null)
+            throw new IllegalArgumentException();
+        if (usedCharacters < 0 || usedCharacters > MAX_USED_CHARACTERS)
+            throw new IllegalArgumentException();
+
+        if (charset == null)
+            charset = determineCharset(text);
+
+        String mimeCharset = CharsetUtil.toMimeCharset(charset.name());
+        if (mimeCharset == null) {
+            // cannot happen if charset was originally null
+            throw new IllegalArgumentException("Unsupported charset");
+        }
+
+        byte[] bytes = encode(text, charset);
+
+        if (encoding == null)
+            encoding = determineEncoding(bytes, usage);
+
+        if (encoding == Encoding.B) {
+            String prefix = ENC_WORD_PREFIX + mimeCharset + "?B?";
+            return encodeB(prefix, text, usedCharacters, charset, bytes);
+        } else {
+            String prefix = ENC_WORD_PREFIX + mimeCharset + "?Q?";
+            return encodeQ(prefix, text, usage, usedCharacters, charset, bytes);
+        }
+    }
+
+    /**
+     * Encodes the specified byte array using the B encoding defined in RFC
+     * 2047.
+     * 
+     * @param bytes
+     *            byte array to encode.
+     * @return encoded string.
+     */
+    public static String encodeB(byte[] bytes) {
+        StringBuilder sb = new StringBuilder();
+
+        int idx = 0;
+        final int end = bytes.length;
+        for (; idx < end - 2; idx += 3) {
+            int data = (bytes[idx] & 0xff) << 16 | (bytes[idx + 1] & 0xff) << 8
+                    | bytes[idx + 2] & 0xff;
+            sb.append((char) BASE64_TABLE[data >> 18 & 0x3f]);
+            sb.append((char) BASE64_TABLE[data >> 12 & 0x3f]);
+            sb.append((char) BASE64_TABLE[data >> 6 & 0x3f]);
+            sb.append((char) BASE64_TABLE[data & 0x3f]);
+        }
+
+        if (idx == end - 2) {
+            int data = (bytes[idx] & 0xff) << 16 | (bytes[idx + 1] & 0xff) << 8;
+            sb.append((char) BASE64_TABLE[data >> 18 & 0x3f]);
+            sb.append((char) BASE64_TABLE[data >> 12 & 0x3f]);
+            sb.append((char) BASE64_TABLE[data >> 6 & 0x3f]);
+            sb.append((char) BASE64_PAD);
+
+        } else if (idx == end - 1) {
+            int data = (bytes[idx] & 0xff) << 16;
+            sb.append((char) BASE64_TABLE[data >> 18 & 0x3f]);
+            sb.append((char) BASE64_TABLE[data >> 12 & 0x3f]);
+            sb.append((char) BASE64_PAD);
+            sb.append((char) BASE64_PAD);
+        }
+
+        return sb.toString();
+    }
+
+    /**
+     * Encodes the specified byte array using the Q encoding defined in RFC
+     * 2047.
+     * 
+     * @param bytes
+     *            byte array to encode.
+     * @param usage
+     *            whether the encoded-word is to be used to replace a text token
+     *            or a word entity (see RFC 822).
+     * @return encoded string.
+     */
+    public static String encodeQ(byte[] bytes, Usage usage) {
+        BitSet qChars = usage == Usage.TEXT_TOKEN ? Q_REGULAR_CHARS
+                : Q_RESTRICTED_CHARS;
+
+        StringBuilder sb = new StringBuilder();
+
+        final int end = bytes.length;
+        for (int idx = 0; idx < end; idx++) {
+            int v = bytes[idx] & 0xff;
+            if (v == 32) {
+                sb.append('_');
+            } else if (!qChars.get(v)) {
+                sb.append('=');
+                sb.append(hexDigit(v >>> 4));
+                sb.append(hexDigit(v & 0xf));
+            } else {
+                sb.append((char) v);
+            }
+        }
+
+        return sb.toString();
+    }
+
+    /**
+     * Tests whether the specified string is a token as defined in RFC 2045
+     * section 5.1.
+     * 
+     * @param str
+     *            string to test.
+     * @return <code>true</code> if the specified string is a RFC 2045 token,
+     *         <code>false</code> otherwise.
+     */
+    public static boolean isToken(String str) {
+        // token := 1*<any (US-ASCII) CHAR except SPACE, CTLs, or tspecials>
+        // tspecials := "(" / ")" / "<" / ">" / "@" / "," / ";" / ":" / "\" /
+        // <"> / "/" / "[" / "]" / "?" / "="
+        // CTL := 0.- 31., 127.
+
+        final int length = str.length();
+        if (length == 0)
+            return false;
+
+        for (int idx = 0; idx < length; idx++) {
+            char ch = str.charAt(idx);
+            if (!TOKEN_CHARS.get(ch))
+                return false;
+        }
+
+        return true;
+    }
+
+    private static boolean isAtomPhrase(String str) {
+        // atom = [CFWS] 1*atext [CFWS]
+
+        boolean containsAText = false;
+
+        final int length = str.length();
+        for (int idx = 0; idx < length; idx++) {
+            char ch = str.charAt(idx);
+            if (ATEXT_CHARS.get(ch)) {
+                containsAText = true;
+            } else if (!CharsetUtil.isWhitespace(ch)) {
+                return false;
+            }
+        }
+
+        return containsAText;
+    }
+
+    // RFC 5322 section 3.2.3
+    private static boolean isDotAtomText(String str) {
+        // dot-atom-text = 1*atext *("." 1*atext)
+        // atext = ALPHA / DIGIT / "!" / "#" / "$" / "%" / "&" / "'" / "*" /
+        // "+" / "-" / "/" / "=" / "?" / "^" / "_" / "`" / "{" / "|" / "}" / "~"
+
+        char prev = '.';
+
+        final int length = str.length();
+        if (length == 0)
+            return false;
+
+        for (int idx = 0; idx < length; idx++) {
+            char ch = str.charAt(idx);
+
+            if (ch == '.') {
+                if (prev == '.' || idx == length - 1)
+                    return false;
+            } else {
+                if (!ATEXT_CHARS.get(ch))
+                    return false;
+            }
+
+            prev = ch;
+        }
+
+        return true;
+    }
+
+    // RFC 5322 section 3.2.4
+    private static String quote(String str) {
+        // quoted-string = [CFWS] DQUOTE *([FWS] qcontent) [FWS] DQUOTE [CFWS]
+        // qcontent = qtext / quoted-pair
+        // qtext = %d33 / %d35-91 / %d93-126
+        // quoted-pair = ("\" (VCHAR / WSP))
+        // VCHAR = %x21-7E
+        // DQUOTE = %x22
+
+        String escaped = str.replaceAll("[\\\\\"]", "\\\\$0");
+        return "\"" + escaped + "\"";
+    }
+
+    private static String encodeB(String prefix, String text,
+            int usedCharacters, Charset charset, byte[] bytes) {
+        int encodedLength = bEncodedLength(bytes);
+
+        int totalLength = prefix.length() + encodedLength
+                + ENC_WORD_SUFFIX.length();
+        if (totalLength <= ENCODED_WORD_MAX_LENGTH - usedCharacters) {
+            return prefix + encodeB(bytes) + ENC_WORD_SUFFIX;
+        } else {
+            int splitOffset = text.offsetByCodePoints(text.length() / 2, -1);
+                                                         
+            String part1 = text.substring(0, splitOffset);
+            byte[] bytes1 = encode(part1, charset);
+            String word1 = encodeB(prefix, part1, usedCharacters, charset,
+                    bytes1);
+
+            String part2 = text.substring(splitOffset);
+            byte[] bytes2 = encode(part2, charset);
+            String word2 = encodeB(prefix, part2, 0, charset, bytes2);
+
+            return word1 + " " + word2;
+        }
+    }
+
+    private static int bEncodedLength(byte[] bytes) {
+        return (bytes.length + 2) / 3 * 4;
+    }
+
+    private static String encodeQ(String prefix, String text, Usage usage,
+            int usedCharacters, Charset charset, byte[] bytes) {
+        int encodedLength = qEncodedLength(bytes, usage);
+
+        int totalLength = prefix.length() + encodedLength
+                + ENC_WORD_SUFFIX.length();
+        if (totalLength <= ENCODED_WORD_MAX_LENGTH - usedCharacters) {
+            return prefix + encodeQ(bytes, usage) + ENC_WORD_SUFFIX;
+        } else {
+            int splitOffset = text.offsetByCodePoints(text.length() / 2, -1);
+
+            String part1 = text.substring(0, splitOffset);
+            byte[] bytes1 = encode(part1, charset);
+            String word1 = encodeQ(prefix, part1, usage, usedCharacters,
+                    charset, bytes1);
+
+            String part2 = text.substring(splitOffset);
+            byte[] bytes2 = encode(part2, charset);
+            String word2 = encodeQ(prefix, part2, usage, 0, charset, bytes2);
+
+            return word1 + " " + word2;
+        }
+    }
+
+    private static int qEncodedLength(byte[] bytes, Usage usage) {
+        BitSet qChars = usage == Usage.TEXT_TOKEN ? Q_REGULAR_CHARS
+                : Q_RESTRICTED_CHARS;
+
+        int count = 0;
+
+        for (int idx = 0; idx < bytes.length; idx++) {
+            int v = bytes[idx] & 0xff;
+            if (v == 32) {
+                count++;
+            } else if (!qChars.get(v)) {
+                count += 3;
+            } else {
+                count++;
+            }
+        }
+
+        return count;
+    }
+
+    private static byte[] encode(String text, Charset charset) {
+        ByteBuffer buffer = charset.encode(text);
+        byte[] bytes = new byte[buffer.limit()];
+        buffer.get(bytes);
+        return bytes;
+    }
+
+    private static Charset determineCharset(String text) {
+        // it is an important property of iso-8859-1 that it directly maps
+        // unicode code points 0000 to 00ff to byte values 00 to ff.
+        boolean ascii = true;
+        final int len = text.length();
+        for (int index = 0; index < len; index++) {
+            char ch = text.charAt(index);
+            if (ch > 0xff) {
+                return CharsetUtil.UTF_8;
+            }
+            if (ch > 0x7f) {
+                ascii = false;
+            }
+        }
+        return ascii ? CharsetUtil.US_ASCII : CharsetUtil.ISO_8859_1;
+    }
+
+    private static Encoding determineEncoding(byte[] bytes, Usage usage) {
+        if (bytes.length == 0)
+            return Encoding.Q;
+
+        BitSet qChars = usage == Usage.TEXT_TOKEN ? Q_REGULAR_CHARS
+                : Q_RESTRICTED_CHARS;
+
+        int qEncoded = 0;
+        for (int i = 0; i < bytes.length; i++) {
+            int v = bytes[i] & 0xff;
+            if (v != 32 && !qChars.get(v)) {
+                qEncoded++;
+            }
+        }
+
+        int percentage = qEncoded * 100 / bytes.length;
+        return percentage > 30 ? Encoding.B : Encoding.Q;
+    }
+
+    private static char hexDigit(int i) {
+        return i < 10 ? (char) (i + '0') : (char) (i - 10 + 'A');
+    }
+}
diff --git a/src/org/apache/james/mime4j/decoder/Base64InputStream.java b/src/org/apache/james/mime4j/decoder/Base64InputStream.java
new file mode 100644
index 0000000..77f5d7d
--- /dev/null
+++ b/src/org/apache/james/mime4j/decoder/Base64InputStream.java
@@ -0,0 +1,151 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you 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.                                           *
+ ****************************************************************/
+
+/**
+ * Modified to improve efficiency by Android   21-Aug-2009
+ */
+
+package org.apache.james.mime4j.decoder;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * Performs Base-64 decoding on an underlying stream.
+ * 
+ * 
+ * @version $Id: Base64InputStream.java,v 1.3 2004/11/29 13:15:47 ntherning Exp $
+ */
+public class Base64InputStream extends InputStream {
+    private final InputStream s;
+    private int outCount = 0;
+    private int outIndex = 0;
+    private final int[] outputBuffer = new int[3];
+    private final byte[] inputBuffer = new byte[4];
+    private boolean done = false;
+
+    public Base64InputStream(InputStream s) {
+        this.s = s;
+    }
+
+    /**
+     * Closes the underlying stream.
+     * 
+     * @throws IOException on I/O errors.
+     */
+    @Override
+    public void close() throws IOException {
+        s.close();
+    }
+    
+    @Override
+    public int read() throws IOException {
+        if (outIndex == outCount) {
+            fillBuffer();
+            if (outIndex == outCount) {
+                return -1;
+            }
+        }
+
+        return outputBuffer[outIndex++];
+    }
+
+    /**
+     * Retrieve data from the underlying stream, decode it,
+     * and put the results in the byteq.
+     * @throws IOException
+     */
+    private void fillBuffer() throws IOException {
+        outCount = 0;
+        outIndex = 0;
+        int inCount = 0;
+
+        int i;
+        // "done" is needed for the two successive '=' at the end
+        while (!done) {
+            switch (i = s.read()) {
+                case -1:
+                    // No more input - just return, let outputBuffer drain out, and be done
+                    return;
+                case '=':
+                    // once we meet the first '=', avoid reading the second '='
+                    done = true;
+                    decodeAndEnqueue(inCount);
+                    return;
+                default:
+                    byte sX = TRANSLATION[i];
+                    if (sX < 0) continue;
+                    inputBuffer[inCount++] = sX;
+                    if (inCount == 4) {
+                        decodeAndEnqueue(inCount);
+                        return;
+                    }
+                    break;
+            }
+        }
+    }
+
+    private void decodeAndEnqueue(int len) {
+        int accum = 0;
+        accum |= inputBuffer[0] << 18;
+        accum |= inputBuffer[1] << 12;
+        accum |= inputBuffer[2] << 6;
+        accum |= inputBuffer[3];
+
+        // There's a bit of duplicated code here because we want to have straight-through operation
+        // for the most common case of len==4
+        if (len == 4) {
+            outputBuffer[0] = (accum >> 16) & 0xFF;
+            outputBuffer[1] = (accum >> 8) & 0xFF;
+            outputBuffer[2] = (accum) & 0xFF;
+            outCount = 3;
+            return;
+        } else if (len == 3) {
+            outputBuffer[0] = (accum >> 16) & 0xFF;
+            outputBuffer[1] = (accum >> 8) & 0xFF;
+            outCount = 2;
+            return;
+        } else {    // len == 2
+            outputBuffer[0] = (accum >> 16) & 0xFF;
+            outCount = 1;
+            return;
+        }
+    }
+
+    private static byte[] TRANSLATION = {
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x00 */
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x10 */
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63, /* 0x20 */
+        52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1, /* 0x30 */
+        -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, /* 0x40 */
+        15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, /* 0x50 */
+        -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, /* 0x60 */
+        41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1, /* 0x70 */
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x80 */
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x90 */
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0xA0 */
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0xB0 */
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0xC0 */
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0xD0 */
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0xE0 */
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1     /* 0xF0 */
+    };
+
+
+}
diff --git a/src/org/apache/james/mime4j/decoder/ByteQueue.java b/src/org/apache/james/mime4j/decoder/ByteQueue.java
new file mode 100644
index 0000000..6d7ccef
--- /dev/null
+++ b/src/org/apache/james/mime4j/decoder/ByteQueue.java
@@ -0,0 +1,62 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you 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 org.apache.james.mime4j.decoder;
+
+import java.util.Iterator;
+
+public class ByteQueue {
+
+    private UnboundedFifoByteBuffer buf;
+    private int initialCapacity = -1;
+
+    public ByteQueue() {
+        buf = new UnboundedFifoByteBuffer();
+    }
+
+    public ByteQueue(int initialCapacity) {
+        buf = new UnboundedFifoByteBuffer(initialCapacity);
+        this.initialCapacity = initialCapacity;
+    }
+
+    public void enqueue(byte b) {
+        buf.add(b);
+    }
+
+    public byte dequeue() {
+        return buf.remove();
+    }
+
+    public int count() {
+        return buf.size();
+    }
+
+    public void clear() {
+        if (initialCapacity != -1)
+            buf = new UnboundedFifoByteBuffer(initialCapacity);
+        else
+            buf = new UnboundedFifoByteBuffer();
+    }
+
+    public Iterator iterator() {
+        return buf.iterator();
+    }
+
+
+}
diff --git a/src/org/apache/james/mime4j/decoder/DecoderUtil.java b/src/org/apache/james/mime4j/decoder/DecoderUtil.java
new file mode 100644
index 0000000..48fe07d
--- /dev/null
+++ b/src/org/apache/james/mime4j/decoder/DecoderUtil.java
@@ -0,0 +1,284 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you 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 org.apache.james.mime4j.decoder;
+
+//BEGIN android-changed: Stubbing out logging
+import org.apache.james.mime4j.Log;
+import org.apache.james.mime4j.LogFactory;
+//END android-changed
+import org.apache.james.mime4j.util.CharsetUtil;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+
+/**
+ * Static methods for decoding strings, byte arrays and encoded words.
+ *
+ * 
+ * @version $Id: DecoderUtil.java,v 1.3 2005/02/07 15:33:59 ntherning Exp $
+ */
+public class DecoderUtil {
+    private static Log log = LogFactory.getLog(DecoderUtil.class);
+    
+    /**
+     * Decodes a string containing quoted-printable encoded data. 
+     * 
+     * @param s the string to decode.
+     * @return the decoded bytes.
+     */
+    public static byte[] decodeBaseQuotedPrintable(String s) {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        
+        try {
+            byte[] bytes = s.getBytes("US-ASCII");
+            
+            QuotedPrintableInputStream is = new QuotedPrintableInputStream(
+                                               new ByteArrayInputStream(bytes));
+            
+            int b = 0;
+            while ((b = is.read()) != -1) {
+                baos.write(b);
+            }
+        } catch (IOException e) {
+            /*
+             * This should never happen!
+             */
+            log.error(e);
+        }
+        
+        return baos.toByteArray();
+    }
+    
+    /**
+     * Decodes a string containing base64 encoded data. 
+     * 
+     * @param s the string to decode.
+     * @return the decoded bytes.
+     */
+    public static byte[] decodeBase64(String s) {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        
+        try {
+            byte[] bytes = s.getBytes("US-ASCII");
+            
+            Base64InputStream is = new Base64InputStream(
+                                        new ByteArrayInputStream(bytes));
+            
+            int b = 0;
+            while ((b = is.read()) != -1) {
+                baos.write(b);
+            }
+        } catch (IOException e) {
+            /*
+             * This should never happen!
+             */
+            log.error(e);
+        }
+        
+        return baos.toByteArray();
+    }
+    
+    /**
+     * Decodes an encoded word encoded with the 'B' encoding (described in 
+     * RFC 2047) found in a header field body.
+     * 
+     * @param encodedWord the encoded word to decode.
+     * @param charset the Java charset to use.
+     * @return the decoded string.
+     * @throws UnsupportedEncodingException if the given Java charset isn't 
+     *         supported.
+     */
+    public static String decodeB(String encodedWord, String charset) 
+            throws UnsupportedEncodingException {
+        
+        return new String(decodeBase64(encodedWord), charset);
+    }
+    
+    /**
+     * Decodes an encoded word encoded with the 'Q' encoding (described in 
+     * RFC 2047) found in a header field body.
+     * 
+     * @param encodedWord the encoded word to decode.
+     * @param charset the Java charset to use.
+     * @return the decoded string.
+     * @throws UnsupportedEncodingException if the given Java charset isn't 
+     *         supported.
+     */
+    public static String decodeQ(String encodedWord, String charset)
+            throws UnsupportedEncodingException {
+           
+        /*
+         * Replace _ with =20
+         */
+        StringBuffer sb = new StringBuffer();
+        for (int i = 0; i < encodedWord.length(); i++) {
+            char c = encodedWord.charAt(i);
+            if (c == '_') {
+                sb.append("=20");
+            } else {
+                sb.append(c);
+            }
+        }
+        
+        return new String(decodeBaseQuotedPrintable(sb.toString()), charset);
+    }
+    
+    /**
+     * Decodes a string containing encoded words as defined by RFC 2047.
+     * Encoded words in have the form 
+     * =?charset?enc?Encoded word?= where enc is either 'Q' or 'q' for 
+     * quoted-printable and 'B' or 'b' for Base64.
+     * 
+     * ANDROID:  COPIED FROM A NEWER VERSION OF MIME4J
+     * 
+     * @param body the string to decode.
+     * @return the decoded string.
+     */
+    public static String decodeEncodedWords(String body) {
+        
+        // ANDROID:  Most strings will not include "=?" so a quick test can prevent unneeded
+        // object creation.  This could also be handled via lazy creation of the StringBuilder.
+        if (body.indexOf("=?") == -1) {
+            return body;
+        }
+
+        int previousEnd = 0;
+        boolean previousWasEncoded = false;
+
+        StringBuilder sb = new StringBuilder();
+
+        while (true) {
+            int begin = body.indexOf("=?", previousEnd);
+
+            // ANDROID:  The mime4j original version has an error here.  It gets confused if
+            // the encoded string begins with an '=' (just after "?Q?").  This patch seeks forward
+            // to find the two '?' in the "header", before looking for the final "?=".
+            if (begin == -1) {
+                break;
+            }
+            int qm1 = body.indexOf('?', begin + 2);
+            if (qm1 == -1) {
+                break;
+            }
+            int qm2 = body.indexOf('?', qm1 + 1);
+            if (qm2 == -1) {
+                break;
+            }
+            int end = body.indexOf("?=", qm2 + 1);
+            if (end == -1) {
+                break;
+            }
+            end += 2;
+
+            String sep = body.substring(previousEnd, begin);
+
+            String decoded = decodeEncodedWord(body, begin, end);
+            if (decoded == null) {
+                sb.append(sep);
+                sb.append(body.substring(begin, end));
+            } else {
+                if (!previousWasEncoded || !CharsetUtil.isWhitespace(sep)) {
+                    sb.append(sep);
+                }
+                sb.append(decoded);
+            }
+
+            previousEnd = end;
+            previousWasEncoded = decoded != null;
+        }
+
+        if (previousEnd == 0)
+            return body;
+
+        sb.append(body.substring(previousEnd));
+        return sb.toString();
+    }
+
+    // return null on error. Begin is index of '=?' in body.
+    public static String decodeEncodedWord(String body, int begin, int end) {
+        // Skip the '?=' chars in body and scan forward from there for next '?'
+        int qm1 = body.indexOf('?', begin + 2);
+        if (qm1 == -1 || qm1 == end - 2)
+            return null;
+
+        int qm2 = body.indexOf('?', qm1 + 1);
+        if (qm2 == -1 || qm2 == end - 2)
+            return null;
+
+        String mimeCharset = body.substring(begin + 2, qm1);
+        String encoding = body.substring(qm1 + 1, qm2);
+        String encodedText = body.substring(qm2 + 1, end - 2);
+
+        String charset = CharsetUtil.toJavaCharset(mimeCharset);
+        if (charset == null) {
+            if (log.isWarnEnabled()) {
+                log.warn("MIME charset '" + mimeCharset + "' in encoded word '"
+                        + body.substring(begin, end) + "' doesn't have a "
+                        + "corresponding Java charset");
+            }
+            return null;
+        } else if (!CharsetUtil.isDecodingSupported(charset)) {
+            if (log.isWarnEnabled()) {
+                log.warn("Current JDK doesn't support decoding of charset '"
+                        + charset + "' (MIME charset '" + mimeCharset
+                        + "' in encoded word '" + body.substring(begin, end)
+                        + "')");
+            }
+            return null;
+        }
+
+        if (encodedText.length() == 0) {
+            if (log.isWarnEnabled()) {
+                log.warn("Missing encoded text in encoded word: '"
+                        + body.substring(begin, end) + "'");
+            }
+            return null;
+        }
+
+        try {
+            if (encoding.equalsIgnoreCase("Q")) {
+                return DecoderUtil.decodeQ(encodedText, charset);
+            } else if (encoding.equalsIgnoreCase("B")) {
+                return DecoderUtil.decodeB(encodedText, charset);
+            } else {
+                if (log.isWarnEnabled()) {
+                    log.warn("Warning: Unknown encoding in encoded word '"
+                            + body.substring(begin, end) + "'");
+                }
+                return null;
+            }
+        } catch (UnsupportedEncodingException e) {
+            // should not happen because of isDecodingSupported check above
+            if (log.isWarnEnabled()) {
+                log.warn("Unsupported encoding in encoded word '"
+                        + body.substring(begin, end) + "'", e);
+            }
+            return null;
+        } catch (RuntimeException e) {
+            if (log.isWarnEnabled()) {
+                log.warn("Could not decode encoded word '"
+                        + body.substring(begin, end) + "'", e);
+            }
+            return null;
+        }
+    }
+}
diff --git a/src/org/apache/james/mime4j/decoder/QuotedPrintableInputStream.java b/src/org/apache/james/mime4j/decoder/QuotedPrintableInputStream.java
new file mode 100644
index 0000000..e43f398
--- /dev/null
+++ b/src/org/apache/james/mime4j/decoder/QuotedPrintableInputStream.java
@@ -0,0 +1,229 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you 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 org.apache.james.mime4j.decoder;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+//BEGIN android-changed: Stubbing out logging
+import org.apache.james.mime4j.Log;
+import org.apache.james.mime4j.LogFactory;
+//END android-changed
+
+/**
+ * Performs Quoted-Printable decoding on an underlying stream.
+ * 
+ * 
+ * 
+ * @version $Id: QuotedPrintableInputStream.java,v 1.3 2004/11/29 13:15:47 ntherning Exp $
+ */
+public class QuotedPrintableInputStream extends InputStream {
+    private static Log log = LogFactory.getLog(QuotedPrintableInputStream.class);
+    
+    private InputStream stream;
+    ByteQueue byteq = new ByteQueue();
+    ByteQueue pushbackq = new ByteQueue();
+    private byte state = 0;
+
+    public QuotedPrintableInputStream(InputStream stream) {
+        this.stream = stream;
+    }
+    
+    /**
+     * Closes the underlying stream.
+     * 
+     * @throws IOException on I/O errors.
+     */
+    public void close() throws IOException {
+        stream.close();
+    }
+
+    public int read() throws IOException {
+        fillBuffer();
+        if (byteq.count() == 0)
+            return -1;
+        else {
+            byte val = byteq.dequeue();
+            if (val >= 0)
+                return val;
+            else
+                return val & 0xFF;
+        }
+    }
+
+    /**
+     * Pulls bytes out of the underlying stream and places them in the
+     * pushback queue.  This is necessary (vs. reading from the
+     * underlying stream directly) to detect and filter out "transport
+     * padding" whitespace, i.e., all whitespace that appears immediately
+     * before a CRLF.
+     *
+     * @throws IOException Underlying stream threw IOException.
+     */
+    private void populatePushbackQueue() throws IOException {
+        //Debug.verify(pushbackq.count() == 0, "PopulatePushbackQueue called when pushback queue was not empty!");
+
+        if (pushbackq.count() != 0)
+            return;
+
+        while (true) {
+            int i = stream.read();
+            switch (i) {
+                case -1:
+                    // stream is done
+                    pushbackq.clear();  // discard any whitespace preceding EOF
+                    return;
+                case ' ':
+                case '\t':
+                    pushbackq.enqueue((byte)i);
+                    break;
+                case '\r':
+                case '\n':
+                    pushbackq.clear();  // discard any whitespace preceding EOL
+                    pushbackq.enqueue((byte)i);
+                    return;
+                default:
+                    pushbackq.enqueue((byte)i);
+                    return;
+            }
+        }
+    }
+
+    /**
+     * Causes the pushback queue to get populated if it is empty, then
+     * consumes and decodes bytes out of it until one or more bytes are
+     * in the byte queue.  This decoding step performs the actual QP
+     * decoding.
+     *
+     * @throws IOException Underlying stream threw IOException.
+     */
+    private void fillBuffer() throws IOException {
+        byte msdChar = 0;  // first digit of escaped num
+        while (byteq.count() == 0) {
+            if (pushbackq.count() == 0) {
+                populatePushbackQueue();
+                if (pushbackq.count() == 0)
+                    return;
+            }
+
+            byte b = (byte)pushbackq.dequeue();
+
+            switch (state) {
+                case 0:  // start state, no bytes pending
+                    if (b != '=') {
+                        byteq.enqueue(b);
+                        break;  // state remains 0
+                    } else {
+                        state = 1;
+                        break;
+                    }
+                case 1:  // encountered "=" so far
+                    if (b == '\r') {
+                        state = 2;
+                        break;
+                    } else if ((b >= '0' && b <= '9') || (b >= 'A' && b <= 'F') || (b >= 'a' && b <= 'f')) {
+                        state = 3;
+                        msdChar = b;  // save until next digit encountered
+                        break;
+                    } else if (b == '=') {
+                        /*
+                         * Special case when == is encountered.
+                         * Emit one = and stay in this state.
+                         */
+                        if (log.isWarnEnabled()) {
+                            log.warn("Malformed MIME; got ==");
+                        }
+                        byteq.enqueue((byte)'=');
+                        break;
+                    } else {
+                        if (log.isWarnEnabled()) {
+                            log.warn("Malformed MIME; expected \\r or "
+                                    + "[0-9A-Z], got " + b);
+                        }
+                        state = 0;
+                        byteq.enqueue((byte)'=');
+                        byteq.enqueue(b);
+                        break;
+                    }
+                case 2:  // encountered "=\r" so far
+                    if (b == '\n') {
+                        state = 0;
+                        break;
+                    } else {
+                        if (log.isWarnEnabled()) {
+                            log.warn("Malformed MIME; expected " 
+                                    + (int)'\n' + ", got " + b);
+                        }
+                        state = 0;
+                        byteq.enqueue((byte)'=');
+                        byteq.enqueue((byte)'\r');
+                        byteq.enqueue(b);
+                        break;
+                    }
+                case 3:  // encountered =<digit> so far; expecting another <digit> to complete the octet
+                    if ((b >= '0' && b <= '9') || (b >= 'A' && b <= 'F') || (b >= 'a' && b <= 'f')) {
+                        byte msd = asciiCharToNumericValue(msdChar);
+                        byte low = asciiCharToNumericValue(b);
+                        state = 0;
+                        byteq.enqueue((byte)((msd << 4) | low));
+                        break;
+                    } else {
+                        if (log.isWarnEnabled()) {
+                            log.warn("Malformed MIME; expected "
+                                     + "[0-9A-Z], got " + b);
+                        }
+                        state = 0;
+                        byteq.enqueue((byte)'=');
+                        byteq.enqueue(msdChar);
+                        byteq.enqueue(b);
+                        break;
+                    }
+                default:  // should never happen
+                    log.error("Illegal state: " + state);
+                    state = 0;
+                    byteq.enqueue(b);
+                    break;
+            }
+        }
+    }
+
+    /**
+     * Converts '0' => 0, 'A' => 10, etc.
+     * @param c ASCII character value.
+     * @return Numeric value of hexadecimal character.
+     */
+    private byte asciiCharToNumericValue(byte c) {
+        if (c >= '0' && c <= '9') {
+            return (byte)(c - '0');
+        } else if (c >= 'A' && c <= 'Z') {
+            return (byte)(0xA + (c - 'A'));
+        } else if (c >= 'a' && c <= 'z') {
+            return (byte)(0xA + (c - 'a'));
+        } else {
+            /*
+             * This should never happen since all calls to this method
+             * are preceded by a check that c is in [0-9A-Za-z]
+             */
+            throw new IllegalArgumentException((char) c 
+                    + " is not a hexadecimal digit");
+        }
+    }
+
+}
diff --git a/src/org/apache/james/mime4j/decoder/UnboundedFifoByteBuffer.java b/src/org/apache/james/mime4j/decoder/UnboundedFifoByteBuffer.java
new file mode 100644
index 0000000..f01194f
--- /dev/null
+++ b/src/org/apache/james/mime4j/decoder/UnboundedFifoByteBuffer.java
@@ -0,0 +1,272 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you 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 org.apache.james.mime4j.decoder;
+
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
+/**
+ * UnboundedFifoByteBuffer is a very efficient buffer implementation.
+ * According to performance testing, it exhibits a constant access time, but it
+ * also outperforms ArrayList when used for the same purpose.
+ * <p>
+ * The removal order of an <code>UnboundedFifoByteBuffer</code> is based on the insertion
+ * order; elements are removed in the same order in which they were added.
+ * The iteration order is the same as the removal order.
+ * <p>
+ * The {@link #remove()} and {@link #get()} operations perform in constant time.
+ * The {@link #add(Object)} operation performs in amortized constant time.  All
+ * other operations perform in linear time or worse.
+ * <p>
+ * Note that this implementation is not synchronized.  The following can be
+ * used to provide synchronized access to your <code>UnboundedFifoByteBuffer</code>:
+ * <pre>
+ *   Buffer fifo = BufferUtils.synchronizedBuffer(new UnboundedFifoByteBuffer());
+ * </pre>
+ * <p>
+ * This buffer prevents null objects from being added.
+ *
+ * @since Commons Collections 3.0 (previously in main package v2.1)
+ * @version $Revision: 1.1 $ $Date: 2004/08/24 06:52:02 $
+ *
+ * 
+ * 
+ * 
+ * 
+ * 
+ */
+class UnboundedFifoByteBuffer {
+
+    protected byte[] buffer;
+    protected int head;
+    protected int tail;
+
+    /**
+     * Constructs an UnboundedFifoByteBuffer with the default number of elements.
+     * It is exactly the same as performing the following:
+     *
+     * <pre>
+     *   new UnboundedFifoByteBuffer(32);
+     * </pre>
+     */
+    public UnboundedFifoByteBuffer() {
+        this(32);
+    }
+
+    /**
+     * Constructs an UnboundedFifoByteBuffer with the specified number of elements.
+     * The integer must be a positive integer.
+     *
+     * @param initialSize  the initial size of the buffer
+     * @throws IllegalArgumentException  if the size is less than 1
+     */
+    public UnboundedFifoByteBuffer(int initialSize) {
+        if (initialSize <= 0) {
+            throw new IllegalArgumentException("The size must be greater than 0");
+        }
+        buffer = new byte[initialSize + 1];
+        head = 0;
+        tail = 0;
+    }
+
+    /**
+     * Returns the number of elements stored in the buffer.
+     *
+     * @return this buffer's size
+     */
+    public int size() {
+        int size = 0;
+
+        if (tail < head) {
+            size = buffer.length - head + tail;
+        } else {
+            size = tail - head;
+        }
+
+        return size;
+    }
+
+    /**
+     * Returns true if this buffer is empty; false otherwise.
+     *
+     * @return true if this buffer is empty
+     */
+    public boolean isEmpty() {
+        return (size() == 0);
+    }
+
+    /**
+     * Adds the given element to this buffer.
+     *
+     * @param b  the byte to add
+     * @return true, always
+     */
+    public boolean add(final byte b) {
+
+        if (size() + 1 >= buffer.length) {
+            byte[] tmp = new byte[((buffer.length - 1) * 2) + 1];
+
+            int j = 0;
+            for (int i = head; i != tail;) {
+                tmp[j] = buffer[i];
+                buffer[i] = 0;
+
+                j++;
+                i++;
+                if (i == buffer.length) {
+                    i = 0;
+                }
+            }
+
+            buffer = tmp;
+            head = 0;
+            tail = j;
+        }
+
+        buffer[tail] = b;
+        tail++;
+        if (tail >= buffer.length) {
+            tail = 0;
+        }
+        return true;
+    }
+
+    /**
+     * Returns the next object in the buffer.
+     *
+     * @return the next object in the buffer
+     * @throws BufferUnderflowException  if this buffer is empty
+     */
+    public byte get() {
+        if (isEmpty()) {
+            throw new IllegalStateException("The buffer is already empty");
+        }
+
+        return buffer[head];
+    }
+
+    /**
+     * Removes the next object from the buffer
+     *
+     * @return the removed object
+     * @throws BufferUnderflowException  if this buffer is empty
+     */
+    public byte remove() {
+        if (isEmpty()) {
+            throw new IllegalStateException("The buffer is already empty");
+        }
+
+        byte element = buffer[head];
+
+        head++;
+        if (head >= buffer.length) {
+            head = 0;
+        }
+
+        return element;
+    }
+
+    /**
+     * Increments the internal index.
+     *
+     * @param index  the index to increment
+     * @return the updated index
+     */
+    private int increment(int index) {
+        index++;
+        if (index >= buffer.length) {
+            index = 0;
+        }
+        return index;
+    }
+
+    /**
+     * Decrements the internal index.
+     *
+     * @param index  the index to decrement
+     * @return the updated index
+     */
+    private int decrement(int index) {
+        index--;
+        if (index < 0) {
+            index = buffer.length - 1;
+        }
+        return index;
+    }
+
+    /**
+     * Returns an iterator over this buffer's elements.
+     *
+     * @return an iterator over this buffer's elements
+     */
+    public Iterator iterator() {
+        return new Iterator() {
+
+            private int index = head;
+            private int lastReturnedIndex = -1;
+
+            public boolean hasNext() {
+                return index != tail;
+
+            }
+
+            public Object next() {
+                if (!hasNext()) {
+                    throw new NoSuchElementException();
+                }
+                lastReturnedIndex = index;
+                index = increment(index);
+                return new Byte(buffer[lastReturnedIndex]);
+            }
+
+            public void remove() {
+                if (lastReturnedIndex == -1) {
+                    throw new IllegalStateException();
+                }
+
+                // First element can be removed quickly
+                if (lastReturnedIndex == head) {
+                    UnboundedFifoByteBuffer.this.remove();
+                    lastReturnedIndex = -1;
+                    return;
+                }
+
+                // Other elements require us to shift the subsequent elements
+                int i = lastReturnedIndex + 1;
+                while (i != tail) {
+                    if (i >= buffer.length) {
+                        buffer[i - 1] = buffer[0];
+                        i = 0;
+                    } else {
+                        buffer[i - 1] = buffer[i];
+                        i++;
+                    }
+                }
+
+                lastReturnedIndex = -1;
+                tail = decrement(tail);
+                buffer[tail] = 0;
+                index = decrement(index);
+            }
+
+        };
+    }
+
+}
\ No newline at end of file
diff --git a/src/org/apache/james/mime4j/field/AddressListField.java b/src/org/apache/james/mime4j/field/AddressListField.java
new file mode 100644
index 0000000..df9f398
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/AddressListField.java
@@ -0,0 +1,65 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you 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 org.apache.james.mime4j.field;
+
+//BEGIN android-changed: Stubbing out logging
+import org.apache.james.mime4j.Log;
+import org.apache.james.mime4j.LogFactory;
+//END android-changed
+import org.apache.james.mime4j.field.address.AddressList;
+import org.apache.james.mime4j.field.address.parser.ParseException;
+
+public class AddressListField extends Field {
+    private AddressList addressList;
+    private ParseException parseException;
+
+    protected AddressListField(String name, String body, String raw, AddressList addressList, ParseException parseException) {
+        super(name, body, raw);
+        this.addressList = addressList;
+        this.parseException = parseException;
+    }
+
+    public AddressList getAddressList() {
+        return addressList;
+    }
+
+    public ParseException getParseException() {
+        return parseException;
+    }
+
+    public static class Parser implements FieldParser {
+        private static Log log = LogFactory.getLog(Parser.class);
+
+        public Field parse(final String name, final String body, final String raw) {
+            AddressList addressList = null;
+            ParseException parseException = null;
+            try {
+                addressList = AddressList.parse(body);
+            }
+            catch (ParseException e) {
+                if (log.isDebugEnabled()) {
+                    log.debug("Parsing value '" + body + "': "+ e.getMessage());
+                }
+                parseException = e;
+            }
+            return new AddressListField(name, body, raw, addressList, parseException);
+        }
+    }
+}
diff --git a/src/org/apache/james/mime4j/field/ContentTransferEncodingField.java b/src/org/apache/james/mime4j/field/ContentTransferEncodingField.java
new file mode 100644
index 0000000..73d8d23
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/ContentTransferEncodingField.java
@@ -0,0 +1,88 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you 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 org.apache.james.mime4j.field;
+
+
+
+/**
+ * Represents a <code>Content-Transfer-Encoding</code> field.
+ *
+ * 
+ * @version $Id: ContentTransferEncodingField.java,v 1.2 2004/10/02 12:41:11 ntherning Exp $
+ */
+public class ContentTransferEncodingField extends Field {
+    /**
+     * The <code>7bit</code> encoding.
+     */
+    public static final String ENC_7BIT = "7bit";
+    /**
+     * The <code>8bit</code> encoding.
+     */
+    public static final String ENC_8BIT = "8bit";
+    /**
+     * The <code>binary</code> encoding.
+     */
+    public static final String ENC_BINARY = "binary";
+    /**
+     * The <code>quoted-printable</code> encoding.
+     */
+    public static final String ENC_QUOTED_PRINTABLE = "quoted-printable";
+    /**
+     * The <code>base64</code> encoding.
+     */
+    public static final String ENC_BASE64 = "base64";
+    
+    private String encoding;
+    
+    protected ContentTransferEncodingField(String name, String body, String raw, String encoding) {
+        super(name, body, raw);
+        this.encoding = encoding;
+    }
+
+    /**
+     * Gets the encoding defined in this field.
+     * 
+     * @return the encoding or an empty string if not set.
+     */
+    public String getEncoding() {
+        return encoding;
+    }
+    
+    /**
+     * Gets the encoding of the given field if. Returns the default 
+     * <code>7bit</code> if not set or if
+     * <code>f</code> is <code>null</code>.
+     * 
+     * @return the encoding.
+     */
+    public static String getEncoding(ContentTransferEncodingField f) {
+        if (f != null && f.getEncoding().length() != 0) {
+            return f.getEncoding();
+        }
+        return ENC_7BIT;
+    }
+    
+    public static class Parser implements FieldParser {
+        public Field parse(final String name, final String body, final String raw) {
+            final String encoding = body.trim().toLowerCase();
+            return new ContentTransferEncodingField(name, body, raw, encoding);
+        }
+    }
+}
diff --git a/src/org/apache/james/mime4j/field/ContentTypeField.java b/src/org/apache/james/mime4j/field/ContentTypeField.java
new file mode 100644
index 0000000..ad9f7f9
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/ContentTypeField.java
@@ -0,0 +1,259 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you 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 org.apache.james.mime4j.field;
+
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+//BEGIN android-changed: Stubbing out logging
+import org.apache.james.mime4j.Log;
+import org.apache.james.mime4j.LogFactory;
+//END android-changed
+import org.apache.james.mime4j.field.contenttype.parser.ContentTypeParser;
+import org.apache.james.mime4j.field.contenttype.parser.ParseException;
+import org.apache.james.mime4j.field.contenttype.parser.TokenMgrError;
+
+/**
+ * Represents a <code>Content-Type</code> field.
+ *
+ * <p>TODO: Remove dependency on Java 1.4 regexps</p>
+ *
+ *
+ * @version $Id: ContentTypeField.java,v 1.6 2005/01/27 14:16:31 ntherning Exp $
+ */
+public class ContentTypeField extends Field {
+
+    /**
+     * The prefix of all <code>multipart</code> MIME types.
+     */
+    public static final String TYPE_MULTIPART_PREFIX = "multipart/";
+    /**
+     * The <code>multipart/digest</code> MIME type.
+     */
+    public static final String TYPE_MULTIPART_DIGEST = "multipart/digest";
+    /**
+     * The <code>text/plain</code> MIME type.
+     */
+    public static final String TYPE_TEXT_PLAIN = "text/plain";
+    /**
+     * The <code>message/rfc822</code> MIME type.
+     */
+    public static final String TYPE_MESSAGE_RFC822 = "message/rfc822";
+    /**
+     * The name of the <code>boundary</code> parameter.
+     */
+    public static final String PARAM_BOUNDARY = "boundary";
+    /**
+     * The name of the <code>charset</code> parameter.
+     */
+    public static final String PARAM_CHARSET = "charset";
+
+    private String mimeType = "";
+    private Map<String, String> parameters = null;
+    private ParseException parseException;
+
+    protected ContentTypeField(String name, String body, String raw, String mimeType, Map<String, String> parameters, ParseException parseException) {
+        super(name, body, raw);
+        this.mimeType = mimeType;
+        this.parameters = parameters;
+        this.parseException = parseException;
+    }
+
+    /**
+     * Gets the exception that was raised during parsing of
+     * the field value, if any; otherwise, null.
+     */
+    public ParseException getParseException() {
+        return parseException;
+    }
+
+    /**
+     * Gets the MIME type defined in this Content-Type field.
+     *
+     * @return the MIME type or an empty string if not set.
+     */
+    public String getMimeType() {
+        return mimeType;
+    }
+
+    /**
+     * Gets the MIME type defined in the child's
+     * Content-Type field or derives a MIME type from the parent
+     * if child is <code>null</code> or hasn't got a MIME type value set.
+     * If child's MIME type is multipart but no boundary
+     * has been set the MIME type of child will be derived from
+     * the parent.
+     *
+     * @param child the child.
+     * @param parent the parent.
+     * @return the MIME type.
+     */
+    public static String getMimeType(ContentTypeField child,
+                                     ContentTypeField parent) {
+
+        if (child == null || child.getMimeType().length() == 0
+                || child.isMultipart() && child.getBoundary() == null) {
+
+            if (parent != null && parent.isMimeType(TYPE_MULTIPART_DIGEST)) {
+                return TYPE_MESSAGE_RFC822;
+            } else {
+                return TYPE_TEXT_PLAIN;
+            }
+        }
+
+        return child.getMimeType();
+    }
+
+    /**
+     * Gets the value of a parameter. Parameter names are case-insensitive.
+     *
+     * @param name the name of the parameter to get.
+     * @return the parameter value or <code>null</code> if not set.
+     */
+    public String getParameter(String name) {
+        return parameters != null
+                    ? parameters.get(name.toLowerCase())
+                    : null;
+    }
+
+    /**
+     * Gets all parameters.
+     *
+     * @return the parameters.
+     */
+    public Map<String, String> getParameters() {
+        if (parameters != null) {
+            return Collections.unmodifiableMap(parameters);
+        }
+        return Collections.emptyMap();
+    }
+
+    /**
+     * Gets the value of the <code>boundary</code> parameter if set.
+     *
+     * @return the <code>boundary</code> parameter value or <code>null</code>
+     *             if not set.
+     */
+    public String getBoundary() {
+        return getParameter(PARAM_BOUNDARY);
+    }
+
+    /**
+     * Gets the value of the <code>charset</code> parameter if set.
+     *
+     * @return the <code>charset</code> parameter value or <code>null</code>
+     *         if not set.
+     */
+    public String getCharset() {
+        return getParameter(PARAM_CHARSET);
+    }
+
+    /**
+     * Gets the value of the <code>charset</code> parameter if set for the
+     * given field. Returns the default <code>us-ascii</code> if not set or if
+     * <code>f</code> is <code>null</code>.
+     *
+     * @return the <code>charset</code> parameter value.
+     */
+    public static String getCharset(ContentTypeField f) {
+        if (f != null) {
+            if (f.getCharset() != null && f.getCharset().length() > 0) {
+                return f.getCharset();
+            }
+        }
+        return "us-ascii";
+    }
+
+    /**
+     * Determines if the MIME type of this field matches the given one.
+     *
+     * @param mimeType the MIME type to match against.
+     * @return <code>true</code> if the MIME type of this field matches,
+     *         <code>false</code> otherwise.
+     */
+    public boolean isMimeType(String mimeType) {
+        return this.mimeType.equalsIgnoreCase(mimeType);
+    }
+
+    /**
+     * Determines if the MIME type of this field is <code>multipart/*</code>.
+     *
+     * @return <code>true</code> if this field is has a <code>multipart/*</code>
+     *         MIME type, <code>false</code> otherwise.
+     */
+    public boolean isMultipart() {
+        return mimeType.startsWith(TYPE_MULTIPART_PREFIX);
+    }
+
+    public static class Parser implements FieldParser {
+        private static Log log = LogFactory.getLog(Parser.class);
+
+        public Field parse(final String name, final String body, final String raw) {
+            ParseException parseException = null;
+            String mimeType = "";
+            Map<String, String> parameters = null;
+
+            ContentTypeParser parser = new ContentTypeParser(new StringReader(body));
+            try {
+                parser.parseAll();
+            }
+            catch (ParseException e) {
+                if (log.isDebugEnabled()) {
+                    log.debug("Parsing value '" + body + "': "+ e.getMessage());
+                }
+                parseException = e;
+            }
+            catch (TokenMgrError e) {
+                if (log.isDebugEnabled()) {
+                    log.debug("Parsing value '" + body + "': "+ e.getMessage());
+                }
+                parseException = new ParseException(e.getMessage());
+            }
+
+            try {
+                final String type = parser.getType();
+                final String subType = parser.getSubType();
+
+                if (type != null && subType != null) {
+                    mimeType = (type + "/" + parser.getSubType()).toLowerCase();
+
+                    ArrayList<String> paramNames = parser.getParamNames();
+                    ArrayList<String> paramValues = parser.getParamValues();
+
+                    if (paramNames != null && paramValues != null) {
+                        for (int i = 0; i < paramNames.size() && i < paramValues.size(); i++) {
+                            if (parameters == null)
+                                parameters = new HashMap<String, String>((int)(paramNames.size() * 1.3 + 1));
+                            String paramName = paramNames.get(i).toLowerCase();
+                            String paramValue = paramValues.get(i);
+                            parameters.put(paramName, paramValue);
+                        }
+                    }
+                }
+            }
+            catch (NullPointerException npe) {
+            }
+            return new ContentTypeField(name, body, raw, mimeType, parameters, parseException);
+        }
+    }
+}
diff --git a/src/org/apache/james/mime4j/field/DateTimeField.java b/src/org/apache/james/mime4j/field/DateTimeField.java
new file mode 100644
index 0000000..5215534
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/DateTimeField.java
@@ -0,0 +1,73 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you 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 org.apache.james.mime4j.field;
+
+//BEGIN android-changed: Stubbing out logging
+
+import com.android.phone.common.mail.utils.LogUtils;
+
+import org.apache.james.mime4j.Log;
+import org.apache.james.mime4j.LogFactory;
+//END
+import org.apache.james.mime4j.field.datetime.DateTime;
+import org.apache.james.mime4j.field.datetime.parser.ParseException;
+
+import java.util.Date;
+
+public class DateTimeField extends Field {
+    private Date date;
+    private ParseException parseException;
+
+    protected DateTimeField(String name, String body, String raw, Date date, ParseException parseException) {
+        super(name, body, raw);
+        this.date = date;
+        this.parseException = parseException;
+    }
+
+    public Date getDate() {
+        return date;
+    }
+
+    public ParseException getParseException() {
+        return parseException;
+    }
+
+    public static class Parser implements FieldParser {
+        private static Log log = LogFactory.getLog(Parser.class);
+
+        public Field parse(final String name, String body, final String raw) {
+            Date date = null;
+            ParseException parseException = null;
+            //BEGIN android-changed
+            body = LogUtils.cleanUpMimeDate(body);
+            //END android-changed
+            try {
+                date = DateTime.parse(body).getDate();
+            }
+            catch (ParseException e) {
+                if (log.isDebugEnabled()) {
+                    log.debug("Parsing value '" + body + "': "+ e.getMessage());
+                }
+                parseException = e;
+            }
+            return new DateTimeField(name, body, raw, date, parseException);
+        }
+    }
+}
diff --git a/src/org/apache/james/mime4j/field/DefaultFieldParser.java b/src/org/apache/james/mime4j/field/DefaultFieldParser.java
new file mode 100644
index 0000000..3695afe
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/DefaultFieldParser.java
@@ -0,0 +1,45 @@
+/*
+ *  Copyright 2006 the mime4j 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 org.apache.james.mime4j.field;
+
+public class DefaultFieldParser extends DelegatingFieldParser {
+    
+    public DefaultFieldParser() {
+        setFieldParser(Field.CONTENT_TRANSFER_ENCODING, new ContentTransferEncodingField.Parser());
+        setFieldParser(Field.CONTENT_TYPE, new ContentTypeField.Parser());
+        
+        final DateTimeField.Parser dateTimeParser = new DateTimeField.Parser();
+        setFieldParser(Field.DATE, dateTimeParser);
+        setFieldParser(Field.RESENT_DATE, dateTimeParser);
+        
+        final MailboxListField.Parser mailboxListParser = new MailboxListField.Parser();
+        setFieldParser(Field.FROM, mailboxListParser);
+        setFieldParser(Field.RESENT_FROM, mailboxListParser);
+        
+        final MailboxField.Parser mailboxParser = new MailboxField.Parser();
+        setFieldParser(Field.SENDER, mailboxParser);
+        setFieldParser(Field.RESENT_SENDER, mailboxParser);
+        
+        final AddressListField.Parser addressListParser = new AddressListField.Parser();
+        setFieldParser(Field.TO, addressListParser);
+        setFieldParser(Field.RESENT_TO, addressListParser);
+        setFieldParser(Field.CC, addressListParser);
+        setFieldParser(Field.RESENT_CC, addressListParser);
+        setFieldParser(Field.BCC, addressListParser);
+        setFieldParser(Field.RESENT_BCC, addressListParser);
+        setFieldParser(Field.REPLY_TO, addressListParser);
+    }
+}
diff --git a/src/org/apache/james/mime4j/field/DelegatingFieldParser.java b/src/org/apache/james/mime4j/field/DelegatingFieldParser.java
new file mode 100644
index 0000000..32b69ec
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/DelegatingFieldParser.java
@@ -0,0 +1,47 @@
+/*
+ *  Copyright 2006 the mime4j 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 org.apache.james.mime4j.field;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class DelegatingFieldParser implements FieldParser {
+
+    private Map<String, FieldParser> parsers = new HashMap<String, FieldParser>();
+    private FieldParser defaultParser = new UnstructuredField.Parser();
+
+    /**
+     * Sets the parser used for the field named <code>name</code>.
+     * @param name the name of the field
+     * @param parser the parser for fields named <code>name</code>
+     */
+    public void setFieldParser(final String name, final FieldParser parser) {
+        parsers.put(name.toLowerCase(), parser);
+    }
+
+    public FieldParser getParser(final String name) {
+        final FieldParser field = parsers.get(name.toLowerCase());
+        if(field==null) {
+            return defaultParser;
+        }
+        return field;
+    }
+
+    public Field parse(final String name, final String body, final String raw) {
+        final FieldParser parser = getParser(name);
+        return parser.parse(name, body, raw);
+    }
+}
diff --git a/src/org/apache/james/mime4j/field/Field.java b/src/org/apache/james/mime4j/field/Field.java
new file mode 100644
index 0000000..4dea5c5
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/Field.java
@@ -0,0 +1,192 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you 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 org.apache.james.mime4j.field;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * The base class of all field classes.
+ *
+ * 
+ * @version $Id: Field.java,v 1.6 2004/10/25 07:26:46 ntherning Exp $
+ */
+public abstract class Field {
+    public static final String SENDER = "Sender";
+    public static final String FROM = "From";
+    public static final String TO = "To";
+    public static final String CC = "Cc";
+    public static final String BCC = "Bcc";
+    public static final String REPLY_TO = "Reply-To";
+    public static final String RESENT_SENDER = "Resent-Sender";
+    public static final String RESENT_FROM = "Resent-From";
+    public static final String RESENT_TO = "Resent-To";
+    public static final String RESENT_CC = "Resent-Cc";
+    public static final String RESENT_BCC = "Resent-Bcc";
+
+    public static final String DATE = "Date";
+    public static final String RESENT_DATE = "Resent-Date";
+
+    public static final String SUBJECT = "Subject";
+    public static final String CONTENT_TYPE = "Content-Type";
+    public static final String CONTENT_TRANSFER_ENCODING = 
+                                        "Content-Transfer-Encoding";
+    
+    private static final String FIELD_NAME_PATTERN = 
+        "^([\\x21-\\x39\\x3b-\\x7e]+)[ \t]*:";
+    private static final Pattern fieldNamePattern = 
+        Pattern.compile(FIELD_NAME_PATTERN);
+        
+    private static final DefaultFieldParser parser = new DefaultFieldParser();
+    
+    private final String name;
+    private final String body;
+    private final String raw;
+    
+    protected Field(final String name, final String body, final String raw) {
+        this.name = name;
+        this.body = body;
+        this.raw = raw;
+    }
+    
+    /**
+     * Parses the given string and returns an instance of the 
+     * <code>Field</code> class. The type of the class returned depends on
+     * the field name:
+     * <table>
+     *      <tr>
+     *          <td><em>Field name</em></td><td><em>Class returned</em></td>
+     *          <td>Content-Type</td><td>org.apache.james.mime4j.field.ContentTypeField</td>
+     *          <td>other</td><td>org.apache.james.mime4j.field.UnstructuredField</td>
+     *      </tr>
+     * </table>
+     * 
+     * @param s the string to parse.
+     * @return a <code>Field</code> instance.
+     * @throws IllegalArgumentException on parse errors.
+     */
+    public static Field parse(final String raw) {
+        
+        /*
+         * Unfold the field.
+         */
+        final String unfolded = raw.replaceAll("\r|\n", "");
+        
+        /*
+         * Split into name and value.
+         */
+        final Matcher fieldMatcher = fieldNamePattern.matcher(unfolded);
+        if (!fieldMatcher.find()) {
+            throw new IllegalArgumentException("Invalid field in string");
+        }
+        final String name = fieldMatcher.group(1);
+        
+        String body = unfolded.substring(fieldMatcher.end());
+        if (body.length() > 0 && body.charAt(0) == ' ') {
+            body = body.substring(1);
+        }
+        
+        return parser.parse(name, body, raw);
+    }
+    
+    /**
+     * Gets the default parser used to parse fields.
+     * @return the default field parser
+     */
+    public static DefaultFieldParser getParser() {
+        return parser;
+    }
+    
+    /**
+     * Gets the name of the field (<code>Subject</code>, 
+     * <code>From</code>, etc).
+     * 
+     * @return the field name.
+     */
+    public String getName() {
+        return name;
+    }
+    
+    /**
+     * Gets the original raw field string.
+     * 
+     * @return the original raw field string.
+     */
+    public String getRaw() {
+        return raw;
+    }
+    
+    /**
+     * Gets the unfolded, unparsed and possibly encoded (see RFC 2047) field 
+     * body string.
+     * 
+     * @return the unfolded unparsed field body string.
+     */
+    public String getBody() {
+        return body;
+    }
+    
+    /**
+     * Determines if this is a <code>Content-Type</code> field.
+     * 
+     * @return <code>true</code> if this is a <code>Content-Type</code> field,
+     *         <code>false</code> otherwise.
+     */
+    public boolean isContentType() {
+        return CONTENT_TYPE.equalsIgnoreCase(name);
+    }
+    
+    /**
+     * Determines if this is a <code>Subject</code> field.
+     * 
+     * @return <code>true</code> if this is a <code>Subject</code> field,
+     *         <code>false</code> otherwise.
+     */
+    public boolean isSubject() {
+        return SUBJECT.equalsIgnoreCase(name);
+    }
+    
+    /**
+     * Determines if this is a <code>From</code> field.
+     * 
+     * @return <code>true</code> if this is a <code>From</code> field,
+     *         <code>false</code> otherwise.
+     */
+    public boolean isFrom() {
+        return FROM.equalsIgnoreCase(name);
+    }
+    
+    /**
+     * Determines if this is a <code>To</code> field.
+     * 
+     * @return <code>true</code> if this is a <code>To</code> field,
+     *         <code>false</code> otherwise.
+     */
+    public boolean isTo() {
+        return TO.equalsIgnoreCase(name);
+    }
+    
+    /**
+     * @see #getRaw()
+     */
+    public String toString() {
+        return raw;
+    }
+}
diff --git a/src/org/apache/james/mime4j/field/FieldParser.java b/src/org/apache/james/mime4j/field/FieldParser.java
new file mode 100644
index 0000000..78aaf13
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/FieldParser.java
@@ -0,0 +1,21 @@
+/*
+ *  Copyright 2006 the mime4j 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 org.apache.james.mime4j.field;
+
+public interface FieldParser {
+    
+    Field parse(final String name, final String body, final String raw);
+}
diff --git a/src/org/apache/james/mime4j/field/MailboxField.java b/src/org/apache/james/mime4j/field/MailboxField.java
new file mode 100644
index 0000000..f159800
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/MailboxField.java
@@ -0,0 +1,70 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you 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 org.apache.james.mime4j.field;
+
+//BEGIN android-changed: Stubbing out logging
+import org.apache.james.mime4j.Log;
+import org.apache.james.mime4j.LogFactory;
+//END android-changed
+import org.apache.james.mime4j.field.address.AddressList;
+import org.apache.james.mime4j.field.address.Mailbox;
+import org.apache.james.mime4j.field.address.MailboxList;
+import org.apache.james.mime4j.field.address.parser.ParseException;
+
+public class MailboxField extends Field {
+    private final Mailbox mailbox;
+    private final ParseException parseException;
+
+    protected MailboxField(final String name, final String body, final String raw, final Mailbox mailbox, final ParseException parseException) {
+        super(name, body, raw);
+        this.mailbox = mailbox;
+        this.parseException = parseException;
+    }
+
+    public Mailbox getMailbox() {
+        return mailbox;
+    }
+
+    public ParseException getParseException() {
+        return parseException;
+    }
+    
+    public static class Parser implements FieldParser {
+        private static Log log = LogFactory.getLog(Parser.class);
+
+        public Field parse(final String name, final String body, final String raw) {
+            Mailbox mailbox = null;
+            ParseException parseException = null;
+            try {
+                MailboxList mailboxList = AddressList.parse(body).flatten();
+                if (mailboxList.size() > 0) {
+                    mailbox = mailboxList.get(0);
+                }
+            }
+            catch (ParseException e) {
+                if (log.isDebugEnabled()) {
+                    log.debug("Parsing value '" + body + "': "+ e.getMessage());
+                }
+                parseException = e;
+            }
+            return new MailboxField(name, body, raw, mailbox, parseException);
+        }
+    }
+}
diff --git a/src/org/apache/james/mime4j/field/MailboxListField.java b/src/org/apache/james/mime4j/field/MailboxListField.java
new file mode 100644
index 0000000..23378d4
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/MailboxListField.java
@@ -0,0 +1,67 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you 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 org.apache.james.mime4j.field;
+
+//BEGIN android-changed: Stubbing out logging
+import org.apache.james.mime4j.Log;
+import org.apache.james.mime4j.LogFactory;
+//END android-changed
+import org.apache.james.mime4j.field.address.AddressList;
+import org.apache.james.mime4j.field.address.MailboxList;
+import org.apache.james.mime4j.field.address.parser.ParseException;
+
+public class MailboxListField extends Field {
+    
+    private MailboxList mailboxList;
+    private ParseException parseException;
+
+    protected MailboxListField(final String name, final String body, final String raw, final MailboxList mailboxList, final ParseException parseException) {
+        super(name, body, raw);
+        this.mailboxList = mailboxList;
+        this.parseException = parseException;
+    }
+
+    public MailboxList getMailboxList() {
+        return mailboxList;
+    }
+
+    public ParseException getParseException() {
+        return parseException;
+    }
+    
+    public static class Parser implements FieldParser {
+        private static Log log = LogFactory.getLog(Parser.class);
+
+        public Field parse(final String name, final String body, final String raw) {
+            MailboxList mailboxList = null;
+            ParseException parseException = null;
+            try {
+                mailboxList = AddressList.parse(body).flatten();
+            }
+            catch (ParseException e) {
+                if (log.isDebugEnabled()) {
+                    log.debug("Parsing value '" + body + "': "+ e.getMessage());
+                }
+                parseException = e;
+            }
+            return new MailboxListField(name, body, raw, mailboxList, parseException);
+        }
+    }
+}
diff --git a/src/org/apache/james/mime4j/field/UnstructuredField.java b/src/org/apache/james/mime4j/field/UnstructuredField.java
new file mode 100644
index 0000000..6084e44
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/UnstructuredField.java
@@ -0,0 +1,49 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you 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 org.apache.james.mime4j.field;
+
+import org.apache.james.mime4j.decoder.DecoderUtil;
+
+
+/**
+ * Simple unstructured field such as <code>Subject</code>.
+ *
+ * 
+ * @version $Id: UnstructuredField.java,v 1.3 2004/10/25 07:26:46 ntherning Exp $
+ */
+public class UnstructuredField extends Field {
+    private String value;
+    
+    protected UnstructuredField(String name, String body, String raw, String value) {
+        super(name, body, raw);
+        this.value = value;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public static class Parser implements FieldParser {
+        public Field parse(final String name, final String body, final String raw) {
+            final String value = DecoderUtil.decodeEncodedWords(body);
+            return new UnstructuredField(name, body, raw, value);
+        }
+    }
+}
diff --git a/src/org/apache/james/mime4j/field/address/Address.java b/src/org/apache/james/mime4j/field/address/Address.java
new file mode 100644
index 0000000..3e24e91
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/address/Address.java
@@ -0,0 +1,52 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you 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 org.apache.james.mime4j.field.address;
+
+import java.util.ArrayList;
+
+/**
+ * The abstract base for classes that represent RFC2822 addresses.
+ * This includes groups and mailboxes.
+ *
+ * Currently, no public methods are introduced on this class.
+ *
+ *
+ */
+public abstract class Address {
+
+	/**
+	 * Adds any mailboxes represented by this address
+	 * into the given ArrayList. Note that this method
+	 * has default (package) access, so a doAddMailboxesTo
+	 * method is needed to allow the behavior to be
+	 * overridden by subclasses.
+	 */
+	final void addMailboxesTo(ArrayList<Address> results) {
+		doAddMailboxesTo(results);
+	}
+
+	/**
+	 * Adds any mailboxes represented by this address
+	 * into the given ArrayList. Must be overridden by
+	 * concrete subclasses.
+	 */
+	protected abstract void doAddMailboxesTo(ArrayList<Address> results);
+
+}
diff --git a/src/org/apache/james/mime4j/field/address/AddressList.java b/src/org/apache/james/mime4j/field/address/AddressList.java
new file mode 100644
index 0000000..1829e79
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/address/AddressList.java
@@ -0,0 +1,138 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you 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 org.apache.james.mime4j.field.address;
+
+import org.apache.james.mime4j.field.address.parser.AddressListParser;
+import org.apache.james.mime4j.field.address.parser.ParseException;
+
+import java.io.StringReader;
+import java.util.ArrayList;
+
+/**
+ * An immutable, random-access list of Address objects.
+ *
+ *
+ */
+public class AddressList {
+
+	private ArrayList<Address> addresses;
+
+	/**
+	 * @param addresses An ArrayList that contains only Address objects.
+	 * @param dontCopy true iff it is not possible for the addresses ArrayList to be modified by someone else.
+	 */
+	public AddressList(ArrayList<Address> addresses, boolean dontCopy) {
+		if (addresses != null)
+			this.addresses = (dontCopy ? addresses : new ArrayList<Address>(addresses));
+		else
+			this.addresses = new ArrayList<Address>(0);
+	}
+
+	/**
+	 * The number of elements in this list.
+	 */
+	public int size() {
+		return addresses.size();
+	}
+
+	/**
+	 * Gets an address.
+	 */
+	public Address get(int index) {
+		if (0 > index || size() <= index)
+			throw new IndexOutOfBoundsException();
+		return addresses.get(index);
+	}
+
+	/**
+	 * Returns a flat list of all mailboxes represented
+	 * in this address list. Use this if you don't care
+	 * about grouping.
+	 */
+	public MailboxList flatten() {
+		// in the common case, all addresses are mailboxes
+		boolean groupDetected = false;
+		for (int i = 0; i < size(); i++) {
+			if (!(get(i) instanceof Mailbox)) {
+				groupDetected = true;
+				break;
+			}
+		}
+
+		if (!groupDetected)
+			return new MailboxList(addresses, true);
+
+		ArrayList<Address> results = new ArrayList<Address>();
+		for (int i = 0; i < size(); i++) {
+			Address addr = get(i);
+			addr.addMailboxesTo(results);
+		}
+
+		// copy-on-construct this time, because subclasses
+		// could have held onto a reference to the results
+		return new MailboxList(results, false);
+	}
+
+	/**
+	 * Dumps a representation of this address list to
+	 * stdout, for debugging purposes.
+	 */
+	public void print() {
+		for (int i = 0; i < size(); i++) {
+			Address addr = get(i);
+			System.out.println(addr.toString());
+		}
+	}
+
+	/**
+	 * Parse the address list string, such as the value
+	 * of a From, To, Cc, Bcc, Sender, or Reply-To
+	 * header.
+	 *
+	 * The string MUST be unfolded already.
+	 */
+	public static AddressList parse(String rawAddressList) throws ParseException {
+		AddressListParser parser = new AddressListParser(new StringReader(rawAddressList));
+		return Builder.getInstance().buildAddressList(parser.parse());
+	}
+
+	/**
+	 * Test console.
+	 */
+	public static void main(String[] args) throws Exception {
+		java.io.BufferedReader reader = new java.io.BufferedReader(new java.io.InputStreamReader(System.in));
+		while (true) {
+			try {
+				System.out.print("> ");
+				String line = reader.readLine();
+				if (line.length() == 0 || line.toLowerCase().equals("exit") || line.toLowerCase().equals("quit")) {
+					System.out.println("Goodbye.");
+					return;
+				}
+				AddressList list = parse(line);
+				list.print();
+			}
+			catch(Exception e) {
+				e.printStackTrace();
+				Thread.sleep(300);
+			}
+		}
+	}
+}
diff --git a/src/org/apache/james/mime4j/field/address/Builder.java b/src/org/apache/james/mime4j/field/address/Builder.java
new file mode 100644
index 0000000..3bcd15b
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/address/Builder.java
@@ -0,0 +1,243 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you 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 org.apache.james.mime4j.field.address;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+
+import org.apache.james.mime4j.decoder.DecoderUtil;
+import org.apache.james.mime4j.field.address.parser.ASTaddr_spec;
+import org.apache.james.mime4j.field.address.parser.ASTaddress;
+import org.apache.james.mime4j.field.address.parser.ASTaddress_list;
+import org.apache.james.mime4j.field.address.parser.ASTangle_addr;
+import org.apache.james.mime4j.field.address.parser.ASTdomain;
+import org.apache.james.mime4j.field.address.parser.ASTgroup_body;
+import org.apache.james.mime4j.field.address.parser.ASTlocal_part;
+import org.apache.james.mime4j.field.address.parser.ASTmailbox;
+import org.apache.james.mime4j.field.address.parser.ASTname_addr;
+import org.apache.james.mime4j.field.address.parser.ASTphrase;
+import org.apache.james.mime4j.field.address.parser.ASTroute;
+import org.apache.james.mime4j.field.address.parser.Node;
+import org.apache.james.mime4j.field.address.parser.SimpleNode;
+import org.apache.james.mime4j.field.address.parser.Token;
+
+/**
+ * Transforms the JJTree-generated abstract syntax tree
+ * into a graph of org.apache.james.mime4j.field.address objects.
+ *
+ *
+ */
+class Builder {
+
+	private static Builder singleton = new Builder();
+
+	public static Builder getInstance() {
+		return singleton;
+	}
+
+
+
+	public AddressList buildAddressList(ASTaddress_list node) {
+		ArrayList<Address> list = new ArrayList<Address>();
+		for (int i = 0; i < node.jjtGetNumChildren(); i++) {
+			ASTaddress childNode = (ASTaddress) node.jjtGetChild(i);
+			Address address = buildAddress(childNode);
+			list.add(address);
+		}
+		return new AddressList(list, true);
+	}
+
+	private Address buildAddress(ASTaddress node) {
+		ChildNodeIterator it = new ChildNodeIterator(node);
+		Node n = it.nextNode();
+		if (n instanceof ASTaddr_spec) {
+			return buildAddrSpec((ASTaddr_spec)n);
+		}
+		else if (n instanceof ASTangle_addr) {
+			return buildAngleAddr((ASTangle_addr)n);
+		}
+		else if (n instanceof ASTphrase) {
+			String name = buildString((ASTphrase)n, false);
+			Node n2 = it.nextNode();
+			if (n2 instanceof ASTgroup_body) {
+				return new Group(name, buildGroupBody((ASTgroup_body)n2));
+			}
+			else if (n2 instanceof ASTangle_addr) {
+                name = DecoderUtil.decodeEncodedWords(name);
+				return new NamedMailbox(name, buildAngleAddr((ASTangle_addr)n2));
+			}
+			else {
+				throw new IllegalStateException();
+			}
+		}
+		else {
+			throw new IllegalStateException();
+		}
+	}
+
+
+
+	private MailboxList buildGroupBody(ASTgroup_body node) {
+		ArrayList<Address> results = new ArrayList<Address>();
+		ChildNodeIterator it = new ChildNodeIterator(node);
+		while (it.hasNext()) {
+			Node n = it.nextNode();
+			if (n instanceof ASTmailbox)
+				results.add(buildMailbox((ASTmailbox)n));
+			else
+				throw new IllegalStateException();
+		}
+		return new MailboxList(results, true);
+	}
+
+	private Mailbox buildMailbox(ASTmailbox node) {
+		ChildNodeIterator it = new ChildNodeIterator(node);
+		Node n = it.nextNode();
+		if (n instanceof ASTaddr_spec) {
+			return buildAddrSpec((ASTaddr_spec)n);
+		}
+		else if (n instanceof ASTangle_addr) {
+			return buildAngleAddr((ASTangle_addr)n);
+		}
+		else if (n instanceof ASTname_addr) {
+			return buildNameAddr((ASTname_addr)n);
+		}
+		else {
+			throw new IllegalStateException();
+		}
+	}
+
+	private NamedMailbox buildNameAddr(ASTname_addr node) {
+		ChildNodeIterator it = new ChildNodeIterator(node);
+		Node n = it.nextNode();
+		String name;
+		if (n instanceof ASTphrase) {
+			name = buildString((ASTphrase)n, false);
+		}
+		else {
+			throw new IllegalStateException();
+		}
+
+		n = it.nextNode();
+		if (n instanceof ASTangle_addr) {
+            name = DecoderUtil.decodeEncodedWords(name);
+			return new NamedMailbox(name, buildAngleAddr((ASTangle_addr) n));
+		}
+		else {
+			throw new IllegalStateException();
+		}
+	}
+
+	private Mailbox buildAngleAddr(ASTangle_addr node) {
+		ChildNodeIterator it = new ChildNodeIterator(node);
+		DomainList route = null;
+		Node n = it.nextNode();
+		if (n instanceof ASTroute) {
+			route = buildRoute((ASTroute)n);
+			n = it.nextNode();
+		}
+		else if (n instanceof ASTaddr_spec)
+			; // do nothing
+		else
+			throw new IllegalStateException();
+
+		if (n instanceof ASTaddr_spec)
+			return buildAddrSpec(route, (ASTaddr_spec)n);
+		else
+			throw new IllegalStateException();
+	}
+
+	private DomainList buildRoute(ASTroute node) {
+		ArrayList<String> results = new ArrayList<String>(node.jjtGetNumChildren());
+		ChildNodeIterator it = new ChildNodeIterator(node);
+		while (it.hasNext()) {
+			Node n = it.nextNode();
+			if (n instanceof ASTdomain)
+				results.add(buildString((ASTdomain)n, true));
+			else
+				throw new IllegalStateException();
+		}
+		return new DomainList(results, true);
+	}
+
+	private Mailbox buildAddrSpec(ASTaddr_spec node) {
+		return buildAddrSpec(null, node);
+	}
+	private Mailbox buildAddrSpec(DomainList route, ASTaddr_spec node) {
+		ChildNodeIterator it = new ChildNodeIterator(node);
+		String localPart = buildString((ASTlocal_part)it.nextNode(), true);
+		String domain = buildString((ASTdomain)it.nextNode(), true);
+		return new Mailbox(route, localPart, domain);
+	}
+
+
+	private String buildString(SimpleNode node, boolean stripSpaces) {
+		Token head = node.firstToken;
+		Token tail = node.lastToken;
+		StringBuffer out = new StringBuffer();
+
+		while (head != tail) {
+			out.append(head.image);
+			head = head.next;
+			if (!stripSpaces)
+				addSpecials(out, head.specialToken);
+		}
+		out.append(tail.image);
+
+		return out.toString();
+	}
+
+	private void addSpecials(StringBuffer out, Token specialToken) {
+		if (specialToken != null) {
+			addSpecials(out, specialToken.specialToken);
+			out.append(specialToken.image);
+		}
+	}
+
+	private static class ChildNodeIterator implements Iterator<Node> {
+
+		private SimpleNode simpleNode;
+		private int index;
+		private int len;
+
+		public ChildNodeIterator(SimpleNode simpleNode) {
+			this.simpleNode = simpleNode;
+			this.len = simpleNode.jjtGetNumChildren();
+			this.index = 0;
+		}
+
+		public void remove() {
+			throw new UnsupportedOperationException();
+		}
+
+		public boolean hasNext() {
+			return index < len;
+		}
+
+		public Node next() {
+			return nextNode();
+		}
+
+		public Node nextNode() {
+			return simpleNode.jjtGetChild(index++);
+		}
+
+	}
+}
diff --git a/src/org/apache/james/mime4j/field/address/DomainList.java b/src/org/apache/james/mime4j/field/address/DomainList.java
new file mode 100644
index 0000000..49b0f3b
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/address/DomainList.java
@@ -0,0 +1,76 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you 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 org.apache.james.mime4j.field.address;
+
+import java.util.ArrayList;
+
+/**
+ * An immutable, random-access list of Strings (that
+ * are supposedly domain names or domain literals).
+ *
+ *
+ */
+public class DomainList {
+	private ArrayList<String> domains;
+
+	/**
+	 * @param domains An ArrayList that contains only String objects.
+	 * @param dontCopy true iff it is not possible for the domains ArrayList to be modified by someone else.
+	 */
+	public DomainList(ArrayList<String> domains, boolean dontCopy) {
+		if (domains != null)
+			this.domains = (dontCopy ? domains : new ArrayList<String>(domains));
+		else
+			this.domains = new ArrayList<String>(0);
+	}
+
+	/**
+	 * The number of elements in this list.
+	 */
+	public int size() {
+		return domains.size();
+	}
+
+	/**
+	 * Gets the domain name or domain literal at the
+	 * specified index.
+	 * @throws IndexOutOfBoundsException If index is &lt; 0 or &gt;= size().
+	 */
+	public String get(int index) {
+		if (0 > index || size() <= index)
+			throw new IndexOutOfBoundsException();
+		return domains.get(index);
+	}
+
+	/**
+	 * Returns the list of domains formatted as a route
+	 * string (not including the trailing ':').
+	 */
+	public String toRouteString() {
+		StringBuffer out = new StringBuffer();
+		for (int i = 0; i < domains.size(); i++) {
+			out.append("@");
+			out.append(get(i));
+			if (i + 1 < domains.size())
+				out.append(",");
+		}
+		return out.toString();
+	}
+}
diff --git a/src/org/apache/james/mime4j/field/address/Group.java b/src/org/apache/james/mime4j/field/address/Group.java
new file mode 100644
index 0000000..c0ab7f7
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/address/Group.java
@@ -0,0 +1,75 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you 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 org.apache.james.mime4j.field.address;
+
+import java.util.ArrayList;
+
+/**
+ * A named group of zero or more mailboxes.
+ *
+ *
+ */
+public class Group extends Address {
+	private String name;
+	private MailboxList mailboxList;
+
+	/**
+	 * @param name The group name.
+	 * @param mailboxes The mailboxes in this group.
+	 */
+	public Group(String name, MailboxList mailboxes) {
+		this.name = name;
+		this.mailboxList = mailboxes;
+	}
+
+	/**
+	 * Returns the group name.
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * Returns the mailboxes in this group.
+	 */
+	public MailboxList getMailboxes() {
+		return mailboxList;
+	}
+
+	@Override
+	public String toString() {
+		StringBuffer buf = new StringBuffer();
+		buf.append(name);
+		buf.append(":");
+		for (int i = 0; i < mailboxList.size(); i++) {
+			buf.append(mailboxList.get(i).toString());
+			if (i + 1 < mailboxList.size())
+				buf.append(",");
+		}
+		buf.append(";");
+		return buf.toString();
+	}
+
+	@Override
+	protected void doAddMailboxesTo(ArrayList<Address> results) {
+		for (int i = 0; i < mailboxList.size(); i++)
+			results.add(mailboxList.get(i));
+	}
+}
diff --git a/src/org/apache/james/mime4j/field/address/Mailbox.java b/src/org/apache/james/mime4j/field/address/Mailbox.java
new file mode 100644
index 0000000..25f2548
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/address/Mailbox.java
@@ -0,0 +1,121 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you 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 org.apache.james.mime4j.field.address;
+
+import java.util.ArrayList;
+
+/**
+ * Represents a single e-mail address.
+ *
+ *
+ */
+public class Mailbox extends Address {
+	private DomainList route;
+	private String localPart;
+	private String domain;
+
+	/**
+	 * Creates a mailbox without a route. Routes are obsolete.
+	 * @param localPart The part of the e-mail address to the left of the "@".
+	 * @param domain The part of the e-mail address to the right of the "@".
+	 */
+	public Mailbox(String localPart, String domain) {
+		this(null, localPart, domain);
+	}
+
+	/**
+	 * Creates a mailbox with a route. Routes are obsolete.
+	 * @param route The zero or more domains that make up the route. Can be null.
+	 * @param localPart The part of the e-mail address to the left of the "@".
+	 * @param domain The part of the e-mail address to the right of the "@".
+	 */
+	public Mailbox(DomainList route, String localPart, String domain) {
+		this.route = route;
+		this.localPart = localPart;
+		this.domain = domain;
+	}
+
+	/**
+	 * Returns the route list.
+	 */
+	public DomainList getRoute() {
+		return route;
+	}
+
+	/**
+	 * Returns the left part of the e-mail address
+	 * (before "@").
+	 */
+	public String getLocalPart() {
+		return localPart;
+	}
+
+	/**
+	 * Returns the right part of the e-mail address
+	 * (after "@").
+	 */
+	public String getDomain() {
+		return domain;
+	}
+
+	/**
+	 * Formats the address as a string, not including
+	 * the route.
+	 *
+	 * @see #getAddressString(boolean)
+	 */
+	public String getAddressString() {
+		return getAddressString(false);
+	}
+
+	/**
+	 * Note that this value may not be usable
+	 * for transport purposes, only display purposes.
+	 *
+	 * For example, if the unparsed address was
+	 *
+	 *   <"Joe Cheng"@joecheng.com>
+	 *
+	 * this method would return
+	 *
+	 *   <Joe Cheng@joecheng.com>
+	 *
+	 * which is not valid for transport; the local part
+	 * would need to be re-quoted.
+	 *
+	 * @param includeRoute true if the route should be included if it exists.
+	 */
+	public String getAddressString(boolean includeRoute) {
+		return "<" + (!includeRoute || route == null ? "" : route.toRouteString() + ":")
+			+ localPart
+			+ (domain == null ? "" : "@")
+			+ domain + ">";
+	}
+
+	@Override
+	protected final void doAddMailboxesTo(ArrayList<Address> results) {
+		results.add(this);
+	}
+
+	@Override
+	public String toString() {
+		return getAddressString();
+	}
+}
diff --git a/src/org/apache/james/mime4j/field/address/MailboxList.java b/src/org/apache/james/mime4j/field/address/MailboxList.java
new file mode 100644
index 0000000..2c9efb3
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/address/MailboxList.java
@@ -0,0 +1,71 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you 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 org.apache.james.mime4j.field.address;
+
+import java.util.ArrayList;
+
+/**
+ * An immutable, random-access list of Mailbox objects.
+ *
+ *
+ */
+public class MailboxList {
+
+	private ArrayList<Address> mailboxes;
+
+	/**
+	 * @param mailboxes An ArrayList that contains only Mailbox objects.
+	 * @param dontCopy true iff it is not possible for the mailboxes ArrayList to be modified by someone else.
+	 */
+	public MailboxList(ArrayList<Address> mailboxes, boolean dontCopy) {
+		if (mailboxes != null)
+			this.mailboxes = (dontCopy ? mailboxes : new ArrayList<Address>(mailboxes));
+		else
+			this.mailboxes = new ArrayList<Address>(0);
+	}
+
+	/**
+	 * The number of elements in this list.
+	 */
+	public int size() {
+		return mailboxes.size();
+	}
+
+	/**
+	 * Gets an address.
+	 */
+	public Mailbox get(int index) {
+		if (0 > index || size() <= index)
+			throw new IndexOutOfBoundsException();
+		return (Mailbox)mailboxes.get(index);
+	}
+
+	/**
+	 * Dumps a representation of this mailbox list to
+	 * stdout, for debugging purposes.
+	 */
+	public void print() {
+		for (int i = 0; i < size(); i++) {
+			Mailbox mailbox = get(i);
+			System.out.println(mailbox.toString());
+		}
+	}
+
+}
diff --git a/src/org/apache/james/mime4j/field/address/NamedMailbox.java b/src/org/apache/james/mime4j/field/address/NamedMailbox.java
new file mode 100644
index 0000000..4b83060
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/address/NamedMailbox.java
@@ -0,0 +1,71 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you 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 org.apache.james.mime4j.field.address;
+
+/**
+ * A Mailbox that has a name/description.
+ *
+ *
+ */
+public class NamedMailbox extends Mailbox {
+	private String name;
+
+	/**
+	 * @see Mailbox#Mailbox(String, String)
+	 */
+	public NamedMailbox(String name, String localPart, String domain) {
+		super(localPart, domain);
+		this.name = name;
+	}
+
+	/**
+	 * @see Mailbox#Mailbox(DomainList, String, String)
+	 */
+	public NamedMailbox(String name, DomainList route, String localPart, String domain) {
+		super(route, localPart, domain);
+		this.name = name;
+	}
+
+	/**
+	 * Creates a named mailbox based on an unnamed mailbox.
+	 */
+	public NamedMailbox(String name, Mailbox baseMailbox) {
+		super(baseMailbox.getRoute(), baseMailbox.getLocalPart(), baseMailbox.getDomain());
+		this.name = name;
+	}
+
+	/**
+	 * Returns the name of the mailbox.
+	 */
+	public String getName() {
+		return this.name;
+	}
+
+	/**
+	 * Same features (or problems) as Mailbox.getAddressString(boolean),
+	 * only more so.
+	 *
+	 * @see Mailbox#getAddressString(boolean)
+	 */
+	@Override
+	public String getAddressString(boolean includeRoute) {
+		return (name == null ? "" : name + " ") + super.getAddressString(includeRoute);
+	}
+}
diff --git a/src/org/apache/james/mime4j/field/address/parser/ASTaddr_spec.java b/src/org/apache/james/mime4j/field/address/parser/ASTaddr_spec.java
new file mode 100644
index 0000000..4d56d00
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/address/parser/ASTaddr_spec.java
@@ -0,0 +1,19 @@
+/* Generated By:JJTree: Do not edit this line. ASTaddr_spec.java */
+
+package org.apache.james.mime4j.field.address.parser;
+
+public class ASTaddr_spec extends SimpleNode {
+  public ASTaddr_spec(int id) {
+    super(id);
+  }
+
+  public ASTaddr_spec(AddressListParser p, int id) {
+    super(p, id);
+  }
+
+
+  /** Accept the visitor. **/
+  public Object jjtAccept(AddressListParserVisitor visitor, Object data) {
+    return visitor.visit(this, data);
+  }
+}
diff --git a/src/org/apache/james/mime4j/field/address/parser/ASTaddress.java b/src/org/apache/james/mime4j/field/address/parser/ASTaddress.java
new file mode 100644
index 0000000..47bdeda
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/address/parser/ASTaddress.java
@@ -0,0 +1,19 @@
+/* Generated By:JJTree: Do not edit this line. ASTaddress.java */
+
+package org.apache.james.mime4j.field.address.parser;
+
+public class ASTaddress extends SimpleNode {
+  public ASTaddress(int id) {
+    super(id);
+  }
+
+  public ASTaddress(AddressListParser p, int id) {
+    super(p, id);
+  }
+
+
+  /** Accept the visitor. **/
+  public Object jjtAccept(AddressListParserVisitor visitor, Object data) {
+    return visitor.visit(this, data);
+  }
+}
diff --git a/src/org/apache/james/mime4j/field/address/parser/ASTaddress_list.java b/src/org/apache/james/mime4j/field/address/parser/ASTaddress_list.java
new file mode 100644
index 0000000..737840e
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/address/parser/ASTaddress_list.java
@@ -0,0 +1,19 @@
+/* Generated By:JJTree: Do not edit this line. ASTaddress_list.java */
+
+package org.apache.james.mime4j.field.address.parser;
+
+public class ASTaddress_list extends SimpleNode {
+  public ASTaddress_list(int id) {
+    super(id);
+  }
+
+  public ASTaddress_list(AddressListParser p, int id) {
+    super(p, id);
+  }
+
+
+  /** Accept the visitor. **/
+  public Object jjtAccept(AddressListParserVisitor visitor, Object data) {
+    return visitor.visit(this, data);
+  }
+}
diff --git a/src/org/apache/james/mime4j/field/address/parser/ASTangle_addr.java b/src/org/apache/james/mime4j/field/address/parser/ASTangle_addr.java
new file mode 100644
index 0000000..8cb8f42
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/address/parser/ASTangle_addr.java
@@ -0,0 +1,19 @@
+/* Generated By:JJTree: Do not edit this line. ASTangle_addr.java */
+
+package org.apache.james.mime4j.field.address.parser;
+
+public class ASTangle_addr extends SimpleNode {
+  public ASTangle_addr(int id) {
+    super(id);
+  }
+
+  public ASTangle_addr(AddressListParser p, int id) {
+    super(p, id);
+  }
+
+
+  /** Accept the visitor. **/
+  public Object jjtAccept(AddressListParserVisitor visitor, Object data) {
+    return visitor.visit(this, data);
+  }
+}
diff --git a/src/org/apache/james/mime4j/field/address/parser/ASTdomain.java b/src/org/apache/james/mime4j/field/address/parser/ASTdomain.java
new file mode 100644
index 0000000..b526643
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/address/parser/ASTdomain.java
@@ -0,0 +1,19 @@
+/* Generated By:JJTree: Do not edit this line. ASTdomain.java */
+
+package org.apache.james.mime4j.field.address.parser;
+
+public class ASTdomain extends SimpleNode {
+  public ASTdomain(int id) {
+    super(id);
+  }
+
+  public ASTdomain(AddressListParser p, int id) {
+    super(p, id);
+  }
+
+
+  /** Accept the visitor. **/
+  public Object jjtAccept(AddressListParserVisitor visitor, Object data) {
+    return visitor.visit(this, data);
+  }
+}
diff --git a/src/org/apache/james/mime4j/field/address/parser/ASTgroup_body.java b/src/org/apache/james/mime4j/field/address/parser/ASTgroup_body.java
new file mode 100644
index 0000000..f6017b9
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/address/parser/ASTgroup_body.java
@@ -0,0 +1,19 @@
+/* Generated By:JJTree: Do not edit this line. ASTgroup_body.java */
+
+package org.apache.james.mime4j.field.address.parser;
+
+public class ASTgroup_body extends SimpleNode {
+  public ASTgroup_body(int id) {
+    super(id);
+  }
+
+  public ASTgroup_body(AddressListParser p, int id) {
+    super(p, id);
+  }
+
+
+  /** Accept the visitor. **/
+  public Object jjtAccept(AddressListParserVisitor visitor, Object data) {
+    return visitor.visit(this, data);
+  }
+}
diff --git a/src/org/apache/james/mime4j/field/address/parser/ASTlocal_part.java b/src/org/apache/james/mime4j/field/address/parser/ASTlocal_part.java
new file mode 100644
index 0000000..5c244fa
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/address/parser/ASTlocal_part.java
@@ -0,0 +1,19 @@
+/* Generated By:JJTree: Do not edit this line. ASTlocal_part.java */
+
+package org.apache.james.mime4j.field.address.parser;
+
+public class ASTlocal_part extends SimpleNode {
+  public ASTlocal_part(int id) {
+    super(id);
+  }
+
+  public ASTlocal_part(AddressListParser p, int id) {
+    super(p, id);
+  }
+
+
+  /** Accept the visitor. **/
+  public Object jjtAccept(AddressListParserVisitor visitor, Object data) {
+    return visitor.visit(this, data);
+  }
+}
diff --git a/src/org/apache/james/mime4j/field/address/parser/ASTmailbox.java b/src/org/apache/james/mime4j/field/address/parser/ASTmailbox.java
new file mode 100644
index 0000000..aeb469d
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/address/parser/ASTmailbox.java
@@ -0,0 +1,19 @@
+/* Generated By:JJTree: Do not edit this line. ASTmailbox.java */
+
+package org.apache.james.mime4j.field.address.parser;
+
+public class ASTmailbox extends SimpleNode {
+  public ASTmailbox(int id) {
+    super(id);
+  }
+
+  public ASTmailbox(AddressListParser p, int id) {
+    super(p, id);
+  }
+
+
+  /** Accept the visitor. **/
+  public Object jjtAccept(AddressListParserVisitor visitor, Object data) {
+    return visitor.visit(this, data);
+  }
+}
diff --git a/src/org/apache/james/mime4j/field/address/parser/ASTname_addr.java b/src/org/apache/james/mime4j/field/address/parser/ASTname_addr.java
new file mode 100644
index 0000000..846c731
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/address/parser/ASTname_addr.java
@@ -0,0 +1,19 @@
+/* Generated By:JJTree: Do not edit this line. ASTname_addr.java */
+
+package org.apache.james.mime4j.field.address.parser;
+
+public class ASTname_addr extends SimpleNode {
+  public ASTname_addr(int id) {
+    super(id);
+  }
+
+  public ASTname_addr(AddressListParser p, int id) {
+    super(p, id);
+  }
+
+
+  /** Accept the visitor. **/
+  public Object jjtAccept(AddressListParserVisitor visitor, Object data) {
+    return visitor.visit(this, data);
+  }
+}
diff --git a/src/org/apache/james/mime4j/field/address/parser/ASTphrase.java b/src/org/apache/james/mime4j/field/address/parser/ASTphrase.java
new file mode 100644
index 0000000..7d711c5
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/address/parser/ASTphrase.java
@@ -0,0 +1,19 @@
+/* Generated By:JJTree: Do not edit this line. ASTphrase.java */
+
+package org.apache.james.mime4j.field.address.parser;
+
+public class ASTphrase extends SimpleNode {
+  public ASTphrase(int id) {
+    super(id);
+  }
+
+  public ASTphrase(AddressListParser p, int id) {
+    super(p, id);
+  }
+
+
+  /** Accept the visitor. **/
+  public Object jjtAccept(AddressListParserVisitor visitor, Object data) {
+    return visitor.visit(this, data);
+  }
+}
diff --git a/src/org/apache/james/mime4j/field/address/parser/ASTroute.java b/src/org/apache/james/mime4j/field/address/parser/ASTroute.java
new file mode 100644
index 0000000..54ea115
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/address/parser/ASTroute.java
@@ -0,0 +1,19 @@
+/* Generated By:JJTree: Do not edit this line. ASTroute.java */
+
+package org.apache.james.mime4j.field.address.parser;
+
+public class ASTroute extends SimpleNode {
+  public ASTroute(int id) {
+    super(id);
+  }
+
+  public ASTroute(AddressListParser p, int id) {
+    super(p, id);
+  }
+
+
+  /** Accept the visitor. **/
+  public Object jjtAccept(AddressListParserVisitor visitor, Object data) {
+    return visitor.visit(this, data);
+  }
+}
diff --git a/src/org/apache/james/mime4j/field/address/parser/AddressListParser.java b/src/org/apache/james/mime4j/field/address/parser/AddressListParser.java
new file mode 100644
index 0000000..8094df0
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/address/parser/AddressListParser.java
@@ -0,0 +1,977 @@
+/* Generated By:JJTree&JavaCC: Do not edit this line. AddressListParser.java */
+/*
+ *  Copyright 2004 the mime4j 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 org.apache.james.mime4j.field.address.parser;
+
+public class AddressListParser/*@bgen(jjtree)*/implements AddressListParserTreeConstants, AddressListParserConstants {/*@bgen(jjtree)*/
+  protected JJTAddressListParserState jjtree = new JJTAddressListParserState();public static void main(String args[]) throws ParseException {
+                while (true) {
+                    try {
+                                AddressListParser parser = new AddressListParser(System.in);
+                        parser.parseLine();
+                        ((SimpleNode)parser.jjtree.rootNode()).dump("> ");
+                    } catch (Exception x) {
+                                x.printStackTrace();
+                                return;
+                    }
+                }
+    }
+
+    private static void log(String msg) {
+        System.out.print(msg);
+    }
+
+    public ASTaddress_list parse() throws ParseException {
+        try {
+            parseAll();
+            return (ASTaddress_list)jjtree.rootNode();
+        } catch (TokenMgrError tme) {
+            throw new ParseException(tme.getMessage());
+        }
+    }
+
+
+    void jjtreeOpenNodeScope(Node n) {
+        ((SimpleNode)n).firstToken = getToken(1);
+    }
+
+    void jjtreeCloseNodeScope(Node n) {
+        ((SimpleNode)n).lastToken = getToken(0);
+    }
+
+  final public void parseLine() throws ParseException {
+    address_list();
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case 1:
+      jj_consume_token(1);
+      break;
+    default:
+      jj_la1[0] = jj_gen;
+      ;
+    }
+    jj_consume_token(2);
+  }
+
+  final public void parseAll() throws ParseException {
+    address_list();
+    jj_consume_token(0);
+  }
+
+  final public void address_list() throws ParseException {
+ /*@bgen(jjtree) address_list */
+  ASTaddress_list jjtn000 = new ASTaddress_list(JJTADDRESS_LIST);
+  boolean jjtc000 = true;
+  jjtree.openNodeScope(jjtn000);
+  jjtreeOpenNodeScope(jjtn000);
+    try {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case 6:
+      case DOTATOM:
+      case QUOTEDSTRING:
+        address();
+        break;
+      default:
+        jj_la1[1] = jj_gen;
+        ;
+      }
+      label_1:
+      while (true) {
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case 3:
+          ;
+          break;
+        default:
+          jj_la1[2] = jj_gen;
+          break label_1;
+        }
+        jj_consume_token(3);
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case 6:
+        case DOTATOM:
+        case QUOTEDSTRING:
+          address();
+          break;
+        default:
+          jj_la1[3] = jj_gen;
+          ;
+        }
+      }
+    } catch (Throwable jjte000) {
+          if (jjtc000) {
+            jjtree.clearNodeScope(jjtn000);
+            jjtc000 = false;
+          } else {
+            jjtree.popNode();
+          }
+          if (jjte000 instanceof RuntimeException) {
+            {if (true) throw (RuntimeException)jjte000;}
+          }
+          if (jjte000 instanceof ParseException) {
+            {if (true) throw (ParseException)jjte000;}
+          }
+          {if (true) throw (Error)jjte000;}
+    } finally {
+          if (jjtc000) {
+            jjtree.closeNodeScope(jjtn000, true);
+            jjtreeCloseNodeScope(jjtn000);
+          }
+    }
+  }
+
+  final public void address() throws ParseException {
+ /*@bgen(jjtree) address */
+  ASTaddress jjtn000 = new ASTaddress(JJTADDRESS);
+  boolean jjtc000 = true;
+  jjtree.openNodeScope(jjtn000);
+  jjtreeOpenNodeScope(jjtn000);
+    try {
+      if (jj_2_1(2147483647)) {
+        addr_spec();
+      } else {
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case 6:
+          angle_addr();
+          break;
+        case DOTATOM:
+        case QUOTEDSTRING:
+          phrase();
+          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+          case 4:
+            group_body();
+            break;
+          case 6:
+            angle_addr();
+            break;
+          default:
+            jj_la1[4] = jj_gen;
+            jj_consume_token(-1);
+            throw new ParseException();
+          }
+          break;
+        default:
+          jj_la1[5] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
+        }
+      }
+    } catch (Throwable jjte000) {
+          if (jjtc000) {
+            jjtree.clearNodeScope(jjtn000);
+            jjtc000 = false;
+          } else {
+            jjtree.popNode();
+          }
+          if (jjte000 instanceof RuntimeException) {
+            {if (true) throw (RuntimeException)jjte000;}
+          }
+          if (jjte000 instanceof ParseException) {
+            {if (true) throw (ParseException)jjte000;}
+          }
+          {if (true) throw (Error)jjte000;}
+    } finally {
+          if (jjtc000) {
+            jjtree.closeNodeScope(jjtn000, true);
+            jjtreeCloseNodeScope(jjtn000);
+          }
+    }
+  }
+
+  final public void mailbox() throws ParseException {
+ /*@bgen(jjtree) mailbox */
+  ASTmailbox jjtn000 = new ASTmailbox(JJTMAILBOX);
+  boolean jjtc000 = true;
+  jjtree.openNodeScope(jjtn000);
+  jjtreeOpenNodeScope(jjtn000);
+    try {
+      if (jj_2_2(2147483647)) {
+        addr_spec();
+      } else {
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case 6:
+          angle_addr();
+          break;
+        case DOTATOM:
+        case QUOTEDSTRING:
+          name_addr();
+          break;
+        default:
+          jj_la1[6] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
+        }
+      }
+    } catch (Throwable jjte000) {
+          if (jjtc000) {
+            jjtree.clearNodeScope(jjtn000);
+            jjtc000 = false;
+          } else {
+            jjtree.popNode();
+          }
+          if (jjte000 instanceof RuntimeException) {
+            {if (true) throw (RuntimeException)jjte000;}
+          }
+          if (jjte000 instanceof ParseException) {
+            {if (true) throw (ParseException)jjte000;}
+          }
+          {if (true) throw (Error)jjte000;}
+    } finally {
+          if (jjtc000) {
+            jjtree.closeNodeScope(jjtn000, true);
+            jjtreeCloseNodeScope(jjtn000);
+          }
+    }
+  }
+
+  final public void name_addr() throws ParseException {
+ /*@bgen(jjtree) name_addr */
+  ASTname_addr jjtn000 = new ASTname_addr(JJTNAME_ADDR);
+  boolean jjtc000 = true;
+  jjtree.openNodeScope(jjtn000);
+  jjtreeOpenNodeScope(jjtn000);
+    try {
+      phrase();
+      angle_addr();
+    } catch (Throwable jjte000) {
+          if (jjtc000) {
+            jjtree.clearNodeScope(jjtn000);
+            jjtc000 = false;
+          } else {
+            jjtree.popNode();
+          }
+          if (jjte000 instanceof RuntimeException) {
+            {if (true) throw (RuntimeException)jjte000;}
+          }
+          if (jjte000 instanceof ParseException) {
+            {if (true) throw (ParseException)jjte000;}
+          }
+          {if (true) throw (Error)jjte000;}
+    } finally {
+          if (jjtc000) {
+            jjtree.closeNodeScope(jjtn000, true);
+            jjtreeCloseNodeScope(jjtn000);
+          }
+    }
+  }
+
+  final public void group_body() throws ParseException {
+ /*@bgen(jjtree) group_body */
+  ASTgroup_body jjtn000 = new ASTgroup_body(JJTGROUP_BODY);
+  boolean jjtc000 = true;
+  jjtree.openNodeScope(jjtn000);
+  jjtreeOpenNodeScope(jjtn000);
+    try {
+      jj_consume_token(4);
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case 6:
+      case DOTATOM:
+      case QUOTEDSTRING:
+        mailbox();
+        break;
+      default:
+        jj_la1[7] = jj_gen;
+        ;
+      }
+      label_2:
+      while (true) {
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case 3:
+          ;
+          break;
+        default:
+          jj_la1[8] = jj_gen;
+          break label_2;
+        }
+        jj_consume_token(3);
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case 6:
+        case DOTATOM:
+        case QUOTEDSTRING:
+          mailbox();
+          break;
+        default:
+          jj_la1[9] = jj_gen;
+          ;
+        }
+      }
+      jj_consume_token(5);
+    } catch (Throwable jjte000) {
+          if (jjtc000) {
+            jjtree.clearNodeScope(jjtn000);
+            jjtc000 = false;
+          } else {
+            jjtree.popNode();
+          }
+          if (jjte000 instanceof RuntimeException) {
+            {if (true) throw (RuntimeException)jjte000;}
+          }
+          if (jjte000 instanceof ParseException) {
+            {if (true) throw (ParseException)jjte000;}
+          }
+          {if (true) throw (Error)jjte000;}
+    } finally {
+          if (jjtc000) {
+            jjtree.closeNodeScope(jjtn000, true);
+            jjtreeCloseNodeScope(jjtn000);
+          }
+    }
+  }
+
+  final public void angle_addr() throws ParseException {
+ /*@bgen(jjtree) angle_addr */
+  ASTangle_addr jjtn000 = new ASTangle_addr(JJTANGLE_ADDR);
+  boolean jjtc000 = true;
+  jjtree.openNodeScope(jjtn000);
+  jjtreeOpenNodeScope(jjtn000);
+    try {
+      jj_consume_token(6);
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case 8:
+        route();
+        break;
+      default:
+        jj_la1[10] = jj_gen;
+        ;
+      }
+      addr_spec();
+      jj_consume_token(7);
+    } catch (Throwable jjte000) {
+          if (jjtc000) {
+            jjtree.clearNodeScope(jjtn000);
+            jjtc000 = false;
+          } else {
+            jjtree.popNode();
+          }
+          if (jjte000 instanceof RuntimeException) {
+            {if (true) throw (RuntimeException)jjte000;}
+          }
+          if (jjte000 instanceof ParseException) {
+            {if (true) throw (ParseException)jjte000;}
+          }
+          {if (true) throw (Error)jjte000;}
+    } finally {
+          if (jjtc000) {
+            jjtree.closeNodeScope(jjtn000, true);
+            jjtreeCloseNodeScope(jjtn000);
+          }
+    }
+  }
+
+  final public void route() throws ParseException {
+ /*@bgen(jjtree) route */
+  ASTroute jjtn000 = new ASTroute(JJTROUTE);
+  boolean jjtc000 = true;
+  jjtree.openNodeScope(jjtn000);
+  jjtreeOpenNodeScope(jjtn000);
+    try {
+      jj_consume_token(8);
+      domain();
+      label_3:
+      while (true) {
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case 3:
+        case 8:
+          ;
+          break;
+        default:
+          jj_la1[11] = jj_gen;
+          break label_3;
+        }
+        label_4:
+        while (true) {
+          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+          case 3:
+            ;
+            break;
+          default:
+            jj_la1[12] = jj_gen;
+            break label_4;
+          }
+          jj_consume_token(3);
+        }
+        jj_consume_token(8);
+        domain();
+      }
+      jj_consume_token(4);
+    } catch (Throwable jjte000) {
+          if (jjtc000) {
+            jjtree.clearNodeScope(jjtn000);
+            jjtc000 = false;
+          } else {
+            jjtree.popNode();
+          }
+          if (jjte000 instanceof RuntimeException) {
+            {if (true) throw (RuntimeException)jjte000;}
+          }
+          if (jjte000 instanceof ParseException) {
+            {if (true) throw (ParseException)jjte000;}
+          }
+          {if (true) throw (Error)jjte000;}
+    } finally {
+          if (jjtc000) {
+            jjtree.closeNodeScope(jjtn000, true);
+            jjtreeCloseNodeScope(jjtn000);
+          }
+    }
+  }
+
+  final public void phrase() throws ParseException {
+ /*@bgen(jjtree) phrase */
+  ASTphrase jjtn000 = new ASTphrase(JJTPHRASE);
+  boolean jjtc000 = true;
+  jjtree.openNodeScope(jjtn000);
+  jjtreeOpenNodeScope(jjtn000);
+    try {
+      label_5:
+      while (true) {
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case DOTATOM:
+          jj_consume_token(DOTATOM);
+          break;
+        case QUOTEDSTRING:
+          jj_consume_token(QUOTEDSTRING);
+          break;
+        default:
+          jj_la1[13] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
+        }
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case DOTATOM:
+        case QUOTEDSTRING:
+          ;
+          break;
+        default:
+          jj_la1[14] = jj_gen;
+          break label_5;
+        }
+      }
+    } finally {
+  if (jjtc000) {
+    jjtree.closeNodeScope(jjtn000, true);
+    jjtreeCloseNodeScope(jjtn000);
+  }
+    }
+  }
+
+  final public void addr_spec() throws ParseException {
+ /*@bgen(jjtree) addr_spec */
+  ASTaddr_spec jjtn000 = new ASTaddr_spec(JJTADDR_SPEC);
+  boolean jjtc000 = true;
+  jjtree.openNodeScope(jjtn000);
+  jjtreeOpenNodeScope(jjtn000);
+    try {
+      local_part();
+      jj_consume_token(8);
+      domain();
+    } catch (Throwable jjte000) {
+          if (jjtc000) {
+            jjtree.clearNodeScope(jjtn000);
+            jjtc000 = false;
+          } else {
+            jjtree.popNode();
+          }
+          if (jjte000 instanceof RuntimeException) {
+            {if (true) throw (RuntimeException)jjte000;}
+          }
+          if (jjte000 instanceof ParseException) {
+            {if (true) throw (ParseException)jjte000;}
+          }
+          {if (true) throw (Error)jjte000;}
+    } finally {
+          if (jjtc000) {
+            jjtree.closeNodeScope(jjtn000, true);
+            jjtreeCloseNodeScope(jjtn000);
+          }
+    }
+  }
+
+  final public void local_part() throws ParseException {
+ /*@bgen(jjtree) local_part */
+  ASTlocal_part jjtn000 = new ASTlocal_part(JJTLOCAL_PART);
+  boolean jjtc000 = true;
+  jjtree.openNodeScope(jjtn000);
+  jjtreeOpenNodeScope(jjtn000);Token t;
+    try {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case DOTATOM:
+        t = jj_consume_token(DOTATOM);
+        break;
+      case QUOTEDSTRING:
+        t = jj_consume_token(QUOTEDSTRING);
+        break;
+      default:
+        jj_la1[15] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+      label_6:
+      while (true) {
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case 9:
+        case DOTATOM:
+        case QUOTEDSTRING:
+          ;
+          break;
+        default:
+          jj_la1[16] = jj_gen;
+          break label_6;
+        }
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case 9:
+          t = jj_consume_token(9);
+          break;
+        default:
+          jj_la1[17] = jj_gen;
+          ;
+        }
+                        if (t.image.charAt(t.image.length() - 1) != '.' || t.kind == AddressListParserConstants.QUOTEDSTRING)
+                                {if (true) throw new ParseException("Words in local part must be separated by '.'");}
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case DOTATOM:
+          t = jj_consume_token(DOTATOM);
+          break;
+        case QUOTEDSTRING:
+          t = jj_consume_token(QUOTEDSTRING);
+          break;
+        default:
+          jj_la1[18] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
+        }
+      }
+    } finally {
+          if (jjtc000) {
+            jjtree.closeNodeScope(jjtn000, true);
+            jjtreeCloseNodeScope(jjtn000);
+          }
+    }
+  }
+
+  final public void domain() throws ParseException {
+ /*@bgen(jjtree) domain */
+  ASTdomain jjtn000 = new ASTdomain(JJTDOMAIN);
+  boolean jjtc000 = true;
+  jjtree.openNodeScope(jjtn000);
+  jjtreeOpenNodeScope(jjtn000);Token t;
+    try {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case DOTATOM:
+        t = jj_consume_token(DOTATOM);
+        label_7:
+        while (true) {
+          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+          case 9:
+          case DOTATOM:
+            ;
+            break;
+          default:
+            jj_la1[19] = jj_gen;
+            break label_7;
+          }
+          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+          case 9:
+            t = jj_consume_token(9);
+            break;
+          default:
+            jj_la1[20] = jj_gen;
+            ;
+          }
+                                if (t.image.charAt(t.image.length() - 1) != '.')
+                                        {if (true) throw new ParseException("Atoms in domain names must be separated by '.'");}
+          t = jj_consume_token(DOTATOM);
+        }
+        break;
+      case DOMAINLITERAL:
+        jj_consume_token(DOMAINLITERAL);
+        break;
+      default:
+        jj_la1[21] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+    } finally {
+          if (jjtc000) {
+            jjtree.closeNodeScope(jjtn000, true);
+            jjtreeCloseNodeScope(jjtn000);
+          }
+    }
+  }
+
+  final private boolean jj_2_1(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_1(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(0, xla); }
+  }
+
+  final private boolean jj_2_2(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_2(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(1, xla); }
+  }
+
+  final private boolean jj_3R_11() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(9)) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(14)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(31)) return true;
+    }
+    return false;
+  }
+
+  final private boolean jj_3R_13() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(9)) jj_scanpos = xsp;
+    if (jj_scan_token(DOTATOM)) return true;
+    return false;
+  }
+
+  final private boolean jj_3R_8() {
+    if (jj_3R_9()) return true;
+    if (jj_scan_token(8)) return true;
+    if (jj_3R_10()) return true;
+    return false;
+  }
+
+  final private boolean jj_3_1() {
+    if (jj_3R_8()) return true;
+    return false;
+  }
+
+  final private boolean jj_3R_12() {
+    if (jj_scan_token(DOTATOM)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_13()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  final private boolean jj_3R_10() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_12()) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(18)) return true;
+    }
+    return false;
+  }
+
+  final private boolean jj_3_2() {
+    if (jj_3R_8()) return true;
+    return false;
+  }
+
+  final private boolean jj_3R_9() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(14)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(31)) return true;
+    }
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_11()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  public AddressListParserTokenManager token_source;
+  SimpleCharStream jj_input_stream;
+  public Token token, jj_nt;
+  private int jj_ntk;
+  private Token jj_scanpos, jj_lastpos;
+  private int jj_la;
+  public boolean lookingAhead = false;
+  private boolean jj_semLA;
+  private int jj_gen;
+  final private int[] jj_la1 = new int[22];
+  static private int[] jj_la1_0;
+  static private int[] jj_la1_1;
+  static {
+      jj_la1_0();
+      jj_la1_1();
+   }
+   private static void jj_la1_0() {
+      jj_la1_0 = new int[] {0x2,0x80004040,0x8,0x80004040,0x50,0x80004040,0x80004040,0x80004040,0x8,0x80004040,0x100,0x108,0x8,0x80004000,0x80004000,0x80004000,0x80004200,0x200,0x80004000,0x4200,0x200,0x44000,};
+   }
+   private static void jj_la1_1() {
+      jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+   }
+  final private JJCalls[] jj_2_rtns = new JJCalls[2];
+  private boolean jj_rescan = false;
+  private int jj_gc = 0;
+
+  public AddressListParser(java.io.InputStream stream) {
+     this(stream, null);
+  }
+  public AddressListParser(java.io.InputStream stream, String encoding) {
+    try { jj_input_stream = new SimpleCharStream(stream, encoding, 1, 1); } catch(java.io.UnsupportedEncodingException e) { throw new RuntimeException(e); }
+    token_source = new AddressListParserTokenManager(jj_input_stream);
+    token = new Token();
+    jj_ntk = -1;
+    jj_gen = 0;
+    for (int i = 0; i < 22; i++) jj_la1[i] = -1;
+    for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
+  }
+
+  public void ReInit(java.io.InputStream stream) {
+     ReInit(stream, null);
+  }
+  public void ReInit(java.io.InputStream stream, String encoding) {
+    try { jj_input_stream.ReInit(stream, encoding, 1, 1); } catch(java.io.UnsupportedEncodingException e) { throw new RuntimeException(e); }
+    token_source.ReInit(jj_input_stream);
+    token = new Token();
+    jj_ntk = -1;
+    jjtree.reset();
+    jj_gen = 0;
+    for (int i = 0; i < 22; i++) jj_la1[i] = -1;
+    for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
+  }
+
+  public AddressListParser(java.io.Reader stream) {
+    jj_input_stream = new SimpleCharStream(stream, 1, 1);
+    token_source = new AddressListParserTokenManager(jj_input_stream);
+    token = new Token();
+    jj_ntk = -1;
+    jj_gen = 0;
+    for (int i = 0; i < 22; i++) jj_la1[i] = -1;
+    for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
+  }
+
+  public void ReInit(java.io.Reader stream) {
+    jj_input_stream.ReInit(stream, 1, 1);
+    token_source.ReInit(jj_input_stream);
+    token = new Token();
+    jj_ntk = -1;
+    jjtree.reset();
+    jj_gen = 0;
+    for (int i = 0; i < 22; i++) jj_la1[i] = -1;
+    for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
+  }
+
+  public AddressListParser(AddressListParserTokenManager tm) {
+    token_source = tm;
+    token = new Token();
+    jj_ntk = -1;
+    jj_gen = 0;
+    for (int i = 0; i < 22; i++) jj_la1[i] = -1;
+    for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
+  }
+
+  public void ReInit(AddressListParserTokenManager tm) {
+    token_source = tm;
+    token = new Token();
+    jj_ntk = -1;
+    jjtree.reset();
+    jj_gen = 0;
+    for (int i = 0; i < 22; i++) jj_la1[i] = -1;
+    for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
+  }
+
+  final private Token jj_consume_token(int kind) throws ParseException {
+    Token oldToken;
+    if ((oldToken = token).next != null) token = token.next;
+    else token = token.next = token_source.getNextToken();
+    jj_ntk = -1;
+    if (token.kind == kind) {
+      jj_gen++;
+      if (++jj_gc > 100) {
+        jj_gc = 0;
+        for (int i = 0; i < jj_2_rtns.length; i++) {
+          JJCalls c = jj_2_rtns[i];
+          while (c != null) {
+            if (c.gen < jj_gen) c.first = null;
+            c = c.next;
+          }
+        }
+      }
+      return token;
+    }
+    token = oldToken;
+    jj_kind = kind;
+    throw generateParseException();
+  }
+
+  static private final class LookaheadSuccess extends java.lang.Error { }
+  final private LookaheadSuccess jj_ls = new LookaheadSuccess();
+  final private boolean jj_scan_token(int kind) {
+    if (jj_scanpos == jj_lastpos) {
+      jj_la--;
+      if (jj_scanpos.next == null) {
+        jj_lastpos = jj_scanpos = jj_scanpos.next = token_source.getNextToken();
+      } else {
+        jj_lastpos = jj_scanpos = jj_scanpos.next;
+      }
+    } else {
+      jj_scanpos = jj_scanpos.next;
+    }
+    if (jj_rescan) {
+      int i = 0; Token tok = token;
+      while (tok != null && tok != jj_scanpos) { i++; tok = tok.next; }
+      if (tok != null) jj_add_error_token(kind, i);
+    }
+    if (jj_scanpos.kind != kind) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) throw jj_ls;
+    return false;
+  }
+
+  final public Token getNextToken() {
+    if (token.next != null) token = token.next;
+    else token = token.next = token_source.getNextToken();
+    jj_ntk = -1;
+    jj_gen++;
+    return token;
+  }
+
+  final public Token getToken(int index) {
+    Token t = lookingAhead ? jj_scanpos : token;
+    for (int i = 0; i < index; i++) {
+      if (t.next != null) t = t.next;
+      else t = t.next = token_source.getNextToken();
+    }
+    return t;
+  }
+
+  final private int jj_ntk() {
+    if ((jj_nt=token.next) == null)
+      return (jj_ntk = (token.next=token_source.getNextToken()).kind);
+    else
+      return (jj_ntk = jj_nt.kind);
+  }
+
+  private java.util.Vector<int[]> jj_expentries = new java.util.Vector<int[]>();
+  private int[] jj_expentry;
+  private int jj_kind = -1;
+  private int[] jj_lasttokens = new int[100];
+  private int jj_endpos;
+
+  private void jj_add_error_token(int kind, int pos) {
+    if (pos >= 100) return;
+    if (pos == jj_endpos + 1) {
+      jj_lasttokens[jj_endpos++] = kind;
+    } else if (jj_endpos != 0) {
+      jj_expentry = new int[jj_endpos];
+      for (int i = 0; i < jj_endpos; i++) {
+        jj_expentry[i] = jj_lasttokens[i];
+      }
+      boolean exists = false;
+      for (java.util.Enumeration<int[]> e = jj_expentries.elements(); e.hasMoreElements();) {
+        int[] oldentry = e.nextElement();
+        if (oldentry.length == jj_expentry.length) {
+          exists = true;
+          for (int i = 0; i < jj_expentry.length; i++) {
+            if (oldentry[i] != jj_expentry[i]) {
+              exists = false;
+              break;
+            }
+          }
+          if (exists) break;
+        }
+      }
+      if (!exists) jj_expentries.addElement(jj_expentry);
+      if (pos != 0) jj_lasttokens[(jj_endpos = pos) - 1] = kind;
+    }
+  }
+
+  public ParseException generateParseException() {
+    jj_expentries.removeAllElements();
+    boolean[] la1tokens = new boolean[34];
+    for (int i = 0; i < 34; i++) {
+      la1tokens[i] = false;
+    }
+    if (jj_kind >= 0) {
+      la1tokens[jj_kind] = true;
+      jj_kind = -1;
+    }
+    for (int i = 0; i < 22; i++) {
+      if (jj_la1[i] == jj_gen) {
+        for (int j = 0; j < 32; j++) {
+          if ((jj_la1_0[i] & (1<<j)) != 0) {
+            la1tokens[j] = true;
+          }
+          if ((jj_la1_1[i] & (1<<j)) != 0) {
+            la1tokens[32+j] = true;
+          }
+        }
+      }
+    }
+    for (int i = 0; i < 34; i++) {
+      if (la1tokens[i]) {
+        jj_expentry = new int[1];
+        jj_expentry[0] = i;
+        jj_expentries.addElement(jj_expentry);
+      }
+    }
+    jj_endpos = 0;
+    jj_rescan_token();
+    jj_add_error_token(0, 0);
+    int[][] exptokseq = new int[jj_expentries.size()][];
+    for (int i = 0; i < jj_expentries.size(); i++) {
+      exptokseq[i] = jj_expentries.elementAt(i);
+    }
+    return new ParseException(token, exptokseq, tokenImage);
+  }
+
+  final public void enable_tracing() {
+  }
+
+  final public void disable_tracing() {
+  }
+
+  final private void jj_rescan_token() {
+    jj_rescan = true;
+    for (int i = 0; i < 2; i++) {
+    try {
+      JJCalls p = jj_2_rtns[i];
+      do {
+        if (p.gen > jj_gen) {
+          jj_la = p.arg; jj_lastpos = jj_scanpos = p.first;
+          switch (i) {
+            case 0: jj_3_1(); break;
+            case 1: jj_3_2(); break;
+          }
+        }
+        p = p.next;
+      } while (p != null);
+      } catch(LookaheadSuccess ls) { }
+    }
+    jj_rescan = false;
+  }
+
+  final private void jj_save(int index, int xla) {
+    JJCalls p = jj_2_rtns[index];
+    while (p.gen > jj_gen) {
+      if (p.next == null) { p = p.next = new JJCalls(); break; }
+      p = p.next;
+    }
+    p.gen = jj_gen + xla - jj_la; p.first = token; p.arg = xla;
+  }
+
+  static final class JJCalls {
+    int gen;
+    Token first;
+    int arg;
+    JJCalls next;
+  }
+
+}
diff --git a/src/org/apache/james/mime4j/field/address/parser/AddressListParser.jj b/src/org/apache/james/mime4j/field/address/parser/AddressListParser.jj
new file mode 100644
index 0000000..c14277b
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/address/parser/AddressListParser.jj
@@ -0,0 +1,595 @@
+/*@bgen(jjtree) Generated By:JJTree: Do not edit this line. /Users/jason/Projects/apache-mime4j-0.3/target/generated-sources/jjtree/org/apache/james/mime4j/field/address/parser/AddressListParser.jj */
+/*@egen*//****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you 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.                                           *
+ ****************************************************************/
+
+
+/**
+ * RFC2822 address list parser.
+ *
+ * Created 9/17/2004
+ * by Joe Cheng <code@joecheng.com>
+ */
+
+options {
+	STATIC=false;
+	LOOKAHEAD=1;                                                                                                                               
+	//DEBUG_PARSER=true;
+	//DEBUG_TOKEN_MANAGER=true;
+}
+
+PARSER_BEGIN(AddressListParser)
+/*
+ *  Copyright 2004 the mime4j 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 org.apache.james.mime4j.field.address.parser;
+
+public class AddressListParser/*@bgen(jjtree)*/implements AddressListParserTreeConstants/*@egen*/ {/*@bgen(jjtree)*/
+  protected JJTAddressListParserState jjtree = new JJTAddressListParserState();
+
+/*@egen*/
+    public static void main(String args[]) throws ParseException {
+		while (true) {
+		    try {
+				AddressListParser parser = new AddressListParser(System.in);
+		    	parser.parseLine();
+		    	((SimpleNode)parser.jjtree.rootNode()).dump("> ");
+		    } catch (Exception x) {
+				x.printStackTrace();
+				return;
+		    }
+		}
+    }
+    
+    private static void log(String msg) {
+    	System.out.print(msg);
+    }
+    
+    public ASTaddress_list parse() throws ParseException {
+        try {
+    	    parseAll();
+    	    return (ASTaddress_list)jjtree.rootNode();
+    	} catch (TokenMgrError tme) {
+    	    throw new ParseException(tme.getMessage());
+    	}
+    }
+    
+    
+    void jjtreeOpenNodeScope(Node n) {
+    	((SimpleNode)n).firstToken = getToken(1);
+    }
+    
+    void jjtreeCloseNodeScope(Node n) {
+    	((SimpleNode)n).lastToken = getToken(0);
+    }
+}
+
+PARSER_END(AddressListParser)
+
+void parseLine()       :
+{}
+{
+	address_list() ["\r"] "\n"
+}
+
+void parseAll()       :
+{}
+{
+	address_list() <EOF>
+}
+
+void address_list() :
+{/*@bgen(jjtree) address_list */
+  ASTaddress_list jjtn000 = new ASTaddress_list(JJTADDRESS_LIST);
+  boolean jjtc000 = true;
+  jjtree.openNodeScope(jjtn000);
+  jjtreeOpenNodeScope(jjtn000);
+/*@egen*/}
+{/*@bgen(jjtree) address_list */
+        try {
+/*@egen*/
+	[ address() ]
+	(
+		","
+		[ address() ]
+	)*/*@bgen(jjtree)*/
+        } catch (Throwable jjte000) {
+          if (jjtc000) {
+            jjtree.clearNodeScope(jjtn000);
+            jjtc000 = false;
+          } else {
+            jjtree.popNode();
+          }
+          if (jjte000 instanceof RuntimeException) {
+            throw (RuntimeException)jjte000;
+          }
+          if (jjte000 instanceof ParseException) {
+            throw (ParseException)jjte000;
+          }
+          throw (Error)jjte000;
+        } finally {
+          if (jjtc000) {
+            jjtree.closeNodeScope(jjtn000, true);
+            jjtreeCloseNodeScope(jjtn000);
+          }
+        }
+/*@egen*/
+}
+
+void address() :
+{/*@bgen(jjtree) address */
+  ASTaddress jjtn000 = new ASTaddress(JJTADDRESS);
+  boolean jjtc000 = true;
+  jjtree.openNodeScope(jjtn000);
+  jjtreeOpenNodeScope(jjtn000);
+/*@egen*/}
+{/*@bgen(jjtree) address */
+        try {
+/*@egen*/
+	LOOKAHEAD(2147483647)
+	addr_spec()
+|	angle_addr()
+|	( phrase() (group_body() | angle_addr()) )/*@bgen(jjtree)*/
+        } catch (Throwable jjte000) {
+          if (jjtc000) {
+            jjtree.clearNodeScope(jjtn000);
+            jjtc000 = false;
+          } else {
+            jjtree.popNode();
+          }
+          if (jjte000 instanceof RuntimeException) {
+            throw (RuntimeException)jjte000;
+          }
+          if (jjte000 instanceof ParseException) {
+            throw (ParseException)jjte000;
+          }
+          throw (Error)jjte000;
+        } finally {
+          if (jjtc000) {
+            jjtree.closeNodeScope(jjtn000, true);
+            jjtreeCloseNodeScope(jjtn000);
+          }
+        }
+/*@egen*/
+}
+
+void mailbox() :
+{/*@bgen(jjtree) mailbox */
+  ASTmailbox jjtn000 = new ASTmailbox(JJTMAILBOX);
+  boolean jjtc000 = true;
+  jjtree.openNodeScope(jjtn000);
+  jjtreeOpenNodeScope(jjtn000);
+/*@egen*/}
+{/*@bgen(jjtree) mailbox */
+        try {
+/*@egen*/
+	LOOKAHEAD(2147483647)
+	addr_spec()
+|	angle_addr()
+|	name_addr()/*@bgen(jjtree)*/
+        } catch (Throwable jjte000) {
+          if (jjtc000) {
+            jjtree.clearNodeScope(jjtn000);
+            jjtc000 = false;
+          } else {
+            jjtree.popNode();
+          }
+          if (jjte000 instanceof RuntimeException) {
+            throw (RuntimeException)jjte000;
+          }
+          if (jjte000 instanceof ParseException) {
+            throw (ParseException)jjte000;
+          }
+          throw (Error)jjte000;
+        } finally {
+          if (jjtc000) {
+            jjtree.closeNodeScope(jjtn000, true);
+            jjtreeCloseNodeScope(jjtn000);
+          }
+        }
+/*@egen*/
+}
+
+void name_addr() :
+{/*@bgen(jjtree) name_addr */
+  ASTname_addr jjtn000 = new ASTname_addr(JJTNAME_ADDR);
+  boolean jjtc000 = true;
+  jjtree.openNodeScope(jjtn000);
+  jjtreeOpenNodeScope(jjtn000);
+/*@egen*/}
+{/*@bgen(jjtree) name_addr */
+        try {
+/*@egen*/
+	phrase() angle_addr()/*@bgen(jjtree)*/
+        } catch (Throwable jjte000) {
+          if (jjtc000) {
+            jjtree.clearNodeScope(jjtn000);
+            jjtc000 = false;
+          } else {
+            jjtree.popNode();
+          }
+          if (jjte000 instanceof RuntimeException) {
+            throw (RuntimeException)jjte000;
+          }
+          if (jjte000 instanceof ParseException) {
+            throw (ParseException)jjte000;
+          }
+          throw (Error)jjte000;
+        } finally {
+          if (jjtc000) {
+            jjtree.closeNodeScope(jjtn000, true);
+            jjtreeCloseNodeScope(jjtn000);
+          }
+        }
+/*@egen*/
+}
+
+void group_body() :
+{/*@bgen(jjtree) group_body */
+  ASTgroup_body jjtn000 = new ASTgroup_body(JJTGROUP_BODY);
+  boolean jjtc000 = true;
+  jjtree.openNodeScope(jjtn000);
+  jjtreeOpenNodeScope(jjtn000);
+/*@egen*/}
+{/*@bgen(jjtree) group_body */
+        try {
+/*@egen*/
+	":"
+	[ mailbox() ]
+	(
+		","
+		[ mailbox() ]
+	)*
+	";"/*@bgen(jjtree)*/
+        } catch (Throwable jjte000) {
+          if (jjtc000) {
+            jjtree.clearNodeScope(jjtn000);
+            jjtc000 = false;
+          } else {
+            jjtree.popNode();
+          }
+          if (jjte000 instanceof RuntimeException) {
+            throw (RuntimeException)jjte000;
+          }
+          if (jjte000 instanceof ParseException) {
+            throw (ParseException)jjte000;
+          }
+          throw (Error)jjte000;
+        } finally {
+          if (jjtc000) {
+            jjtree.closeNodeScope(jjtn000, true);
+            jjtreeCloseNodeScope(jjtn000);
+          }
+        }
+/*@egen*/
+}
+
+void angle_addr() :
+{/*@bgen(jjtree) angle_addr */
+  ASTangle_addr jjtn000 = new ASTangle_addr(JJTANGLE_ADDR);
+  boolean jjtc000 = true;
+  jjtree.openNodeScope(jjtn000);
+  jjtreeOpenNodeScope(jjtn000);
+/*@egen*/}
+{/*@bgen(jjtree) angle_addr */
+        try {
+/*@egen*/
+	"<" [ route() ] addr_spec() ">"/*@bgen(jjtree)*/
+        } catch (Throwable jjte000) {
+          if (jjtc000) {
+            jjtree.clearNodeScope(jjtn000);
+            jjtc000 = false;
+          } else {
+            jjtree.popNode();
+          }
+          if (jjte000 instanceof RuntimeException) {
+            throw (RuntimeException)jjte000;
+          }
+          if (jjte000 instanceof ParseException) {
+            throw (ParseException)jjte000;
+          }
+          throw (Error)jjte000;
+        } finally {
+          if (jjtc000) {
+            jjtree.closeNodeScope(jjtn000, true);
+            jjtreeCloseNodeScope(jjtn000);
+          }
+        }
+/*@egen*/
+}
+
+void route() :
+{/*@bgen(jjtree) route */
+  ASTroute jjtn000 = new ASTroute(JJTROUTE);
+  boolean jjtc000 = true;
+  jjtree.openNodeScope(jjtn000);
+  jjtreeOpenNodeScope(jjtn000);
+/*@egen*/}
+{/*@bgen(jjtree) route */
+        try {
+/*@egen*/
+	"@" domain() ( (",")* "@" domain() )* ":"/*@bgen(jjtree)*/
+        } catch (Throwable jjte000) {
+          if (jjtc000) {
+            jjtree.clearNodeScope(jjtn000);
+            jjtc000 = false;
+          } else {
+            jjtree.popNode();
+          }
+          if (jjte000 instanceof RuntimeException) {
+            throw (RuntimeException)jjte000;
+          }
+          if (jjte000 instanceof ParseException) {
+            throw (ParseException)jjte000;
+          }
+          throw (Error)jjte000;
+        } finally {
+          if (jjtc000) {
+            jjtree.closeNodeScope(jjtn000, true);
+            jjtreeCloseNodeScope(jjtn000);
+          }
+        }
+/*@egen*/
+}
+
+void phrase() :
+{/*@bgen(jjtree) phrase */
+  ASTphrase jjtn000 = new ASTphrase(JJTPHRASE);
+  boolean jjtc000 = true;
+  jjtree.openNodeScope(jjtn000);
+  jjtreeOpenNodeScope(jjtn000);
+/*@egen*/}
+{/*@bgen(jjtree) phrase */
+try {
+/*@egen*/
+(	<DOTATOM>
+|	<QUOTEDSTRING>
+)+/*@bgen(jjtree)*/
+} finally {
+  if (jjtc000) {
+    jjtree.closeNodeScope(jjtn000, true);
+    jjtreeCloseNodeScope(jjtn000);
+  }
+}
+/*@egen*/
+}
+
+void addr_spec() :
+{/*@bgen(jjtree) addr_spec */
+  ASTaddr_spec jjtn000 = new ASTaddr_spec(JJTADDR_SPEC);
+  boolean jjtc000 = true;
+  jjtree.openNodeScope(jjtn000);
+  jjtreeOpenNodeScope(jjtn000);
+/*@egen*/}
+{/*@bgen(jjtree) addr_spec */
+        try {
+/*@egen*/
+	( local_part() "@" domain() )/*@bgen(jjtree)*/
+        } catch (Throwable jjte000) {
+          if (jjtc000) {
+            jjtree.clearNodeScope(jjtn000);
+            jjtc000 = false;
+          } else {
+            jjtree.popNode();
+          }
+          if (jjte000 instanceof RuntimeException) {
+            throw (RuntimeException)jjte000;
+          }
+          if (jjte000 instanceof ParseException) {
+            throw (ParseException)jjte000;
+          }
+          throw (Error)jjte000;
+        } finally {
+          if (jjtc000) {
+            jjtree.closeNodeScope(jjtn000, true);
+            jjtreeCloseNodeScope(jjtn000);
+          }
+        }
+/*@egen*/
+}
+
+void local_part() :
+{/*@bgen(jjtree) local_part */
+  ASTlocal_part jjtn000 = new ASTlocal_part(JJTLOCAL_PART);
+  boolean jjtc000 = true;
+  jjtree.openNodeScope(jjtn000);
+  jjtreeOpenNodeScope(jjtn000);
+/*@egen*/ Token t; }
+{/*@bgen(jjtree) local_part */
+        try {
+/*@egen*/
+	( t=<DOTATOM> | t=<QUOTEDSTRING> )
+	(	[t="."]
+		{
+			if (t.image.charAt(t.image.length() - 1) != '.' || t.kind == AddressListParserConstants.QUOTEDSTRING)
+				throw new ParseException("Words in local part must be separated by '.'");
+		}
+		(	t=<DOTATOM> | t=<QUOTEDSTRING> )
+	)*/*@bgen(jjtree)*/
+        } finally {
+          if (jjtc000) {
+            jjtree.closeNodeScope(jjtn000, true);
+            jjtreeCloseNodeScope(jjtn000);
+          }
+        }
+/*@egen*/
+}
+
+void domain() :
+{/*@bgen(jjtree) domain */
+  ASTdomain jjtn000 = new ASTdomain(JJTDOMAIN);
+  boolean jjtc000 = true;
+  jjtree.openNodeScope(jjtn000);
+  jjtreeOpenNodeScope(jjtn000);
+/*@egen*/ Token t; }
+{/*@bgen(jjtree) domain */
+        try {
+/*@egen*/
+	(	t=<DOTATOM>
+		(	[t="."]
+			{
+				if (t.image.charAt(t.image.length() - 1) != '.')
+					throw new ParseException("Atoms in domain names must be separated by '.'");
+			}
+			t=<DOTATOM>
+		)*
+	)
+|	<DOMAINLITERAL>/*@bgen(jjtree)*/
+        } finally {
+          if (jjtc000) {
+            jjtree.closeNodeScope(jjtn000, true);
+            jjtreeCloseNodeScope(jjtn000);
+          }
+        }
+/*@egen*/
+}
+
+SPECIAL_TOKEN :
+{
+ 	< WS: ( [" ", "\t"] )+ >
+}
+
+TOKEN :
+{
+	< #ALPHA: ["a" - "z", "A" - "Z"] >
+|	< #DIGIT: ["0" - "9"] >
+|	< #ATEXT: ( <ALPHA> | <DIGIT>
+			  | "!" | "#" | "$" | "%"
+			  | "&" | "'" | "*" | "+"
+			  | "-" | "/" | "=" | "?"
+			  | "^" | "_" | "`" | "{"
+			  | "|" | "}" | "~"
+			  )>
+|	< DOTATOM: <ATEXT> ( <ATEXT> | "." )* >
+}
+
+TOKEN_MGR_DECLS :
+{
+	// Keeps track of how many levels of comment nesting
+	// we've encountered.  This is only used when the 2nd
+	// level is reached, for example ((this)), not (this).
+	// This is because the outermost level must be treated
+	// specially anyway, because the outermost ")" has a 
+	// different token type than inner ")" instances.
+	static int commentNest;
+}
+
+MORE :
+{
+	// domain literal
+	"[" : INDOMAINLITERAL
+}
+
+<INDOMAINLITERAL>
+MORE :
+{
+	< <QUOTEDPAIR>> { image.deleteCharAt(image.length() - 2); }
+|	< ~["[", "]", "\\"] >
+}
+
+<INDOMAINLITERAL>
+TOKEN :
+{
+	< DOMAINLITERAL: "]" > { matchedToken.image = image.toString(); }: DEFAULT
+}
+
+MORE :
+{
+	// starts a comment
+	"(" : INCOMMENT
+}
+
+<INCOMMENT>
+SKIP :
+{
+	// ends a comment
+	< COMMENT: ")" > : DEFAULT
+	// if this is ever changed to not be a SKIP, need
+	// to make sure matchedToken.token = token.toString()
+	// is called.
+}
+
+<INCOMMENT>
+MORE :
+{
+	< <QUOTEDPAIR>> { image.deleteCharAt(image.length() - 2); }
+|	"(" { commentNest = 1; } : NESTED_COMMENT
+|	< <ANY>>
+}
+
+<NESTED_COMMENT>
+MORE :
+{
+	< <QUOTEDPAIR>> { image.deleteCharAt(image.length() - 2); }
+|	"(" { ++commentNest; }
+|	")" { --commentNest; if (commentNest == 0) SwitchTo(INCOMMENT); }
+|	< <ANY>>
+}
+
+
+// QUOTED STRINGS
+
+MORE :
+{
+	"\"" { image.deleteCharAt(image.length() - 1); } : INQUOTEDSTRING
+}
+
+<INQUOTEDSTRING>
+MORE :
+{
+	< <QUOTEDPAIR>> { image.deleteCharAt(image.length() - 2); }
+|	< (~["\"", "\\"])+ >
+}
+
+<INQUOTEDSTRING>
+TOKEN :
+{
+	< QUOTEDSTRING: "\"" > { matchedToken.image = image.substring(0, image.length() - 1); } : DEFAULT
+}
+
+// GLOBALS
+
+<*>
+TOKEN :
+{
+	< #QUOTEDPAIR: "\\" <ANY> >
+|	< #ANY: ~[] >
+}
+
+// ERROR!
+/*
+
+<*>
+TOKEN :
+{
+	< UNEXPECTED_CHAR: <ANY> >
+}
+
+*/
\ No newline at end of file
diff --git a/src/org/apache/james/mime4j/field/address/parser/AddressListParserConstants.java b/src/org/apache/james/mime4j/field/address/parser/AddressListParserConstants.java
new file mode 100644
index 0000000..006a082
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/address/parser/AddressListParserConstants.java
@@ -0,0 +1,76 @@
+/* Generated By:JJTree&JavaCC: Do not edit this line. AddressListParserConstants.java */
+/*
+ *  Copyright 2004 the mime4j 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 org.apache.james.mime4j.field.address.parser;
+
+public interface AddressListParserConstants {
+
+  int EOF = 0;
+  int WS = 10;
+  int ALPHA = 11;
+  int DIGIT = 12;
+  int ATEXT = 13;
+  int DOTATOM = 14;
+  int DOMAINLITERAL = 18;
+  int COMMENT = 20;
+  int QUOTEDSTRING = 31;
+  int QUOTEDPAIR = 32;
+  int ANY = 33;
+
+  int DEFAULT = 0;
+  int INDOMAINLITERAL = 1;
+  int INCOMMENT = 2;
+  int NESTED_COMMENT = 3;
+  int INQUOTEDSTRING = 4;
+
+  String[] tokenImage = {
+    "<EOF>",
+    "\"\\r\"",
+    "\"\\n\"",
+    "\",\"",
+    "\":\"",
+    "\";\"",
+    "\"<\"",
+    "\">\"",
+    "\"@\"",
+    "\".\"",
+    "<WS>",
+    "<ALPHA>",
+    "<DIGIT>",
+    "<ATEXT>",
+    "<DOTATOM>",
+    "\"[\"",
+    "<token of kind 16>",
+    "<token of kind 17>",
+    "\"]\"",
+    "\"(\"",
+    "\")\"",
+    "<token of kind 21>",
+    "\"(\"",
+    "<token of kind 23>",
+    "<token of kind 24>",
+    "\"(\"",
+    "\")\"",
+    "<token of kind 27>",
+    "\"\\\"\"",
+    "<token of kind 29>",
+    "<token of kind 30>",
+    "\"\\\"\"",
+    "<QUOTEDPAIR>",
+    "<ANY>",
+  };
+
+}
diff --git a/src/org/apache/james/mime4j/field/address/parser/AddressListParserTokenManager.java b/src/org/apache/james/mime4j/field/address/parser/AddressListParserTokenManager.java
new file mode 100644
index 0000000..d2dd88d
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/address/parser/AddressListParserTokenManager.java
@@ -0,0 +1,1009 @@
+/* Generated By:JJTree&JavaCC: Do not edit this line. AddressListParserTokenManager.java */
+/*
+ *  Copyright 2004 the mime4j 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 org.apache.james.mime4j.field.address.parser;
+
+public class AddressListParserTokenManager implements AddressListParserConstants
+{
+        // Keeps track of how many levels of comment nesting
+        // we've encountered.  This is only used when the 2nd
+        // level is reached, for example ((this)), not (this).
+        // This is because the outermost level must be treated
+        // specially anyway, because the outermost ")" has a 
+        // different token type than inner ")" instances.
+        static int commentNest;
+  public  java.io.PrintStream debugStream = System.out;
+  public  void setDebugStream(java.io.PrintStream ds) { debugStream = ds; }
+private final int jjStopStringLiteralDfa_0(int pos, long active0)
+{
+   switch (pos)
+   {
+      default :
+         return -1;
+   }
+}
+private final int jjStartNfa_0(int pos, long active0)
+{
+   return jjMoveNfa_0(jjStopStringLiteralDfa_0(pos, active0), pos + 1);
+}
+private final int jjStopAtPos(int pos, int kind)
+{
+   jjmatchedKind = kind;
+   jjmatchedPos = pos;
+   return pos + 1;
+}
+private final int jjStartNfaWithStates_0(int pos, int kind, int state)
+{
+   jjmatchedKind = kind;
+   jjmatchedPos = pos;
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) { return pos + 1; }
+   return jjMoveNfa_0(state, pos + 1);
+}
+private final int jjMoveStringLiteralDfa0_0()
+{
+   switch(curChar)
+   {
+      case 10:
+         return jjStopAtPos(0, 2);
+      case 13:
+         return jjStopAtPos(0, 1);
+      case 34:
+         return jjStopAtPos(0, 28);
+      case 40:
+         return jjStopAtPos(0, 19);
+      case 44:
+         return jjStopAtPos(0, 3);
+      case 46:
+         return jjStopAtPos(0, 9);
+      case 58:
+         return jjStopAtPos(0, 4);
+      case 59:
+         return jjStopAtPos(0, 5);
+      case 60:
+         return jjStopAtPos(0, 6);
+      case 62:
+         return jjStopAtPos(0, 7);
+      case 64:
+         return jjStopAtPos(0, 8);
+      case 91:
+         return jjStopAtPos(0, 15);
+      default :
+         return jjMoveNfa_0(1, 0);
+   }
+}
+private final void jjCheckNAdd(int state)
+{
+   if (jjrounds[state] != jjround)
+   {
+      jjstateSet[jjnewStateCnt++] = state;
+      jjrounds[state] = jjround;
+   }
+}
+private final void jjAddStates(int start, int end)
+{
+   do {
+      jjstateSet[jjnewStateCnt++] = jjnextStates[start];
+   } while (start++ != end);
+}
+private final void jjCheckNAddTwoStates(int state1, int state2)
+{
+   jjCheckNAdd(state1);
+   jjCheckNAdd(state2);
+}
+private final void jjCheckNAddStates(int start, int end)
+{
+   do {
+      jjCheckNAdd(jjnextStates[start]);
+   } while (start++ != end);
+}
+private final void jjCheckNAddStates(int start)
+{
+   jjCheckNAdd(jjnextStates[start]);
+   jjCheckNAdd(jjnextStates[start + 1]);
+}
+private final int jjMoveNfa_0(int startState, int curPos)
+{
+   int[] nextStates;
+   int startsAt = 0;
+   jjnewStateCnt = 3;
+   int i = 1;
+   jjstateSet[0] = startState;
+   int j, kind = 0x7fffffff;
+   for (;;)
+   {
+      if (++jjround == 0x7fffffff)
+         ReInitRounds();
+      if (curChar < 64)
+      {
+         long l = 1L << curChar;
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 1:
+                  if ((0xa3ffacfa00000000L & l) != 0L)
+                  {
+                     if (kind > 14)
+                        kind = 14;
+                     jjCheckNAdd(2);
+                  }
+                  else if ((0x100000200L & l) != 0L)
+                  {
+                     if (kind > 10)
+                        kind = 10;
+                     jjCheckNAdd(0);
+                  }
+                  break;
+               case 0:
+                  if ((0x100000200L & l) == 0L)
+                     break;
+                  kind = 10;
+                  jjCheckNAdd(0);
+                  break;
+               case 2:
+                  if ((0xa3ffecfa00000000L & l) == 0L)
+                     break;
+                  if (kind > 14)
+                     kind = 14;
+                  jjCheckNAdd(2);
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      else if (curChar < 128)
+      {
+         long l = 1L << (curChar & 077);
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 1:
+               case 2:
+                  if ((0x7fffffffc7fffffeL & l) == 0L)
+                     break;
+                  if (kind > 14)
+                     kind = 14;
+                  jjCheckNAdd(2);
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      else
+      {
+         int i2 = (curChar & 0xff) >> 6;
+         long l2 = 1L << (curChar & 077);
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      if (kind != 0x7fffffff)
+      {
+         jjmatchedKind = kind;
+         jjmatchedPos = curPos;
+         kind = 0x7fffffff;
+      }
+      ++curPos;
+      if ((i = jjnewStateCnt) == (startsAt = 3 - (jjnewStateCnt = startsAt)))
+         return curPos;
+      try { curChar = input_stream.readChar(); }
+      catch(java.io.IOException e) { return curPos; }
+   }
+}
+private final int jjStopStringLiteralDfa_2(int pos, long active0)
+{
+   switch (pos)
+   {
+      default :
+         return -1;
+   }
+}
+private final int jjStartNfa_2(int pos, long active0)
+{
+   return jjMoveNfa_2(jjStopStringLiteralDfa_2(pos, active0), pos + 1);
+}
+private final int jjStartNfaWithStates_2(int pos, int kind, int state)
+{
+   jjmatchedKind = kind;
+   jjmatchedPos = pos;
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) { return pos + 1; }
+   return jjMoveNfa_2(state, pos + 1);
+}
+private final int jjMoveStringLiteralDfa0_2()
+{
+   switch(curChar)
+   {
+      case 40:
+         return jjStopAtPos(0, 22);
+      case 41:
+         return jjStopAtPos(0, 20);
+      default :
+         return jjMoveNfa_2(0, 0);
+   }
+}
+static final long[] jjbitVec0 = {
+   0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL
+};
+private final int jjMoveNfa_2(int startState, int curPos)
+{
+   int[] nextStates;
+   int startsAt = 0;
+   jjnewStateCnt = 3;
+   int i = 1;
+   jjstateSet[0] = startState;
+   int j, kind = 0x7fffffff;
+   for (;;)
+   {
+      if (++jjround == 0x7fffffff)
+         ReInitRounds();
+      if (curChar < 64)
+      {
+         long l = 1L << curChar;
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+                  if (kind > 23)
+                     kind = 23;
+                  break;
+               case 1:
+                  if (kind > 21)
+                     kind = 21;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      else if (curChar < 128)
+      {
+         long l = 1L << (curChar & 077);
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+                  if (kind > 23)
+                     kind = 23;
+                  if (curChar == 92)
+                     jjstateSet[jjnewStateCnt++] = 1;
+                  break;
+               case 1:
+                  if (kind > 21)
+                     kind = 21;
+                  break;
+               case 2:
+                  if (kind > 23)
+                     kind = 23;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      else
+      {
+         int i2 = (curChar & 0xff) >> 6;
+         long l2 = 1L << (curChar & 077);
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+                  if ((jjbitVec0[i2] & l2) != 0L && kind > 23)
+                     kind = 23;
+                  break;
+               case 1:
+                  if ((jjbitVec0[i2] & l2) != 0L && kind > 21)
+                     kind = 21;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      if (kind != 0x7fffffff)
+      {
+         jjmatchedKind = kind;
+         jjmatchedPos = curPos;
+         kind = 0x7fffffff;
+      }
+      ++curPos;
+      if ((i = jjnewStateCnt) == (startsAt = 3 - (jjnewStateCnt = startsAt)))
+         return curPos;
+      try { curChar = input_stream.readChar(); }
+      catch(java.io.IOException e) { return curPos; }
+   }
+}
+private final int jjStopStringLiteralDfa_4(int pos, long active0)
+{
+   switch (pos)
+   {
+      default :
+         return -1;
+   }
+}
+private final int jjStartNfa_4(int pos, long active0)
+{
+   return jjMoveNfa_4(jjStopStringLiteralDfa_4(pos, active0), pos + 1);
+}
+private final int jjStartNfaWithStates_4(int pos, int kind, int state)
+{
+   jjmatchedKind = kind;
+   jjmatchedPos = pos;
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) { return pos + 1; }
+   return jjMoveNfa_4(state, pos + 1);
+}
+private final int jjMoveStringLiteralDfa0_4()
+{
+   switch(curChar)
+   {
+      case 34:
+         return jjStopAtPos(0, 31);
+      default :
+         return jjMoveNfa_4(0, 0);
+   }
+}
+private final int jjMoveNfa_4(int startState, int curPos)
+{
+   int[] nextStates;
+   int startsAt = 0;
+   jjnewStateCnt = 3;
+   int i = 1;
+   jjstateSet[0] = startState;
+   int j, kind = 0x7fffffff;
+   for (;;)
+   {
+      if (++jjround == 0x7fffffff)
+         ReInitRounds();
+      if (curChar < 64)
+      {
+         long l = 1L << curChar;
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+               case 2:
+                  if ((0xfffffffbffffffffL & l) == 0L)
+                     break;
+                  if (kind > 30)
+                     kind = 30;
+                  jjCheckNAdd(2);
+                  break;
+               case 1:
+                  if (kind > 29)
+                     kind = 29;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      else if (curChar < 128)
+      {
+         long l = 1L << (curChar & 077);
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+                  if ((0xffffffffefffffffL & l) != 0L)
+                  {
+                     if (kind > 30)
+                        kind = 30;
+                     jjCheckNAdd(2);
+                  }
+                  else if (curChar == 92)
+                     jjstateSet[jjnewStateCnt++] = 1;
+                  break;
+               case 1:
+                  if (kind > 29)
+                     kind = 29;
+                  break;
+               case 2:
+                  if ((0xffffffffefffffffL & l) == 0L)
+                     break;
+                  if (kind > 30)
+                     kind = 30;
+                  jjCheckNAdd(2);
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      else
+      {
+         int i2 = (curChar & 0xff) >> 6;
+         long l2 = 1L << (curChar & 077);
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+               case 2:
+                  if ((jjbitVec0[i2] & l2) == 0L)
+                     break;
+                  if (kind > 30)
+                     kind = 30;
+                  jjCheckNAdd(2);
+                  break;
+               case 1:
+                  if ((jjbitVec0[i2] & l2) != 0L && kind > 29)
+                     kind = 29;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      if (kind != 0x7fffffff)
+      {
+         jjmatchedKind = kind;
+         jjmatchedPos = curPos;
+         kind = 0x7fffffff;
+      }
+      ++curPos;
+      if ((i = jjnewStateCnt) == (startsAt = 3 - (jjnewStateCnt = startsAt)))
+         return curPos;
+      try { curChar = input_stream.readChar(); }
+      catch(java.io.IOException e) { return curPos; }
+   }
+}
+private final int jjStopStringLiteralDfa_3(int pos, long active0)
+{
+   switch (pos)
+   {
+      default :
+         return -1;
+   }
+}
+private final int jjStartNfa_3(int pos, long active0)
+{
+   return jjMoveNfa_3(jjStopStringLiteralDfa_3(pos, active0), pos + 1);
+}
+private final int jjStartNfaWithStates_3(int pos, int kind, int state)
+{
+   jjmatchedKind = kind;
+   jjmatchedPos = pos;
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) { return pos + 1; }
+   return jjMoveNfa_3(state, pos + 1);
+}
+private final int jjMoveStringLiteralDfa0_3()
+{
+   switch(curChar)
+   {
+      case 40:
+         return jjStopAtPos(0, 25);
+      case 41:
+         return jjStopAtPos(0, 26);
+      default :
+         return jjMoveNfa_3(0, 0);
+   }
+}
+private final int jjMoveNfa_3(int startState, int curPos)
+{
+   int[] nextStates;
+   int startsAt = 0;
+   jjnewStateCnt = 3;
+   int i = 1;
+   jjstateSet[0] = startState;
+   int j, kind = 0x7fffffff;
+   for (;;)
+   {
+      if (++jjround == 0x7fffffff)
+         ReInitRounds();
+      if (curChar < 64)
+      {
+         long l = 1L << curChar;
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+                  if (kind > 27)
+                     kind = 27;
+                  break;
+               case 1:
+                  if (kind > 24)
+                     kind = 24;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      else if (curChar < 128)
+      {
+         long l = 1L << (curChar & 077);
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+                  if (kind > 27)
+                     kind = 27;
+                  if (curChar == 92)
+                     jjstateSet[jjnewStateCnt++] = 1;
+                  break;
+               case 1:
+                  if (kind > 24)
+                     kind = 24;
+                  break;
+               case 2:
+                  if (kind > 27)
+                     kind = 27;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      else
+      {
+         int i2 = (curChar & 0xff) >> 6;
+         long l2 = 1L << (curChar & 077);
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+                  if ((jjbitVec0[i2] & l2) != 0L && kind > 27)
+                     kind = 27;
+                  break;
+               case 1:
+                  if ((jjbitVec0[i2] & l2) != 0L && kind > 24)
+                     kind = 24;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      if (kind != 0x7fffffff)
+      {
+         jjmatchedKind = kind;
+         jjmatchedPos = curPos;
+         kind = 0x7fffffff;
+      }
+      ++curPos;
+      if ((i = jjnewStateCnt) == (startsAt = 3 - (jjnewStateCnt = startsAt)))
+         return curPos;
+      try { curChar = input_stream.readChar(); }
+      catch(java.io.IOException e) { return curPos; }
+   }
+}
+private final int jjStopStringLiteralDfa_1(int pos, long active0)
+{
+   switch (pos)
+   {
+      default :
+         return -1;
+   }
+}
+private final int jjStartNfa_1(int pos, long active0)
+{
+   return jjMoveNfa_1(jjStopStringLiteralDfa_1(pos, active0), pos + 1);
+}
+private final int jjStartNfaWithStates_1(int pos, int kind, int state)
+{
+   jjmatchedKind = kind;
+   jjmatchedPos = pos;
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) { return pos + 1; }
+   return jjMoveNfa_1(state, pos + 1);
+}
+private final int jjMoveStringLiteralDfa0_1()
+{
+   switch(curChar)
+   {
+      case 93:
+         return jjStopAtPos(0, 18);
+      default :
+         return jjMoveNfa_1(0, 0);
+   }
+}
+private final int jjMoveNfa_1(int startState, int curPos)
+{
+   int[] nextStates;
+   int startsAt = 0;
+   jjnewStateCnt = 3;
+   int i = 1;
+   jjstateSet[0] = startState;
+   int j, kind = 0x7fffffff;
+   for (;;)
+   {
+      if (++jjround == 0x7fffffff)
+         ReInitRounds();
+      if (curChar < 64)
+      {
+         long l = 1L << curChar;
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+                  if (kind > 17)
+                     kind = 17;
+                  break;
+               case 1:
+                  if (kind > 16)
+                     kind = 16;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      else if (curChar < 128)
+      {
+         long l = 1L << (curChar & 077);
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+                  if ((0xffffffffc7ffffffL & l) != 0L)
+                  {
+                     if (kind > 17)
+                        kind = 17;
+                  }
+                  else if (curChar == 92)
+                     jjstateSet[jjnewStateCnt++] = 1;
+                  break;
+               case 1:
+                  if (kind > 16)
+                     kind = 16;
+                  break;
+               case 2:
+                  if ((0xffffffffc7ffffffL & l) != 0L && kind > 17)
+                     kind = 17;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      else
+      {
+         int i2 = (curChar & 0xff) >> 6;
+         long l2 = 1L << (curChar & 077);
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+                  if ((jjbitVec0[i2] & l2) != 0L && kind > 17)
+                     kind = 17;
+                  break;
+               case 1:
+                  if ((jjbitVec0[i2] & l2) != 0L && kind > 16)
+                     kind = 16;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      if (kind != 0x7fffffff)
+      {
+         jjmatchedKind = kind;
+         jjmatchedPos = curPos;
+         kind = 0x7fffffff;
+      }
+      ++curPos;
+      if ((i = jjnewStateCnt) == (startsAt = 3 - (jjnewStateCnt = startsAt)))
+         return curPos;
+      try { curChar = input_stream.readChar(); }
+      catch(java.io.IOException e) { return curPos; }
+   }
+}
+static final int[] jjnextStates = {
+};
+public static final String[] jjstrLiteralImages = {
+"", "\15", "\12", "\54", "\72", "\73", "\74", "\76", "\100", "\56", null, null, 
+null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
+null, null, null, null, null, null, null, null, };
+public static final String[] lexStateNames = {
+   "DEFAULT", 
+   "INDOMAINLITERAL", 
+   "INCOMMENT", 
+   "NESTED_COMMENT", 
+   "INQUOTEDSTRING", 
+};
+public static final int[] jjnewLexState = {
+   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, -1, -1, 0, 2, 0, -1, 3, -1, -1, 
+   -1, -1, -1, 4, -1, -1, 0, -1, -1, 
+};
+static final long[] jjtoToken = {
+   0x800443ffL, 
+};
+static final long[] jjtoSkip = {
+   0x100400L, 
+};
+static final long[] jjtoSpecial = {
+   0x400L, 
+};
+static final long[] jjtoMore = {
+   0x7feb8000L, 
+};
+protected SimpleCharStream input_stream;
+private final int[] jjrounds = new int[3];
+private final int[] jjstateSet = new int[6];
+StringBuffer image;
+int jjimageLen;
+int lengthOfMatch;
+protected char curChar;
+public AddressListParserTokenManager(SimpleCharStream stream){
+   if (SimpleCharStream.staticFlag)
+      throw new Error("ERROR: Cannot use a static CharStream class with a non-static lexical analyzer.");
+   input_stream = stream;
+}
+public AddressListParserTokenManager(SimpleCharStream stream, int lexState){
+   this(stream);
+   SwitchTo(lexState);
+}
+public void ReInit(SimpleCharStream stream)
+{
+   jjmatchedPos = jjnewStateCnt = 0;
+   curLexState = defaultLexState;
+   input_stream = stream;
+   ReInitRounds();
+}
+private final void ReInitRounds()
+{
+   int i;
+   jjround = 0x80000001;
+   for (i = 3; i-- > 0;)
+      jjrounds[i] = 0x80000000;
+}
+public void ReInit(SimpleCharStream stream, int lexState)
+{
+   ReInit(stream);
+   SwitchTo(lexState);
+}
+public void SwitchTo(int lexState)
+{
+   if (lexState >= 5 || lexState < 0)
+      throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE);
+   else
+      curLexState = lexState;
+}
+
+protected Token jjFillToken()
+{
+   Token t = Token.newToken(jjmatchedKind);
+   t.kind = jjmatchedKind;
+   String im = jjstrLiteralImages[jjmatchedKind];
+   t.image = (im == null) ? input_stream.GetImage() : im;
+   t.beginLine = input_stream.getBeginLine();
+   t.beginColumn = input_stream.getBeginColumn();
+   t.endLine = input_stream.getEndLine();
+   t.endColumn = input_stream.getEndColumn();
+   return t;
+}
+
+int curLexState = 0;
+int defaultLexState = 0;
+int jjnewStateCnt;
+int jjround;
+int jjmatchedPos;
+int jjmatchedKind;
+
+public Token getNextToken() 
+{
+  int kind;
+  Token specialToken = null;
+  Token matchedToken;
+  int curPos = 0;
+
+  EOFLoop :
+  for (;;)
+  {   
+   try   
+   {     
+      curChar = input_stream.BeginToken();
+   }     
+   catch(java.io.IOException e)
+   {        
+      jjmatchedKind = 0;
+      matchedToken = jjFillToken();
+      matchedToken.specialToken = specialToken;
+      return matchedToken;
+   }
+   image = null;
+   jjimageLen = 0;
+
+   for (;;)
+   {
+     switch(curLexState)
+     {
+       case 0:
+         jjmatchedKind = 0x7fffffff;
+         jjmatchedPos = 0;
+         curPos = jjMoveStringLiteralDfa0_0();
+         break;
+       case 1:
+         jjmatchedKind = 0x7fffffff;
+         jjmatchedPos = 0;
+         curPos = jjMoveStringLiteralDfa0_1();
+         break;
+       case 2:
+         jjmatchedKind = 0x7fffffff;
+         jjmatchedPos = 0;
+         curPos = jjMoveStringLiteralDfa0_2();
+         break;
+       case 3:
+         jjmatchedKind = 0x7fffffff;
+         jjmatchedPos = 0;
+         curPos = jjMoveStringLiteralDfa0_3();
+         break;
+       case 4:
+         jjmatchedKind = 0x7fffffff;
+         jjmatchedPos = 0;
+         curPos = jjMoveStringLiteralDfa0_4();
+         break;
+     }
+     if (jjmatchedKind != 0x7fffffff)
+     {
+        if (jjmatchedPos + 1 < curPos)
+           input_stream.backup(curPos - jjmatchedPos - 1);
+        if ((jjtoToken[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L)
+        {
+           matchedToken = jjFillToken();
+           matchedToken.specialToken = specialToken;
+           TokenLexicalActions(matchedToken);
+       if (jjnewLexState[jjmatchedKind] != -1)
+         curLexState = jjnewLexState[jjmatchedKind];
+           return matchedToken;
+        }
+        else if ((jjtoSkip[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L)
+        {
+           if ((jjtoSpecial[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L)
+           {
+              matchedToken = jjFillToken();
+              if (specialToken == null)
+                 specialToken = matchedToken;
+              else
+              {
+                 matchedToken.specialToken = specialToken;
+                 specialToken = (specialToken.next = matchedToken);
+              }
+           }
+         if (jjnewLexState[jjmatchedKind] != -1)
+           curLexState = jjnewLexState[jjmatchedKind];
+           continue EOFLoop;
+        }
+        MoreLexicalActions();
+      if (jjnewLexState[jjmatchedKind] != -1)
+        curLexState = jjnewLexState[jjmatchedKind];
+        curPos = 0;
+        jjmatchedKind = 0x7fffffff;
+        try {
+           curChar = input_stream.readChar();
+           continue;
+        }
+        catch (java.io.IOException e1) { }
+     }
+     int error_line = input_stream.getEndLine();
+     int error_column = input_stream.getEndColumn();
+     String error_after = null;
+     boolean EOFSeen = false;
+     try { input_stream.readChar(); input_stream.backup(1); }
+     catch (java.io.IOException e1) {
+        EOFSeen = true;
+        error_after = curPos <= 1 ? "" : input_stream.GetImage();
+        if (curChar == '\n' || curChar == '\r') {
+           error_line++;
+           error_column = 0;
+        }
+        else
+           error_column++;
+     }
+     if (!EOFSeen) {
+        input_stream.backup(1);
+        error_after = curPos <= 1 ? "" : input_stream.GetImage();
+     }
+     throw new TokenMgrError(EOFSeen, curLexState, error_line, error_column, error_after, curChar, TokenMgrError.LEXICAL_ERROR);
+   }
+  }
+}
+
+void MoreLexicalActions()
+{
+   jjimageLen += (lengthOfMatch = jjmatchedPos + 1);
+   switch(jjmatchedKind)
+   {
+      case 16 :
+         if (image == null)
+            image = new StringBuffer();
+         image.append(input_stream.GetSuffix(jjimageLen));
+         jjimageLen = 0;
+                          image.deleteCharAt(image.length() - 2);
+         break;
+      case 21 :
+         if (image == null)
+            image = new StringBuffer();
+         image.append(input_stream.GetSuffix(jjimageLen));
+         jjimageLen = 0;
+                          image.deleteCharAt(image.length() - 2);
+         break;
+      case 22 :
+         if (image == null)
+            image = new StringBuffer();
+         image.append(input_stream.GetSuffix(jjimageLen));
+         jjimageLen = 0;
+              commentNest = 1;
+         break;
+      case 24 :
+         if (image == null)
+            image = new StringBuffer();
+         image.append(input_stream.GetSuffix(jjimageLen));
+         jjimageLen = 0;
+                          image.deleteCharAt(image.length() - 2);
+         break;
+      case 25 :
+         if (image == null)
+            image = new StringBuffer();
+         image.append(input_stream.GetSuffix(jjimageLen));
+         jjimageLen = 0;
+              ++commentNest;
+         break;
+      case 26 :
+         if (image == null)
+            image = new StringBuffer();
+         image.append(input_stream.GetSuffix(jjimageLen));
+         jjimageLen = 0;
+              --commentNest; if (commentNest == 0) SwitchTo(INCOMMENT);
+         break;
+      case 28 :
+         if (image == null)
+            image = new StringBuffer();
+         image.append(input_stream.GetSuffix(jjimageLen));
+         jjimageLen = 0;
+               image.deleteCharAt(image.length() - 1);
+         break;
+      case 29 :
+         if (image == null)
+            image = new StringBuffer();
+         image.append(input_stream.GetSuffix(jjimageLen));
+         jjimageLen = 0;
+                          image.deleteCharAt(image.length() - 2);
+         break;
+      default : 
+         break;
+   }
+}
+void TokenLexicalActions(Token matchedToken)
+{
+   switch(jjmatchedKind)
+   {
+      case 18 :
+        if (image == null)
+            image = new StringBuffer();
+            image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
+                                 matchedToken.image = image.toString();
+         break;
+      case 31 :
+        if (image == null)
+            image = new StringBuffer();
+            image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
+                                 matchedToken.image = image.substring(0, image.length() - 1);
+         break;
+      default : 
+         break;
+   }
+}
+}
diff --git a/src/org/apache/james/mime4j/field/address/parser/AddressListParserTreeConstants.java b/src/org/apache/james/mime4j/field/address/parser/AddressListParserTreeConstants.java
new file mode 100644
index 0000000..5987f19
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/address/parser/AddressListParserTreeConstants.java
@@ -0,0 +1,35 @@
+/* Generated By:JJTree: Do not edit this line. /Users/jason/Projects/apache-mime4j-0.3/target/generated-sources/jjtree/org/apache/james/mime4j/field/address/parser/AddressListParserTreeConstants.java */
+
+package org.apache.james.mime4j.field.address.parser;
+
+public interface AddressListParserTreeConstants
+{
+  public int JJTVOID = 0;
+  public int JJTADDRESS_LIST = 1;
+  public int JJTADDRESS = 2;
+  public int JJTMAILBOX = 3;
+  public int JJTNAME_ADDR = 4;
+  public int JJTGROUP_BODY = 5;
+  public int JJTANGLE_ADDR = 6;
+  public int JJTROUTE = 7;
+  public int JJTPHRASE = 8;
+  public int JJTADDR_SPEC = 9;
+  public int JJTLOCAL_PART = 10;
+  public int JJTDOMAIN = 11;
+
+
+  public String[] jjtNodeName = {
+    "void",
+    "address_list",
+    "address",
+    "mailbox",
+    "name_addr",
+    "group_body",
+    "angle_addr",
+    "route",
+    "phrase",
+    "addr_spec",
+    "local_part",
+    "domain",
+  };
+}
diff --git a/src/org/apache/james/mime4j/field/address/parser/AddressListParserVisitor.java b/src/org/apache/james/mime4j/field/address/parser/AddressListParserVisitor.java
new file mode 100644
index 0000000..8ec2fe7
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/address/parser/AddressListParserVisitor.java
@@ -0,0 +1,19 @@
+/* Generated By:JJTree: Do not edit this line. /Users/jason/Projects/apache-mime4j-0.3/target/generated-sources/jjtree/org/apache/james/mime4j/field/address/parser/AddressListParserVisitor.java */
+
+package org.apache.james.mime4j.field.address.parser;
+
+public interface AddressListParserVisitor
+{
+  public Object visit(SimpleNode node, Object data);
+  public Object visit(ASTaddress_list node, Object data);
+  public Object visit(ASTaddress node, Object data);
+  public Object visit(ASTmailbox node, Object data);
+  public Object visit(ASTname_addr node, Object data);
+  public Object visit(ASTgroup_body node, Object data);
+  public Object visit(ASTangle_addr node, Object data);
+  public Object visit(ASTroute node, Object data);
+  public Object visit(ASTphrase node, Object data);
+  public Object visit(ASTaddr_spec node, Object data);
+  public Object visit(ASTlocal_part node, Object data);
+  public Object visit(ASTdomain node, Object data);
+}
diff --git a/src/org/apache/james/mime4j/field/address/parser/BaseNode.java b/src/org/apache/james/mime4j/field/address/parser/BaseNode.java
new file mode 100644
index 0000000..7809746
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/address/parser/BaseNode.java
@@ -0,0 +1,30 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you 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 org.apache.james.mime4j.field.address.parser;
+
+import org.apache.james.mime4j.field.address.parser.Node;
+import org.apache.james.mime4j.field.address.parser.Token;
+
+public abstract class BaseNode implements Node {
+  
+  public Token firstToken;
+  public Token lastToken;
+
+}
\ No newline at end of file
diff --git a/src/org/apache/james/mime4j/field/address/parser/JJTAddressListParserState.java b/src/org/apache/james/mime4j/field/address/parser/JJTAddressListParserState.java
new file mode 100644
index 0000000..08b5c5b
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/address/parser/JJTAddressListParserState.java
@@ -0,0 +1,123 @@
+/* Generated By:JJTree: Do not edit this line. /Users/jason/Projects/apache-mime4j-0.3/target/generated-sources/jjtree/org/apache/james/mime4j/field/address/parser/JJTAddressListParserState.java */
+
+package org.apache.james.mime4j.field.address.parser;
+
+class JJTAddressListParserState {
+  private java.util.Stack<Node> nodes;
+  private java.util.Stack<Integer> marks;
+
+  private int sp;		// number of nodes on stack
+  private int mk;		// current mark
+  private boolean node_created;
+
+  JJTAddressListParserState() {
+    nodes = new java.util.Stack<Node>();
+    marks = new java.util.Stack<Integer>();
+    sp = 0;
+    mk = 0;
+  }
+
+  /* Determines whether the current node was actually closed and
+     pushed.  This should only be called in the final user action of a
+     node scope.  */
+  boolean nodeCreated() {
+    return node_created;
+  }
+
+  /* Call this to reinitialize the node stack.  It is called
+     automatically by the parser's ReInit() method. */
+  void reset() {
+    nodes.removeAllElements();
+    marks.removeAllElements();
+    sp = 0;
+    mk = 0;
+  }
+
+  /* Returns the root node of the AST.  It only makes sense to call
+     this after a successful parse. */
+  Node rootNode() {
+    return nodes.elementAt(0);
+  }
+
+  /* Pushes a node on to the stack. */
+  void pushNode(Node n) {
+    nodes.push(n);
+    ++sp;
+  }
+
+  /* Returns the node on the top of the stack, and remove it from the
+     stack.  */
+  Node popNode() {
+    if (--sp < mk) {
+      mk = marks.pop().intValue();
+    }
+    return nodes.pop();
+  }
+
+  /* Returns the node currently on the top of the stack. */
+  Node peekNode() {
+    return nodes.peek();
+  }
+
+  /* Returns the number of children on the stack in the current node
+     scope. */
+  int nodeArity() {
+    return sp - mk;
+  }
+
+
+  void clearNodeScope(Node n) {
+    while (sp > mk) {
+      popNode();
+    }
+    mk = marks.pop().intValue();
+  }
+
+
+  void openNodeScope(Node n) {
+    marks.push(new Integer(mk));
+    mk = sp;
+    n.jjtOpen();
+  }
+
+
+  /* A definite node is constructed from a specified number of
+     children.  That number of nodes are popped from the stack and
+     made the children of the definite node.  Then the definite node
+     is pushed on to the stack. */
+  void closeNodeScope(Node n, int num) {
+    mk = marks.pop().intValue();
+    while (num-- > 0) {
+      Node c = popNode();
+      c.jjtSetParent(n);
+      n.jjtAddChild(c, num);
+    }
+    n.jjtClose();
+    pushNode(n);
+    node_created = true;
+  }
+
+
+  /* A conditional node is constructed if its condition is true.  All
+     the nodes that have been pushed since the node was opened are
+     made children of the the conditional node, which is then pushed
+     on to the stack.  If the condition is false the node is not
+     constructed and they are left on the stack. */
+  void closeNodeScope(Node n, boolean condition) {
+    if (condition) {
+      int a = nodeArity();
+      mk = marks.pop().intValue();
+      while (a-- > 0) {
+	Node c = popNode();
+	c.jjtSetParent(n);
+	n.jjtAddChild(c, a);
+      }
+      n.jjtClose();
+      pushNode(n);
+      node_created = true;
+    } else {
+      mk = marks.pop().intValue();
+      node_created = false;
+    }
+  }
+}
diff --git a/src/org/apache/james/mime4j/field/address/parser/Node.java b/src/org/apache/james/mime4j/field/address/parser/Node.java
new file mode 100644
index 0000000..1588920
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/address/parser/Node.java
@@ -0,0 +1,37 @@
+/* Generated By:JJTree: Do not edit this line. Node.java */
+
+package org.apache.james.mime4j.field.address.parser;
+
+/* All AST nodes must implement this interface.  It provides basic
+   machinery for constructing the parent and child relationships
+   between nodes. */
+
+public interface Node {
+
+  /** This method is called after the node has been made the current
+    node.  It indicates that child nodes can now be added to it. */
+  public void jjtOpen();
+
+  /** This method is called after all the child nodes have been
+    added. */
+  public void jjtClose();
+
+  /** This pair of methods are used to inform the node of its
+    parent. */
+  public void jjtSetParent(Node n);
+  public Node jjtGetParent();
+
+  /** This method tells the node to add its argument to the node's
+    list of children.  */
+  public void jjtAddChild(Node n, int i);
+
+  /** This method returns a child node.  The children are numbered
+     from zero, left to right. */
+  public Node jjtGetChild(int i);
+
+  /** Return the number of children the node has. */
+  public int jjtGetNumChildren();
+
+  /** Accept the visitor. **/
+  public Object jjtAccept(AddressListParserVisitor visitor, Object data);
+}
diff --git a/src/org/apache/james/mime4j/field/address/parser/ParseException.java b/src/org/apache/james/mime4j/field/address/parser/ParseException.java
new file mode 100644
index 0000000..e20146f
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/address/parser/ParseException.java
@@ -0,0 +1,207 @@
+/* Generated By:JavaCC: Do not edit this line. ParseException.java Version 3.0 */
+/*
+ *  Copyright 2004 the mime4j 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 org.apache.james.mime4j.field.address.parser;
+
+/**
+ * This exception is thrown when parse errors are encountered.
+ * You can explicitly create objects of this exception type by
+ * calling the method generateParseException in the generated
+ * parser.
+ *
+ * You can modify this class to customize your error reporting
+ * mechanisms so long as you retain the public fields.
+ */
+public class ParseException extends Exception {
+
+  /**
+   * This constructor is used by the method "generateParseException"
+   * in the generated parser.  Calling this constructor generates
+   * a new object of this type with the fields "currentToken",
+   * "expectedTokenSequences", and "tokenImage" set.  The boolean
+   * flag "specialConstructor" is also set to true to indicate that
+   * this constructor was used to create this object.
+   * This constructor calls its super class with the empty string
+   * to force the "toString" method of parent class "Throwable" to
+   * print the error message in the form:
+   *     ParseException: <result of getMessage>
+   */
+  public ParseException(Token currentTokenVal,
+                        int[][] expectedTokenSequencesVal,
+                        String[] tokenImageVal
+                       )
+  {
+    super("");
+    specialConstructor = true;
+    currentToken = currentTokenVal;
+    expectedTokenSequences = expectedTokenSequencesVal;
+    tokenImage = tokenImageVal;
+  }
+
+  /**
+   * The following constructors are for use by you for whatever
+   * purpose you can think of.  Constructing the exception in this
+   * manner makes the exception behave in the normal way - i.e., as
+   * documented in the class "Throwable".  The fields "errorToken",
+   * "expectedTokenSequences", and "tokenImage" do not contain
+   * relevant information.  The JavaCC generated code does not use
+   * these constructors.
+   */
+
+  public ParseException() {
+    super();
+    specialConstructor = false;
+  }
+
+  public ParseException(String message) {
+    super(message);
+    specialConstructor = false;
+  }
+
+  /**
+   * This variable determines which constructor was used to create
+   * this object and thereby affects the semantics of the
+   * "getMessage" method (see below).
+   */
+  protected boolean specialConstructor;
+
+  /**
+   * This is the last token that has been consumed successfully.  If
+   * this object has been created due to a parse error, the token
+   * followng this token will (therefore) be the first error token.
+   */
+  public Token currentToken;
+
+  /**
+   * Each entry in this array is an array of integers.  Each array
+   * of integers represents a sequence of tokens (by their ordinal
+   * values) that is expected at this point of the parse.
+   */
+  public int[][] expectedTokenSequences;
+
+  /**
+   * This is a reference to the "tokenImage" array of the generated
+   * parser within which the parse error occurred.  This array is
+   * defined in the generated ...Constants interface.
+   */
+  public String[] tokenImage;
+
+  /**
+   * This method has the standard behavior when this object has been
+   * created using the standard constructors.  Otherwise, it uses
+   * "currentToken" and "expectedTokenSequences" to generate a parse
+   * error message and returns it.  If this object has been created
+   * due to a parse error, and you do not catch it (it gets thrown
+   * from the parser), then this method is called during the printing
+   * of the final stack trace, and hence the correct error message
+   * gets displayed.
+   */
+  public String getMessage() {
+    if (!specialConstructor) {
+      return super.getMessage();
+    }
+    StringBuffer expected = new StringBuffer();
+    int maxSize = 0;
+    for (int i = 0; i < expectedTokenSequences.length; i++) {
+      if (maxSize < expectedTokenSequences[i].length) {
+        maxSize = expectedTokenSequences[i].length;
+      }
+      for (int j = 0; j < expectedTokenSequences[i].length; j++) {
+        expected.append(tokenImage[expectedTokenSequences[i][j]]).append(" ");
+      }
+      if (expectedTokenSequences[i][expectedTokenSequences[i].length - 1] != 0) {
+        expected.append("...");
+      }
+      expected.append(eol).append("    ");
+    }
+    String retval = "Encountered \"";
+    Token tok = currentToken.next;
+    for (int i = 0; i < maxSize; i++) {
+      if (i != 0) retval += " ";
+      if (tok.kind == 0) {
+        retval += tokenImage[0];
+        break;
+      }
+      retval += add_escapes(tok.image);
+      tok = tok.next; 
+    }
+    retval += "\" at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn;
+    retval += "." + eol;
+    if (expectedTokenSequences.length == 1) {
+      retval += "Was expecting:" + eol + "    ";
+    } else {
+      retval += "Was expecting one of:" + eol + "    ";
+    }
+    retval += expected.toString();
+    return retval;
+  }
+
+  /**
+   * The end of line string for this machine.
+   */
+  protected String eol = System.getProperty("line.separator", "\n");
+ 
+  /**
+   * Used to convert raw characters to their escaped version
+   * when these raw version cannot be used as part of an ASCII
+   * string literal.
+   */
+  protected String add_escapes(String str) {
+      StringBuffer retval = new StringBuffer();
+      char ch;
+      for (int i = 0; i < str.length(); i++) {
+        switch (str.charAt(i))
+        {
+           case 0 :
+              continue;
+           case '\b':
+              retval.append("\\b");
+              continue;
+           case '\t':
+              retval.append("\\t");
+              continue;
+           case '\n':
+              retval.append("\\n");
+              continue;
+           case '\f':
+              retval.append("\\f");
+              continue;
+           case '\r':
+              retval.append("\\r");
+              continue;
+           case '\"':
+              retval.append("\\\"");
+              continue;
+           case '\'':
+              retval.append("\\\'");
+              continue;
+           case '\\':
+              retval.append("\\\\");
+              continue;
+           default:
+              if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
+                 String s = "0000" + Integer.toString(ch, 16);
+                 retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+              } else {
+                 retval.append(ch);
+              }
+              continue;
+        }
+      }
+      return retval.toString();
+   }
+
+}
diff --git a/src/org/apache/james/mime4j/field/address/parser/SimpleCharStream.java b/src/org/apache/james/mime4j/field/address/parser/SimpleCharStream.java
new file mode 100644
index 0000000..c9ba0b4
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/address/parser/SimpleCharStream.java
@@ -0,0 +1,454 @@
+/* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version 4.0 */
+/*
+ *  Copyright 2004 the mime4j 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 org.apache.james.mime4j.field.address.parser;
+
+/**
+ * An implementation of interface CharStream, where the stream is assumed to
+ * contain only ASCII characters (without unicode processing).
+ */
+
+public class SimpleCharStream
+{
+  public static final boolean staticFlag = false;
+  int bufsize;
+  int available;
+  int tokenBegin;
+  public int bufpos = -1;
+  protected int bufline[];
+  protected int bufcolumn[];
+
+  protected int column = 0;
+  protected int line = 1;
+
+  protected boolean prevCharIsCR = false;
+  protected boolean prevCharIsLF = false;
+
+  protected java.io.Reader inputStream;
+
+  protected char[] buffer;
+  protected int maxNextCharInd = 0;
+  protected int inBuf = 0;
+  protected int tabSize = 8;
+
+  protected void setTabSize(int i) { tabSize = i; }
+  protected int getTabSize(int i) { return tabSize; }
+
+
+  protected void ExpandBuff(boolean wrapAround)
+  {
+     char[] newbuffer = new char[bufsize + 2048];
+     int newbufline[] = new int[bufsize + 2048];
+     int newbufcolumn[] = new int[bufsize + 2048];
+
+     try
+     {
+        if (wrapAround)
+        {
+           System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize - tokenBegin);
+           System.arraycopy(buffer, 0, newbuffer,
+                                             bufsize - tokenBegin, bufpos);
+           buffer = newbuffer;
+
+           System.arraycopy(bufline, tokenBegin, newbufline, 0, bufsize - tokenBegin);
+           System.arraycopy(bufline, 0, newbufline, bufsize - tokenBegin, bufpos);
+           bufline = newbufline;
+
+           System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize - tokenBegin);
+           System.arraycopy(bufcolumn, 0, newbufcolumn, bufsize - tokenBegin, bufpos);
+           bufcolumn = newbufcolumn;
+
+           maxNextCharInd = (bufpos += (bufsize - tokenBegin));
+        }
+        else
+        {
+           System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize - tokenBegin);
+           buffer = newbuffer;
+
+           System.arraycopy(bufline, tokenBegin, newbufline, 0, bufsize - tokenBegin);
+           bufline = newbufline;
+
+           System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize - tokenBegin);
+           bufcolumn = newbufcolumn;
+
+           maxNextCharInd = (bufpos -= tokenBegin);
+        }
+     }
+     catch (Throwable t)
+     {
+        throw new Error(t.getMessage());
+     }
+
+
+     bufsize += 2048;
+     available = bufsize;
+     tokenBegin = 0;
+  }
+
+  protected void FillBuff() throws java.io.IOException
+  {
+     if (maxNextCharInd == available)
+     {
+        if (available == bufsize)
+        {
+           if (tokenBegin > 2048)
+           {
+              bufpos = maxNextCharInd = 0;
+              available = tokenBegin;
+           }
+           else if (tokenBegin < 0)
+              bufpos = maxNextCharInd = 0;
+           else
+              ExpandBuff(false);
+        }
+        else if (available > tokenBegin)
+           available = bufsize;
+        else if ((tokenBegin - available) < 2048)
+           ExpandBuff(true);
+        else
+           available = tokenBegin;
+     }
+
+     int i;
+     try {
+        if ((i = inputStream.read(buffer, maxNextCharInd,
+                                    available - maxNextCharInd)) == -1)
+        {
+           inputStream.close();
+           throw new java.io.IOException();
+        }
+        else
+           maxNextCharInd += i;
+        return;
+     }
+     catch(java.io.IOException e) {
+        --bufpos;
+        backup(0);
+        if (tokenBegin == -1)
+           tokenBegin = bufpos;
+        throw e;
+     }
+  }
+
+  public char BeginToken() throws java.io.IOException
+  {
+     tokenBegin = -1;
+     char c = readChar();
+     tokenBegin = bufpos;
+
+     return c;
+  }
+
+  protected void UpdateLineColumn(char c)
+  {
+     column++;
+
+     if (prevCharIsLF)
+     {
+        prevCharIsLF = false;
+        line += (column = 1);
+     }
+     else if (prevCharIsCR)
+     {
+        prevCharIsCR = false;
+        if (c == '\n')
+        {
+           prevCharIsLF = true;
+        }
+        else
+           line += (column = 1);
+     }
+
+     switch (c)
+     {
+        case '\r' :
+           prevCharIsCR = true;
+           break;
+        case '\n' :
+           prevCharIsLF = true;
+           break;
+        case '\t' :
+           column--;
+           column += (tabSize - (column % tabSize));
+           break;
+        default :
+           break;
+     }
+
+     bufline[bufpos] = line;
+     bufcolumn[bufpos] = column;
+  }
+
+  public char readChar() throws java.io.IOException
+  {
+     if (inBuf > 0)
+     {
+        --inBuf;
+
+        if (++bufpos == bufsize)
+           bufpos = 0;
+
+        return buffer[bufpos];
+     }
+
+     if (++bufpos >= maxNextCharInd)
+        FillBuff();
+
+     char c = buffer[bufpos];
+
+     UpdateLineColumn(c);
+     return (c);
+  }
+
+  /**
+   * @deprecated 
+   * @see #getEndColumn
+   */
+  @Deprecated
+  public int getColumn() {
+     return bufcolumn[bufpos];
+  }
+
+  /**
+   * @deprecated 
+   * @see #getEndLine
+   */
+  @Deprecated
+  public int getLine() {
+     return bufline[bufpos];
+  }
+
+  public int getEndColumn() {
+     return bufcolumn[bufpos];
+  }
+
+  public int getEndLine() {
+     return bufline[bufpos];
+  }
+
+  public int getBeginColumn() {
+     return bufcolumn[tokenBegin];
+  }
+
+  public int getBeginLine() {
+     return bufline[tokenBegin];
+  }
+
+  public void backup(int amount) {
+
+    inBuf += amount;
+    if ((bufpos -= amount) < 0)
+       bufpos += bufsize;
+  }
+
+  public SimpleCharStream(java.io.Reader dstream, int startline,
+  int startcolumn, int buffersize)
+  {
+    inputStream = dstream;
+    line = startline;
+    column = startcolumn - 1;
+
+    available = bufsize = buffersize;
+    buffer = new char[buffersize];
+    bufline = new int[buffersize];
+    bufcolumn = new int[buffersize];
+  }
+
+  public SimpleCharStream(java.io.Reader dstream, int startline,
+                          int startcolumn)
+  {
+     this(dstream, startline, startcolumn, 4096);
+  }
+
+  public SimpleCharStream(java.io.Reader dstream)
+  {
+     this(dstream, 1, 1, 4096);
+  }
+  public void ReInit(java.io.Reader dstream, int startline,
+  int startcolumn, int buffersize)
+  {
+    inputStream = dstream;
+    line = startline;
+    column = startcolumn - 1;
+
+    if (buffer == null || buffersize != buffer.length)
+    {
+      available = bufsize = buffersize;
+      buffer = new char[buffersize];
+      bufline = new int[buffersize];
+      bufcolumn = new int[buffersize];
+    }
+    prevCharIsLF = prevCharIsCR = false;
+    tokenBegin = inBuf = maxNextCharInd = 0;
+    bufpos = -1;
+  }
+
+  public void ReInit(java.io.Reader dstream, int startline,
+                     int startcolumn)
+  {
+     ReInit(dstream, startline, startcolumn, 4096);
+  }
+
+  public void ReInit(java.io.Reader dstream)
+  {
+     ReInit(dstream, 1, 1, 4096);
+  }
+  public SimpleCharStream(java.io.InputStream dstream, String encoding, int startline,
+  int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException
+  {
+     this(encoding == null ? new java.io.InputStreamReader(dstream) : new java.io.InputStreamReader(dstream, encoding), startline, startcolumn, buffersize);
+  }
+
+  public SimpleCharStream(java.io.InputStream dstream, int startline,
+  int startcolumn, int buffersize)
+  {
+     this(new java.io.InputStreamReader(dstream), startline, startcolumn, buffersize);
+  }
+
+  public SimpleCharStream(java.io.InputStream dstream, String encoding, int startline,
+                          int startcolumn) throws java.io.UnsupportedEncodingException
+  {
+     this(dstream, encoding, startline, startcolumn, 4096);
+  }
+
+  public SimpleCharStream(java.io.InputStream dstream, int startline,
+                          int startcolumn)
+  {
+     this(dstream, startline, startcolumn, 4096);
+  }
+
+  public SimpleCharStream(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException
+  {
+     this(dstream, encoding, 1, 1, 4096);
+  }
+
+  public SimpleCharStream(java.io.InputStream dstream)
+  {
+     this(dstream, 1, 1, 4096);
+  }
+
+  public void ReInit(java.io.InputStream dstream, String encoding, int startline,
+                          int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException
+  {
+     ReInit(encoding == null ? new java.io.InputStreamReader(dstream) : new java.io.InputStreamReader(dstream, encoding), startline, startcolumn, buffersize);
+  }
+
+  public void ReInit(java.io.InputStream dstream, int startline,
+                          int startcolumn, int buffersize)
+  {
+     ReInit(new java.io.InputStreamReader(dstream), startline, startcolumn, buffersize);
+  }
+
+  public void ReInit(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException
+  {
+     ReInit(dstream, encoding, 1, 1, 4096);
+  }
+
+  public void ReInit(java.io.InputStream dstream)
+  {
+     ReInit(dstream, 1, 1, 4096);
+  }
+  public void ReInit(java.io.InputStream dstream, String encoding, int startline,
+                     int startcolumn) throws java.io.UnsupportedEncodingException
+  {
+     ReInit(dstream, encoding, startline, startcolumn, 4096);
+  }
+  public void ReInit(java.io.InputStream dstream, int startline,
+                     int startcolumn)
+  {
+     ReInit(dstream, startline, startcolumn, 4096);
+  }
+  public String GetImage()
+  {
+     if (bufpos >= tokenBegin)
+        return new String(buffer, tokenBegin, bufpos - tokenBegin + 1);
+     else
+        return new String(buffer, tokenBegin, bufsize - tokenBegin) +
+                              new String(buffer, 0, bufpos + 1);
+  }
+
+  public char[] GetSuffix(int len)
+  {
+     char[] ret = new char[len];
+
+     if ((bufpos + 1) >= len)
+        System.arraycopy(buffer, bufpos - len + 1, ret, 0, len);
+     else
+     {
+        System.arraycopy(buffer, bufsize - (len - bufpos - 1), ret, 0,
+                                                          len - bufpos - 1);
+        System.arraycopy(buffer, 0, ret, len - bufpos - 1, bufpos + 1);
+     }
+
+     return ret;
+  }
+
+  public void Done()
+  {
+     buffer = null;
+     bufline = null;
+     bufcolumn = null;
+  }
+
+  /**
+   * Method to adjust line and column numbers for the start of a token.
+   */
+  public void adjustBeginLineColumn(int newLine, int newCol)
+  {
+     int start = tokenBegin;
+     int len;
+
+     if (bufpos >= tokenBegin)
+     {
+        len = bufpos - tokenBegin + inBuf + 1;
+     }
+     else
+     {
+        len = bufsize - tokenBegin + bufpos + 1 + inBuf;
+     }
+
+     int i = 0, j = 0, k = 0;
+     int nextColDiff = 0, columnDiff = 0;
+
+     while (i < len &&
+            bufline[j = start % bufsize] == bufline[k = ++start % bufsize])
+     {
+        bufline[j] = newLine;
+        nextColDiff = columnDiff + bufcolumn[k] - bufcolumn[j];
+        bufcolumn[j] = newCol + columnDiff;
+        columnDiff = nextColDiff;
+        i++;
+     } 
+
+     if (i < len)
+     {
+        bufline[j] = newLine++;
+        bufcolumn[j] = newCol + columnDiff;
+
+        while (i++ < len)
+        {
+           if (bufline[j = start % bufsize] != bufline[++start % bufsize])
+              bufline[j] = newLine++;
+           else
+              bufline[j] = newLine;
+        }
+     }
+
+     line = bufline[j];
+     column = bufcolumn[j];
+  }
+
+}
diff --git a/src/org/apache/james/mime4j/field/address/parser/SimpleNode.java b/src/org/apache/james/mime4j/field/address/parser/SimpleNode.java
new file mode 100644
index 0000000..9bf537e
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/address/parser/SimpleNode.java
@@ -0,0 +1,87 @@
+/* Generated By:JJTree: Do not edit this line. SimpleNode.java */
+
+package org.apache.james.mime4j.field.address.parser;
+
+public class SimpleNode extends org.apache.james.mime4j.field.address.parser.BaseNode implements Node {
+  protected Node parent;
+  protected Node[] children;
+  protected int id;
+  protected AddressListParser parser;
+
+  public SimpleNode(int i) {
+    id = i;
+  }
+
+  public SimpleNode(AddressListParser p, int i) {
+    this(i);
+    parser = p;
+  }
+
+  public void jjtOpen() {
+  }
+
+  public void jjtClose() {
+  }
+  
+  public void jjtSetParent(Node n) { parent = n; }
+  public Node jjtGetParent() { return parent; }
+
+  public void jjtAddChild(Node n, int i) {
+    if (children == null) {
+      children = new Node[i + 1];
+    } else if (i >= children.length) {
+      Node c[] = new Node[i + 1];
+      System.arraycopy(children, 0, c, 0, children.length);
+      children = c;
+    }
+    children[i] = n;
+  }
+
+  public Node jjtGetChild(int i) {
+    return children[i];
+  }
+
+  public int jjtGetNumChildren() {
+    return (children == null) ? 0 : children.length;
+  }
+
+  /** Accept the visitor. **/
+  public Object jjtAccept(AddressListParserVisitor visitor, Object data) {
+    return visitor.visit(this, data);
+  }
+
+  /** Accept the visitor. **/
+  public Object childrenAccept(AddressListParserVisitor visitor, Object data) {
+    if (children != null) {
+      for (int i = 0; i < children.length; ++i) {
+        children[i].jjtAccept(visitor, data);
+      }
+    }
+    return data;
+  }
+
+  /* You can override these two methods in subclasses of SimpleNode to
+     customize the way the node appears when the tree is dumped.  If
+     your output uses more than one line you should override
+     toString(String), otherwise overriding toString() is probably all
+     you need to do. */
+
+  public String toString() { return AddressListParserTreeConstants.jjtNodeName[id]; }
+  public String toString(String prefix) { return prefix + toString(); }
+
+  /* Override this method if you want to customize how the node dumps
+     out its children. */
+
+  public void dump(String prefix) {
+    System.out.println(toString(prefix));
+    if (children != null) {
+      for (int i = 0; i < children.length; ++i) {
+	SimpleNode n = (SimpleNode)children[i];
+	if (n != null) {
+	  n.dump(prefix + " ");
+	}
+      }
+    }
+  }
+}
+
diff --git a/src/org/apache/james/mime4j/field/address/parser/Token.java b/src/org/apache/james/mime4j/field/address/parser/Token.java
new file mode 100644
index 0000000..2382e8e
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/address/parser/Token.java
@@ -0,0 +1,96 @@
+/* Generated By:JavaCC: Do not edit this line. Token.java Version 3.0 */
+/*
+ *  Copyright 2004 the mime4j 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 org.apache.james.mime4j.field.address.parser;
+
+/**
+ * Describes the input token stream.
+ */
+
+public class Token {
+
+  /**
+   * An integer that describes the kind of this token.  This numbering
+   * system is determined by JavaCCParser, and a table of these numbers is
+   * stored in the file ...Constants.java.
+   */
+  public int kind;
+
+  /**
+   * beginLine and beginColumn describe the position of the first character
+   * of this token; endLine and endColumn describe the position of the
+   * last character of this token.
+   */
+  public int beginLine, beginColumn, endLine, endColumn;
+
+  /**
+   * The string image of the token.
+   */
+  public String image;
+
+  /**
+   * A reference to the next regular (non-special) token from the input
+   * stream.  If this is the last token from the input stream, or if the
+   * token manager has not read tokens beyond this one, this field is
+   * set to null.  This is true only if this token is also a regular
+   * token.  Otherwise, see below for a description of the contents of
+   * this field.
+   */
+  public Token next;
+
+  /**
+   * This field is used to access special tokens that occur prior to this
+   * token, but after the immediately preceding regular (non-special) token.
+   * If there are no such special tokens, this field is set to null.
+   * When there are more than one such special token, this field refers
+   * to the last of these special tokens, which in turn refers to the next
+   * previous special token through its specialToken field, and so on
+   * until the first special token (whose specialToken field is null).
+   * The next fields of special tokens refer to other special tokens that
+   * immediately follow it (without an intervening regular token).  If there
+   * is no such token, this field is null.
+   */
+  public Token specialToken;
+
+  /**
+   * Returns the image.
+   */
+  public String toString()
+  {
+     return image;
+  }
+
+  /**
+   * Returns a new Token object, by default. However, if you want, you
+   * can create and return subclass objects based on the value of ofKind.
+   * Simply add the cases to the switch for all those special cases.
+   * For example, if you have a subclass of Token called IDToken that
+   * you want to create if ofKind is ID, simlpy add something like :
+   *
+   *    case MyParserConstants.ID : return new IDToken();
+   *
+   * to the following switch statement. Then you can cast matchedToken
+   * variable to the appropriate type and use it in your lexical actions.
+   */
+  public static final Token newToken(int ofKind)
+  {
+     switch(ofKind)
+     {
+       default : return new Token();
+     }
+  }
+
+}
diff --git a/src/org/apache/james/mime4j/field/address/parser/TokenMgrError.java b/src/org/apache/james/mime4j/field/address/parser/TokenMgrError.java
new file mode 100644
index 0000000..0299c85
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/address/parser/TokenMgrError.java
@@ -0,0 +1,148 @@
+/* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 3.0 */
+/*
+ *  Copyright 2004 the mime4j 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 org.apache.james.mime4j.field.address.parser;
+
+public class TokenMgrError extends Error
+{
+   /*
+    * Ordinals for various reasons why an Error of this type can be thrown.
+    */
+
+   /**
+    * Lexical error occured.
+    */
+   static final int LEXICAL_ERROR = 0;
+
+   /**
+    * An attempt wass made to create a second instance of a static token manager.
+    */
+   static final int STATIC_LEXER_ERROR = 1;
+
+   /**
+    * Tried to change to an invalid lexical state.
+    */
+   static final int INVALID_LEXICAL_STATE = 2;
+
+   /**
+    * Detected (and bailed out of) an infinite loop in the token manager.
+    */
+   static final int LOOP_DETECTED = 3;
+
+   /**
+    * Indicates the reason why the exception is thrown. It will have
+    * one of the above 4 values.
+    */
+   int errorCode;
+
+   /**
+    * Replaces unprintable characters by their espaced (or unicode escaped)
+    * equivalents in the given string
+    */
+   protected static final String addEscapes(String str) {
+      StringBuffer retval = new StringBuffer();
+      char ch;
+      for (int i = 0; i < str.length(); i++) {
+        switch (str.charAt(i))
+        {
+           case 0 :
+              continue;
+           case '\b':
+              retval.append("\\b");
+              continue;
+           case '\t':
+              retval.append("\\t");
+              continue;
+           case '\n':
+              retval.append("\\n");
+              continue;
+           case '\f':
+              retval.append("\\f");
+              continue;
+           case '\r':
+              retval.append("\\r");
+              continue;
+           case '\"':
+              retval.append("\\\"");
+              continue;
+           case '\'':
+              retval.append("\\\'");
+              continue;
+           case '\\':
+              retval.append("\\\\");
+              continue;
+           default:
+              if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
+                 String s = "0000" + Integer.toString(ch, 16);
+                 retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+              } else {
+                 retval.append(ch);
+              }
+              continue;
+        }
+      }
+      return retval.toString();
+   }
+
+   /**
+    * Returns a detailed message for the Error when it is thrown by the
+    * token manager to indicate a lexical error.
+    * Parameters : 
+    *    EOFSeen     : indicates if EOF caused the lexicl error
+    *    curLexState : lexical state in which this error occured
+    *    errorLine   : line number when the error occured
+    *    errorColumn : column number when the error occured
+    *    errorAfter  : prefix that was seen before this error occured
+    *    curchar     : the offending character
+    * Note: You can customize the lexical error message by modifying this method.
+    */
+   protected static String LexicalError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar) {
+      return("Lexical error at line " +
+           errorLine + ", column " +
+           errorColumn + ".  Encountered: " +
+           (EOFSeen ? "<EOF> " : ("\"" + addEscapes(String.valueOf(curChar)) + "\"") + " (" + (int)curChar + "), ") +
+           "after : \"" + addEscapes(errorAfter) + "\"");
+   }
+
+   /**
+    * You can also modify the body of this method to customize your error messages.
+    * For example, cases like LOOP_DETECTED and INVALID_LEXICAL_STATE are not
+    * of end-users concern, so you can return something like : 
+    *
+    *     "Internal Error : Please file a bug report .... "
+    *
+    * from this method for such cases in the release version of your parser.
+    */
+   public String getMessage() {
+      return super.getMessage();
+   }
+
+   /*
+    * Constructors of various flavors follow.
+    */
+
+   public TokenMgrError() {
+   }
+
+   public TokenMgrError(String message, int reason) {
+      super(message);
+      errorCode = reason;
+   }
+
+   public TokenMgrError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar, int reason) {
+      this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
+   }
+}
diff --git a/src/org/apache/james/mime4j/field/contenttype/parser/ContentTypeParser.java b/src/org/apache/james/mime4j/field/contenttype/parser/ContentTypeParser.java
new file mode 100644
index 0000000..cacf3af
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/contenttype/parser/ContentTypeParser.java
@@ -0,0 +1,268 @@
+/* Generated By:JavaCC: Do not edit this line. ContentTypeParser.java */
+/*
+ *  Copyright 2004 the mime4j 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 org.apache.james.mime4j.field.contenttype.parser;
+
+import java.util.ArrayList;
+import java.util.Vector;
+
+public class ContentTypeParser implements ContentTypeParserConstants {
+
+        private String type;
+        private String subtype;
+        private ArrayList<String> paramNames = new ArrayList<String>();
+        private ArrayList<String> paramValues = new ArrayList<String>();
+
+        public String getType() { return type; }
+        public String getSubType() { return subtype; }
+        public ArrayList<String> getParamNames() { return paramNames; }
+        public ArrayList<String> getParamValues() { return paramValues; }
+
+    public static void main(String args[]) throws ParseException {
+        while (true) {
+            try {
+                ContentTypeParser parser = new ContentTypeParser(System.in);
+                parser.parseLine();
+            } catch (Exception x) {
+                x.printStackTrace();
+                return;
+            }
+        }
+    }
+
+  final public void parseLine() throws ParseException {
+    parse();
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case 1:
+      jj_consume_token(1);
+      break;
+    default:
+      jj_la1[0] = jj_gen;
+      ;
+    }
+    jj_consume_token(2);
+  }
+
+  final public void parseAll() throws ParseException {
+    parse();
+    jj_consume_token(0);
+  }
+
+  final public void parse() throws ParseException {
+        Token type;
+        Token subtype;
+    type = jj_consume_token(ATOKEN);
+    jj_consume_token(3);
+    subtype = jj_consume_token(ATOKEN);
+                this.type = type.image;
+                this.subtype = subtype.image;
+    label_1:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case 4:
+        ;
+        break;
+      default:
+        jj_la1[1] = jj_gen;
+        break label_1;
+      }
+      jj_consume_token(4);
+      parameter();
+    }
+  }
+
+  final public void parameter() throws ParseException {
+        Token attrib;
+        String val;
+    attrib = jj_consume_token(ATOKEN);
+    jj_consume_token(5);
+    val = value();
+                paramNames.add(attrib.image);
+                paramValues.add(val);
+  }
+
+  final public String value() throws ParseException {
+ Token t;
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case ATOKEN:
+      t = jj_consume_token(ATOKEN);
+      break;
+    case QUOTEDSTRING:
+      t = jj_consume_token(QUOTEDSTRING);
+      break;
+    default:
+      jj_la1[2] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+          {if (true) return t.image;}
+    throw new Error("Missing return statement in function");
+  }
+
+  public ContentTypeParserTokenManager token_source;
+  SimpleCharStream jj_input_stream;
+  public Token token, jj_nt;
+  private int jj_ntk;
+  private int jj_gen;
+  final private int[] jj_la1 = new int[3];
+  static private int[] jj_la1_0;
+  static {
+      jj_la1_0();
+   }
+   private static void jj_la1_0() {
+      jj_la1_0 = new int[] {0x2,0x10,0x280000,};
+   }
+
+  public ContentTypeParser(java.io.InputStream stream) {
+     this(stream, null);
+  }
+  public ContentTypeParser(java.io.InputStream stream, String encoding) {
+    try { jj_input_stream = new SimpleCharStream(stream, encoding, 1, 1); } catch(java.io.UnsupportedEncodingException e) { throw new RuntimeException(e); }
+    token_source = new ContentTypeParserTokenManager(jj_input_stream);
+    token = new Token();
+    jj_ntk = -1;
+    jj_gen = 0;
+    for (int i = 0; i < 3; i++) jj_la1[i] = -1;
+  }
+
+  public void ReInit(java.io.InputStream stream) {
+     ReInit(stream, null);
+  }
+  public void ReInit(java.io.InputStream stream, String encoding) {
+    try { jj_input_stream.ReInit(stream, encoding, 1, 1); } catch(java.io.UnsupportedEncodingException e) { throw new RuntimeException(e); }
+    token_source.ReInit(jj_input_stream);
+    token = new Token();
+    jj_ntk = -1;
+    jj_gen = 0;
+    for (int i = 0; i < 3; i++) jj_la1[i] = -1;
+  }
+
+  public ContentTypeParser(java.io.Reader stream) {
+    jj_input_stream = new SimpleCharStream(stream, 1, 1);
+    token_source = new ContentTypeParserTokenManager(jj_input_stream);
+    token = new Token();
+    jj_ntk = -1;
+    jj_gen = 0;
+    for (int i = 0; i < 3; i++) jj_la1[i] = -1;
+  }
+
+  public void ReInit(java.io.Reader stream) {
+    jj_input_stream.ReInit(stream, 1, 1);
+    token_source.ReInit(jj_input_stream);
+    token = new Token();
+    jj_ntk = -1;
+    jj_gen = 0;
+    for (int i = 0; i < 3; i++) jj_la1[i] = -1;
+  }
+
+  public ContentTypeParser(ContentTypeParserTokenManager tm) {
+    token_source = tm;
+    token = new Token();
+    jj_ntk = -1;
+    jj_gen = 0;
+    for (int i = 0; i < 3; i++) jj_la1[i] = -1;
+  }
+
+  public void ReInit(ContentTypeParserTokenManager tm) {
+    token_source = tm;
+    token = new Token();
+    jj_ntk = -1;
+    jj_gen = 0;
+    for (int i = 0; i < 3; i++) jj_la1[i] = -1;
+  }
+
+  final private Token jj_consume_token(int kind) throws ParseException {
+    Token oldToken;
+    if ((oldToken = token).next != null) token = token.next;
+    else token = token.next = token_source.getNextToken();
+    jj_ntk = -1;
+    if (token.kind == kind) {
+      jj_gen++;
+      return token;
+    }
+    token = oldToken;
+    jj_kind = kind;
+    throw generateParseException();
+  }
+
+  final public Token getNextToken() {
+    if (token.next != null) token = token.next;
+    else token = token.next = token_source.getNextToken();
+    jj_ntk = -1;
+    jj_gen++;
+    return token;
+  }
+
+  final public Token getToken(int index) {
+    Token t = token;
+    for (int i = 0; i < index; i++) {
+      if (t.next != null) t = t.next;
+      else t = t.next = token_source.getNextToken();
+    }
+    return t;
+  }
+
+  final private int jj_ntk() {
+    if ((jj_nt=token.next) == null)
+      return (jj_ntk = (token.next=token_source.getNextToken()).kind);
+    else
+      return (jj_ntk = jj_nt.kind);
+  }
+
+  private Vector<int[]> jj_expentries = new Vector<int[]>();
+  private int[] jj_expentry;
+  private int jj_kind = -1;
+
+  public ParseException generateParseException() {
+    jj_expentries.removeAllElements();
+    boolean[] la1tokens = new boolean[24];
+    for (int i = 0; i < 24; i++) {
+      la1tokens[i] = false;
+    }
+    if (jj_kind >= 0) {
+      la1tokens[jj_kind] = true;
+      jj_kind = -1;
+    }
+    for (int i = 0; i < 3; i++) {
+      if (jj_la1[i] == jj_gen) {
+        for (int j = 0; j < 32; j++) {
+          if ((jj_la1_0[i] & (1<<j)) != 0) {
+            la1tokens[j] = true;
+          }
+        }
+      }
+    }
+    for (int i = 0; i < 24; i++) {
+      if (la1tokens[i]) {
+        jj_expentry = new int[1];
+        jj_expentry[0] = i;
+        jj_expentries.addElement(jj_expentry);
+      }
+    }
+    int[][] exptokseq = new int[jj_expentries.size()][];
+    for (int i = 0; i < jj_expentries.size(); i++) {
+      exptokseq[i] = jj_expentries.elementAt(i);
+    }
+    return new ParseException(token, exptokseq, tokenImage);
+  }
+
+  final public void enable_tracing() {
+  }
+
+  final public void disable_tracing() {
+  }
+
+}
diff --git a/src/org/apache/james/mime4j/field/contenttype/parser/ContentTypeParserConstants.java b/src/org/apache/james/mime4j/field/contenttype/parser/ContentTypeParserConstants.java
new file mode 100644
index 0000000..d933d80
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/contenttype/parser/ContentTypeParserConstants.java
@@ -0,0 +1,62 @@
+/* Generated By:JavaCC: Do not edit this line. ContentTypeParserConstants.java */
+/*
+ *  Copyright 2004 the mime4j 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 org.apache.james.mime4j.field.contenttype.parser;
+
+public interface ContentTypeParserConstants {
+
+  int EOF = 0;
+  int WS = 6;
+  int COMMENT = 8;
+  int QUOTEDSTRING = 19;
+  int DIGITS = 20;
+  int ATOKEN = 21;
+  int QUOTEDPAIR = 22;
+  int ANY = 23;
+
+  int DEFAULT = 0;
+  int INCOMMENT = 1;
+  int NESTED_COMMENT = 2;
+  int INQUOTEDSTRING = 3;
+
+  String[] tokenImage = {
+    "<EOF>",
+    "\"\\r\"",
+    "\"\\n\"",
+    "\"/\"",
+    "\";\"",
+    "\"=\"",
+    "<WS>",
+    "\"(\"",
+    "\")\"",
+    "<token of kind 9>",
+    "\"(\"",
+    "<token of kind 11>",
+    "<token of kind 12>",
+    "\"(\"",
+    "\")\"",
+    "<token of kind 15>",
+    "\"\\\"\"",
+    "<token of kind 17>",
+    "<token of kind 18>",
+    "\"\\\"\"",
+    "<DIGITS>",
+    "<ATOKEN>",
+    "<QUOTEDPAIR>",
+    "<ANY>",
+  };
+
+}
diff --git a/src/org/apache/james/mime4j/field/contenttype/parser/ContentTypeParserTokenManager.java b/src/org/apache/james/mime4j/field/contenttype/parser/ContentTypeParserTokenManager.java
new file mode 100644
index 0000000..25b7aba
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/contenttype/parser/ContentTypeParserTokenManager.java
@@ -0,0 +1,877 @@
+/* Generated By:JavaCC: Do not edit this line. ContentTypeParserTokenManager.java */
+/*
+ *  Copyright 2004 the mime4j 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 org.apache.james.mime4j.field.contenttype.parser;
+import java.util.ArrayList;
+
+public class ContentTypeParserTokenManager implements ContentTypeParserConstants
+{
+        // Keeps track of how many levels of comment nesting
+        // we've encountered.  This is only used when the 2nd
+        // level is reached, for example ((this)), not (this).
+        // This is because the outermost level must be treated
+        // specially anyway, because the outermost ")" has a
+        // different token type than inner ")" instances.
+        static int commentNest;
+  public  java.io.PrintStream debugStream = System.out;
+  public  void setDebugStream(java.io.PrintStream ds) { debugStream = ds; }
+private final int jjStopStringLiteralDfa_0(int pos, long active0)
+{
+   switch (pos)
+   {
+      default :
+         return -1;
+   }
+}
+private final int jjStartNfa_0(int pos, long active0)
+{
+   return jjMoveNfa_0(jjStopStringLiteralDfa_0(pos, active0), pos + 1);
+}
+private final int jjStopAtPos(int pos, int kind)
+{
+   jjmatchedKind = kind;
+   jjmatchedPos = pos;
+   return pos + 1;
+}
+private final int jjStartNfaWithStates_0(int pos, int kind, int state)
+{
+   jjmatchedKind = kind;
+   jjmatchedPos = pos;
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) { return pos + 1; }
+   return jjMoveNfa_0(state, pos + 1);
+}
+private final int jjMoveStringLiteralDfa0_0()
+{
+   switch(curChar)
+   {
+      case 10:
+         return jjStartNfaWithStates_0(0, 2, 2);
+      case 13:
+         return jjStartNfaWithStates_0(0, 1, 2);
+      case 34:
+         return jjStopAtPos(0, 16);
+      case 40:
+         return jjStopAtPos(0, 7);
+      case 47:
+         return jjStopAtPos(0, 3);
+      case 59:
+         return jjStopAtPos(0, 4);
+      case 61:
+         return jjStopAtPos(0, 5);
+      default :
+         return jjMoveNfa_0(3, 0);
+   }
+}
+private final void jjCheckNAdd(int state)
+{
+   if (jjrounds[state] != jjround)
+   {
+      jjstateSet[jjnewStateCnt++] = state;
+      jjrounds[state] = jjround;
+   }
+}
+private final void jjAddStates(int start, int end)
+{
+   do {
+      jjstateSet[jjnewStateCnt++] = jjnextStates[start];
+   } while (start++ != end);
+}
+private final void jjCheckNAddTwoStates(int state1, int state2)
+{
+   jjCheckNAdd(state1);
+   jjCheckNAdd(state2);
+}
+private final void jjCheckNAddStates(int start, int end)
+{
+   do {
+      jjCheckNAdd(jjnextStates[start]);
+   } while (start++ != end);
+}
+private final void jjCheckNAddStates(int start)
+{
+   jjCheckNAdd(jjnextStates[start]);
+   jjCheckNAdd(jjnextStates[start + 1]);
+}
+static final long[] jjbitVec0 = {
+   0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL
+};
+private final int jjMoveNfa_0(int startState, int curPos)
+{
+   int[] nextStates;
+   int startsAt = 0;
+   jjnewStateCnt = 3;
+   int i = 1;
+   jjstateSet[0] = startState;
+   int j, kind = 0x7fffffff;
+   for (;;)
+   {
+      if (++jjround == 0x7fffffff)
+         ReInitRounds();
+      if (curChar < 64)
+      {
+         long l = 1L << curChar;
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 3:
+                  if ((0x3ff6cfafffffdffL & l) != 0L)
+                  {
+                     if (kind > 21)
+                        kind = 21;
+                     jjCheckNAdd(2);
+                  }
+                  else if ((0x100000200L & l) != 0L)
+                  {
+                     if (kind > 6)
+                        kind = 6;
+                     jjCheckNAdd(0);
+                  }
+                  if ((0x3ff000000000000L & l) != 0L)
+                  {
+                     if (kind > 20)
+                        kind = 20;
+                     jjCheckNAdd(1);
+                  }
+                  break;
+               case 0:
+                  if ((0x100000200L & l) == 0L)
+                     break;
+                  kind = 6;
+                  jjCheckNAdd(0);
+                  break;
+               case 1:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 20)
+                     kind = 20;
+                  jjCheckNAdd(1);
+                  break;
+               case 2:
+                  if ((0x3ff6cfafffffdffL & l) == 0L)
+                     break;
+                  if (kind > 21)
+                     kind = 21;
+                  jjCheckNAdd(2);
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      else if (curChar < 128)
+      {
+         long l = 1L << (curChar & 077);
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 3:
+               case 2:
+                  if ((0xffffffffc7fffffeL & l) == 0L)
+                     break;
+                  kind = 21;
+                  jjCheckNAdd(2);
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      else
+      {
+         int i2 = (curChar & 0xff) >> 6;
+         long l2 = 1L << (curChar & 077);
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 3:
+               case 2:
+                  if ((jjbitVec0[i2] & l2) == 0L)
+                     break;
+                  if (kind > 21)
+                     kind = 21;
+                  jjCheckNAdd(2);
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      if (kind != 0x7fffffff)
+      {
+         jjmatchedKind = kind;
+         jjmatchedPos = curPos;
+         kind = 0x7fffffff;
+      }
+      ++curPos;
+      if ((i = jjnewStateCnt) == (startsAt = 3 - (jjnewStateCnt = startsAt)))
+         return curPos;
+      try { curChar = input_stream.readChar(); }
+      catch(java.io.IOException e) { return curPos; }
+   }
+}
+private final int jjStopStringLiteralDfa_1(int pos, long active0)
+{
+   switch (pos)
+   {
+      default :
+         return -1;
+   }
+}
+private final int jjStartNfa_1(int pos, long active0)
+{
+   return jjMoveNfa_1(jjStopStringLiteralDfa_1(pos, active0), pos + 1);
+}
+private final int jjStartNfaWithStates_1(int pos, int kind, int state)
+{
+   jjmatchedKind = kind;
+   jjmatchedPos = pos;
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) { return pos + 1; }
+   return jjMoveNfa_1(state, pos + 1);
+}
+private final int jjMoveStringLiteralDfa0_1()
+{
+   switch(curChar)
+   {
+      case 40:
+         return jjStopAtPos(0, 10);
+      case 41:
+         return jjStopAtPos(0, 8);
+      default :
+         return jjMoveNfa_1(0, 0);
+   }
+}
+private final int jjMoveNfa_1(int startState, int curPos)
+{
+   int[] nextStates;
+   int startsAt = 0;
+   jjnewStateCnt = 3;
+   int i = 1;
+   jjstateSet[0] = startState;
+   int j, kind = 0x7fffffff;
+   for (;;)
+   {
+      if (++jjround == 0x7fffffff)
+         ReInitRounds();
+      if (curChar < 64)
+      {
+         long l = 1L << curChar;
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+                  if (kind > 11)
+                     kind = 11;
+                  break;
+               case 1:
+                  if (kind > 9)
+                     kind = 9;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      else if (curChar < 128)
+      {
+         long l = 1L << (curChar & 077);
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+                  if (kind > 11)
+                     kind = 11;
+                  if (curChar == 92)
+                     jjstateSet[jjnewStateCnt++] = 1;
+                  break;
+               case 1:
+                  if (kind > 9)
+                     kind = 9;
+                  break;
+               case 2:
+                  if (kind > 11)
+                     kind = 11;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      else
+      {
+         int i2 = (curChar & 0xff) >> 6;
+         long l2 = 1L << (curChar & 077);
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+                  if ((jjbitVec0[i2] & l2) != 0L && kind > 11)
+                     kind = 11;
+                  break;
+               case 1:
+                  if ((jjbitVec0[i2] & l2) != 0L && kind > 9)
+                     kind = 9;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      if (kind != 0x7fffffff)
+      {
+         jjmatchedKind = kind;
+         jjmatchedPos = curPos;
+         kind = 0x7fffffff;
+      }
+      ++curPos;
+      if ((i = jjnewStateCnt) == (startsAt = 3 - (jjnewStateCnt = startsAt)))
+         return curPos;
+      try { curChar = input_stream.readChar(); }
+      catch(java.io.IOException e) { return curPos; }
+   }
+}
+private final int jjStopStringLiteralDfa_3(int pos, long active0)
+{
+   switch (pos)
+   {
+      default :
+         return -1;
+   }
+}
+private final int jjStartNfa_3(int pos, long active0)
+{
+   return jjMoveNfa_3(jjStopStringLiteralDfa_3(pos, active0), pos + 1);
+}
+private final int jjStartNfaWithStates_3(int pos, int kind, int state)
+{
+   jjmatchedKind = kind;
+   jjmatchedPos = pos;
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) { return pos + 1; }
+   return jjMoveNfa_3(state, pos + 1);
+}
+private final int jjMoveStringLiteralDfa0_3()
+{
+   switch(curChar)
+   {
+      case 34:
+         return jjStopAtPos(0, 19);
+      default :
+         return jjMoveNfa_3(0, 0);
+   }
+}
+private final int jjMoveNfa_3(int startState, int curPos)
+{
+   int[] nextStates;
+   int startsAt = 0;
+   jjnewStateCnt = 3;
+   int i = 1;
+   jjstateSet[0] = startState;
+   int j, kind = 0x7fffffff;
+   for (;;)
+   {
+      if (++jjround == 0x7fffffff)
+         ReInitRounds();
+      if (curChar < 64)
+      {
+         long l = 1L << curChar;
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+               case 2:
+                  if ((0xfffffffbffffffffL & l) == 0L)
+                     break;
+                  if (kind > 18)
+                     kind = 18;
+                  jjCheckNAdd(2);
+                  break;
+               case 1:
+                  if (kind > 17)
+                     kind = 17;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      else if (curChar < 128)
+      {
+         long l = 1L << (curChar & 077);
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+                  if ((0xffffffffefffffffL & l) != 0L)
+                  {
+                     if (kind > 18)
+                        kind = 18;
+                     jjCheckNAdd(2);
+                  }
+                  else if (curChar == 92)
+                     jjstateSet[jjnewStateCnt++] = 1;
+                  break;
+               case 1:
+                  if (kind > 17)
+                     kind = 17;
+                  break;
+               case 2:
+                  if ((0xffffffffefffffffL & l) == 0L)
+                     break;
+                  if (kind > 18)
+                     kind = 18;
+                  jjCheckNAdd(2);
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      else
+      {
+         int i2 = (curChar & 0xff) >> 6;
+         long l2 = 1L << (curChar & 077);
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+               case 2:
+                  if ((jjbitVec0[i2] & l2) == 0L)
+                     break;
+                  if (kind > 18)
+                     kind = 18;
+                  jjCheckNAdd(2);
+                  break;
+               case 1:
+                  if ((jjbitVec0[i2] & l2) != 0L && kind > 17)
+                     kind = 17;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      if (kind != 0x7fffffff)
+      {
+         jjmatchedKind = kind;
+         jjmatchedPos = curPos;
+         kind = 0x7fffffff;
+      }
+      ++curPos;
+      if ((i = jjnewStateCnt) == (startsAt = 3 - (jjnewStateCnt = startsAt)))
+         return curPos;
+      try { curChar = input_stream.readChar(); }
+      catch(java.io.IOException e) { return curPos; }
+   }
+}
+private final int jjStopStringLiteralDfa_2(int pos, long active0)
+{
+   switch (pos)
+   {
+      default :
+         return -1;
+   }
+}
+private final int jjStartNfa_2(int pos, long active0)
+{
+   return jjMoveNfa_2(jjStopStringLiteralDfa_2(pos, active0), pos + 1);
+}
+private final int jjStartNfaWithStates_2(int pos, int kind, int state)
+{
+   jjmatchedKind = kind;
+   jjmatchedPos = pos;
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) { return pos + 1; }
+   return jjMoveNfa_2(state, pos + 1);
+}
+private final int jjMoveStringLiteralDfa0_2()
+{
+   switch(curChar)
+   {
+      case 40:
+         return jjStopAtPos(0, 13);
+      case 41:
+         return jjStopAtPos(0, 14);
+      default :
+         return jjMoveNfa_2(0, 0);
+   }
+}
+private final int jjMoveNfa_2(int startState, int curPos)
+{
+   int[] nextStates;
+   int startsAt = 0;
+   jjnewStateCnt = 3;
+   int i = 1;
+   jjstateSet[0] = startState;
+   int j, kind = 0x7fffffff;
+   for (;;)
+   {
+      if (++jjround == 0x7fffffff)
+         ReInitRounds();
+      if (curChar < 64)
+      {
+         long l = 1L << curChar;
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+                  if (kind > 15)
+                     kind = 15;
+                  break;
+               case 1:
+                  if (kind > 12)
+                     kind = 12;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      else if (curChar < 128)
+      {
+         long l = 1L << (curChar & 077);
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+                  if (kind > 15)
+                     kind = 15;
+                  if (curChar == 92)
+                     jjstateSet[jjnewStateCnt++] = 1;
+                  break;
+               case 1:
+                  if (kind > 12)
+                     kind = 12;
+                  break;
+               case 2:
+                  if (kind > 15)
+                     kind = 15;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      else
+      {
+         int i2 = (curChar & 0xff) >> 6;
+         long l2 = 1L << (curChar & 077);
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+                  if ((jjbitVec0[i2] & l2) != 0L && kind > 15)
+                     kind = 15;
+                  break;
+               case 1:
+                  if ((jjbitVec0[i2] & l2) != 0L && kind > 12)
+                     kind = 12;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      if (kind != 0x7fffffff)
+      {
+         jjmatchedKind = kind;
+         jjmatchedPos = curPos;
+         kind = 0x7fffffff;
+      }
+      ++curPos;
+      if ((i = jjnewStateCnt) == (startsAt = 3 - (jjnewStateCnt = startsAt)))
+         return curPos;
+      try { curChar = input_stream.readChar(); }
+      catch(java.io.IOException e) { return curPos; }
+   }
+}
+static final int[] jjnextStates = {
+};
+public static final String[] jjstrLiteralImages = {
+"", "\15", "\12", "\57", "\73", "\75", null, null, null, null, null, null, 
+null, null, null, null, null, null, null, null, null, null, null, null, };
+public static final String[] lexStateNames = {
+   "DEFAULT", 
+   "INCOMMENT", 
+   "NESTED_COMMENT", 
+   "INQUOTEDSTRING", 
+};
+public static final int[] jjnewLexState = {
+   -1, -1, -1, -1, -1, -1, -1, 1, 0, -1, 2, -1, -1, -1, -1, -1, 3, -1, -1, 0, -1, -1, -1, -1, 
+};
+static final long[] jjtoToken = {
+   0x38003fL, 
+};
+static final long[] jjtoSkip = {
+   0x140L, 
+};
+static final long[] jjtoSpecial = {
+   0x40L, 
+};
+static final long[] jjtoMore = {
+   0x7fe80L, 
+};
+protected SimpleCharStream input_stream;
+private final int[] jjrounds = new int[3];
+private final int[] jjstateSet = new int[6];
+StringBuffer image;
+int jjimageLen;
+int lengthOfMatch;
+protected char curChar;
+public ContentTypeParserTokenManager(SimpleCharStream stream){
+   if (SimpleCharStream.staticFlag)
+      throw new Error("ERROR: Cannot use a static CharStream class with a non-static lexical analyzer.");
+   input_stream = stream;
+}
+public ContentTypeParserTokenManager(SimpleCharStream stream, int lexState){
+   this(stream);
+   SwitchTo(lexState);
+}
+public void ReInit(SimpleCharStream stream)
+{
+   jjmatchedPos = jjnewStateCnt = 0;
+   curLexState = defaultLexState;
+   input_stream = stream;
+   ReInitRounds();
+}
+private final void ReInitRounds()
+{
+   int i;
+   jjround = 0x80000001;
+   for (i = 3; i-- > 0;)
+      jjrounds[i] = 0x80000000;
+}
+public void ReInit(SimpleCharStream stream, int lexState)
+{
+   ReInit(stream);
+   SwitchTo(lexState);
+}
+public void SwitchTo(int lexState)
+{
+   if (lexState >= 4 || lexState < 0)
+      throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE);
+   else
+      curLexState = lexState;
+}
+
+protected Token jjFillToken()
+{
+   Token t = Token.newToken(jjmatchedKind);
+   t.kind = jjmatchedKind;
+   String im = jjstrLiteralImages[jjmatchedKind];
+   t.image = (im == null) ? input_stream.GetImage() : im;
+   t.beginLine = input_stream.getBeginLine();
+   t.beginColumn = input_stream.getBeginColumn();
+   t.endLine = input_stream.getEndLine();
+   t.endColumn = input_stream.getEndColumn();
+   return t;
+}
+
+int curLexState = 0;
+int defaultLexState = 0;
+int jjnewStateCnt;
+int jjround;
+int jjmatchedPos;
+int jjmatchedKind;
+
+public Token getNextToken() 
+{
+  int kind;
+  Token specialToken = null;
+  Token matchedToken;
+  int curPos = 0;
+
+  EOFLoop :
+  for (;;)
+  {   
+   try   
+   {     
+      curChar = input_stream.BeginToken();
+   }     
+   catch(java.io.IOException e)
+   {        
+      jjmatchedKind = 0;
+      matchedToken = jjFillToken();
+      matchedToken.specialToken = specialToken;
+      return matchedToken;
+   }
+   image = null;
+   jjimageLen = 0;
+
+   for (;;)
+   {
+     switch(curLexState)
+     {
+       case 0:
+         jjmatchedKind = 0x7fffffff;
+         jjmatchedPos = 0;
+         curPos = jjMoveStringLiteralDfa0_0();
+         break;
+       case 1:
+         jjmatchedKind = 0x7fffffff;
+         jjmatchedPos = 0;
+         curPos = jjMoveStringLiteralDfa0_1();
+         break;
+       case 2:
+         jjmatchedKind = 0x7fffffff;
+         jjmatchedPos = 0;
+         curPos = jjMoveStringLiteralDfa0_2();
+         break;
+       case 3:
+         jjmatchedKind = 0x7fffffff;
+         jjmatchedPos = 0;
+         curPos = jjMoveStringLiteralDfa0_3();
+         break;
+     }
+     if (jjmatchedKind != 0x7fffffff)
+     {
+        if (jjmatchedPos + 1 < curPos)
+           input_stream.backup(curPos - jjmatchedPos - 1);
+        if ((jjtoToken[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L)
+        {
+           matchedToken = jjFillToken();
+           matchedToken.specialToken = specialToken;
+           TokenLexicalActions(matchedToken);
+       if (jjnewLexState[jjmatchedKind] != -1)
+         curLexState = jjnewLexState[jjmatchedKind];
+           return matchedToken;
+        }
+        else if ((jjtoSkip[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L)
+        {
+           if ((jjtoSpecial[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L)
+           {
+              matchedToken = jjFillToken();
+              if (specialToken == null)
+                 specialToken = matchedToken;
+              else
+              {
+                 matchedToken.specialToken = specialToken;
+                 specialToken = (specialToken.next = matchedToken);
+              }
+           }
+         if (jjnewLexState[jjmatchedKind] != -1)
+           curLexState = jjnewLexState[jjmatchedKind];
+           continue EOFLoop;
+        }
+        MoreLexicalActions();
+      if (jjnewLexState[jjmatchedKind] != -1)
+        curLexState = jjnewLexState[jjmatchedKind];
+        curPos = 0;
+        jjmatchedKind = 0x7fffffff;
+        try {
+           curChar = input_stream.readChar();
+           continue;
+        }
+        catch (java.io.IOException e1) { }
+     }
+     int error_line = input_stream.getEndLine();
+     int error_column = input_stream.getEndColumn();
+     String error_after = null;
+     boolean EOFSeen = false;
+     try { input_stream.readChar(); input_stream.backup(1); }
+     catch (java.io.IOException e1) {
+        EOFSeen = true;
+        error_after = curPos <= 1 ? "" : input_stream.GetImage();
+        if (curChar == '\n' || curChar == '\r') {
+           error_line++;
+           error_column = 0;
+        }
+        else
+           error_column++;
+     }
+     if (!EOFSeen) {
+        input_stream.backup(1);
+        error_after = curPos <= 1 ? "" : input_stream.GetImage();
+     }
+     throw new TokenMgrError(EOFSeen, curLexState, error_line, error_column, error_after, curChar, TokenMgrError.LEXICAL_ERROR);
+   }
+  }
+}
+
+void MoreLexicalActions()
+{
+   jjimageLen += (lengthOfMatch = jjmatchedPos + 1);
+   switch(jjmatchedKind)
+   {
+      case 9 :
+         if (image == null)
+            image = new StringBuffer();
+         image.append(input_stream.GetSuffix(jjimageLen));
+         jjimageLen = 0;
+                          image.deleteCharAt(image.length() - 2);
+         break;
+      case 10 :
+         if (image == null)
+            image = new StringBuffer();
+         image.append(input_stream.GetSuffix(jjimageLen));
+         jjimageLen = 0;
+              commentNest = 1;
+         break;
+      case 12 :
+         if (image == null)
+            image = new StringBuffer();
+         image.append(input_stream.GetSuffix(jjimageLen));
+         jjimageLen = 0;
+                          image.deleteCharAt(image.length() - 2);
+         break;
+      case 13 :
+         if (image == null)
+            image = new StringBuffer();
+         image.append(input_stream.GetSuffix(jjimageLen));
+         jjimageLen = 0;
+              ++commentNest;
+         break;
+      case 14 :
+         if (image == null)
+            image = new StringBuffer();
+         image.append(input_stream.GetSuffix(jjimageLen));
+         jjimageLen = 0;
+              --commentNest; if (commentNest == 0) SwitchTo(INCOMMENT);
+         break;
+      case 16 :
+         if (image == null)
+            image = new StringBuffer();
+         image.append(input_stream.GetSuffix(jjimageLen));
+         jjimageLen = 0;
+               image.deleteCharAt(image.length() - 1);
+         break;
+      case 17 :
+         if (image == null)
+            image = new StringBuffer();
+         image.append(input_stream.GetSuffix(jjimageLen));
+         jjimageLen = 0;
+                          image.deleteCharAt(image.length() - 2);
+         break;
+      default : 
+         break;
+   }
+}
+void TokenLexicalActions(Token matchedToken)
+{
+   switch(jjmatchedKind)
+   {
+      case 19 :
+        if (image == null)
+            image = new StringBuffer();
+            image.append(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
+                                 matchedToken.image = image.substring(0, image.length() - 1);
+         break;
+      default : 
+         break;
+   }
+}
+}
diff --git a/src/org/apache/james/mime4j/field/contenttype/parser/ParseException.java b/src/org/apache/james/mime4j/field/contenttype/parser/ParseException.java
new file mode 100644
index 0000000..d9b69b2
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/contenttype/parser/ParseException.java
@@ -0,0 +1,207 @@
+/* Generated By:JavaCC: Do not edit this line. ParseException.java Version 3.0 */
+/*
+ *  Copyright 2004 the mime4j 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 org.apache.james.mime4j.field.contenttype.parser;
+
+/**
+ * This exception is thrown when parse errors are encountered.
+ * You can explicitly create objects of this exception type by
+ * calling the method generateParseException in the generated
+ * parser.
+ *
+ * You can modify this class to customize your error reporting
+ * mechanisms so long as you retain the public fields.
+ */
+public class ParseException extends Exception {
+
+  /**
+   * This constructor is used by the method "generateParseException"
+   * in the generated parser.  Calling this constructor generates
+   * a new object of this type with the fields "currentToken",
+   * "expectedTokenSequences", and "tokenImage" set.  The boolean
+   * flag "specialConstructor" is also set to true to indicate that
+   * this constructor was used to create this object.
+   * This constructor calls its super class with the empty string
+   * to force the "toString" method of parent class "Throwable" to
+   * print the error message in the form:
+   *     ParseException: <result of getMessage>
+   */
+  public ParseException(Token currentTokenVal,
+                        int[][] expectedTokenSequencesVal,
+                        String[] tokenImageVal
+                       )
+  {
+    super("");
+    specialConstructor = true;
+    currentToken = currentTokenVal;
+    expectedTokenSequences = expectedTokenSequencesVal;
+    tokenImage = tokenImageVal;
+  }
+
+  /**
+   * The following constructors are for use by you for whatever
+   * purpose you can think of.  Constructing the exception in this
+   * manner makes the exception behave in the normal way - i.e., as
+   * documented in the class "Throwable".  The fields "errorToken",
+   * "expectedTokenSequences", and "tokenImage" do not contain
+   * relevant information.  The JavaCC generated code does not use
+   * these constructors.
+   */
+
+  public ParseException() {
+    super();
+    specialConstructor = false;
+  }
+
+  public ParseException(String message) {
+    super(message);
+    specialConstructor = false;
+  }
+
+  /**
+   * This variable determines which constructor was used to create
+   * this object and thereby affects the semantics of the
+   * "getMessage" method (see below).
+   */
+  protected boolean specialConstructor;
+
+  /**
+   * This is the last token that has been consumed successfully.  If
+   * this object has been created due to a parse error, the token
+   * followng this token will (therefore) be the first error token.
+   */
+  public Token currentToken;
+
+  /**
+   * Each entry in this array is an array of integers.  Each array
+   * of integers represents a sequence of tokens (by their ordinal
+   * values) that is expected at this point of the parse.
+   */
+  public int[][] expectedTokenSequences;
+
+  /**
+   * This is a reference to the "tokenImage" array of the generated
+   * parser within which the parse error occurred.  This array is
+   * defined in the generated ...Constants interface.
+   */
+  public String[] tokenImage;
+
+  /**
+   * This method has the standard behavior when this object has been
+   * created using the standard constructors.  Otherwise, it uses
+   * "currentToken" and "expectedTokenSequences" to generate a parse
+   * error message and returns it.  If this object has been created
+   * due to a parse error, and you do not catch it (it gets thrown
+   * from the parser), then this method is called during the printing
+   * of the final stack trace, and hence the correct error message
+   * gets displayed.
+   */
+  public String getMessage() {
+    if (!specialConstructor) {
+      return super.getMessage();
+    }
+    StringBuffer expected = new StringBuffer();
+    int maxSize = 0;
+    for (int i = 0; i < expectedTokenSequences.length; i++) {
+      if (maxSize < expectedTokenSequences[i].length) {
+        maxSize = expectedTokenSequences[i].length;
+      }
+      for (int j = 0; j < expectedTokenSequences[i].length; j++) {
+        expected.append(tokenImage[expectedTokenSequences[i][j]]).append(" ");
+      }
+      if (expectedTokenSequences[i][expectedTokenSequences[i].length - 1] != 0) {
+        expected.append("...");
+      }
+      expected.append(eol).append("    ");
+    }
+    String retval = "Encountered \"";
+    Token tok = currentToken.next;
+    for (int i = 0; i < maxSize; i++) {
+      if (i != 0) retval += " ";
+      if (tok.kind == 0) {
+        retval += tokenImage[0];
+        break;
+      }
+      retval += add_escapes(tok.image);
+      tok = tok.next; 
+    }
+    retval += "\" at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn;
+    retval += "." + eol;
+    if (expectedTokenSequences.length == 1) {
+      retval += "Was expecting:" + eol + "    ";
+    } else {
+      retval += "Was expecting one of:" + eol + "    ";
+    }
+    retval += expected.toString();
+    return retval;
+  }
+
+  /**
+   * The end of line string for this machine.
+   */
+  protected String eol = System.getProperty("line.separator", "\n");
+ 
+  /**
+   * Used to convert raw characters to their escaped version
+   * when these raw version cannot be used as part of an ASCII
+   * string literal.
+   */
+  protected String add_escapes(String str) {
+      StringBuffer retval = new StringBuffer();
+      char ch;
+      for (int i = 0; i < str.length(); i++) {
+        switch (str.charAt(i))
+        {
+           case 0 :
+              continue;
+           case '\b':
+              retval.append("\\b");
+              continue;
+           case '\t':
+              retval.append("\\t");
+              continue;
+           case '\n':
+              retval.append("\\n");
+              continue;
+           case '\f':
+              retval.append("\\f");
+              continue;
+           case '\r':
+              retval.append("\\r");
+              continue;
+           case '\"':
+              retval.append("\\\"");
+              continue;
+           case '\'':
+              retval.append("\\\'");
+              continue;
+           case '\\':
+              retval.append("\\\\");
+              continue;
+           default:
+              if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
+                 String s = "0000" + Integer.toString(ch, 16);
+                 retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+              } else {
+                 retval.append(ch);
+              }
+              continue;
+        }
+      }
+      return retval.toString();
+   }
+
+}
diff --git a/src/org/apache/james/mime4j/field/contenttype/parser/SimpleCharStream.java b/src/org/apache/james/mime4j/field/contenttype/parser/SimpleCharStream.java
new file mode 100644
index 0000000..ae035b7
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/contenttype/parser/SimpleCharStream.java
@@ -0,0 +1,454 @@
+/* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version 4.0 */
+/*
+ *  Copyright 2004 the mime4j 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 org.apache.james.mime4j.field.contenttype.parser;
+
+/**
+ * An implementation of interface CharStream, where the stream is assumed to
+ * contain only ASCII characters (without unicode processing).
+ */
+
+public class SimpleCharStream
+{
+  public static final boolean staticFlag = false;
+  int bufsize;
+  int available;
+  int tokenBegin;
+  public int bufpos = -1;
+  protected int bufline[];
+  protected int bufcolumn[];
+
+  protected int column = 0;
+  protected int line = 1;
+
+  protected boolean prevCharIsCR = false;
+  protected boolean prevCharIsLF = false;
+
+  protected java.io.Reader inputStream;
+
+  protected char[] buffer;
+  protected int maxNextCharInd = 0;
+  protected int inBuf = 0;
+  protected int tabSize = 8;
+
+  protected void setTabSize(int i) { tabSize = i; }
+  protected int getTabSize(int i) { return tabSize; }
+
+
+  protected void ExpandBuff(boolean wrapAround)
+  {
+     char[] newbuffer = new char[bufsize + 2048];
+     int newbufline[] = new int[bufsize + 2048];
+     int newbufcolumn[] = new int[bufsize + 2048];
+
+     try
+     {
+        if (wrapAround)
+        {
+           System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize - tokenBegin);
+           System.arraycopy(buffer, 0, newbuffer,
+                                             bufsize - tokenBegin, bufpos);
+           buffer = newbuffer;
+
+           System.arraycopy(bufline, tokenBegin, newbufline, 0, bufsize - tokenBegin);
+           System.arraycopy(bufline, 0, newbufline, bufsize - tokenBegin, bufpos);
+           bufline = newbufline;
+
+           System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize - tokenBegin);
+           System.arraycopy(bufcolumn, 0, newbufcolumn, bufsize - tokenBegin, bufpos);
+           bufcolumn = newbufcolumn;
+
+           maxNextCharInd = (bufpos += (bufsize - tokenBegin));
+        }
+        else
+        {
+           System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize - tokenBegin);
+           buffer = newbuffer;
+
+           System.arraycopy(bufline, tokenBegin, newbufline, 0, bufsize - tokenBegin);
+           bufline = newbufline;
+
+           System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize - tokenBegin);
+           bufcolumn = newbufcolumn;
+
+           maxNextCharInd = (bufpos -= tokenBegin);
+        }
+     }
+     catch (Throwable t)
+     {
+        throw new Error(t.getMessage());
+     }
+
+
+     bufsize += 2048;
+     available = bufsize;
+     tokenBegin = 0;
+  }
+
+  protected void FillBuff() throws java.io.IOException
+  {
+     if (maxNextCharInd == available)
+     {
+        if (available == bufsize)
+        {
+           if (tokenBegin > 2048)
+           {
+              bufpos = maxNextCharInd = 0;
+              available = tokenBegin;
+           }
+           else if (tokenBegin < 0)
+              bufpos = maxNextCharInd = 0;
+           else
+              ExpandBuff(false);
+        }
+        else if (available > tokenBegin)
+           available = bufsize;
+        else if ((tokenBegin - available) < 2048)
+           ExpandBuff(true);
+        else
+           available = tokenBegin;
+     }
+
+     int i;
+     try {
+        if ((i = inputStream.read(buffer, maxNextCharInd,
+                                    available - maxNextCharInd)) == -1)
+        {
+           inputStream.close();
+           throw new java.io.IOException();
+        }
+        else
+           maxNextCharInd += i;
+        return;
+     }
+     catch(java.io.IOException e) {
+        --bufpos;
+        backup(0);
+        if (tokenBegin == -1)
+           tokenBegin = bufpos;
+        throw e;
+     }
+  }
+
+  public char BeginToken() throws java.io.IOException
+  {
+     tokenBegin = -1;
+     char c = readChar();
+     tokenBegin = bufpos;
+
+     return c;
+  }
+
+  protected void UpdateLineColumn(char c)
+  {
+     column++;
+
+     if (prevCharIsLF)
+     {
+        prevCharIsLF = false;
+        line += (column = 1);
+     }
+     else if (prevCharIsCR)
+     {
+        prevCharIsCR = false;
+        if (c == '\n')
+        {
+           prevCharIsLF = true;
+        }
+        else
+           line += (column = 1);
+     }
+
+     switch (c)
+     {
+        case '\r' :
+           prevCharIsCR = true;
+           break;
+        case '\n' :
+           prevCharIsLF = true;
+           break;
+        case '\t' :
+           column--;
+           column += (tabSize - (column % tabSize));
+           break;
+        default :
+           break;
+     }
+
+     bufline[bufpos] = line;
+     bufcolumn[bufpos] = column;
+  }
+
+  public char readChar() throws java.io.IOException
+  {
+     if (inBuf > 0)
+     {
+        --inBuf;
+
+        if (++bufpos == bufsize)
+           bufpos = 0;
+
+        return buffer[bufpos];
+     }
+
+     if (++bufpos >= maxNextCharInd)
+        FillBuff();
+
+     char c = buffer[bufpos];
+
+     UpdateLineColumn(c);
+     return (c);
+  }
+
+  /**
+   * @deprecated 
+   * @see #getEndColumn
+   */
+  @Deprecated
+  public int getColumn() {
+     return bufcolumn[bufpos];
+  }
+
+  /**
+   * @deprecated 
+   * @see #getEndLine
+   */
+  @Deprecated
+  public int getLine() {
+     return bufline[bufpos];
+  }
+
+  public int getEndColumn() {
+     return bufcolumn[bufpos];
+  }
+
+  public int getEndLine() {
+     return bufline[bufpos];
+  }
+
+  public int getBeginColumn() {
+     return bufcolumn[tokenBegin];
+  }
+
+  public int getBeginLine() {
+     return bufline[tokenBegin];
+  }
+
+  public void backup(int amount) {
+
+    inBuf += amount;
+    if ((bufpos -= amount) < 0)
+       bufpos += bufsize;
+  }
+
+  public SimpleCharStream(java.io.Reader dstream, int startline,
+  int startcolumn, int buffersize)
+  {
+    inputStream = dstream;
+    line = startline;
+    column = startcolumn - 1;
+
+    available = bufsize = buffersize;
+    buffer = new char[buffersize];
+    bufline = new int[buffersize];
+    bufcolumn = new int[buffersize];
+  }
+
+  public SimpleCharStream(java.io.Reader dstream, int startline,
+                          int startcolumn)
+  {
+     this(dstream, startline, startcolumn, 4096);
+  }
+
+  public SimpleCharStream(java.io.Reader dstream)
+  {
+     this(dstream, 1, 1, 4096);
+  }
+  public void ReInit(java.io.Reader dstream, int startline,
+  int startcolumn, int buffersize)
+  {
+    inputStream = dstream;
+    line = startline;
+    column = startcolumn - 1;
+
+    if (buffer == null || buffersize != buffer.length)
+    {
+      available = bufsize = buffersize;
+      buffer = new char[buffersize];
+      bufline = new int[buffersize];
+      bufcolumn = new int[buffersize];
+    }
+    prevCharIsLF = prevCharIsCR = false;
+    tokenBegin = inBuf = maxNextCharInd = 0;
+    bufpos = -1;
+  }
+
+  public void ReInit(java.io.Reader dstream, int startline,
+                     int startcolumn)
+  {
+     ReInit(dstream, startline, startcolumn, 4096);
+  }
+
+  public void ReInit(java.io.Reader dstream)
+  {
+     ReInit(dstream, 1, 1, 4096);
+  }
+  public SimpleCharStream(java.io.InputStream dstream, String encoding, int startline,
+  int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException
+  {
+     this(encoding == null ? new java.io.InputStreamReader(dstream) : new java.io.InputStreamReader(dstream, encoding), startline, startcolumn, buffersize);
+  }
+
+  public SimpleCharStream(java.io.InputStream dstream, int startline,
+  int startcolumn, int buffersize)
+  {
+     this(new java.io.InputStreamReader(dstream), startline, startcolumn, buffersize);
+  }
+
+  public SimpleCharStream(java.io.InputStream dstream, String encoding, int startline,
+                          int startcolumn) throws java.io.UnsupportedEncodingException
+  {
+     this(dstream, encoding, startline, startcolumn, 4096);
+  }
+
+  public SimpleCharStream(java.io.InputStream dstream, int startline,
+                          int startcolumn)
+  {
+     this(dstream, startline, startcolumn, 4096);
+  }
+
+  public SimpleCharStream(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException
+  {
+     this(dstream, encoding, 1, 1, 4096);
+  }
+
+  public SimpleCharStream(java.io.InputStream dstream)
+  {
+     this(dstream, 1, 1, 4096);
+  }
+
+  public void ReInit(java.io.InputStream dstream, String encoding, int startline,
+                          int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException
+  {
+     ReInit(encoding == null ? new java.io.InputStreamReader(dstream) : new java.io.InputStreamReader(dstream, encoding), startline, startcolumn, buffersize);
+  }
+
+  public void ReInit(java.io.InputStream dstream, int startline,
+                          int startcolumn, int buffersize)
+  {
+     ReInit(new java.io.InputStreamReader(dstream), startline, startcolumn, buffersize);
+  }
+
+  public void ReInit(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException
+  {
+     ReInit(dstream, encoding, 1, 1, 4096);
+  }
+
+  public void ReInit(java.io.InputStream dstream)
+  {
+     ReInit(dstream, 1, 1, 4096);
+  }
+  public void ReInit(java.io.InputStream dstream, String encoding, int startline,
+                     int startcolumn) throws java.io.UnsupportedEncodingException
+  {
+     ReInit(dstream, encoding, startline, startcolumn, 4096);
+  }
+  public void ReInit(java.io.InputStream dstream, int startline,
+                     int startcolumn)
+  {
+     ReInit(dstream, startline, startcolumn, 4096);
+  }
+  public String GetImage()
+  {
+     if (bufpos >= tokenBegin)
+        return new String(buffer, tokenBegin, bufpos - tokenBegin + 1);
+     else
+        return new String(buffer, tokenBegin, bufsize - tokenBegin) +
+                              new String(buffer, 0, bufpos + 1);
+  }
+
+  public char[] GetSuffix(int len)
+  {
+     char[] ret = new char[len];
+
+     if ((bufpos + 1) >= len)
+        System.arraycopy(buffer, bufpos - len + 1, ret, 0, len);
+     else
+     {
+        System.arraycopy(buffer, bufsize - (len - bufpos - 1), ret, 0,
+                                                          len - bufpos - 1);
+        System.arraycopy(buffer, 0, ret, len - bufpos - 1, bufpos + 1);
+     }
+
+     return ret;
+  }
+
+  public void Done()
+  {
+     buffer = null;
+     bufline = null;
+     bufcolumn = null;
+  }
+
+  /**
+   * Method to adjust line and column numbers for the start of a token.
+   */
+  public void adjustBeginLineColumn(int newLine, int newCol)
+  {
+     int start = tokenBegin;
+     int len;
+
+     if (bufpos >= tokenBegin)
+     {
+        len = bufpos - tokenBegin + inBuf + 1;
+     }
+     else
+     {
+        len = bufsize - tokenBegin + bufpos + 1 + inBuf;
+     }
+
+     int i = 0, j = 0, k = 0;
+     int nextColDiff = 0, columnDiff = 0;
+
+     while (i < len &&
+            bufline[j = start % bufsize] == bufline[k = ++start % bufsize])
+     {
+        bufline[j] = newLine;
+        nextColDiff = columnDiff + bufcolumn[k] - bufcolumn[j];
+        bufcolumn[j] = newCol + columnDiff;
+        columnDiff = nextColDiff;
+        i++;
+     } 
+
+     if (i < len)
+     {
+        bufline[j] = newLine++;
+        bufcolumn[j] = newCol + columnDiff;
+
+        while (i++ < len)
+        {
+           if (bufline[j = start % bufsize] != bufline[++start % bufsize])
+              bufline[j] = newLine++;
+           else
+              bufline[j] = newLine;
+        }
+     }
+
+     line = bufline[j];
+     column = bufcolumn[j];
+  }
+
+}
diff --git a/src/org/apache/james/mime4j/field/contenttype/parser/Token.java b/src/org/apache/james/mime4j/field/contenttype/parser/Token.java
new file mode 100644
index 0000000..34e65ee
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/contenttype/parser/Token.java
@@ -0,0 +1,96 @@
+/* Generated By:JavaCC: Do not edit this line. Token.java Version 3.0 */
+/*
+ *  Copyright 2004 the mime4j 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 org.apache.james.mime4j.field.contenttype.parser;
+
+/**
+ * Describes the input token stream.
+ */
+
+public class Token {
+
+  /**
+   * An integer that describes the kind of this token.  This numbering
+   * system is determined by JavaCCParser, and a table of these numbers is
+   * stored in the file ...Constants.java.
+   */
+  public int kind;
+
+  /**
+   * beginLine and beginColumn describe the position of the first character
+   * of this token; endLine and endColumn describe the position of the
+   * last character of this token.
+   */
+  public int beginLine, beginColumn, endLine, endColumn;
+
+  /**
+   * The string image of the token.
+   */
+  public String image;
+
+  /**
+   * A reference to the next regular (non-special) token from the input
+   * stream.  If this is the last token from the input stream, or if the
+   * token manager has not read tokens beyond this one, this field is
+   * set to null.  This is true only if this token is also a regular
+   * token.  Otherwise, see below for a description of the contents of
+   * this field.
+   */
+  public Token next;
+
+  /**
+   * This field is used to access special tokens that occur prior to this
+   * token, but after the immediately preceding regular (non-special) token.
+   * If there are no such special tokens, this field is set to null.
+   * When there are more than one such special token, this field refers
+   * to the last of these special tokens, which in turn refers to the next
+   * previous special token through its specialToken field, and so on
+   * until the first special token (whose specialToken field is null).
+   * The next fields of special tokens refer to other special tokens that
+   * immediately follow it (without an intervening regular token).  If there
+   * is no such token, this field is null.
+   */
+  public Token specialToken;
+
+  /**
+   * Returns the image.
+   */
+  public String toString()
+  {
+     return image;
+  }
+
+  /**
+   * Returns a new Token object, by default. However, if you want, you
+   * can create and return subclass objects based on the value of ofKind.
+   * Simply add the cases to the switch for all those special cases.
+   * For example, if you have a subclass of Token called IDToken that
+   * you want to create if ofKind is ID, simlpy add something like :
+   *
+   *    case MyParserConstants.ID : return new IDToken();
+   *
+   * to the following switch statement. Then you can cast matchedToken
+   * variable to the appropriate type and use it in your lexical actions.
+   */
+  public static final Token newToken(int ofKind)
+  {
+     switch(ofKind)
+     {
+       default : return new Token();
+     }
+  }
+
+}
diff --git a/src/org/apache/james/mime4j/field/contenttype/parser/TokenMgrError.java b/src/org/apache/james/mime4j/field/contenttype/parser/TokenMgrError.java
new file mode 100644
index 0000000..ea5a782
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/contenttype/parser/TokenMgrError.java
@@ -0,0 +1,148 @@
+/* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 3.0 */
+/*
+ *  Copyright 2004 the mime4j 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 org.apache.james.mime4j.field.contenttype.parser;
+
+public class TokenMgrError extends Error
+{
+   /*
+    * Ordinals for various reasons why an Error of this type can be thrown.
+    */
+
+   /**
+    * Lexical error occured.
+    */
+   static final int LEXICAL_ERROR = 0;
+
+   /**
+    * An attempt wass made to create a second instance of a static token manager.
+    */
+   static final int STATIC_LEXER_ERROR = 1;
+
+   /**
+    * Tried to change to an invalid lexical state.
+    */
+   static final int INVALID_LEXICAL_STATE = 2;
+
+   /**
+    * Detected (and bailed out of) an infinite loop in the token manager.
+    */
+   static final int LOOP_DETECTED = 3;
+
+   /**
+    * Indicates the reason why the exception is thrown. It will have
+    * one of the above 4 values.
+    */
+   int errorCode;
+
+   /**
+    * Replaces unprintable characters by their espaced (or unicode escaped)
+    * equivalents in the given string
+    */
+   protected static final String addEscapes(String str) {
+      StringBuffer retval = new StringBuffer();
+      char ch;
+      for (int i = 0; i < str.length(); i++) {
+        switch (str.charAt(i))
+        {
+           case 0 :
+              continue;
+           case '\b':
+              retval.append("\\b");
+              continue;
+           case '\t':
+              retval.append("\\t");
+              continue;
+           case '\n':
+              retval.append("\\n");
+              continue;
+           case '\f':
+              retval.append("\\f");
+              continue;
+           case '\r':
+              retval.append("\\r");
+              continue;
+           case '\"':
+              retval.append("\\\"");
+              continue;
+           case '\'':
+              retval.append("\\\'");
+              continue;
+           case '\\':
+              retval.append("\\\\");
+              continue;
+           default:
+              if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
+                 String s = "0000" + Integer.toString(ch, 16);
+                 retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+              } else {
+                 retval.append(ch);
+              }
+              continue;
+        }
+      }
+      return retval.toString();
+   }
+
+   /**
+    * Returns a detailed message for the Error when it is thrown by the
+    * token manager to indicate a lexical error.
+    * Parameters : 
+    *    EOFSeen     : indicates if EOF caused the lexicl error
+    *    curLexState : lexical state in which this error occured
+    *    errorLine   : line number when the error occured
+    *    errorColumn : column number when the error occured
+    *    errorAfter  : prefix that was seen before this error occured
+    *    curchar     : the offending character
+    * Note: You can customize the lexical error message by modifying this method.
+    */
+   protected static String LexicalError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar) {
+      return("Lexical error at line " +
+           errorLine + ", column " +
+           errorColumn + ".  Encountered: " +
+           (EOFSeen ? "<EOF> " : ("\"" + addEscapes(String.valueOf(curChar)) + "\"") + " (" + (int)curChar + "), ") +
+           "after : \"" + addEscapes(errorAfter) + "\"");
+   }
+
+   /**
+    * You can also modify the body of this method to customize your error messages.
+    * For example, cases like LOOP_DETECTED and INVALID_LEXICAL_STATE are not
+    * of end-users concern, so you can return something like : 
+    *
+    *     "Internal Error : Please file a bug report .... "
+    *
+    * from this method for such cases in the release version of your parser.
+    */
+   public String getMessage() {
+      return super.getMessage();
+   }
+
+   /*
+    * Constructors of various flavors follow.
+    */
+
+   public TokenMgrError() {
+   }
+
+   public TokenMgrError(String message, int reason) {
+      super(message);
+      errorCode = reason;
+   }
+
+   public TokenMgrError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar, int reason) {
+      this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
+   }
+}
diff --git a/src/org/apache/james/mime4j/field/datetime/DateTime.java b/src/org/apache/james/mime4j/field/datetime/DateTime.java
new file mode 100644
index 0000000..506ff54
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/datetime/DateTime.java
@@ -0,0 +1,127 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you 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 org.apache.james.mime4j.field.datetime;
+
+import org.apache.james.mime4j.field.datetime.parser.DateTimeParser;
+import org.apache.james.mime4j.field.datetime.parser.ParseException;
+import org.apache.james.mime4j.field.datetime.parser.TokenMgrError;
+
+import java.util.Date;
+import java.util.Calendar;
+import java.util.TimeZone;
+import java.util.GregorianCalendar;
+import java.io.StringReader;
+
+public class DateTime {
+    private final Date date;
+    private final int year;
+    private final int month;
+    private final int day;
+    private final int hour;
+    private final int minute;
+    private final int second;
+    private final int timeZone;
+
+    public DateTime(String yearString, int month, int day, int hour, int minute, int second, int timeZone) {
+        this.year = convertToYear(yearString);
+        this.date = convertToDate(year, month, day, hour, minute, second, timeZone);
+        this.month = month;
+        this.day = day;
+        this.hour = hour;
+        this.minute = minute;
+        this.second = second;
+        this.timeZone = timeZone;
+    }
+
+    private int convertToYear(String yearString) {
+        int year = Integer.parseInt(yearString);
+        switch (yearString.length()) {
+            case 1:
+            case 2:
+                if (year >= 0 && year < 50)
+                    return 2000 + year;
+                else
+                    return 1900 + year;
+            case 3:
+                return 1900 + year;
+            default:
+                return year;
+        }
+    }
+
+    public static Date convertToDate(int year, int month, int day, int hour, int minute, int second, int timeZone) {
+        Calendar c = new GregorianCalendar(TimeZone.getTimeZone("GMT+0"));
+        c.set(year, month - 1, day, hour, minute, second);
+        c.set(Calendar.MILLISECOND, 0);
+
+        if (timeZone != Integer.MIN_VALUE) {
+            int minutes = ((timeZone / 100) * 60) + timeZone % 100;
+            c.add(Calendar.MINUTE, -1 * minutes);
+        }
+
+        return c.getTime();
+    }
+
+    public Date getDate() {
+        return date;
+    }
+
+    public int getYear() {
+        return year;
+    }
+
+    public int getMonth() {
+        return month;
+    }
+
+    public int getDay() {
+        return day;
+    }
+
+    public int getHour() {
+        return hour;
+    }
+
+    public int getMinute() {
+        return minute;
+    }
+
+    public int getSecond() {
+        return second;
+    }
+
+    public int getTimeZone() {
+        return timeZone;
+    }
+
+    public void print() {
+        System.out.println(getYear() + " " + getMonth() + " " + getDay() + "; " + getHour() + " " + getMinute() + " " + getSecond() + " " + getTimeZone());
+    }
+
+
+    public static DateTime parse(String dateString) throws ParseException {
+        try {
+            return new DateTimeParser(new StringReader(dateString)).parseAll();
+        }
+        catch (TokenMgrError err) {
+            throw new ParseException(err.getMessage());
+        }
+    }
+}
diff --git a/src/org/apache/james/mime4j/field/datetime/parser/DateTimeParser.java b/src/org/apache/james/mime4j/field/datetime/parser/DateTimeParser.java
new file mode 100644
index 0000000..43edebb
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/datetime/parser/DateTimeParser.java
@@ -0,0 +1,570 @@
+/* Generated By:JavaCC: Do not edit this line. DateTimeParser.java */
+/*
+ *  Copyright 2004 the mime4j 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 org.apache.james.mime4j.field.datetime.parser;
+
+import org.apache.james.mime4j.field.datetime.DateTime;
+
+import java.util.Vector;
+
+public class DateTimeParser implements DateTimeParserConstants {
+    private static final boolean ignoreMilitaryZoneOffset = true;
+
+    public static void main(String args[]) throws ParseException {
+                while (true) {
+                    try {
+                                DateTimeParser parser = new DateTimeParser(System.in);
+                        parser.parseLine();
+                    } catch (Exception x) {
+                                x.printStackTrace();
+                                return;
+                    }
+                }
+    }
+
+    private static int parseDigits(Token token) {
+        return Integer.parseInt(token.image, 10);
+    }
+
+    private static int getMilitaryZoneOffset(char c) {
+        if (ignoreMilitaryZoneOffset)
+            return 0;
+
+        c = Character.toUpperCase(c);
+
+        switch (c) {
+            case 'A': return 1;
+            case 'B': return 2;
+            case 'C': return 3;
+            case 'D': return 4;
+            case 'E': return 5;
+            case 'F': return 6;
+            case 'G': return 7;
+            case 'H': return 8;
+            case 'I': return 9;
+            case 'K': return 10;
+            case 'L': return 11;
+            case 'M': return 12;
+
+            case 'N': return -1;
+            case 'O': return -2;
+            case 'P': return -3;
+            case 'Q': return -4;
+            case 'R': return -5;
+            case 'S': return -6;
+            case 'T': return -7;
+            case 'U': return -8;
+            case 'V': return -9;
+            case 'W': return -10;
+            case 'X': return -11;
+            case 'Y': return -12;
+
+            case 'Z': return 0;
+            default: return 0;
+        }
+    }
+
+    private static class Time {
+        private int hour;
+        private int minute;
+        private int second;
+        private int zone;
+
+        public Time(int hour, int minute, int second, int zone) {
+            this.hour = hour;
+            this.minute = minute;
+            this.second = second;
+            this.zone = zone;
+        }
+
+        public int getHour() { return hour; }
+        public int getMinute() { return minute; }
+        public int getSecond() { return second; }
+        public int getZone() { return zone; }
+    }
+
+    private static class Date {
+        private String year;
+        private int month;
+        private int day;
+
+        public Date(String year, int month, int day) {
+            this.year = year;
+            this.month = month;
+            this.day = day;
+        }
+
+        public String getYear() { return year; }
+        public int getMonth() { return month; }
+        public int getDay() { return day; }
+    }
+
+  final public DateTime parseLine() throws ParseException {
+ DateTime dt;
+    dt = date_time();
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case 1:
+      jj_consume_token(1);
+      break;
+    default:
+      jj_la1[0] = jj_gen;
+      ;
+    }
+    jj_consume_token(2);
+          {if (true) return dt;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public DateTime parseAll() throws ParseException {
+ DateTime dt;
+    dt = date_time();
+    jj_consume_token(0);
+          {if (true) return dt;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public DateTime date_time() throws ParseException {
+ Date d; Time t;
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case 4:
+    case 5:
+    case 6:
+    case 7:
+    case 8:
+    case 9:
+    case 10:
+      day_of_week();
+      jj_consume_token(3);
+      break;
+    default:
+      jj_la1[1] = jj_gen;
+      ;
+    }
+    d = date();
+    t = time();
+            {if (true) return new DateTime(
+                    d.getYear(),
+                    d.getMonth(),
+                    d.getDay(),
+                    t.getHour(),
+                    t.getMinute(),
+                    t.getSecond(),
+                    t.getZone());}    // time zone offset
+
+    throw new Error("Missing return statement in function");
+  }
+
+  final public String day_of_week() throws ParseException {
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case 4:
+      jj_consume_token(4);
+      break;
+    case 5:
+      jj_consume_token(5);
+      break;
+    case 6:
+      jj_consume_token(6);
+      break;
+    case 7:
+      jj_consume_token(7);
+      break;
+    case 8:
+      jj_consume_token(8);
+      break;
+    case 9:
+      jj_consume_token(9);
+      break;
+    case 10:
+      jj_consume_token(10);
+      break;
+    default:
+      jj_la1[2] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+      {if (true) return token.image;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public Date date() throws ParseException {
+ int d, m; String y;
+    d = day();
+    m = month();
+    y = year();
+      {if (true) return new Date(y, m, d);}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public int day() throws ParseException {
+ Token t;
+    t = jj_consume_token(DIGITS);
+                 {if (true) return parseDigits(t);}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public int month() throws ParseException {
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case 11:
+      jj_consume_token(11);
+            {if (true) return 1;}
+      break;
+    case 12:
+      jj_consume_token(12);
+            {if (true) return 2;}
+      break;
+    case 13:
+      jj_consume_token(13);
+            {if (true) return 3;}
+      break;
+    case 14:
+      jj_consume_token(14);
+            {if (true) return 4;}
+      break;
+    case 15:
+      jj_consume_token(15);
+            {if (true) return 5;}
+      break;
+    case 16:
+      jj_consume_token(16);
+            {if (true) return 6;}
+      break;
+    case 17:
+      jj_consume_token(17);
+            {if (true) return 7;}
+      break;
+    case 18:
+      jj_consume_token(18);
+            {if (true) return 8;}
+      break;
+    case 19:
+      jj_consume_token(19);
+            {if (true) return 9;}
+      break;
+    case 20:
+      jj_consume_token(20);
+            {if (true) return 10;}
+      break;
+    case 21:
+      jj_consume_token(21);
+            {if (true) return 11;}
+      break;
+    case 22:
+      jj_consume_token(22);
+            {if (true) return 12;}
+      break;
+    default:
+      jj_la1[3] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+    throw new Error("Missing return statement in function");
+  }
+
+  final public String year() throws ParseException {
+ Token t;
+    t = jj_consume_token(DIGITS);
+                 {if (true) return t.image;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public Time time() throws ParseException {
+ int h, m, s=0, z;
+    h = hour();
+    jj_consume_token(23);
+    m = minute();
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case 23:
+      jj_consume_token(23);
+      s = second();
+      break;
+    default:
+      jj_la1[4] = jj_gen;
+      ;
+    }
+    z = zone();
+      {if (true) return new Time(h, m, s, z);}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public int hour() throws ParseException {
+ Token t;
+    t = jj_consume_token(DIGITS);
+                 {if (true) return parseDigits(t);}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public int minute() throws ParseException {
+ Token t;
+    t = jj_consume_token(DIGITS);
+                 {if (true) return parseDigits(t);}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public int second() throws ParseException {
+ Token t;
+    t = jj_consume_token(DIGITS);
+                 {if (true) return parseDigits(t);}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public int zone() throws ParseException {
+  Token t, u; int z;
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case OFFSETDIR:
+      t = jj_consume_token(OFFSETDIR);
+      u = jj_consume_token(DIGITS);
+                                              z=parseDigits(u)*(t.image.equals("-") ? -1 : 1);
+      break;
+    case 25:
+    case 26:
+    case 27:
+    case 28:
+    case 29:
+    case 30:
+    case 31:
+    case 32:
+    case 33:
+    case 34:
+    case MILITARY_ZONE:
+      z = obs_zone();
+      break;
+    default:
+      jj_la1[5] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+      {if (true) return z;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public int obs_zone() throws ParseException {
+ Token t; int z;
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case 25:
+      jj_consume_token(25);
+            z=0;
+      break;
+    case 26:
+      jj_consume_token(26);
+            z=0;
+      break;
+    case 27:
+      jj_consume_token(27);
+            z=-5;
+      break;
+    case 28:
+      jj_consume_token(28);
+            z=-4;
+      break;
+    case 29:
+      jj_consume_token(29);
+            z=-6;
+      break;
+    case 30:
+      jj_consume_token(30);
+            z=-5;
+      break;
+    case 31:
+      jj_consume_token(31);
+            z=-7;
+      break;
+    case 32:
+      jj_consume_token(32);
+            z=-6;
+      break;
+    case 33:
+      jj_consume_token(33);
+            z=-8;
+      break;
+    case 34:
+      jj_consume_token(34);
+            z=-7;
+      break;
+    case MILITARY_ZONE:
+      t = jj_consume_token(MILITARY_ZONE);
+                                                             z=getMilitaryZoneOffset(t.image.charAt(0));
+      break;
+    default:
+      jj_la1[6] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+      {if (true) return z * 100;}
+    throw new Error("Missing return statement in function");
+  }
+
+  public DateTimeParserTokenManager token_source;
+  SimpleCharStream jj_input_stream;
+  public Token token, jj_nt;
+  private int jj_ntk;
+  private int jj_gen;
+  final private int[] jj_la1 = new int[7];
+  static private int[] jj_la1_0;
+  static private int[] jj_la1_1;
+  static {
+      jj_la1_0();
+      jj_la1_1();
+   }
+   private static void jj_la1_0() {
+      jj_la1_0 = new int[] {0x2,0x7f0,0x7f0,0x7ff800,0x800000,0xff000000,0xfe000000,};
+   }
+   private static void jj_la1_1() {
+      jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,0xf,0xf,};
+   }
+
+  public DateTimeParser(java.io.InputStream stream) {
+     this(stream, null);
+  }
+  public DateTimeParser(java.io.InputStream stream, String encoding) {
+    try { jj_input_stream = new SimpleCharStream(stream, encoding, 1, 1); } catch(java.io.UnsupportedEncodingException e) { throw new RuntimeException(e); }
+    token_source = new DateTimeParserTokenManager(jj_input_stream);
+    token = new Token();
+    jj_ntk = -1;
+    jj_gen = 0;
+    for (int i = 0; i < 7; i++) jj_la1[i] = -1;
+  }
+
+  public void ReInit(java.io.InputStream stream) {
+     ReInit(stream, null);
+  }
+  public void ReInit(java.io.InputStream stream, String encoding) {
+    try { jj_input_stream.ReInit(stream, encoding, 1, 1); } catch(java.io.UnsupportedEncodingException e) { throw new RuntimeException(e); }
+    token_source.ReInit(jj_input_stream);
+    token = new Token();
+    jj_ntk = -1;
+    jj_gen = 0;
+    for (int i = 0; i < 7; i++) jj_la1[i] = -1;
+  }
+
+  public DateTimeParser(java.io.Reader stream) {
+    jj_input_stream = new SimpleCharStream(stream, 1, 1);
+    token_source = new DateTimeParserTokenManager(jj_input_stream);
+    token = new Token();
+    jj_ntk = -1;
+    jj_gen = 0;
+    for (int i = 0; i < 7; i++) jj_la1[i] = -1;
+  }
+
+  public void ReInit(java.io.Reader stream) {
+    jj_input_stream.ReInit(stream, 1, 1);
+    token_source.ReInit(jj_input_stream);
+    token = new Token();
+    jj_ntk = -1;
+    jj_gen = 0;
+    for (int i = 0; i < 7; i++) jj_la1[i] = -1;
+  }
+
+  public DateTimeParser(DateTimeParserTokenManager tm) {
+    token_source = tm;
+    token = new Token();
+    jj_ntk = -1;
+    jj_gen = 0;
+    for (int i = 0; i < 7; i++) jj_la1[i] = -1;
+  }
+
+  public void ReInit(DateTimeParserTokenManager tm) {
+    token_source = tm;
+    token = new Token();
+    jj_ntk = -1;
+    jj_gen = 0;
+    for (int i = 0; i < 7; i++) jj_la1[i] = -1;
+  }
+
+  final private Token jj_consume_token(int kind) throws ParseException {
+    Token oldToken;
+    if ((oldToken = token).next != null) token = token.next;
+    else token = token.next = token_source.getNextToken();
+    jj_ntk = -1;
+    if (token.kind == kind) {
+      jj_gen++;
+      return token;
+    }
+    token = oldToken;
+    jj_kind = kind;
+    throw generateParseException();
+  }
+
+  final public Token getNextToken() {
+    if (token.next != null) token = token.next;
+    else token = token.next = token_source.getNextToken();
+    jj_ntk = -1;
+    jj_gen++;
+    return token;
+  }
+
+  final public Token getToken(int index) {
+    Token t = token;
+    for (int i = 0; i < index; i++) {
+      if (t.next != null) t = t.next;
+      else t = t.next = token_source.getNextToken();
+    }
+    return t;
+  }
+
+  final private int jj_ntk() {
+    if ((jj_nt=token.next) == null)
+      return (jj_ntk = (token.next=token_source.getNextToken()).kind);
+    else
+      return (jj_ntk = jj_nt.kind);
+  }
+
+  private Vector<int[]> jj_expentries = new Vector<int[]>();
+  private int[] jj_expentry;
+  private int jj_kind = -1;
+
+  public ParseException generateParseException() {
+    jj_expentries.removeAllElements();
+    boolean[] la1tokens = new boolean[49];
+    for (int i = 0; i < 49; i++) {
+      la1tokens[i] = false;
+    }
+    if (jj_kind >= 0) {
+      la1tokens[jj_kind] = true;
+      jj_kind = -1;
+    }
+    for (int i = 0; i < 7; i++) {
+      if (jj_la1[i] == jj_gen) {
+        for (int j = 0; j < 32; j++) {
+          if ((jj_la1_0[i] & (1<<j)) != 0) {
+            la1tokens[j] = true;
+          }
+          if ((jj_la1_1[i] & (1<<j)) != 0) {
+            la1tokens[32+j] = true;
+          }
+        }
+      }
+    }
+    for (int i = 0; i < 49; i++) {
+      if (la1tokens[i]) {
+        jj_expentry = new int[1];
+        jj_expentry[0] = i;
+        jj_expentries.addElement(jj_expentry);
+      }
+    }
+    int[][] exptokseq = new int[jj_expentries.size()][];
+    for (int i = 0; i < jj_expentries.size(); i++) {
+      exptokseq[i] = jj_expentries.elementAt(i);
+    }
+    return new ParseException(token, exptokseq, tokenImage);
+  }
+
+  final public void enable_tracing() {
+  }
+
+  final public void disable_tracing() {
+  }
+
+}
diff --git a/src/org/apache/james/mime4j/field/datetime/parser/DateTimeParserConstants.java b/src/org/apache/james/mime4j/field/datetime/parser/DateTimeParserConstants.java
new file mode 100644
index 0000000..2c203db
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/datetime/parser/DateTimeParserConstants.java
@@ -0,0 +1,86 @@
+/* Generated By:JavaCC: Do not edit this line. DateTimeParserConstants.java */
+/*
+ *  Copyright 2004 the mime4j 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 org.apache.james.mime4j.field.datetime.parser;
+
+public interface DateTimeParserConstants {
+
+  int EOF = 0;
+  int OFFSETDIR = 24;
+  int MILITARY_ZONE = 35;
+  int WS = 36;
+  int COMMENT = 38;
+  int DIGITS = 46;
+  int QUOTEDPAIR = 47;
+  int ANY = 48;
+
+  int DEFAULT = 0;
+  int INCOMMENT = 1;
+  int NESTED_COMMENT = 2;
+
+  String[] tokenImage = {
+    "<EOF>",
+    "\"\\r\"",
+    "\"\\n\"",
+    "\",\"",
+    "\"Mon\"",
+    "\"Tue\"",
+    "\"Wed\"",
+    "\"Thu\"",
+    "\"Fri\"",
+    "\"Sat\"",
+    "\"Sun\"",
+    "\"Jan\"",
+    "\"Feb\"",
+    "\"Mar\"",
+    "\"Apr\"",
+    "\"May\"",
+    "\"Jun\"",
+    "\"Jul\"",
+    "\"Aug\"",
+    "\"Sep\"",
+    "\"Oct\"",
+    "\"Nov\"",
+    "\"Dec\"",
+    "\":\"",
+    "<OFFSETDIR>",
+    "\"UT\"",
+    "\"GMT\"",
+    "\"EST\"",
+    "\"EDT\"",
+    "\"CST\"",
+    "\"CDT\"",
+    "\"MST\"",
+    "\"MDT\"",
+    "\"PST\"",
+    "\"PDT\"",
+    "<MILITARY_ZONE>",
+    "<WS>",
+    "\"(\"",
+    "\")\"",
+    "<token of kind 39>",
+    "\"(\"",
+    "<token of kind 41>",
+    "<token of kind 42>",
+    "\"(\"",
+    "\")\"",
+    "<token of kind 45>",
+    "<DIGITS>",
+    "<QUOTEDPAIR>",
+    "<ANY>",
+  };
+
+}
diff --git a/src/org/apache/james/mime4j/field/datetime/parser/DateTimeParserTokenManager.java b/src/org/apache/james/mime4j/field/datetime/parser/DateTimeParserTokenManager.java
new file mode 100644
index 0000000..4b2d2fd
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/datetime/parser/DateTimeParserTokenManager.java
@@ -0,0 +1,882 @@
+/* Generated By:JavaCC: Do not edit this line. DateTimeParserTokenManager.java */
+/*
+ *  Copyright 2004 the mime4j 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 org.apache.james.mime4j.field.datetime.parser;
+import org.apache.james.mime4j.field.datetime.DateTime;
+import java.util.Calendar;
+
+public class DateTimeParserTokenManager implements DateTimeParserConstants
+{
+        // Keeps track of how many levels of comment nesting
+        // we've encountered.  This is only used when the 2nd
+        // level is reached, for example ((this)), not (this).
+        // This is because the outermost level must be treated
+        // specially anyway, because the outermost ")" has a
+        // different token type than inner ")" instances.
+        static int commentNest;
+  public  java.io.PrintStream debugStream = System.out;
+  public  void setDebugStream(java.io.PrintStream ds) { debugStream = ds; }
+private final int jjStopStringLiteralDfa_0(int pos, long active0)
+{
+   switch (pos)
+   {
+      case 0:
+         if ((active0 & 0x7fe7cf7f0L) != 0L)
+         {
+            jjmatchedKind = 35;
+            return -1;
+         }
+         return -1;
+      case 1:
+         if ((active0 & 0x7fe7cf7f0L) != 0L)
+         {
+            if (jjmatchedPos == 0)
+            {
+               jjmatchedKind = 35;
+               jjmatchedPos = 0;
+            }
+            return -1;
+         }
+         return -1;
+      default :
+         return -1;
+   }
+}
+private final int jjStartNfa_0(int pos, long active0)
+{
+   return jjMoveNfa_0(jjStopStringLiteralDfa_0(pos, active0), pos + 1);
+}
+private final int jjStopAtPos(int pos, int kind)
+{
+   jjmatchedKind = kind;
+   jjmatchedPos = pos;
+   return pos + 1;
+}
+private final int jjStartNfaWithStates_0(int pos, int kind, int state)
+{
+   jjmatchedKind = kind;
+   jjmatchedPos = pos;
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) { return pos + 1; }
+   return jjMoveNfa_0(state, pos + 1);
+}
+private final int jjMoveStringLiteralDfa0_0()
+{
+   switch(curChar)
+   {
+      case 10:
+         return jjStopAtPos(0, 2);
+      case 13:
+         return jjStopAtPos(0, 1);
+      case 40:
+         return jjStopAtPos(0, 37);
+      case 44:
+         return jjStopAtPos(0, 3);
+      case 58:
+         return jjStopAtPos(0, 23);
+      case 65:
+         return jjMoveStringLiteralDfa1_0(0x44000L);
+      case 67:
+         return jjMoveStringLiteralDfa1_0(0x60000000L);
+      case 68:
+         return jjMoveStringLiteralDfa1_0(0x400000L);
+      case 69:
+         return jjMoveStringLiteralDfa1_0(0x18000000L);
+      case 70:
+         return jjMoveStringLiteralDfa1_0(0x1100L);
+      case 71:
+         return jjMoveStringLiteralDfa1_0(0x4000000L);
+      case 74:
+         return jjMoveStringLiteralDfa1_0(0x30800L);
+      case 77:
+         return jjMoveStringLiteralDfa1_0(0x18000a010L);
+      case 78:
+         return jjMoveStringLiteralDfa1_0(0x200000L);
+      case 79:
+         return jjMoveStringLiteralDfa1_0(0x100000L);
+      case 80:
+         return jjMoveStringLiteralDfa1_0(0x600000000L);
+      case 83:
+         return jjMoveStringLiteralDfa1_0(0x80600L);
+      case 84:
+         return jjMoveStringLiteralDfa1_0(0xa0L);
+      case 85:
+         return jjMoveStringLiteralDfa1_0(0x2000000L);
+      case 87:
+         return jjMoveStringLiteralDfa1_0(0x40L);
+      default :
+         return jjMoveNfa_0(0, 0);
+   }
+}
+private final int jjMoveStringLiteralDfa1_0(long active0)
+{
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_0(0, active0);
+      return 1;
+   }
+   switch(curChar)
+   {
+      case 68:
+         return jjMoveStringLiteralDfa2_0(active0, 0x550000000L);
+      case 77:
+         return jjMoveStringLiteralDfa2_0(active0, 0x4000000L);
+      case 83:
+         return jjMoveStringLiteralDfa2_0(active0, 0x2a8000000L);
+      case 84:
+         if ((active0 & 0x2000000L) != 0L)
+            return jjStopAtPos(1, 25);
+         break;
+      case 97:
+         return jjMoveStringLiteralDfa2_0(active0, 0xaa00L);
+      case 99:
+         return jjMoveStringLiteralDfa2_0(active0, 0x100000L);
+      case 101:
+         return jjMoveStringLiteralDfa2_0(active0, 0x481040L);
+      case 104:
+         return jjMoveStringLiteralDfa2_0(active0, 0x80L);
+      case 111:
+         return jjMoveStringLiteralDfa2_0(active0, 0x200010L);
+      case 112:
+         return jjMoveStringLiteralDfa2_0(active0, 0x4000L);
+      case 114:
+         return jjMoveStringLiteralDfa2_0(active0, 0x100L);
+      case 117:
+         return jjMoveStringLiteralDfa2_0(active0, 0x70420L);
+      default :
+         break;
+   }
+   return jjStartNfa_0(0, active0);
+}
+private final int jjMoveStringLiteralDfa2_0(long old0, long active0)
+{
+   if (((active0 &= old0)) == 0L)
+      return jjStartNfa_0(0, old0); 
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_0(1, active0);
+      return 2;
+   }
+   switch(curChar)
+   {
+      case 84:
+         if ((active0 & 0x4000000L) != 0L)
+            return jjStopAtPos(2, 26);
+         else if ((active0 & 0x8000000L) != 0L)
+            return jjStopAtPos(2, 27);
+         else if ((active0 & 0x10000000L) != 0L)
+            return jjStopAtPos(2, 28);
+         else if ((active0 & 0x20000000L) != 0L)
+            return jjStopAtPos(2, 29);
+         else if ((active0 & 0x40000000L) != 0L)
+            return jjStopAtPos(2, 30);
+         else if ((active0 & 0x80000000L) != 0L)
+            return jjStopAtPos(2, 31);
+         else if ((active0 & 0x100000000L) != 0L)
+            return jjStopAtPos(2, 32);
+         else if ((active0 & 0x200000000L) != 0L)
+            return jjStopAtPos(2, 33);
+         else if ((active0 & 0x400000000L) != 0L)
+            return jjStopAtPos(2, 34);
+         break;
+      case 98:
+         if ((active0 & 0x1000L) != 0L)
+            return jjStopAtPos(2, 12);
+         break;
+      case 99:
+         if ((active0 & 0x400000L) != 0L)
+            return jjStopAtPos(2, 22);
+         break;
+      case 100:
+         if ((active0 & 0x40L) != 0L)
+            return jjStopAtPos(2, 6);
+         break;
+      case 101:
+         if ((active0 & 0x20L) != 0L)
+            return jjStopAtPos(2, 5);
+         break;
+      case 103:
+         if ((active0 & 0x40000L) != 0L)
+            return jjStopAtPos(2, 18);
+         break;
+      case 105:
+         if ((active0 & 0x100L) != 0L)
+            return jjStopAtPos(2, 8);
+         break;
+      case 108:
+         if ((active0 & 0x20000L) != 0L)
+            return jjStopAtPos(2, 17);
+         break;
+      case 110:
+         if ((active0 & 0x10L) != 0L)
+            return jjStopAtPos(2, 4);
+         else if ((active0 & 0x400L) != 0L)
+            return jjStopAtPos(2, 10);
+         else if ((active0 & 0x800L) != 0L)
+            return jjStopAtPos(2, 11);
+         else if ((active0 & 0x10000L) != 0L)
+            return jjStopAtPos(2, 16);
+         break;
+      case 112:
+         if ((active0 & 0x80000L) != 0L)
+            return jjStopAtPos(2, 19);
+         break;
+      case 114:
+         if ((active0 & 0x2000L) != 0L)
+            return jjStopAtPos(2, 13);
+         else if ((active0 & 0x4000L) != 0L)
+            return jjStopAtPos(2, 14);
+         break;
+      case 116:
+         if ((active0 & 0x200L) != 0L)
+            return jjStopAtPos(2, 9);
+         else if ((active0 & 0x100000L) != 0L)
+            return jjStopAtPos(2, 20);
+         break;
+      case 117:
+         if ((active0 & 0x80L) != 0L)
+            return jjStopAtPos(2, 7);
+         break;
+      case 118:
+         if ((active0 & 0x200000L) != 0L)
+            return jjStopAtPos(2, 21);
+         break;
+      case 121:
+         if ((active0 & 0x8000L) != 0L)
+            return jjStopAtPos(2, 15);
+         break;
+      default :
+         break;
+   }
+   return jjStartNfa_0(1, active0);
+}
+private final void jjCheckNAdd(int state)
+{
+   if (jjrounds[state] != jjround)
+   {
+      jjstateSet[jjnewStateCnt++] = state;
+      jjrounds[state] = jjround;
+   }
+}
+private final void jjAddStates(int start, int end)
+{
+   do {
+      jjstateSet[jjnewStateCnt++] = jjnextStates[start];
+   } while (start++ != end);
+}
+private final void jjCheckNAddTwoStates(int state1, int state2)
+{
+   jjCheckNAdd(state1);
+   jjCheckNAdd(state2);
+}
+private final void jjCheckNAddStates(int start, int end)
+{
+   do {
+      jjCheckNAdd(jjnextStates[start]);
+   } while (start++ != end);
+}
+private final void jjCheckNAddStates(int start)
+{
+   jjCheckNAdd(jjnextStates[start]);
+   jjCheckNAdd(jjnextStates[start + 1]);
+}
+private final int jjMoveNfa_0(int startState, int curPos)
+{
+   int[] nextStates;
+   int startsAt = 0;
+   jjnewStateCnt = 4;
+   int i = 1;
+   jjstateSet[0] = startState;
+   int j, kind = 0x7fffffff;
+   for (;;)
+   {
+      if (++jjround == 0x7fffffff)
+         ReInitRounds();
+      if (curChar < 64)
+      {
+         long l = 1L << curChar;
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+                  if ((0x3ff000000000000L & l) != 0L)
+                  {
+                     if (kind > 46)
+                        kind = 46;
+                     jjCheckNAdd(3);
+                  }
+                  else if ((0x100000200L & l) != 0L)
+                  {
+                     if (kind > 36)
+                        kind = 36;
+                     jjCheckNAdd(2);
+                  }
+                  else if ((0x280000000000L & l) != 0L)
+                  {
+                     if (kind > 24)
+                        kind = 24;
+                  }
+                  break;
+               case 2:
+                  if ((0x100000200L & l) == 0L)
+                     break;
+                  kind = 36;
+                  jjCheckNAdd(2);
+                  break;
+               case 3:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  kind = 46;
+                  jjCheckNAdd(3);
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      else if (curChar < 128)
+      {
+         long l = 1L << (curChar & 077);
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+                  if ((0x7fffbfe07fffbfeL & l) != 0L)
+                     kind = 35;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      else
+      {
+         int i2 = (curChar & 0xff) >> 6;
+         long l2 = 1L << (curChar & 077);
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      if (kind != 0x7fffffff)
+      {
+         jjmatchedKind = kind;
+         jjmatchedPos = curPos;
+         kind = 0x7fffffff;
+      }
+      ++curPos;
+      if ((i = jjnewStateCnt) == (startsAt = 4 - (jjnewStateCnt = startsAt)))
+         return curPos;
+      try { curChar = input_stream.readChar(); }
+      catch(java.io.IOException e) { return curPos; }
+   }
+}
+private final int jjStopStringLiteralDfa_1(int pos, long active0)
+{
+   switch (pos)
+   {
+      default :
+         return -1;
+   }
+}
+private final int jjStartNfa_1(int pos, long active0)
+{
+   return jjMoveNfa_1(jjStopStringLiteralDfa_1(pos, active0), pos + 1);
+}
+private final int jjStartNfaWithStates_1(int pos, int kind, int state)
+{
+   jjmatchedKind = kind;
+   jjmatchedPos = pos;
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) { return pos + 1; }
+   return jjMoveNfa_1(state, pos + 1);
+}
+private final int jjMoveStringLiteralDfa0_1()
+{
+   switch(curChar)
+   {
+      case 40:
+         return jjStopAtPos(0, 40);
+      case 41:
+         return jjStopAtPos(0, 38);
+      default :
+         return jjMoveNfa_1(0, 0);
+   }
+}
+static final long[] jjbitVec0 = {
+   0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL
+};
+private final int jjMoveNfa_1(int startState, int curPos)
+{
+   int[] nextStates;
+   int startsAt = 0;
+   jjnewStateCnt = 3;
+   int i = 1;
+   jjstateSet[0] = startState;
+   int j, kind = 0x7fffffff;
+   for (;;)
+   {
+      if (++jjround == 0x7fffffff)
+         ReInitRounds();
+      if (curChar < 64)
+      {
+         long l = 1L << curChar;
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+                  if (kind > 41)
+                     kind = 41;
+                  break;
+               case 1:
+                  if (kind > 39)
+                     kind = 39;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      else if (curChar < 128)
+      {
+         long l = 1L << (curChar & 077);
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+                  if (kind > 41)
+                     kind = 41;
+                  if (curChar == 92)
+                     jjstateSet[jjnewStateCnt++] = 1;
+                  break;
+               case 1:
+                  if (kind > 39)
+                     kind = 39;
+                  break;
+               case 2:
+                  if (kind > 41)
+                     kind = 41;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      else
+      {
+         int i2 = (curChar & 0xff) >> 6;
+         long l2 = 1L << (curChar & 077);
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+                  if ((jjbitVec0[i2] & l2) != 0L && kind > 41)
+                     kind = 41;
+                  break;
+               case 1:
+                  if ((jjbitVec0[i2] & l2) != 0L && kind > 39)
+                     kind = 39;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      if (kind != 0x7fffffff)
+      {
+         jjmatchedKind = kind;
+         jjmatchedPos = curPos;
+         kind = 0x7fffffff;
+      }
+      ++curPos;
+      if ((i = jjnewStateCnt) == (startsAt = 3 - (jjnewStateCnt = startsAt)))
+         return curPos;
+      try { curChar = input_stream.readChar(); }
+      catch(java.io.IOException e) { return curPos; }
+   }
+}
+private final int jjStopStringLiteralDfa_2(int pos, long active0)
+{
+   switch (pos)
+   {
+      default :
+         return -1;
+   }
+}
+private final int jjStartNfa_2(int pos, long active0)
+{
+   return jjMoveNfa_2(jjStopStringLiteralDfa_2(pos, active0), pos + 1);
+}
+private final int jjStartNfaWithStates_2(int pos, int kind, int state)
+{
+   jjmatchedKind = kind;
+   jjmatchedPos = pos;
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) { return pos + 1; }
+   return jjMoveNfa_2(state, pos + 1);
+}
+private final int jjMoveStringLiteralDfa0_2()
+{
+   switch(curChar)
+   {
+      case 40:
+         return jjStopAtPos(0, 43);
+      case 41:
+         return jjStopAtPos(0, 44);
+      default :
+         return jjMoveNfa_2(0, 0);
+   }
+}
+private final int jjMoveNfa_2(int startState, int curPos)
+{
+   int[] nextStates;
+   int startsAt = 0;
+   jjnewStateCnt = 3;
+   int i = 1;
+   jjstateSet[0] = startState;
+   int j, kind = 0x7fffffff;
+   for (;;)
+   {
+      if (++jjround == 0x7fffffff)
+         ReInitRounds();
+      if (curChar < 64)
+      {
+         long l = 1L << curChar;
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+                  if (kind > 45)
+                     kind = 45;
+                  break;
+               case 1:
+                  if (kind > 42)
+                     kind = 42;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      else if (curChar < 128)
+      {
+         long l = 1L << (curChar & 077);
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+                  if (kind > 45)
+                     kind = 45;
+                  if (curChar == 92)
+                     jjstateSet[jjnewStateCnt++] = 1;
+                  break;
+               case 1:
+                  if (kind > 42)
+                     kind = 42;
+                  break;
+               case 2:
+                  if (kind > 45)
+                     kind = 45;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      else
+      {
+         int i2 = (curChar & 0xff) >> 6;
+         long l2 = 1L << (curChar & 077);
+         MatchLoop: do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+                  if ((jjbitVec0[i2] & l2) != 0L && kind > 45)
+                     kind = 45;
+                  break;
+               case 1:
+                  if ((jjbitVec0[i2] & l2) != 0L && kind > 42)
+                     kind = 42;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      if (kind != 0x7fffffff)
+      {
+         jjmatchedKind = kind;
+         jjmatchedPos = curPos;
+         kind = 0x7fffffff;
+      }
+      ++curPos;
+      if ((i = jjnewStateCnt) == (startsAt = 3 - (jjnewStateCnt = startsAt)))
+         return curPos;
+      try { curChar = input_stream.readChar(); }
+      catch(java.io.IOException e) { return curPos; }
+   }
+}
+static final int[] jjnextStates = {
+};
+public static final String[] jjstrLiteralImages = {
+"", "\15", "\12", "\54", "\115\157\156", "\124\165\145", "\127\145\144", 
+"\124\150\165", "\106\162\151", "\123\141\164", "\123\165\156", "\112\141\156", 
+"\106\145\142", "\115\141\162", "\101\160\162", "\115\141\171", "\112\165\156", 
+"\112\165\154", "\101\165\147", "\123\145\160", "\117\143\164", "\116\157\166", 
+"\104\145\143", "\72", null, "\125\124", "\107\115\124", "\105\123\124", "\105\104\124", 
+"\103\123\124", "\103\104\124", "\115\123\124", "\115\104\124", "\120\123\124", 
+"\120\104\124", null, null, null, null, null, null, null, null, null, null, null, null, null, 
+null, };
+public static final String[] lexStateNames = {
+   "DEFAULT", 
+   "INCOMMENT", 
+   "NESTED_COMMENT", 
+};
+public static final int[] jjnewLexState = {
+   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, 0, -1, 2, -1, -1, -1, -1, -1, -1, -1, -1, 
+};
+static final long[] jjtoToken = {
+   0x400fffffffffL, 
+};
+static final long[] jjtoSkip = {
+   0x5000000000L, 
+};
+static final long[] jjtoSpecial = {
+   0x1000000000L, 
+};
+static final long[] jjtoMore = {
+   0x3fa000000000L, 
+};
+protected SimpleCharStream input_stream;
+private final int[] jjrounds = new int[4];
+private final int[] jjstateSet = new int[8];
+StringBuffer image;
+int jjimageLen;
+int lengthOfMatch;
+protected char curChar;
+public DateTimeParserTokenManager(SimpleCharStream stream){
+   if (SimpleCharStream.staticFlag)
+      throw new Error("ERROR: Cannot use a static CharStream class with a non-static lexical analyzer.");
+   input_stream = stream;
+}
+public DateTimeParserTokenManager(SimpleCharStream stream, int lexState){
+   this(stream);
+   SwitchTo(lexState);
+}
+public void ReInit(SimpleCharStream stream)
+{
+   jjmatchedPos = jjnewStateCnt = 0;
+   curLexState = defaultLexState;
+   input_stream = stream;
+   ReInitRounds();
+}
+private final void ReInitRounds()
+{
+   int i;
+   jjround = 0x80000001;
+   for (i = 4; i-- > 0;)
+      jjrounds[i] = 0x80000000;
+}
+public void ReInit(SimpleCharStream stream, int lexState)
+{
+   ReInit(stream);
+   SwitchTo(lexState);
+}
+public void SwitchTo(int lexState)
+{
+   if (lexState >= 3 || lexState < 0)
+      throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE);
+   else
+      curLexState = lexState;
+}
+
+protected Token jjFillToken()
+{
+   Token t = Token.newToken(jjmatchedKind);
+   t.kind = jjmatchedKind;
+   String im = jjstrLiteralImages[jjmatchedKind];
+   t.image = (im == null) ? input_stream.GetImage() : im;
+   t.beginLine = input_stream.getBeginLine();
+   t.beginColumn = input_stream.getBeginColumn();
+   t.endLine = input_stream.getEndLine();
+   t.endColumn = input_stream.getEndColumn();
+   return t;
+}
+
+int curLexState = 0;
+int defaultLexState = 0;
+int jjnewStateCnt;
+int jjround;
+int jjmatchedPos;
+int jjmatchedKind;
+
+public Token getNextToken() 
+{
+  int kind;
+  Token specialToken = null;
+  Token matchedToken;
+  int curPos = 0;
+
+  EOFLoop :
+  for (;;)
+  {   
+   try   
+   {     
+      curChar = input_stream.BeginToken();
+   }     
+   catch(java.io.IOException e)
+   {        
+      jjmatchedKind = 0;
+      matchedToken = jjFillToken();
+      matchedToken.specialToken = specialToken;
+      return matchedToken;
+   }
+   image = null;
+   jjimageLen = 0;
+
+   for (;;)
+   {
+     switch(curLexState)
+     {
+       case 0:
+         jjmatchedKind = 0x7fffffff;
+         jjmatchedPos = 0;
+         curPos = jjMoveStringLiteralDfa0_0();
+         break;
+       case 1:
+         jjmatchedKind = 0x7fffffff;
+         jjmatchedPos = 0;
+         curPos = jjMoveStringLiteralDfa0_1();
+         break;
+       case 2:
+         jjmatchedKind = 0x7fffffff;
+         jjmatchedPos = 0;
+         curPos = jjMoveStringLiteralDfa0_2();
+         break;
+     }
+     if (jjmatchedKind != 0x7fffffff)
+     {
+        if (jjmatchedPos + 1 < curPos)
+           input_stream.backup(curPos - jjmatchedPos - 1);
+        if ((jjtoToken[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L)
+        {
+           matchedToken = jjFillToken();
+           matchedToken.specialToken = specialToken;
+       if (jjnewLexState[jjmatchedKind] != -1)
+         curLexState = jjnewLexState[jjmatchedKind];
+           return matchedToken;
+        }
+        else if ((jjtoSkip[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L)
+        {
+           if ((jjtoSpecial[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L)
+           {
+              matchedToken = jjFillToken();
+              if (specialToken == null)
+                 specialToken = matchedToken;
+              else
+              {
+                 matchedToken.specialToken = specialToken;
+                 specialToken = (specialToken.next = matchedToken);
+              }
+           }
+         if (jjnewLexState[jjmatchedKind] != -1)
+           curLexState = jjnewLexState[jjmatchedKind];
+           continue EOFLoop;
+        }
+        MoreLexicalActions();
+      if (jjnewLexState[jjmatchedKind] != -1)
+        curLexState = jjnewLexState[jjmatchedKind];
+        curPos = 0;
+        jjmatchedKind = 0x7fffffff;
+        try {
+           curChar = input_stream.readChar();
+           continue;
+        }
+        catch (java.io.IOException e1) { }
+     }
+     int error_line = input_stream.getEndLine();
+     int error_column = input_stream.getEndColumn();
+     String error_after = null;
+     boolean EOFSeen = false;
+     try { input_stream.readChar(); input_stream.backup(1); }
+     catch (java.io.IOException e1) {
+        EOFSeen = true;
+        error_after = curPos <= 1 ? "" : input_stream.GetImage();
+        if (curChar == '\n' || curChar == '\r') {
+           error_line++;
+           error_column = 0;
+        }
+        else
+           error_column++;
+     }
+     if (!EOFSeen) {
+        input_stream.backup(1);
+        error_after = curPos <= 1 ? "" : input_stream.GetImage();
+     }
+     throw new TokenMgrError(EOFSeen, curLexState, error_line, error_column, error_after, curChar, TokenMgrError.LEXICAL_ERROR);
+   }
+  }
+}
+
+void MoreLexicalActions()
+{
+   jjimageLen += (lengthOfMatch = jjmatchedPos + 1);
+   switch(jjmatchedKind)
+   {
+      case 39 :
+         if (image == null)
+            image = new StringBuffer();
+         image.append(input_stream.GetSuffix(jjimageLen));
+         jjimageLen = 0;
+                          image.deleteCharAt(image.length() - 2);
+         break;
+      case 40 :
+         if (image == null)
+            image = new StringBuffer();
+         image.append(input_stream.GetSuffix(jjimageLen));
+         jjimageLen = 0;
+              commentNest = 1;
+         break;
+      case 42 :
+         if (image == null)
+            image = new StringBuffer();
+         image.append(input_stream.GetSuffix(jjimageLen));
+         jjimageLen = 0;
+                          image.deleteCharAt(image.length() - 2);
+         break;
+      case 43 :
+         if (image == null)
+            image = new StringBuffer();
+         image.append(input_stream.GetSuffix(jjimageLen));
+         jjimageLen = 0;
+              ++commentNest;
+         break;
+      case 44 :
+         if (image == null)
+            image = new StringBuffer();
+         image.append(input_stream.GetSuffix(jjimageLen));
+         jjimageLen = 0;
+              --commentNest; if (commentNest == 0) SwitchTo(INCOMMENT);
+         break;
+      default : 
+         break;
+   }
+}
+}
diff --git a/src/org/apache/james/mime4j/field/datetime/parser/ParseException.java b/src/org/apache/james/mime4j/field/datetime/parser/ParseException.java
new file mode 100644
index 0000000..13b3ff0
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/datetime/parser/ParseException.java
@@ -0,0 +1,207 @@
+/* Generated By:JavaCC: Do not edit this line. ParseException.java Version 3.0 */
+/*
+ *  Copyright 2004 the mime4j 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 org.apache.james.mime4j.field.datetime.parser;
+
+/**
+ * This exception is thrown when parse errors are encountered.
+ * You can explicitly create objects of this exception type by
+ * calling the method generateParseException in the generated
+ * parser.
+ *
+ * You can modify this class to customize your error reporting
+ * mechanisms so long as you retain the public fields.
+ */
+public class ParseException extends Exception {
+
+  /**
+   * This constructor is used by the method "generateParseException"
+   * in the generated parser.  Calling this constructor generates
+   * a new object of this type with the fields "currentToken",
+   * "expectedTokenSequences", and "tokenImage" set.  The boolean
+   * flag "specialConstructor" is also set to true to indicate that
+   * this constructor was used to create this object.
+   * This constructor calls its super class with the empty string
+   * to force the "toString" method of parent class "Throwable" to
+   * print the error message in the form:
+   *     ParseException: <result of getMessage>
+   */
+  public ParseException(Token currentTokenVal,
+                        int[][] expectedTokenSequencesVal,
+                        String[] tokenImageVal
+                       )
+  {
+    super("");
+    specialConstructor = true;
+    currentToken = currentTokenVal;
+    expectedTokenSequences = expectedTokenSequencesVal;
+    tokenImage = tokenImageVal;
+  }
+
+  /**
+   * The following constructors are for use by you for whatever
+   * purpose you can think of.  Constructing the exception in this
+   * manner makes the exception behave in the normal way - i.e., as
+   * documented in the class "Throwable".  The fields "errorToken",
+   * "expectedTokenSequences", and "tokenImage" do not contain
+   * relevant information.  The JavaCC generated code does not use
+   * these constructors.
+   */
+
+  public ParseException() {
+    super();
+    specialConstructor = false;
+  }
+
+  public ParseException(String message) {
+    super(message);
+    specialConstructor = false;
+  }
+
+  /**
+   * This variable determines which constructor was used to create
+   * this object and thereby affects the semantics of the
+   * "getMessage" method (see below).
+   */
+  protected boolean specialConstructor;
+
+  /**
+   * This is the last token that has been consumed successfully.  If
+   * this object has been created due to a parse error, the token
+   * followng this token will (therefore) be the first error token.
+   */
+  public Token currentToken;
+
+  /**
+   * Each entry in this array is an array of integers.  Each array
+   * of integers represents a sequence of tokens (by their ordinal
+   * values) that is expected at this point of the parse.
+   */
+  public int[][] expectedTokenSequences;
+
+  /**
+   * This is a reference to the "tokenImage" array of the generated
+   * parser within which the parse error occurred.  This array is
+   * defined in the generated ...Constants interface.
+   */
+  public String[] tokenImage;
+
+  /**
+   * This method has the standard behavior when this object has been
+   * created using the standard constructors.  Otherwise, it uses
+   * "currentToken" and "expectedTokenSequences" to generate a parse
+   * error message and returns it.  If this object has been created
+   * due to a parse error, and you do not catch it (it gets thrown
+   * from the parser), then this method is called during the printing
+   * of the final stack trace, and hence the correct error message
+   * gets displayed.
+   */
+  public String getMessage() {
+    if (!specialConstructor) {
+      return super.getMessage();
+    }
+    StringBuffer expected = new StringBuffer();
+    int maxSize = 0;
+    for (int i = 0; i < expectedTokenSequences.length; i++) {
+      if (maxSize < expectedTokenSequences[i].length) {
+        maxSize = expectedTokenSequences[i].length;
+      }
+      for (int j = 0; j < expectedTokenSequences[i].length; j++) {
+        expected.append(tokenImage[expectedTokenSequences[i][j]]).append(" ");
+      }
+      if (expectedTokenSequences[i][expectedTokenSequences[i].length - 1] != 0) {
+        expected.append("...");
+      }
+      expected.append(eol).append("    ");
+    }
+    String retval = "Encountered \"";
+    Token tok = currentToken.next;
+    for (int i = 0; i < maxSize; i++) {
+      if (i != 0) retval += " ";
+      if (tok.kind == 0) {
+        retval += tokenImage[0];
+        break;
+      }
+      retval += add_escapes(tok.image);
+      tok = tok.next; 
+    }
+    retval += "\" at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn;
+    retval += "." + eol;
+    if (expectedTokenSequences.length == 1) {
+      retval += "Was expecting:" + eol + "    ";
+    } else {
+      retval += "Was expecting one of:" + eol + "    ";
+    }
+    retval += expected.toString();
+    return retval;
+  }
+
+  /**
+   * The end of line string for this machine.
+   */
+  protected String eol = System.getProperty("line.separator", "\n");
+ 
+  /**
+   * Used to convert raw characters to their escaped version
+   * when these raw version cannot be used as part of an ASCII
+   * string literal.
+   */
+  protected String add_escapes(String str) {
+      StringBuffer retval = new StringBuffer();
+      char ch;
+      for (int i = 0; i < str.length(); i++) {
+        switch (str.charAt(i))
+        {
+           case 0 :
+              continue;
+           case '\b':
+              retval.append("\\b");
+              continue;
+           case '\t':
+              retval.append("\\t");
+              continue;
+           case '\n':
+              retval.append("\\n");
+              continue;
+           case '\f':
+              retval.append("\\f");
+              continue;
+           case '\r':
+              retval.append("\\r");
+              continue;
+           case '\"':
+              retval.append("\\\"");
+              continue;
+           case '\'':
+              retval.append("\\\'");
+              continue;
+           case '\\':
+              retval.append("\\\\");
+              continue;
+           default:
+              if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
+                 String s = "0000" + Integer.toString(ch, 16);
+                 retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+              } else {
+                 retval.append(ch);
+              }
+              continue;
+        }
+      }
+      return retval.toString();
+   }
+
+}
diff --git a/src/org/apache/james/mime4j/field/datetime/parser/SimpleCharStream.java b/src/org/apache/james/mime4j/field/datetime/parser/SimpleCharStream.java
new file mode 100644
index 0000000..2724529
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/datetime/parser/SimpleCharStream.java
@@ -0,0 +1,454 @@
+/* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version 4.0 */
+/*
+ *  Copyright 2004 the mime4j 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 org.apache.james.mime4j.field.datetime.parser;
+
+/**
+ * An implementation of interface CharStream, where the stream is assumed to
+ * contain only ASCII characters (without unicode processing).
+ */
+
+public class SimpleCharStream
+{
+  public static final boolean staticFlag = false;
+  int bufsize;
+  int available;
+  int tokenBegin;
+  public int bufpos = -1;
+  protected int bufline[];
+  protected int bufcolumn[];
+
+  protected int column = 0;
+  protected int line = 1;
+
+  protected boolean prevCharIsCR = false;
+  protected boolean prevCharIsLF = false;
+
+  protected java.io.Reader inputStream;
+
+  protected char[] buffer;
+  protected int maxNextCharInd = 0;
+  protected int inBuf = 0;
+  protected int tabSize = 8;
+
+  protected void setTabSize(int i) { tabSize = i; }
+  protected int getTabSize(int i) { return tabSize; }
+
+
+  protected void ExpandBuff(boolean wrapAround)
+  {
+     char[] newbuffer = new char[bufsize + 2048];
+     int newbufline[] = new int[bufsize + 2048];
+     int newbufcolumn[] = new int[bufsize + 2048];
+
+     try
+     {
+        if (wrapAround)
+        {
+           System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize - tokenBegin);
+           System.arraycopy(buffer, 0, newbuffer,
+                                             bufsize - tokenBegin, bufpos);
+           buffer = newbuffer;
+
+           System.arraycopy(bufline, tokenBegin, newbufline, 0, bufsize - tokenBegin);
+           System.arraycopy(bufline, 0, newbufline, bufsize - tokenBegin, bufpos);
+           bufline = newbufline;
+
+           System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize - tokenBegin);
+           System.arraycopy(bufcolumn, 0, newbufcolumn, bufsize - tokenBegin, bufpos);
+           bufcolumn = newbufcolumn;
+
+           maxNextCharInd = (bufpos += (bufsize - tokenBegin));
+        }
+        else
+        {
+           System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize - tokenBegin);
+           buffer = newbuffer;
+
+           System.arraycopy(bufline, tokenBegin, newbufline, 0, bufsize - tokenBegin);
+           bufline = newbufline;
+
+           System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize - tokenBegin);
+           bufcolumn = newbufcolumn;
+
+           maxNextCharInd = (bufpos -= tokenBegin);
+        }
+     }
+     catch (Throwable t)
+     {
+        throw new Error(t.getMessage());
+     }
+
+
+     bufsize += 2048;
+     available = bufsize;
+     tokenBegin = 0;
+  }
+
+  protected void FillBuff() throws java.io.IOException
+  {
+     if (maxNextCharInd == available)
+     {
+        if (available == bufsize)
+        {
+           if (tokenBegin > 2048)
+           {
+              bufpos = maxNextCharInd = 0;
+              available = tokenBegin;
+           }
+           else if (tokenBegin < 0)
+              bufpos = maxNextCharInd = 0;
+           else
+              ExpandBuff(false);
+        }
+        else if (available > tokenBegin)
+           available = bufsize;
+        else if ((tokenBegin - available) < 2048)
+           ExpandBuff(true);
+        else
+           available = tokenBegin;
+     }
+
+     int i;
+     try {
+        if ((i = inputStream.read(buffer, maxNextCharInd,
+                                    available - maxNextCharInd)) == -1)
+        {
+           inputStream.close();
+           throw new java.io.IOException();
+        }
+        else
+           maxNextCharInd += i;
+        return;
+     }
+     catch(java.io.IOException e) {
+        --bufpos;
+        backup(0);
+        if (tokenBegin == -1)
+           tokenBegin = bufpos;
+        throw e;
+     }
+  }
+
+  public char BeginToken() throws java.io.IOException
+  {
+     tokenBegin = -1;
+     char c = readChar();
+     tokenBegin = bufpos;
+
+     return c;
+  }
+
+  protected void UpdateLineColumn(char c)
+  {
+     column++;
+
+     if (prevCharIsLF)
+     {
+        prevCharIsLF = false;
+        line += (column = 1);
+     }
+     else if (prevCharIsCR)
+     {
+        prevCharIsCR = false;
+        if (c == '\n')
+        {
+           prevCharIsLF = true;
+        }
+        else
+           line += (column = 1);
+     }
+
+     switch (c)
+     {
+        case '\r' :
+           prevCharIsCR = true;
+           break;
+        case '\n' :
+           prevCharIsLF = true;
+           break;
+        case '\t' :
+           column--;
+           column += (tabSize - (column % tabSize));
+           break;
+        default :
+           break;
+     }
+
+     bufline[bufpos] = line;
+     bufcolumn[bufpos] = column;
+  }
+
+  public char readChar() throws java.io.IOException
+  {
+     if (inBuf > 0)
+     {
+        --inBuf;
+
+        if (++bufpos == bufsize)
+           bufpos = 0;
+
+        return buffer[bufpos];
+     }
+
+     if (++bufpos >= maxNextCharInd)
+        FillBuff();
+
+     char c = buffer[bufpos];
+
+     UpdateLineColumn(c);
+     return (c);
+  }
+
+  /**
+   * @deprecated 
+   * @see #getEndColumn
+   */
+  @Deprecated
+  public int getColumn() {
+     return bufcolumn[bufpos];
+  }
+
+  /**
+   * @deprecated 
+   * @see #getEndLine
+   */
+  @Deprecated
+  public int getLine() {
+     return bufline[bufpos];
+  }
+
+  public int getEndColumn() {
+     return bufcolumn[bufpos];
+  }
+
+  public int getEndLine() {
+     return bufline[bufpos];
+  }
+
+  public int getBeginColumn() {
+     return bufcolumn[tokenBegin];
+  }
+
+  public int getBeginLine() {
+     return bufline[tokenBegin];
+  }
+
+  public void backup(int amount) {
+
+    inBuf += amount;
+    if ((bufpos -= amount) < 0)
+       bufpos += bufsize;
+  }
+
+  public SimpleCharStream(java.io.Reader dstream, int startline,
+  int startcolumn, int buffersize)
+  {
+    inputStream = dstream;
+    line = startline;
+    column = startcolumn - 1;
+
+    available = bufsize = buffersize;
+    buffer = new char[buffersize];
+    bufline = new int[buffersize];
+    bufcolumn = new int[buffersize];
+  }
+
+  public SimpleCharStream(java.io.Reader dstream, int startline,
+                          int startcolumn)
+  {
+     this(dstream, startline, startcolumn, 4096);
+  }
+
+  public SimpleCharStream(java.io.Reader dstream)
+  {
+     this(dstream, 1, 1, 4096);
+  }
+  public void ReInit(java.io.Reader dstream, int startline,
+  int startcolumn, int buffersize)
+  {
+    inputStream = dstream;
+    line = startline;
+    column = startcolumn - 1;
+
+    if (buffer == null || buffersize != buffer.length)
+    {
+      available = bufsize = buffersize;
+      buffer = new char[buffersize];
+      bufline = new int[buffersize];
+      bufcolumn = new int[buffersize];
+    }
+    prevCharIsLF = prevCharIsCR = false;
+    tokenBegin = inBuf = maxNextCharInd = 0;
+    bufpos = -1;
+  }
+
+  public void ReInit(java.io.Reader dstream, int startline,
+                     int startcolumn)
+  {
+     ReInit(dstream, startline, startcolumn, 4096);
+  }
+
+  public void ReInit(java.io.Reader dstream)
+  {
+     ReInit(dstream, 1, 1, 4096);
+  }
+  public SimpleCharStream(java.io.InputStream dstream, String encoding, int startline,
+  int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException
+  {
+     this(encoding == null ? new java.io.InputStreamReader(dstream) : new java.io.InputStreamReader(dstream, encoding), startline, startcolumn, buffersize);
+  }
+
+  public SimpleCharStream(java.io.InputStream dstream, int startline,
+  int startcolumn, int buffersize)
+  {
+     this(new java.io.InputStreamReader(dstream), startline, startcolumn, buffersize);
+  }
+
+  public SimpleCharStream(java.io.InputStream dstream, String encoding, int startline,
+                          int startcolumn) throws java.io.UnsupportedEncodingException
+  {
+     this(dstream, encoding, startline, startcolumn, 4096);
+  }
+
+  public SimpleCharStream(java.io.InputStream dstream, int startline,
+                          int startcolumn)
+  {
+     this(dstream, startline, startcolumn, 4096);
+  }
+
+  public SimpleCharStream(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException
+  {
+     this(dstream, encoding, 1, 1, 4096);
+  }
+
+  public SimpleCharStream(java.io.InputStream dstream)
+  {
+     this(dstream, 1, 1, 4096);
+  }
+
+  public void ReInit(java.io.InputStream dstream, String encoding, int startline,
+                          int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException
+  {
+     ReInit(encoding == null ? new java.io.InputStreamReader(dstream) : new java.io.InputStreamReader(dstream, encoding), startline, startcolumn, buffersize);
+  }
+
+  public void ReInit(java.io.InputStream dstream, int startline,
+                          int startcolumn, int buffersize)
+  {
+     ReInit(new java.io.InputStreamReader(dstream), startline, startcolumn, buffersize);
+  }
+
+  public void ReInit(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException
+  {
+     ReInit(dstream, encoding, 1, 1, 4096);
+  }
+
+  public void ReInit(java.io.InputStream dstream)
+  {
+     ReInit(dstream, 1, 1, 4096);
+  }
+  public void ReInit(java.io.InputStream dstream, String encoding, int startline,
+                     int startcolumn) throws java.io.UnsupportedEncodingException
+  {
+     ReInit(dstream, encoding, startline, startcolumn, 4096);
+  }
+  public void ReInit(java.io.InputStream dstream, int startline,
+                     int startcolumn)
+  {
+     ReInit(dstream, startline, startcolumn, 4096);
+  }
+  public String GetImage()
+  {
+     if (bufpos >= tokenBegin)
+        return new String(buffer, tokenBegin, bufpos - tokenBegin + 1);
+     else
+        return new String(buffer, tokenBegin, bufsize - tokenBegin) +
+                              new String(buffer, 0, bufpos + 1);
+  }
+
+  public char[] GetSuffix(int len)
+  {
+     char[] ret = new char[len];
+
+     if ((bufpos + 1) >= len)
+        System.arraycopy(buffer, bufpos - len + 1, ret, 0, len);
+     else
+     {
+        System.arraycopy(buffer, bufsize - (len - bufpos - 1), ret, 0,
+                                                          len - bufpos - 1);
+        System.arraycopy(buffer, 0, ret, len - bufpos - 1, bufpos + 1);
+     }
+
+     return ret;
+  }
+
+  public void Done()
+  {
+     buffer = null;
+     bufline = null;
+     bufcolumn = null;
+  }
+
+  /**
+   * Method to adjust line and column numbers for the start of a token.
+   */
+  public void adjustBeginLineColumn(int newLine, int newCol)
+  {
+     int start = tokenBegin;
+     int len;
+
+     if (bufpos >= tokenBegin)
+     {
+        len = bufpos - tokenBegin + inBuf + 1;
+     }
+     else
+     {
+        len = bufsize - tokenBegin + bufpos + 1 + inBuf;
+     }
+
+     int i = 0, j = 0, k = 0;
+     int nextColDiff = 0, columnDiff = 0;
+
+     while (i < len &&
+            bufline[j = start % bufsize] == bufline[k = ++start % bufsize])
+     {
+        bufline[j] = newLine;
+        nextColDiff = columnDiff + bufcolumn[k] - bufcolumn[j];
+        bufcolumn[j] = newCol + columnDiff;
+        columnDiff = nextColDiff;
+        i++;
+     } 
+
+     if (i < len)
+     {
+        bufline[j] = newLine++;
+        bufcolumn[j] = newCol + columnDiff;
+
+        while (i++ < len)
+        {
+           if (bufline[j = start % bufsize] != bufline[++start % bufsize])
+              bufline[j] = newLine++;
+           else
+              bufline[j] = newLine;
+        }
+     }
+
+     line = bufline[j];
+     column = bufcolumn[j];
+  }
+
+}
diff --git a/src/org/apache/james/mime4j/field/datetime/parser/Token.java b/src/org/apache/james/mime4j/field/datetime/parser/Token.java
new file mode 100644
index 0000000..0927a09
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/datetime/parser/Token.java
@@ -0,0 +1,96 @@
+/* Generated By:JavaCC: Do not edit this line. Token.java Version 3.0 */
+/*
+ *  Copyright 2004 the mime4j 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 org.apache.james.mime4j.field.datetime.parser;
+
+/**
+ * Describes the input token stream.
+ */
+
+public class Token {
+
+  /**
+   * An integer that describes the kind of this token.  This numbering
+   * system is determined by JavaCCParser, and a table of these numbers is
+   * stored in the file ...Constants.java.
+   */
+  public int kind;
+
+  /**
+   * beginLine and beginColumn describe the position of the first character
+   * of this token; endLine and endColumn describe the position of the
+   * last character of this token.
+   */
+  public int beginLine, beginColumn, endLine, endColumn;
+
+  /**
+   * The string image of the token.
+   */
+  public String image;
+
+  /**
+   * A reference to the next regular (non-special) token from the input
+   * stream.  If this is the last token from the input stream, or if the
+   * token manager has not read tokens beyond this one, this field is
+   * set to null.  This is true only if this token is also a regular
+   * token.  Otherwise, see below for a description of the contents of
+   * this field.
+   */
+  public Token next;
+
+  /**
+   * This field is used to access special tokens that occur prior to this
+   * token, but after the immediately preceding regular (non-special) token.
+   * If there are no such special tokens, this field is set to null.
+   * When there are more than one such special token, this field refers
+   * to the last of these special tokens, which in turn refers to the next
+   * previous special token through its specialToken field, and so on
+   * until the first special token (whose specialToken field is null).
+   * The next fields of special tokens refer to other special tokens that
+   * immediately follow it (without an intervening regular token).  If there
+   * is no such token, this field is null.
+   */
+  public Token specialToken;
+
+  /**
+   * Returns the image.
+   */
+  public String toString()
+  {
+     return image;
+  }
+
+  /**
+   * Returns a new Token object, by default. However, if you want, you
+   * can create and return subclass objects based on the value of ofKind.
+   * Simply add the cases to the switch for all those special cases.
+   * For example, if you have a subclass of Token called IDToken that
+   * you want to create if ofKind is ID, simlpy add something like :
+   *
+   *    case MyParserConstants.ID : return new IDToken();
+   *
+   * to the following switch statement. Then you can cast matchedToken
+   * variable to the appropriate type and use it in your lexical actions.
+   */
+  public static final Token newToken(int ofKind)
+  {
+     switch(ofKind)
+     {
+       default : return new Token();
+     }
+  }
+
+}
diff --git a/src/org/apache/james/mime4j/field/datetime/parser/TokenMgrError.java b/src/org/apache/james/mime4j/field/datetime/parser/TokenMgrError.java
new file mode 100644
index 0000000..e7043c1
--- /dev/null
+++ b/src/org/apache/james/mime4j/field/datetime/parser/TokenMgrError.java
@@ -0,0 +1,148 @@
+/* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 3.0 */
+/*
+ *  Copyright 2004 the mime4j 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 org.apache.james.mime4j.field.datetime.parser;
+
+public class TokenMgrError extends Error
+{
+   /*
+    * Ordinals for various reasons why an Error of this type can be thrown.
+    */
+
+   /**
+    * Lexical error occured.
+    */
+   static final int LEXICAL_ERROR = 0;
+
+   /**
+    * An attempt wass made to create a second instance of a static token manager.
+    */
+   static final int STATIC_LEXER_ERROR = 1;
+
+   /**
+    * Tried to change to an invalid lexical state.
+    */
+   static final int INVALID_LEXICAL_STATE = 2;
+
+   /**
+    * Detected (and bailed out of) an infinite loop in the token manager.
+    */
+   static final int LOOP_DETECTED = 3;
+
+   /**
+    * Indicates the reason why the exception is thrown. It will have
+    * one of the above 4 values.
+    */
+   int errorCode;
+
+   /**
+    * Replaces unprintable characters by their espaced (or unicode escaped)
+    * equivalents in the given string
+    */
+   protected static final String addEscapes(String str) {
+      StringBuffer retval = new StringBuffer();
+      char ch;
+      for (int i = 0; i < str.length(); i++) {
+        switch (str.charAt(i))
+        {
+           case 0 :
+              continue;
+           case '\b':
+              retval.append("\\b");
+              continue;
+           case '\t':
+              retval.append("\\t");
+              continue;
+           case '\n':
+              retval.append("\\n");
+              continue;
+           case '\f':
+              retval.append("\\f");
+              continue;
+           case '\r':
+              retval.append("\\r");
+              continue;
+           case '\"':
+              retval.append("\\\"");
+              continue;
+           case '\'':
+              retval.append("\\\'");
+              continue;
+           case '\\':
+              retval.append("\\\\");
+              continue;
+           default:
+              if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
+                 String s = "0000" + Integer.toString(ch, 16);
+                 retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+              } else {
+                 retval.append(ch);
+              }
+              continue;
+        }
+      }
+      return retval.toString();
+   }
+
+   /**
+    * Returns a detailed message for the Error when it is thrown by the
+    * token manager to indicate a lexical error.
+    * Parameters : 
+    *    EOFSeen     : indicates if EOF caused the lexicl error
+    *    curLexState : lexical state in which this error occured
+    *    errorLine   : line number when the error occured
+    *    errorColumn : column number when the error occured
+    *    errorAfter  : prefix that was seen before this error occured
+    *    curchar     : the offending character
+    * Note: You can customize the lexical error message by modifying this method.
+    */
+   protected static String LexicalError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar) {
+      return("Lexical error at line " +
+           errorLine + ", column " +
+           errorColumn + ".  Encountered: " +
+           (EOFSeen ? "<EOF> " : ("\"" + addEscapes(String.valueOf(curChar)) + "\"") + " (" + (int)curChar + "), ") +
+           "after : \"" + addEscapes(errorAfter) + "\"");
+   }
+
+   /**
+    * You can also modify the body of this method to customize your error messages.
+    * For example, cases like LOOP_DETECTED and INVALID_LEXICAL_STATE are not
+    * of end-users concern, so you can return something like : 
+    *
+    *     "Internal Error : Please file a bug report .... "
+    *
+    * from this method for such cases in the release version of your parser.
+    */
+   public String getMessage() {
+      return super.getMessage();
+   }
+
+   /*
+    * Constructors of various flavors follow.
+    */
+
+   public TokenMgrError() {
+   }
+
+   public TokenMgrError(String message, int reason) {
+      super(message);
+      errorCode = reason;
+   }
+
+   public TokenMgrError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar, int reason) {
+      this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
+   }
+}
diff --git a/src/org/apache/james/mime4j/util/CharsetUtil.java b/src/org/apache/james/mime4j/util/CharsetUtil.java
new file mode 100644
index 0000000..4e712fc
--- /dev/null
+++ b/src/org/apache/james/mime4j/util/CharsetUtil.java
@@ -0,0 +1,1249 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you 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 org.apache.james.mime4j.util;
+
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.IllegalCharsetNameException;
+import java.nio.charset.UnsupportedCharsetException;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.TreeSet;
+
+//BEGIN android-changed: Stubbing out logging
+import org.apache.james.mime4j.Log;
+import org.apache.james.mime4j.LogFactory;
+//END android-changed
+
+/**
+ * Utility class for working with character sets. It is somewhat similar to
+ * the Java 1.4 <code>java.nio.charset.Charset</code> class but knows many
+ * more aliases and is compatible with Java 1.3. It will use a simple detection
+ * mechanism to detect what character sets the current VM supports. This will
+ * be a sub-set of the character sets listed in the
+ * <a href="http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html">
+ * Java 1.5 (J2SE5.0) Supported Encodings</a> document.
+ * <p>
+ * The <a href="http://www.iana.org/assignments/character-sets">
+ * IANA Character Sets</a> document has been used to determine the preferred
+ * MIME character set names and to get a list of known aliases.
+ * <p>
+ * This is a complete list of the character sets known to this class:
+ * <table>
+ *     <tr>
+ *         <td>Canonical (Java) name</td>
+ *         <td>MIME preferred</td>
+ *         <td>Aliases</td>
+ *     </tr>
+ *     <tr>
+ *         <td>ASCII</td>
+ *         <td>US-ASCII</td>
+ *         <td>ANSI_X3.4-1968 iso-ir-6 ANSI_X3.4-1986 ISO_646.irv:1991 ISO646-US us IBM367 cp367 csASCII ascii7 646 iso_646.irv:1983 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Big5</td>
+ *         <td>Big5</td>
+ *         <td>csBig5 CN-Big5 BIG-FIVE BIGFIVE </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Big5_HKSCS</td>
+ *         <td>Big5-HKSCS</td>
+ *         <td>big5hkscs </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Big5_Solaris</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp037</td>
+ *         <td>IBM037</td>
+ *         <td>ebcdic-cp-us ebcdic-cp-ca ebcdic-cp-wt ebcdic-cp-nl csIBM037 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp1006</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp1025</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp1026</td>
+ *         <td>IBM1026</td>
+ *         <td>csIBM1026 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp1046</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp1047</td>
+ *         <td>IBM1047</td>
+ *         <td>IBM-1047 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp1097</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp1098</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp1112</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp1122</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp1123</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp1124</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp1140</td>
+ *         <td>IBM01140</td>
+ *         <td>CCSID01140 CP01140 ebcdic-us-37+euro </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp1141</td>
+ *         <td>IBM01141</td>
+ *         <td>CCSID01141 CP01141 ebcdic-de-273+euro </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp1142</td>
+ *         <td>IBM01142</td>
+ *         <td>CCSID01142 CP01142 ebcdic-dk-277+euro ebcdic-no-277+euro </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp1143</td>
+ *         <td>IBM01143</td>
+ *         <td>CCSID01143 CP01143 ebcdic-fi-278+euro ebcdic-se-278+euro </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp1144</td>
+ *         <td>IBM01144</td>
+ *         <td>CCSID01144 CP01144 ebcdic-it-280+euro </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp1145</td>
+ *         <td>IBM01145</td>
+ *         <td>CCSID01145 CP01145 ebcdic-es-284+euro </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp1146</td>
+ *         <td>IBM01146</td>
+ *         <td>CCSID01146 CP01146 ebcdic-gb-285+euro </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp1147</td>
+ *         <td>IBM01147</td>
+ *         <td>CCSID01147 CP01147 ebcdic-fr-297+euro </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp1148</td>
+ *         <td>IBM01148</td>
+ *         <td>CCSID01148 CP01148 ebcdic-international-500+euro </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp1149</td>
+ *         <td>IBM01149</td>
+ *         <td>CCSID01149 CP01149 ebcdic-is-871+euro </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp1250</td>
+ *         <td>windows-1250</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp1251</td>
+ *         <td>windows-1251</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp1252</td>
+ *         <td>windows-1252</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp1253</td>
+ *         <td>windows-1253</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp1254</td>
+ *         <td>windows-1254</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp1255</td>
+ *         <td>windows-1255</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp1256</td>
+ *         <td>windows-1256</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp1257</td>
+ *         <td>windows-1257</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp1258</td>
+ *         <td>windows-1258</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp1381</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp1383</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp273</td>
+ *         <td>IBM273</td>
+ *         <td>csIBM273 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp277</td>
+ *         <td>IBM277</td>
+ *         <td>EBCDIC-CP-DK EBCDIC-CP-NO csIBM277 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp278</td>
+ *         <td>IBM278</td>
+ *         <td>CP278 ebcdic-cp-fi ebcdic-cp-se csIBM278 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp280</td>
+ *         <td>IBM280</td>
+ *         <td>ebcdic-cp-it csIBM280 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp284</td>
+ *         <td>IBM284</td>
+ *         <td>ebcdic-cp-es csIBM284 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp285</td>
+ *         <td>IBM285</td>
+ *         <td>ebcdic-cp-gb csIBM285 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp297</td>
+ *         <td>IBM297</td>
+ *         <td>ebcdic-cp-fr csIBM297 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp33722</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp420</td>
+ *         <td>IBM420</td>
+ *         <td>ebcdic-cp-ar1 csIBM420 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp424</td>
+ *         <td>IBM424</td>
+ *         <td>ebcdic-cp-he csIBM424 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp437</td>
+ *         <td>IBM437</td>
+ *         <td>437 csPC8CodePage437 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp500</td>
+ *         <td>IBM500</td>
+ *         <td>ebcdic-cp-be ebcdic-cp-ch csIBM500 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp737</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp775</td>
+ *         <td>IBM775</td>
+ *         <td>csPC775Baltic </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp838</td>
+ *         <td>IBM-Thai</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp850</td>
+ *         <td>IBM850</td>
+ *         <td>850 csPC850Multilingual </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp852</td>
+ *         <td>IBM852</td>
+ *         <td>852 csPCp852 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp855</td>
+ *         <td>IBM855</td>
+ *         <td>855 csIBM855 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp856</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp857</td>
+ *         <td>IBM857</td>
+ *         <td>857 csIBM857 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp858</td>
+ *         <td>IBM00858</td>
+ *         <td>CCSID00858 CP00858 PC-Multilingual-850+euro </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp860</td>
+ *         <td>IBM860</td>
+ *         <td>860 csIBM860 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp861</td>
+ *         <td>IBM861</td>
+ *         <td>861 cp-is csIBM861 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp862</td>
+ *         <td>IBM862</td>
+ *         <td>862 csPC862LatinHebrew </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp863</td>
+ *         <td>IBM863</td>
+ *         <td>863 csIBM863 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp864</td>
+ *         <td>IBM864</td>
+ *         <td>cp864 csIBM864 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp865</td>
+ *         <td>IBM865</td>
+ *         <td>865 csIBM865 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp866</td>
+ *         <td>IBM866</td>
+ *         <td>866 csIBM866 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp868</td>
+ *         <td>IBM868</td>
+ *         <td>cp-ar csIBM868 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp869</td>
+ *         <td>IBM869</td>
+ *         <td>cp-gr csIBM869 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp870</td>
+ *         <td>IBM870</td>
+ *         <td>ebcdic-cp-roece ebcdic-cp-yu csIBM870 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp871</td>
+ *         <td>IBM871</td>
+ *         <td>ebcdic-cp-is csIBM871 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp875</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp918</td>
+ *         <td>IBM918</td>
+ *         <td>ebcdic-cp-ar2 csIBM918 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp921</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp922</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp930</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp933</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp935</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp937</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp939</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp942</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp942C</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp943</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp943C</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp948</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp949</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp949C</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp950</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp964</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>Cp970</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>EUC_CN</td>
+ *         <td>GB2312</td>
+ *         <td>x-EUC-CN csGB2312 euccn euc-cn gb2312-80 gb2312-1980 CN-GB CN-GB-ISOIR165 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>EUC_JP</td>
+ *         <td>EUC-JP</td>
+ *         <td>csEUCPkdFmtJapanese Extended_UNIX_Code_Packed_Format_for_Japanese eucjis x-eucjp eucjp x-euc-jp </td>
+ *     </tr>
+ *     <tr>
+ *         <td>EUC_JP_LINUX</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>EUC_JP_Solaris</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>EUC_KR</td>
+ *         <td>EUC-KR</td>
+ *         <td>csEUCKR ksc5601 5601 ksc5601_1987 ksc_5601 ksc5601-1987 ks_c_5601-1987 euckr </td>
+ *     </tr>
+ *     <tr>
+ *         <td>EUC_TW</td>
+ *         <td>EUC-TW</td>
+ *         <td>x-EUC-TW cns11643 euctw </td>
+ *     </tr>
+ *     <tr>
+ *         <td>GB18030</td>
+ *         <td>GB18030</td>
+ *         <td>gb18030-2000 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>GBK</td>
+ *         <td>windows-936</td>
+ *         <td>CP936 MS936 ms_936 x-mswin-936 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>ISCII91</td>
+ *         <td>?</td>
+ *         <td>x-ISCII91 iscii </td>
+ *     </tr>
+ *     <tr>
+ *         <td>ISO2022CN</td>
+ *         <td>ISO-2022-CN</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>ISO2022JP</td>
+ *         <td>ISO-2022-JP</td>
+ *         <td>csISO2022JP JIS jis_encoding csjisencoding </td>
+ *     </tr>
+ *     <tr>
+ *         <td>ISO2022KR</td>
+ *         <td>ISO-2022-KR</td>
+ *         <td>csISO2022KR </td>
+ *     </tr>
+ *     <tr>
+ *         <td>ISO2022_CN_CNS</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>ISO2022_CN_GB</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>ISO8859_1</td>
+ *         <td>ISO-8859-1</td>
+ *         <td>ISO_8859-1:1987 iso-ir-100 ISO_8859-1 latin1 l1 IBM819 CP819 csISOLatin1 8859_1 819 IBM-819 ISO8859-1 ISO_8859_1 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>ISO8859_13</td>
+ *         <td>ISO-8859-13</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>ISO8859_15</td>
+ *         <td>ISO-8859-15</td>
+ *         <td>ISO_8859-15 Latin-9 8859_15 csISOlatin9 IBM923 cp923 923 L9 IBM-923 ISO8859-15 LATIN9 LATIN0 csISOlatin0 ISO8859_15_FDIS </td>
+ *     </tr>
+ *     <tr>
+ *         <td>ISO8859_2</td>
+ *         <td>ISO-8859-2</td>
+ *         <td>ISO_8859-2:1987 iso-ir-101 ISO_8859-2 latin2 l2 csISOLatin2 8859_2 iso8859_2 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>ISO8859_3</td>
+ *         <td>ISO-8859-3</td>
+ *         <td>ISO_8859-3:1988 iso-ir-109 ISO_8859-3 latin3 l3 csISOLatin3 8859_3 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>ISO8859_4</td>
+ *         <td>ISO-8859-4</td>
+ *         <td>ISO_8859-4:1988 iso-ir-110 ISO_8859-4 latin4 l4 csISOLatin4 8859_4 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>ISO8859_5</td>
+ *         <td>ISO-8859-5</td>
+ *         <td>ISO_8859-5:1988 iso-ir-144 ISO_8859-5 cyrillic csISOLatinCyrillic 8859_5 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>ISO8859_6</td>
+ *         <td>ISO-8859-6</td>
+ *         <td>ISO_8859-6:1987 iso-ir-127 ISO_8859-6 ECMA-114 ASMO-708 arabic csISOLatinArabic 8859_6 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>ISO8859_7</td>
+ *         <td>ISO-8859-7</td>
+ *         <td>ISO_8859-7:1987 iso-ir-126 ISO_8859-7 ELOT_928 ECMA-118 greek greek8 csISOLatinGreek 8859_7 sun_eu_greek </td>
+ *     </tr>
+ *     <tr>
+ *         <td>ISO8859_8</td>
+ *         <td>ISO-8859-8</td>
+ *         <td>ISO_8859-8:1988 iso-ir-138 ISO_8859-8 hebrew csISOLatinHebrew 8859_8 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>ISO8859_9</td>
+ *         <td>ISO-8859-9</td>
+ *         <td>ISO_8859-9:1989 iso-ir-148 ISO_8859-9 latin5 l5 csISOLatin5 8859_9 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>JISAutoDetect</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>JIS_C6626-1983</td>
+ *         <td>JIS_C6626-1983</td>
+ *         <td>x-JIS0208 JIS0208 csISO87JISX0208 x0208 JIS_X0208-1983 iso-ir-87 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>JIS_X0201</td>
+ *         <td>JIS_X0201</td>
+ *         <td>X0201 JIS0201 csHalfWidthKatakana </td>
+ *     </tr>
+ *     <tr>
+ *         <td>JIS_X0212-1990</td>
+ *         <td>JIS_X0212-1990</td>
+ *         <td>iso-ir-159 x0212 JIS0212 csISO159JISX02121990 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>KOI8_R</td>
+ *         <td>KOI8-R</td>
+ *         <td>csKOI8R koi8 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>MS874</td>
+ *         <td>windows-874</td>
+ *         <td>cp874 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>MS932</td>
+ *         <td>Windows-31J</td>
+ *         <td>windows-932 csWindows31J x-ms-cp932 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>MS949</td>
+ *         <td>windows-949</td>
+ *         <td>windows949 ms_949 x-windows-949 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>MS950</td>
+ *         <td>windows-950</td>
+ *         <td>x-windows-950 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>MS950_HKSCS</td>
+ *         <td></td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>MacArabic</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>MacCentralEurope</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>MacCroatian</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>MacCyrillic</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>MacDingbat</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>MacGreek</td>
+ *         <td>MacGreek</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>MacHebrew</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>MacIceland</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>MacRoman</td>
+ *         <td>MacRoman</td>
+ *         <td>Macintosh MAC csMacintosh </td>
+ *     </tr>
+ *     <tr>
+ *         <td>MacRomania</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>MacSymbol</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>MacThai</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>MacTurkish</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>MacUkraine</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>SJIS</td>
+ *         <td>Shift_JIS</td>
+ *         <td>MS_Kanji csShiftJIS shift-jis x-sjis pck </td>
+ *     </tr>
+ *     <tr>
+ *         <td>TIS620</td>
+ *         <td>TIS-620</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>UTF-16</td>
+ *         <td>UTF-16</td>
+ *         <td>UTF_16 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>UTF8</td>
+ *         <td>UTF-8</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>UnicodeBig</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>UnicodeBigUnmarked</td>
+ *         <td>UTF-16BE</td>
+ *         <td>X-UTF-16BE UTF_16BE ISO-10646-UCS-2 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>UnicodeLittle</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ *     <tr>
+ *         <td>UnicodeLittleUnmarked</td>
+ *         <td>UTF-16LE</td>
+ *         <td>UTF_16LE X-UTF-16LE </td>
+ *     </tr>
+ *     <tr>
+ *         <td>x-Johab</td>
+ *         <td>johab</td>
+ *         <td>johab cp1361 ms1361 ksc5601-1992 ksc5601_1992 </td>
+ *     </tr>
+ *     <tr>
+ *         <td>x-iso-8859-11</td>
+ *         <td>?</td>
+ *         <td></td>
+ *     </tr>
+ * </table>
+ *
+ *
+ * @version $Id: CharsetUtil.java,v 1.1 2004/10/25 07:26:46 ntherning Exp $
+ */
+public class CharsetUtil {
+    private static Log log = LogFactory.getLog(CharsetUtil.class);
+
+    private static class Charset implements Comparable<Charset> {
+        private String canonical = null;
+        private String mime = null;
+        private String[] aliases = null;
+
+        private Charset(String canonical, String mime, String[] aliases) {
+            this.canonical = canonical;
+            this.mime = mime;
+            this.aliases = aliases;
+        }
+
+        public int compareTo(Charset c) {
+            return this.canonical.compareTo(c.canonical);
+        }
+    }
+
+    private static Charset[] JAVA_CHARSETS = {
+        new Charset("ISO8859_1", "ISO-8859-1",
+                    new String[] {"ISO_8859-1:1987", "iso-ir-100", "ISO_8859-1",
+                                  "latin1", "l1", "IBM819", "CP819",
+                                  "csISOLatin1", "8859_1", "819", "IBM-819",
+                                  "ISO8859-1", "ISO_8859_1"}),
+        new Charset("ISO8859_2", "ISO-8859-2",
+                    new String[] {"ISO_8859-2:1987", "iso-ir-101", "ISO_8859-2",
+                                  "latin2", "l2", "csISOLatin2", "8859_2",
+                                  "iso8859_2"}),
+        new Charset("ISO8859_3", "ISO-8859-3", new String[] {"ISO_8859-3:1988", "iso-ir-109", "ISO_8859-3", "latin3", "l3", "csISOLatin3", "8859_3"}),
+        new Charset("ISO8859_4", "ISO-8859-4",
+                    new String[] {"ISO_8859-4:1988", "iso-ir-110", "ISO_8859-4",
+                                  "latin4", "l4", "csISOLatin4", "8859_4"}),
+        new Charset("ISO8859_5", "ISO-8859-5",
+                    new String[] {"ISO_8859-5:1988", "iso-ir-144", "ISO_8859-5",
+                                  "cyrillic", "csISOLatinCyrillic", "8859_5"}),
+        new Charset("ISO8859_6", "ISO-8859-6", new String[] {"ISO_8859-6:1987", "iso-ir-127", "ISO_8859-6", "ECMA-114", "ASMO-708", "arabic", "csISOLatinArabic", "8859_6"}),
+        new Charset("ISO8859_7", "ISO-8859-7",
+                    new String[] {"ISO_8859-7:1987", "iso-ir-126", "ISO_8859-7",
+                                  "ELOT_928", "ECMA-118", "greek", "greek8",
+                                  "csISOLatinGreek", "8859_7", "sun_eu_greek"}),
+        new Charset("ISO8859_8", "ISO-8859-8", new String[] {"ISO_8859-8:1988", "iso-ir-138", "ISO_8859-8", "hebrew", "csISOLatinHebrew", "8859_8"}),
+        new Charset("ISO8859_9", "ISO-8859-9",
+                    new String[] {"ISO_8859-9:1989", "iso-ir-148", "ISO_8859-9",
+                                  "latin5", "l5", "csISOLatin5", "8859_9"}),
+
+        new Charset("ISO8859_13", "ISO-8859-13", new String[] {}),
+        new Charset("ISO8859_15", "ISO-8859-15",
+                    new String[] {"ISO_8859-15", "Latin-9", "8859_15",
+                                  "csISOlatin9", "IBM923", "cp923", "923", "L9",
+                                  "IBM-923", "ISO8859-15", "LATIN9", "LATIN0",
+                                  "csISOlatin0", "ISO8859_15_FDIS"}),
+        new Charset("KOI8_R", "KOI8-R", new String[] {"csKOI8R", "koi8"}),
+        new Charset("ASCII", "US-ASCII",
+                    new String[] {"ANSI_X3.4-1968", "iso-ir-6",
+                                  "ANSI_X3.4-1986", "ISO_646.irv:1991",
+                                  "ISO646-US", "us", "IBM367", "cp367",
+                                  "csASCII", "ascii7", "646", "iso_646.irv:1983"}),
+        new Charset("UTF8", "UTF-8", new String[] {}),
+        new Charset("UTF-16", "UTF-16", new String[] {"UTF_16"}),
+        new Charset("UnicodeBigUnmarked", "UTF-16BE", new String[] {"X-UTF-16BE", "UTF_16BE", "ISO-10646-UCS-2"}),
+        new Charset("UnicodeLittleUnmarked", "UTF-16LE", new String[] {"UTF_16LE", "X-UTF-16LE"}),
+        new Charset("Big5", "Big5", new String[] {"csBig5", "CN-Big5", "BIG-FIVE", "BIGFIVE"}),
+        new Charset("Big5_HKSCS", "Big5-HKSCS", new String[] {"big5hkscs"}),
+        new Charset("EUC_JP", "EUC-JP",
+                    new String[] {"csEUCPkdFmtJapanese",
+                              "Extended_UNIX_Code_Packed_Format_for_Japanese",
+                              "eucjis", "x-eucjp", "eucjp", "x-euc-jp"}),
+        new Charset("EUC_KR", "EUC-KR",
+                    new String[] {"csEUCKR", "ksc5601", "5601", "ksc5601_1987",
+                                  "ksc_5601", "ksc5601-1987", "ks_c_5601-1987",
+                                  "euckr"}),
+        new Charset("GB18030", "GB18030", new String[] {"gb18030-2000"}),
+        new Charset("EUC_CN", "GB2312", new String[] {"x-EUC-CN", "csGB2312", "euccn", "euc-cn", "gb2312-80", "gb2312-1980", "CN-GB", "CN-GB-ISOIR165"}),
+        new Charset("GBK", "windows-936", new String[] {"CP936", "MS936", "ms_936", "x-mswin-936"}),
+
+        new Charset("Cp037", "IBM037", new String[] {"ebcdic-cp-us", "ebcdic-cp-ca", "ebcdic-cp-wt", "ebcdic-cp-nl", "csIBM037"}),
+        new Charset("Cp273", "IBM273", new String[] {"csIBM273"}),
+        new Charset("Cp277", "IBM277", new String[] {"EBCDIC-CP-DK", "EBCDIC-CP-NO", "csIBM277"}),
+        new Charset("Cp278", "IBM278", new String[] {"CP278", "ebcdic-cp-fi", "ebcdic-cp-se", "csIBM278"}),
+        new Charset("Cp280", "IBM280", new String[] {"ebcdic-cp-it", "csIBM280"}),
+        new Charset("Cp284", "IBM284", new String[] {"ebcdic-cp-es", "csIBM284"}),
+        new Charset("Cp285", "IBM285", new String[] {"ebcdic-cp-gb", "csIBM285"}),
+        new Charset("Cp297", "IBM297", new String[] {"ebcdic-cp-fr", "csIBM297"}),
+        new Charset("Cp420", "IBM420", new String[] {"ebcdic-cp-ar1", "csIBM420"}),
+        new Charset("Cp424", "IBM424", new String[] {"ebcdic-cp-he", "csIBM424"}),
+        new Charset("Cp437", "IBM437", new String[] {"437", "csPC8CodePage437"}),
+        new Charset("Cp500", "IBM500", new String[] {"ebcdic-cp-be", "ebcdic-cp-ch", "csIBM500"}),
+        new Charset("Cp775", "IBM775", new String[] {"csPC775Baltic"}),
+        new Charset("Cp838", "IBM-Thai", new String[] {}),
+        new Charset("Cp850", "IBM850", new String[] {"850", "csPC850Multilingual"}),
+        new Charset("Cp852", "IBM852", new String[] {"852", "csPCp852"}),
+        new Charset("Cp855", "IBM855", new String[] {"855", "csIBM855"}),
+        new Charset("Cp857", "IBM857", new String[] {"857", "csIBM857"}),
+        new Charset("Cp858", "IBM00858",
+                new String[] {"CCSID00858", "CP00858",
+                              "PC-Multilingual-850+euro"}),
+        new Charset("Cp860", "IBM860", new String[] {"860", "csIBM860"}),
+        new Charset("Cp861", "IBM861", new String[] {"861", "cp-is", "csIBM861"}),
+        new Charset("Cp862", "IBM862", new String[] {"862", "csPC862LatinHebrew"}),
+        new Charset("Cp863", "IBM863", new String[] {"863", "csIBM863"}),
+        new Charset("Cp864", "IBM864", new String[] {"cp864", "csIBM864"}),
+        new Charset("Cp865", "IBM865", new String[] {"865", "csIBM865"}),
+        new Charset("Cp866", "IBM866", new String[] {"866", "csIBM866"}),
+        new Charset("Cp868", "IBM868", new String[] {"cp-ar", "csIBM868"}),
+        new Charset("Cp869", "IBM869", new String[] {"cp-gr", "csIBM869"}),
+        new Charset("Cp870", "IBM870", new String[] {"ebcdic-cp-roece", "ebcdic-cp-yu", "csIBM870"}),
+        new Charset("Cp871", "IBM871", new String[] {"ebcdic-cp-is", "csIBM871"}),
+        new Charset("Cp918", "IBM918", new String[] {"ebcdic-cp-ar2", "csIBM918"}),
+        new Charset("Cp1026", "IBM1026", new String[] {"csIBM1026"}),
+        new Charset("Cp1047", "IBM1047", new String[] {"IBM-1047"}),
+        new Charset("Cp1140", "IBM01140",
+                    new String[] {"CCSID01140", "CP01140",
+                                  "ebcdic-us-37+euro"}),
+        new Charset("Cp1141", "IBM01141",
+                    new String[] {"CCSID01141", "CP01141",
+                                  "ebcdic-de-273+euro"}),
+        new Charset("Cp1142", "IBM01142", new String[] {"CCSID01142", "CP01142", "ebcdic-dk-277+euro", "ebcdic-no-277+euro"}),
+        new Charset("Cp1143", "IBM01143", new String[] {"CCSID01143", "CP01143", "ebcdic-fi-278+euro", "ebcdic-se-278+euro"}),
+        new Charset("Cp1144", "IBM01144", new String[] {"CCSID01144", "CP01144", "ebcdic-it-280+euro"}),
+        new Charset("Cp1145", "IBM01145", new String[] {"CCSID01145", "CP01145", "ebcdic-es-284+euro"}),
+        new Charset("Cp1146", "IBM01146", new String[] {"CCSID01146", "CP01146", "ebcdic-gb-285+euro"}),
+        new Charset("Cp1147", "IBM01147", new String[] {"CCSID01147", "CP01147", "ebcdic-fr-297+euro"}),
+        new Charset("Cp1148", "IBM01148", new String[] {"CCSID01148", "CP01148", "ebcdic-international-500+euro"}),
+        new Charset("Cp1149", "IBM01149", new String[] {"CCSID01149", "CP01149", "ebcdic-is-871+euro"}),
+        new Charset("Cp1250", "windows-1250", new String[] {}),
+        new Charset("Cp1251", "windows-1251", new String[] {}),
+        new Charset("Cp1252", "windows-1252", new String[] {}),
+        new Charset("Cp1253", "windows-1253", new String[] {}),
+        new Charset("Cp1254", "windows-1254", new String[] {}),
+        new Charset("Cp1255", "windows-1255", new String[] {}),
+        new Charset("Cp1256", "windows-1256", new String[] {}),
+        new Charset("Cp1257", "windows-1257", new String[] {}),
+        new Charset("Cp1258", "windows-1258", new String[] {}),
+        new Charset("ISO2022CN", "ISO-2022-CN", new String[] {}),
+        new Charset("ISO2022JP", "ISO-2022-JP", new String[] {"csISO2022JP", "JIS", "jis_encoding", "csjisencoding"}),
+        new Charset("ISO2022KR", "ISO-2022-KR", new String[] {"csISO2022KR"}),
+        new Charset("JIS_X0201", "JIS_X0201", new String[] {"X0201", "JIS0201", "csHalfWidthKatakana"}),
+        new Charset("JIS_X0212-1990", "JIS_X0212-1990", new String[] {"iso-ir-159", "x0212", "JIS0212", "csISO159JISX02121990"}),
+        new Charset("JIS_C6626-1983", "JIS_C6626-1983", new String[] {"x-JIS0208", "JIS0208", "csISO87JISX0208", "x0208", "JIS_X0208-1983", "iso-ir-87"}),
+        new Charset("SJIS", "Shift_JIS", new String[] {"MS_Kanji", "csShiftJIS", "shift-jis", "x-sjis", "pck"}),
+        new Charset("TIS620", "TIS-620", new String[] {}),
+        new Charset("MS932", "Windows-31J", new String[] {"windows-932", "csWindows31J", "x-ms-cp932"}),
+        new Charset("EUC_TW", "EUC-TW", new String[] {"x-EUC-TW", "cns11643", "euctw"}),
+        new Charset("x-Johab", "johab", new String[] {"johab", "cp1361", "ms1361", "ksc5601-1992", "ksc5601_1992"}),
+        new Charset("MS950_HKSCS", "", new String[] {}),
+        new Charset("MS874", "windows-874", new String[] {"cp874"}),
+        new Charset("MS949", "windows-949", new String[] {"windows949", "ms_949", "x-windows-949"}),
+        new Charset("MS950", "windows-950", new String[] {"x-windows-950"}),
+
+        new Charset("Cp737", null, new String[] {}),
+        new Charset("Cp856", null, new String[] {}),
+        new Charset("Cp875", null, new String[] {}),
+        new Charset("Cp921", null, new String[] {}),
+        new Charset("Cp922", null, new String[] {}),
+        new Charset("Cp930", null, new String[] {}),
+        new Charset("Cp933", null, new String[] {}),
+        new Charset("Cp935", null, new String[] {}),
+        new Charset("Cp937", null, new String[] {}),
+        new Charset("Cp939", null, new String[] {}),
+        new Charset("Cp942", null, new String[] {}),
+        new Charset("Cp942C", null, new String[] {}),
+        new Charset("Cp943", null, new String[] {}),
+        new Charset("Cp943C", null, new String[] {}),
+        new Charset("Cp948", null, new String[] {}),
+        new Charset("Cp949", null, new String[] {}),
+        new Charset("Cp949C", null, new String[] {}),
+        new Charset("Cp950", null, new String[] {}),
+        new Charset("Cp964", null, new String[] {}),
+        new Charset("Cp970", null, new String[] {}),
+        new Charset("Cp1006", null, new String[] {}),
+        new Charset("Cp1025", null, new String[] {}),
+        new Charset("Cp1046", null, new String[] {}),
+        new Charset("Cp1097", null, new String[] {}),
+        new Charset("Cp1098", null, new String[] {}),
+        new Charset("Cp1112", null, new String[] {}),
+        new Charset("Cp1122", null, new String[] {}),
+        new Charset("Cp1123", null, new String[] {}),
+        new Charset("Cp1124", null, new String[] {}),
+        new Charset("Cp1381", null, new String[] {}),
+        new Charset("Cp1383", null, new String[] {}),
+        new Charset("Cp33722", null, new String[] {}),
+        new Charset("Big5_Solaris", null, new String[] {}),
+        new Charset("EUC_JP_LINUX", null, new String[] {}),
+        new Charset("EUC_JP_Solaris", null, new String[] {}),
+        new Charset("ISCII91", null, new String[] {"x-ISCII91", "iscii"}),
+        new Charset("ISO2022_CN_CNS", null, new String[] {}),
+        new Charset("ISO2022_CN_GB", null, new String[] {}),
+        new Charset("x-iso-8859-11", null, new String[] {}),
+        new Charset("JISAutoDetect", null, new String[] {}),
+        new Charset("MacArabic", null, new String[] {}),
+        new Charset("MacCentralEurope", null, new String[] {}),
+        new Charset("MacCroatian", null, new String[] {}),
+        new Charset("MacCyrillic", null, new String[] {}),
+        new Charset("MacDingbat", null, new String[] {}),
+        new Charset("MacGreek", "MacGreek", new String[] {}),
+        new Charset("MacHebrew", null, new String[] {}),
+        new Charset("MacIceland", null, new String[] {}),
+        new Charset("MacRoman", "MacRoman", new String[] {"Macintosh", "MAC", "csMacintosh"}),
+        new Charset("MacRomania", null, new String[] {}),
+        new Charset("MacSymbol", null, new String[] {}),
+        new Charset("MacThai", null, new String[] {}),
+        new Charset("MacTurkish", null, new String[] {}),
+        new Charset("MacUkraine", null, new String[] {}),
+        new Charset("UnicodeBig", null, new String[] {}),
+        new Charset("UnicodeLittle", null, new String[] {})
+    };
+
+    /**
+     * Contains the canonical names of character sets which can be used to
+     * decode bytes into Java chars.
+     */
+    private static TreeSet<String> decodingSupported = null;
+
+    /**
+     * Contains the canonical names of character sets which can be used to
+     * encode Java chars into bytes.
+     */
+    private static TreeSet<String> encodingSupported = null;
+
+    /**
+     * Maps character set names to Charset objects. All possible names of
+     * a charset will be mapped to the Charset.
+     */
+    private static HashMap<String, Charset> charsetMap = null;
+
+    static {
+        decodingSupported = new TreeSet<String>();
+        encodingSupported = new TreeSet<String>();
+        byte[] dummy = new byte[] {'d', 'u', 'm', 'm', 'y'};
+        for (int i = 0; i < JAVA_CHARSETS.length; i++) {
+            try {
+                String s = new String(dummy, JAVA_CHARSETS[i].canonical);
+                decodingSupported.add(JAVA_CHARSETS[i].canonical.toLowerCase(Locale.US));
+            } catch (UnsupportedOperationException e) {
+            } catch (UnsupportedEncodingException e) {
+            }
+            try {
+                "dummy".getBytes(JAVA_CHARSETS[i].canonical);
+                encodingSupported.add(JAVA_CHARSETS[i].canonical.toLowerCase(Locale.US));
+            } catch (UnsupportedOperationException e) {
+            } catch (UnsupportedEncodingException e) {
+            }
+        }
+
+        charsetMap = new HashMap<String, Charset>();
+        for (int i = 0; i < JAVA_CHARSETS.length; i++) {
+            Charset c = JAVA_CHARSETS[i];
+            charsetMap.put(c.canonical.toLowerCase(Locale.US), c);
+            if (c.mime != null) {
+                charsetMap.put(c.mime.toLowerCase(Locale.US), c);
+            }
+            if (c.aliases != null) {
+                for (int j = 0; j < c.aliases.length; j++) {
+                    charsetMap.put(c.aliases[j].toLowerCase(Locale.US), c);
+                }
+            }
+        }
+
+        if (log.isDebugEnabled()) {
+            log.debug("Character sets which support decoding: "
+                        + decodingSupported);
+            log.debug("Character sets which support encoding: "
+                        + encodingSupported);
+        }
+    }
+
+    /**
+     * ANDROID:  THE FOLLOWING SET OF STATIC STRINGS ARE COPIED FROM A NEWER VERSION OF MIME4J
+     */
+
+    /** carriage return - line feed sequence */
+    public static final String CRLF = "\r\n";
+
+    /** US-ASCII CR, carriage return (13) */
+    public static final int CR = '\r';
+
+    /** US-ASCII LF, line feed (10) */
+    public static final int LF = '\n';
+
+    /** US-ASCII SP, space (32) */
+    public static final int SP = ' ';
+
+    /** US-ASCII HT, horizontal-tab (9)*/
+    public static final int HT = '\t';
+
+    public static final java.nio.charset.Charset US_ASCII = java.nio.charset.Charset
+            .forName("US-ASCII");
+
+    public static final java.nio.charset.Charset ISO_8859_1 = java.nio.charset.Charset
+            .forName("ISO-8859-1");
+
+    public static final java.nio.charset.Charset UTF_8 = java.nio.charset.Charset
+            .forName("UTF-8");
+
+    /**
+     * Returns <code>true</code> if the specified character is a whitespace
+     * character (CR, LF, SP or HT).
+     *
+     * ANDROID:  COPIED FROM A NEWER VERSION OF MIME4J
+     *
+     * @param ch
+     *            character to test.
+     * @return <code>true</code> if the specified character is a whitespace
+     *         character, <code>false</code> otherwise.
+     */
+    public static boolean isWhitespace(char ch) {
+        return ch == SP || ch == HT || ch == CR || ch == LF;
+    }
+
+    /**
+     * Returns <code>true</code> if the specified string consists entirely of
+     * whitespace characters.
+     *
+     * ANDROID:  COPIED FROM A NEWER VERSION OF MIME4J
+     *
+     * @param s
+     *            string to test.
+     * @return <code>true</code> if the specified string consists entirely of
+     *         whitespace characters, <code>false</code> otherwise.
+     */
+    public static boolean isWhitespace(final String s) {
+        if (s == null) {
+            throw new IllegalArgumentException("String may not be null");
+        }
+        final int len = s.length();
+        for (int i = 0; i < len; i++) {
+            if (!isWhitespace(s.charAt(i))) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Determines if the VM supports encoding (chars to bytes) the
+     * specified character set. NOTE: the given character set name may
+     * not be known to the VM even if this method returns <code>true</code>.
+     * Use {@link #toJavaCharset(String)} to get the canonical Java character
+     * set name.
+     *
+     * @param charsetName the characters set name.
+     * @return <code>true</code> if encoding is supported, <code>false</code>
+     *         otherwise.
+     */
+    public static boolean isEncodingSupported(String charsetName) {
+        return encodingSupported.contains(charsetName.toLowerCase(Locale.US));
+    }
+
+    /**
+     * Determines if the VM supports decoding (bytes to chars) the
+     * specified character set. NOTE: the given character set name may
+     * not be known to the VM even if this method returns <code>true</code>.
+     * Use {@link #toJavaCharset(String)} to get the canonical Java character
+     * set name.
+     *
+     * @param charsetName the characters set name.
+     * @return <code>true</code> if decoding is supported, <code>false</code>
+     *         otherwise.
+     */
+    public static boolean isDecodingSupported(String charsetName) {
+        return decodingSupported.contains(charsetName.toLowerCase(Locale.US));
+    }
+
+    /**
+     * Gets the preferred MIME character set name for the specified
+     * character set or <code>null</code> if not known.
+     *
+     * @param charsetName the character set name to look for.
+     * @return the MIME preferred name or <code>null</code> if not known.
+     */
+    public static String toMimeCharset(String charsetName) {
+        Charset c = charsetMap.get(charsetName.toLowerCase(Locale.US));
+        if (c != null) {
+            return c.mime;
+        }
+        return null;
+    }
+
+    /**
+     * Gets the canonical Java character set name for the specified
+     * character set or <code>null</code> if not known. This should be
+     * called before doing any conversions using the Java API. NOTE:
+     * you must use {@link #isEncodingSupported(String)} or
+     * {@link #isDecodingSupported(String)} to make sure the returned
+     * Java character set is supported by the current VM.
+     *
+     * @param charsetName the character set name to look for.
+     * @return the canonical Java name or <code>null</code> if not known.
+     */
+    public static String toJavaCharset(String charsetName) {
+        Charset c = charsetMap.get(charsetName.toLowerCase(Locale.US));
+        if (c != null) {
+            return c.canonical;
+        }
+        return null;
+    }
+
+    public static java.nio.charset.Charset getCharset(String charsetName) {
+        String defaultCharset = "ISO-8859-1";
+
+        // Use the default chareset if given charset is null
+        if(charsetName == null) charsetName = defaultCharset;
+
+        try {
+            return java.nio.charset.Charset.forName(charsetName);
+        } catch (IllegalCharsetNameException e) {
+            log.info("Illegal charset " + charsetName + ", fallback to " +
+                    defaultCharset + ": " + e);
+            // Use default charset on exception
+            return java.nio.charset.Charset.forName(defaultCharset);
+        } catch (UnsupportedCharsetException ex) {
+            log.info("Unsupported charset " + charsetName + ", fallback to " +
+                    defaultCharset + ": " + ex);
+            // Use default charset on exception
+            return java.nio.charset.Charset.forName(defaultCharset);
+        }
+
+    }
+    /*
+     * Uncomment the code below and run the main method to regenerate the
+     * Javadoc table above when the known charsets change.
+     */
+
+    /*
+    private static String dumpHtmlTable() {
+        LinkedList l = new LinkedList(Arrays.asList(JAVA_CHARSETS));
+        Collections.sort(l);
+        StringBuffer sb = new StringBuffer();
+        sb.append(" * <table>\n");
+        sb.append(" *     <tr>\n");
+        sb.append(" *         <td>Canonical (Java) name</td>\n");
+        sb.append(" *         <td>MIME preferred</td>\n");
+        sb.append(" *         <td>Aliases</td>\n");
+        sb.append(" *     </tr>\n");
+
+        for (Iterator it = l.iterator(); it.hasNext();) {
+            Charset c = (Charset) it.next();
+            sb.append(" *     <tr>\n");
+            sb.append(" *         <td>" + c.canonical + "</td>\n");
+            sb.append(" *         <td>" + (c.mime == null ? "?" : c.mime)+ "</td>\n");
+            sb.append(" *         <td>");
+            for (int i = 0; c.aliases != null && i < c.aliases.length; i++) {
+                sb.append(c.aliases[i] + " ");
+            }
+            sb.append("</td>\n");
+            sb.append(" *     </tr>\n");
+        }
+        sb.append(" * </table>\n");
+        return sb.toString();
+    }
+
+    public static void main(String[] args) {
+        System.out.println(dumpHtmlTable());
+    }*/
+}
\ No newline at end of file
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index af3f7e4..8900568 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -19,6 +19,7 @@
 
     <uses-permission android:name="android.permission.CALL_PHONE" />
     <uses-permission android:name="android.permission.PERFORM_CDMA_PROVISIONING" />
+    <uses-permission android:name="android.permission.PERFORM_SIM_ACTIVATION" />
 
     <application android:label="@string/app_name">
         <uses-library android:name="android.test.runner" />
@@ -56,6 +57,8 @@
                 <data android:scheme="smsto" />
             </intent-filter>
         </service>
+
+        <receiver android:name="com.android.services.telephony.activation.ResponseReceiver" />
     </application>
 
     <!--
diff --git a/tests/src/com/android/services/telephony/activation/ResponseReceiver.java b/tests/src/com/android/services/telephony/activation/ResponseReceiver.java
new file mode 100644
index 0000000..33e7f00
--- /dev/null
+++ b/tests/src/com/android/services/telephony/activation/ResponseReceiver.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.services.telephony.activation;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+
+import com.android.services.telephony.Log;
+
+public class ResponseReceiver extends BroadcastReceiver {
+    volatile public static boolean responseReceived = false;
+    public static final String ACTION_ACTIVATION_RESPONSE =
+            "com.android.services.telephony.ACTIVATION_RESPONSE";
+
+    private final Object mLock;
+    private Context mContext;
+
+    ResponseReceiver(Object lock) {
+        mLock = lock;
+    }
+
+    /** ${inheritDoc} */
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        if (!ACTION_ACTIVATION_RESPONSE.equals(intent.getAction())) {
+            Log.e(this, null, "Unexpected intent: " + intent.getAction());
+            return;
+        }
+
+        responseReceived = true;
+        Log.i(this, "received intent");
+
+        if (mLock != null) {
+            synchronized(mLock) {
+                Log.i(this, "notifying");
+                mLock.notify();
+            }
+        }
+    }
+
+    void register(Context context) {
+        context.registerReceiver(this, new IntentFilter(ACTION_ACTIVATION_RESPONSE));
+        mContext = context;
+    }
+
+    void unregister() {
+        mContext.unregisterReceiver(this);
+    }
+}
diff --git a/tests/src/com/android/services/telephony/activation/SimActivationTest.java b/tests/src/com/android/services/telephony/activation/SimActivationTest.java
new file mode 100644
index 0000000..f6060dc
--- /dev/null
+++ b/tests/src/com/android/services/telephony/activation/SimActivationTest.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.services.telephony.activation;
+
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
+
+import com.android.services.telephony.Log;
+
+public class SimActivationTest extends AndroidTestCase {
+
+    private static Object mActivationLock = new Object();
+    private ResponseReceiver mResponseReceiver;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        mResponseReceiver = new ResponseReceiver(mActivationLock);
+        mResponseReceiver.register(context());
+    }
+
+    /** ${inheritDoc} */
+    @Override
+    protected void tearDown() throws Exception {
+        mResponseReceiver.unregister();
+        super.tearDown();
+    }
+
+    @SmallTest
+    public void testSimActivationResponse() throws Exception {
+        Log.i(this, "Running activation test");
+
+        Intent responseIntent = new Intent(ResponseReceiver.ACTION_ACTIVATION_RESPONSE);
+        responseIntent.setPackage(context().getPackageName());
+        PendingIntent pendingResponse = PendingIntent.getBroadcast(
+                context(), 0, responseIntent, 0);
+
+        Intent intent = new Intent(Intent.ACTION_SIM_ACTIVATION_REQUEST);
+        intent.putExtra(Intent.EXTRA_SIM_ACTIVATION_RESPONSE, pendingResponse);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+        Log.i(this, "sent intent");
+        context().startActivity(intent);
+        synchronized (mActivationLock) {
+            Log.i(this, "waiting ");
+            mActivationLock.wait(5000);
+            Log.i(this, "unwaiting");
+        }
+        assertTrue(ResponseReceiver.responseReceived);
+    }
+
+    private Context context() {
+        return getContext();
+    }
+}