diff --git a/Android.mk b/Android.mk
index f77dc5b..775d795 100644
--- a/Android.mk
+++ b/Android.mk
@@ -15,13 +15,13 @@
         voip-common \
         ims-common \
         org.apache.http.legacy \
-        libprotobuf-java-nano
+        libprotobuf-java-lite
 
 LOCAL_STATIC_ANDROID_LIBRARIES := \
-        android-support-v7-appcompat \
-        android-support-v7-preference \
-        android-support-v7-recyclerview \
-        android-support-v14-preference
+        androidx.appcompat_appcompat \
+        androidx.preference_preference \
+        androidx.recyclerview_recyclerview \
+        androidx.legacy_legacy-preference-v14
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
         guava \
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 30760dc..59f61eb 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -65,6 +65,7 @@
     <protected-broadcast android:name= "com.android.internal.telephony.CARRIER_SIGNAL_PCO_VALUE" />
     <protected-broadcast android:name= "com.android.internal.telephony.CARRIER_SIGNAL_RESET" />
     <protected-broadcast android:name= "com.android.internal.telephony.CARRIER_SIGNAL_DEFAULT_NETWORK_AVAILABLE" />
+    <protected-broadcast android:name= "com.android.internal.telephony.ACTION_LINE1_NUMBER_ERROR_DETECTED" />
     <protected-broadcast android:name= "com.android.internal.provider.action.VOICEMAIL_SMS_RECEIVED" />
     <protected-broadcast android:name= "com.android.intent.isim_refresh" />
     <protected-broadcast android:name= "com.android.ims.ACTION_RCS_SERVICE_AVAILABLE" />
@@ -90,6 +91,7 @@
     <protected-broadcast android:name= "android.telephony.action.SIM_APPLICATION_STATE_CHANGED" />
     <protected-broadcast android:name= "android.telephony.action.SIM_SLOT_STATUS_CHANGED" />
     <protected-broadcast android:name= "android.telephony.action.SUBSCRIPTION_CARRIER_IDENTITY_CHANGED" />
+    <protected-broadcast android:name= "android.telephony.action.SUBSCRIPTION_PRECISE_CARRIER_IDENTITY_CHANGED" />
 
     <uses-permission android:name="android.permission.BROADCAST_STICKY" />
     <uses-permission android:name="android.permission.CALL_PHONE" />
@@ -214,7 +216,8 @@
         <activity android:name="EmergencyDialer"
             android:label="@string/emergencyDialerIconLabel"
             android:theme="@style/EmergencyDialerTheme"
-            android:screenOrientation="portrait">
+            android:screenOrientation="portrait"
+            android:resizeableActivity="false">
             <intent-filter>
                 <action android:name="com.android.phone.EmergencyDialer.DIAL" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -255,39 +258,6 @@
                   android:theme="@android:style/Theme.Translucent.NoTitleBar"
                   android:exported="false"/>
 
-        <!-- "Mobile network settings" screen, used on both
-             non-voice-capable tablets and regular phone devices. -->
-        <activity android:name="MobileNetworkSettings"
-            android:label="@string/network_settings_title"
-            android:theme="@style/NetworkOperatorsSettingsTheme">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.NETWORK_OPERATOR_SETTINGS" />
-                <action android:name="android.settings.DATA_ROAMING_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <activity-alias android:name="Settings"
-            android:targetActivity="MobileNetworkSettings" />
-
-        <!-- networks setting -->
-        <!-- "Choose network" screen. Used only when the Automatically
-             select network turned off-->
-        <activity android:name="NetworkSelectSettingActivity"
-            android:label="@string/choose_network_title"
-            android:theme="@style/NetworkOperatorsSettingsTheme"
-            android:configChanges="orientation|screenSize">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <!-- service to handle network query requests sent to RIL -->
-        <service android:name="NetworkQueryService" />
-
         <activity android:name="GsmUmtsCallOptions"
                 android:label="@string/gsm_umts_options"
                 android:theme="@style/DialerSettingsLight">
diff --git a/OWNERS b/OWNERS
index f190411..1d3173f 100644
--- a/OWNERS
+++ b/OWNERS
@@ -9,3 +9,4 @@
 mpq@google.com
 jminjie@google.com
 shuoq@google.com
+paulye@google.com
diff --git a/ecc/README.md b/ecc/README.md
index ef795d5..b5dc538 100644
--- a/ecc/README.md
+++ b/ecc/README.md
@@ -6,43 +6,28 @@
 
 gen_eccdata.sh
   - A script to launch the newest conversion toolset to convert
-    input/eccdata.txt into output/eccdata, and invoke compatibility
-    verification tools of earlier versions of toolsets.
+    input/eccdata.txt into output/eccdata.
 
 input/eccdata.txt
   - A text file in ProtoBuf text format which contains all known ECC data.
-    This file shall be compatible with the last version of format toolset,
-    but may not be compatible with all earlier versions.
 
 output/eccdata
-  - The binary file generated from input files, with the last version of
-    format toolset. This file shall be compatible with all earlier versions.
+  - The binary file generated from input files.
 
 conversion_toolset_v*
-  - Contains format definitions, converting tools and verification tools of
-    one version of ECC data format.
+  - Contains format definitions and converting tools.
 
 proto
   - A symbolic link references to protobuf folder of the newest version of
     conversion toolsets. It's used in Android.mk.
 
-Conversion Toolset
-===================
-
-Every version of conversion toolset shall include at least:
-  - A script to generate eccdata from a known version of input/eccdata.txt.
-  - A script to verify compatibility of output/eccdata generated by any
-    newer version of format toolset.
-
-The output/eccdata generated by a version of conversion toolset shall be
-able to pass compatibility verifications of all previous versions of format
-toolset.
-
 Updating ECC database
 ===================
 Steps to update the ECC database:
 1. Edit input/eccdata.txt
 2. Source and launch
 3. Run gen_eccdata.sh
-The database file "output/eccdata" should be updated.
-
+4. Make TeleService
+5. Push TeleService.apk to system/priv-app/TeleService
+6. Reboot device
+7. run 'atest TeleServiceTests:IsoToEccProtobufRepositoryTest#testEccDataContent'
diff --git a/ecc/conversion_toolset_v1/env.sh b/ecc/conversion_toolset_v1/env.sh
index 23d9f10..534c807 100644
--- a/ecc/conversion_toolset_v1/env.sh
+++ b/ecc/conversion_toolset_v1/env.sh
@@ -20,19 +20,3 @@
 PROTOBUF_DIR="${LOCAL_TOOLSET_DIR}/proto"
 PROTOBUF_FILE="${PROTOBUF_DIR}/protobuf_ecc_data.proto"
 RAW_DATA="${INTERMEDIATE_DIR}/eccdata.raw"
-
-read -d "" PYTHON_COMMAND << END || :
-${ANDROID_BUILD_TOP}/prebuilts/python/${KERNEL}-x86/2.7.5/bin/python
-END
-PYTHONPATH="${PYTHONPATH}:${INTERMEDIATE_DIR}"
-PYTHONPATH="${PYTHONPATH}:${ANDROID_BUILD_TOP}/external/nanopb-c/generator/"
-
-if ! [ -x "${PYTHON_COMMAND}" ] ; then
-  echo "Missing ${PYTHON_COMMAND}." 1>&2
-  exit 1
-fi
-
-"${PROTOC_COMMAND}" \
-  --python_out="${INTERMEDIATE_DIR}" \
-  --proto_path="${PROTOBUF_DIR}" \
-  "${PROTOBUF_FILE}"
diff --git a/ecc/conversion_toolset_v1/gen_eccdata.sh b/ecc/conversion_toolset_v1/gen_eccdata.sh
index 8dd751f..1efac37 100644
--- a/ecc/conversion_toolset_v1/gen_eccdata.sh
+++ b/ecc/conversion_toolset_v1/gen_eccdata.sh
@@ -18,19 +18,12 @@
 LOCAL_TOOLSET_DIR="${ECC_ROOT}/conversion_toolset_v1"
 source "${LOCAL_TOOLSET_DIR}/env.sh"
 
+echo "Converting eccdata..."
 ${ANDROID_BUILD_TOP}/prebuilts/tools/linux-x86_64/protoc/bin/protoc \
   --encode=ecc.AllInfo proto/protobuf_ecc_data.proto \
   < "${INPUT_DATA}" > "${RAW_DATA}"
 
-echo
-echo "Starting strict verification"
-"${PYTHON_COMMAND}" -B \
-  "${LOCAL_TOOLSET_DIR}/verify_protobuf_compatibility.py" \
-  --input="${RAW_DATA}" --strict
-echo "Passed strict verification"
-
-echo
-echo "Compressing and encoding eccdata"
+echo "Compressing eccdata..."
 gzip -c < "${RAW_DATA}" > "${OUTPUT_DATA}"
-echo "Done"
 
+echo "Done"
diff --git a/ecc/conversion_toolset_v1/proto/Android.bp b/ecc/conversion_toolset_v1/proto/Android.bp
new file mode 100644
index 0000000..7d6cce4
--- /dev/null
+++ b/ecc/conversion_toolset_v1/proto/Android.bp
@@ -0,0 +1,28 @@
+// Copyright (C) 2018 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+java_library_static {
+    name: "ecc-protos-lite",
+    proto: {
+        type: "nano",
+        output_params: [
+            "store_unknown_fields=true",
+            "enum_style=java",
+        ],
+    },
+    srcs: ["protobuf_ecc_data.proto"],
+    no_framework_libs: true,
+    jarjar_rules: "jarjar-rules.txt",
+    java_version: "1.8",
+}
\ No newline at end of file
diff --git a/ecc/conversion_toolset_v1/proto/jarjar-rules.txt b/ecc/conversion_toolset_v1/proto/jarjar-rules.txt
new file mode 100644
index 0000000..98ac044
--- /dev/null
+++ b/ecc/conversion_toolset_v1/proto/jarjar-rules.txt
@@ -0,0 +1 @@
+rule com.google.protobuf.nano.** com.android.phone.ecc.nano.@1
\ No newline at end of file
diff --git a/ecc/conversion_toolset_v1/verify_eccdata_compatibility.sh b/ecc/conversion_toolset_v1/verify_eccdata_compatibility.sh
deleted file mode 100644
index 8686722..0000000
--- a/ecc/conversion_toolset_v1/verify_eccdata_compatibility.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-# Copyright 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_TOOLSET_DIR="${ECC_ROOT}/conversion_toolset_v1"
-source "${LOCAL_TOOLSET_DIR}/env.sh"
-
-echo "Starting compatibility verification v1"
-echo "Decoding and decompressing eccdata"
-gunzip -c < "${OUTPUT_DATA}" > "${RAW_DATA}"
-${PYTHON_COMMAND} -B \
-  "${LOCAL_TOOLSET_DIR}/verify_protobuf_compatibility.py" \
-  --input="${RAW_DATA}"
-echo "Passed compatibility verification v1"
-
diff --git a/ecc/conversion_toolset_v1/verify_protobuf_compatibility.py b/ecc/conversion_toolset_v1/verify_protobuf_compatibility.py
deleted file mode 100644
index bc707eb..0000000
--- a/ecc/conversion_toolset_v1/verify_protobuf_compatibility.py
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/usr/bin/python -B
-
-# Copyright 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Notice:
-# - verify_eccdata_strict.py: Verify data which is generated by this
-# version of this toolset.
-# - verify_eccdata_compatibility.py: Verify data which is generated by any
-# newer version of this tool set for ensuring backward compatibility.
-
-import sys
-import argparse
-import protobuf_ecc_data_pb2
-
-parser = argparse.ArgumentParser()
-parser.add_argument("--input", required=True)
-parser.add_argument("--strict", action="store_true")
-args = parser.parse_args()
-
-all_ecc_info = protobuf_ecc_data_pb2.AllInfo()
-
-with open(args.input, "rb") as ecc_data_source_file:
-  all_ecc_info.ParseFromString(ecc_data_source_file.read())
-
-if (args.strict):
-  print("Verify in strict mode")
-
-assert all_ecc_info.HasField("revision")
-assert all_ecc_info.revision > 0
-assert len(all_ecc_info.countries) > 0
-
-loaded_iso = []
-for country_info in all_ecc_info.countries:
-  assert country_info.HasField("iso_code")
-  assert len(country_info.iso_code) > 0
-  assert country_info.iso_code == country_info.iso_code.strip().upper()
-  assert country_info.iso_code not in loaded_iso
-  loaded_iso.append(country_info.iso_code)
-  assert country_info.HasField("ecc_fallback")
-  assert len(country_info.ecc_fallback) > 0
-
-  if len(country_info.eccs) > 0:
-    loaded_phone_number = []
-    for ecc_info in country_info.eccs:
-      assert ecc_info.HasField("phone_number")
-      phone_number = ecc_info.phone_number.strip()
-      assert len(phone_number) > 0
-      assert phone_number not in loaded_phone_number
-      loaded_phone_number.append(phone_number)
-
-      if (args.strict):
-        assert len(ecc_info.types) > 0
-        loaded_types = []
-        for ecc_type in ecc_info.types:
-          assert ecc_type == protobuf_ecc_data_pb2.EccInfo.POLICE or \
-              ecc_type == protobuf_ecc_data_pb2.EccInfo.AMBULANCE or \
-              ecc_type == protobuf_ecc_data_pb2.EccInfo.FIRE
-          assert ecc_type not in loaded_types
-          loaded_types.append(ecc_type)
-      else:
-        # For forward compatibility, ecc_info.types could be null if a phone
-        # number contains only new types which is not defined now. Just leave
-        # a warning message for this case.
-        if len(ecc_info.types) == 0:
-          print("WARNING: No recognizable type for " + \
-              country_info.iso_code + " - " + ecc_info.phone_number)
-        else:
-          loaded_types = []
-          for ecc_type in ecc_info.types:
-            assert ecc_type not in loaded_types
-            loaded_types.append(ecc_type)
-  elif (args.strict):
-    print("Warning: Empty ecc list for country " + country_info.iso_code)
diff --git a/ecc/gen_eccdata.sh b/ecc/gen_eccdata.sh
index 5cf52de..4f3a097 100755
--- a/ecc/gen_eccdata.sh
+++ b/ecc/gen_eccdata.sh
@@ -53,15 +53,8 @@
 source "${TOOLSET_DIR}/gen_eccdata.sh"
 echo
 
-# Check compatibility with every previous version
-rm -rf "${INTERMEDIATE_DIR}/*"
-source ${ECC_ROOT}/conversion_toolset_v1/verify_eccdata_compatibility.sh
-#rm -rf "${INTERMEDIATE_DIR}/*"
-#source ${ECC_ROOT}/conversion_toolset_v2/verify_eccdata_compatibility.sh
-#rm -rf "${INTERMEDIATE_DIR}/*"
-#source ${ECC_ROOT}/conversion_toolset_v3/verify_eccdata_compatibility.sh
-#...
-
-echo
-echo "Passed all compatibility verification!"
-
+echo "To verify data compatibility:"
+echo "  1. make TeleService"
+echo "  2. push TeleService.apk to system/priv-app/TeleService"
+echo "  3. reboot device"
+echo "  4. run 'atest TeleServiceTests:IsoToEccProtobufRepositoryTest#testEccDataContent'"
diff --git a/ecc/input/eccdata.txt b/ecc/input/eccdata.txt
index 54be16b..403cad7 100644
--- a/ecc/input/eccdata.txt
+++ b/ecc/input/eccdata.txt
@@ -808,7 +808,7 @@
 countries {
   iso_code: "GB"
   eccs {
-    phone_number: "112"
+    phone_number: "999"
     types: POLICE
     types: AMBULANCE
     types: FIRE
diff --git a/ecc/output/eccdata b/ecc/output/eccdata
index 2d0165a..679bc36 100644
--- a/ecc/output/eccdata
+++ b/ecc/output/eccdata
Binary files differ
diff --git a/res/layout/emergency_shortcut_buttons_group.xml b/res/layout/emergency_shortcut_buttons_group.xml
index bafedd1..7911f30 100644
--- a/res/layout/emergency_shortcut_buttons_group.xml
+++ b/res/layout/emergency_shortcut_buttons_group.xml
@@ -38,7 +38,8 @@
                 android:ellipsize="end"
                 android:lineHeight="@dimen/emergency_number_title_line_height"
                 android:fontFamily="sans-serif-medium"
-                android:textAppearance="@style/SubtitleTextAppearance"
+                android:textColor="@android:color/white"
+                android:textSize="@dimen/emergency_number_title_text_size"
                 android:text="@string/single_emergency_number_title"/>
         </FrameLayout>
         <LinearLayout
@@ -63,7 +64,8 @@
                 android:maxLines="2"
                 android:ellipsize="end"
                 android:lineHeight="@dimen/location_text_line_height"
-                android:textAppearance="@style/SubtitleTextAppearance"/>
+                android:textColor="@android:color/white"
+                android:textSize="@dimen/emergency_location_text_size"/>
         </LinearLayout>
     </FrameLayout>
     <LinearLayout
diff --git a/res/layout/pref_dialog_editphonenumber.xml b/res/layout/pref_dialog_editphonenumber.xml
index cb16516..3bd52c0 100644
--- a/res/layout/pref_dialog_editphonenumber.xml
+++ b/res/layout/pref_dialog_editphonenumber.xml
@@ -21,7 +21,7 @@
     android:orientation="vertical"
     android:padding="?android:attr/dialogPreferredPadding">
 
-    <TextView android:id="@+android:id/message"
+    <TextView android:id="@+id/message"
         style="?android:attr/textAppearanceMedium"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/res/layout/telephony_disallowed_preference_screen.xml b/res/layout/telephony_disallowed_preference_screen.xml
index 18b4d94..baa049f 100644
--- a/res/layout/telephony_disallowed_preference_screen.xml
+++ b/res/layout/telephony_disallowed_preference_screen.xml
@@ -30,7 +30,7 @@
                 android:cacheColorHint="@android:color/white"
                 android:fadingEdgeLength="16dip" />
 
-        <TextView android:id="@+android:id/empty"
+        <TextView android:id="@+id/empty"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:gravity="center"
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 951df4e..3fde2c8 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Stel tans instellings terug…"</string>
     <string name="response_error" msgid="6674110501330139405">"Onverwagte antwoord van netwerk."</string>
     <string name="exception_error" msgid="7027667130619518211">"Netwerk- of SIM-kaartfout."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS-versoek is na gewone oproep verander"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS-versoek is na USSD-versoek verander"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Na nuwe SS-versoek verander"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS-versoek is na video-oproep verander"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS-versoek is gewysig tot DIAL-versoek."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS-versoek is gewysig tot USSD-versoek."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS-versoek is gewysig tot nuwe SS-versoek."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS-versoek is gewysig tot Video DIAL-versoek."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"Die instelling op jou foonprogram se belperking-nommers is aangeskakel. As gevolg hiervan werk sommige oproepverwante kenmerke nie."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Skakel die radio aan voordat jy na hierdie instellings kyk."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
@@ -163,7 +163,7 @@
     <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>
-    <string name="network_query_error" msgid="8466081377231178298">"Kon nie netwerke vind nie. Probeer weer."</string>
+    <string name="network_query_error" msgid="6828516148953325006">"Fout het voorgekom terwyl netwerke gesoek is."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Registreer op <xliff:g id="NETWORK">%s</xliff:g>…"</string>
     <string name="not_allowed" msgid="5613353860205691579">"Jou SIM-kaart laat nie \'n verbinding na hierdie netwerk toe nie."</string>
     <string name="connect_later" msgid="2308119155752343975">"Kan nie nou aan hierdie netwerk koppel nie. Probeer later weer."</string>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Verander die netwerkbedryfsmodus"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Voorkeurnetwerktipe"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(verbode)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Kies netwerk"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Ontkoppel"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Gekoppel"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Koppel tans …"</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Kon nie koppel nie"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA verkies"</item>
     <item msgid="8442633436636425221">"Net GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Oproepe"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Netwerk"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Verbeterde 4G LTE-modus"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Gevorderde oproepe"</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="2382798156640007971">"Laat datagebruik toe"</string>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"Swerwing"</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="6843814381576397939">"Dataswerwing is afgeskakel. Tik om aan te skakel."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Verlore mobiele dataverbinding"</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="1603164667540144353">"Dit kan baie duur wees."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Bevestig met jou netwerkverskaffer vir prysberekening."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Laat dataswerwing toe?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Programdatagebruik"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Datagebruik"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> mobiele data gebruik <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Gevorderd"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Diensverskaffer"</string>
@@ -507,24 +501,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Kan nie oproepe aanhou 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="incall_error_promote_wfc" msgid="106510757624022064">"Aktiveer Wi-Fi-oproepe om \'n oproep te maak."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Noodinligting"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Eienaar"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Tik weer om inligting te bekyk"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Noodoproep"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Net noodoproepe"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Noodnommer"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Noodnommers"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Tik weer om <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g> te bel"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Skakel tans radio aan…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Geen sein nie. Probeer tans weer …"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Kan nie gedurende \'n noodoproep na vliegtuigmodus verander nie."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Noodoproepe is nie bekikbaar nie"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Polisie"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Ambulans"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Brand"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</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>
@@ -545,9 +527,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Kon nie kontak invoer nie"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Gehoorapparate"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Skakel gehoorapparaat-versoenbaarheid aan"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Intydse teksoproep (RTT)"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Laat boodskappe binne \'n stemoproep toe"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"RTT help bellers wat doof is, hardhorend is, \'n spraakgebrek het of meer as net stem benodig.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Kom meer te wete&lt;/a&gt;\n       &lt;br&amp;gtlt;br&gt; - RTT-oproepe word as \'n boodskaptranskripsie gestoor\n       &lt;br&amp;gt - RTT is nie vir video-oproepe beskikbaar nie"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Skakel RTT aan of af"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY af"</item>
     <item msgid="3971695875449640648">"TTY vol"</item>
@@ -610,8 +591,6 @@
     <string name="selectContact" msgid="781975788478987237">"kies kontak"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Stembel nie ondersteun nie"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"bel"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"wys belblad"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Noodoproepbelblad"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Visuele stemboodskapdiens"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Stel PIN"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Verander PIN"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index be333a2..82725a5 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"ቅንብሮችን በማህደር ላይ..."</string>
     <string name="response_error" msgid="6674110501330139405">"ከአውታረ መረብ ያልተጠበቀ ምላሽ"</string>
     <string name="exception_error" msgid="7027667130619518211">"አውታረ መረብ ወይም SIM ካርድ ስህተት።"</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"የSS ጥያቄ ወደ መደበኛ ጥሪ ተለውጧል"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"የSS ጥያቄ ወደ USSD ጥያቄ ተለውጧል"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"ወደ አዲስ SS ጥያቄ ተለውጧል"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"የSS ጥያቄ ወደ ቪዲዮ ጥሪ ተለውጧል"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"የSS ጥያቄ ወደ የDIAL ጥያቄ ተቀይሯል።"</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"የSS ጥያቄ ወደ የUSSD ጥያቄ ተቀይሯል።"</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"የSS ጥያቄ ወደ አዲስ የSS ጥያቄ ተቀይሯል።"</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"የSS ጥያቄ ወደ ቪዲዮ DIAL ጥያቄ ተለውጧል።"</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"የስልክህ መተግበሪያ የተወሰነ ስልክ ቁጥሮች ቅንብር የበራ ነው። በዚህም ውጤት መሰረት፣ ከጥሪ ጋር የተያያዙ አንዳንድ ባህሪያት እየሰሩ አይደለም።"</string>
     <string name="radio_off_error" msgid="2304459933248513376">" እነዚህን ቅንብሮች ከማየትህ በፊት ሬዲዮኑን አብራ።"</string>
     <string name="close_dialog" msgid="2365884406356986917">"እሺ"</string>
@@ -163,7 +163,7 @@
     <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="network_query_error" msgid="8466081377231178298">"አውታረ መረቦችን ማግኘት አልተቻለም። እንደገና ይሞክሩ።"</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>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"የአውታረመረቡንመከወኛ ሁነታ ለውጥ"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"የሚመረጠው የአውታረ መረብ አይነት"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(የተከለከለ)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"አውታረ መረብ ይምረጡ"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"ግንኙነት ተቋርጧል"</string>
-    <string name="network_connected" msgid="1288589103624338857">"ተገናኝቷል"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"በመገናኘት ላይ..."</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"መገናኘት አልተቻለም"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA ይመረጣል"</item>
     <item msgid="8442633436636425221">"GSM ብቻ"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"በመደወል ላይ"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"አውታረ መረብ"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"የተሻሻለ የ4ጂ LTE ሁነታ"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"የላቀ ጥሪ ማድረግ"</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>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"በማዛወር ላይ"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"በእንቅስቃሴ ላይ ሲሆን ወደ ውሂብ አገልግሎቶች ተያያዝ"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"በእንቅስቃሴ ላይ ሲሆን ወደ ውሂብ አገልግሎቶች ተያያዝ"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"የውሂብ ዝውውር ጠፍቷል። ለማብራት መታ ያድርጉ።"</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"የጠፋ የሞባይል ውሂብ ግንኙነት"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"የውሂብ ተያያዥነት የጠፋበት ምክንያት የቤትህን አውታረ መረብ እንቅስቃሴ ውሂብ በማጥፋትህ ነው።"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"ከፍተኛ ክፍያዎችን ሊያስከትልብዎት ይችላል።"</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"ለተመኑ የአውታረ መረብ አቅራቢዎን ያነጋግሩ።"</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"የውሂብ ዝውውር ፍቀድ?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"የመተግበሪያ ውሂብ አጠቃቀም"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"የውሂብ አጠቃቀም"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> ጥቅም ላይ የዋለ የተንቀሳቃሽ ስልክ ውሂብ <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"የላቀ"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"አገልግሎት አቅራቢ"</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"ጥሪዎችን መያዝ አልተቻለም።"</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"ጥሪ ለማድረግ ወደ ሽቦ አልባ አውታረ መረብ ያገናኙ።"</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"ጥሪ ለማድረግ Wi-Fi ጥሪን ያንቁ።"</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"የአደጋ ጊዜ መረጃ"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"ባለቤት"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"መረጃ ለማየት እንደገና መታ ያድርጉ"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"የአደጋ ጊዜ ጥሪ"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"የአደጋ ጊዜ ጥሪ ብቻ"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"የአደጋ ጊዜ ቁጥር"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"የአደጋ ጊዜ ቁጥሮች"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"ወደ <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g> ለመደወል እንደገና መታ ያድርጉ"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"ሬዲዮ ክፈት"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"ምንም አገልግሎት የለም። ዳግም በመሞከር ላይ…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"በአደጋ ጥሪ ወቅት የአውሮፕላን ሁነታ መግባት አይችልም።"</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"የአደጋ ጊዜ ጥሪ ማድረግ አይገኝም"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"ፖሊስ"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"አምቡላንስ"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"እሳት"</string>
-    <!-- format error in translation for description_concat_format (7141070875487870177) -->
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"ለመደወል የሰሌዳ ቁልፍ ተጠቀም"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"ያዝ"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"መጨረሻ"</string>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"እውቂያን ማስመጣት አልተቻለም"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"ማዳመጫ መርጃዎች"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"የመስሚያ መርጃ ተጓዳኝ አብራ"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"ቅጽበታዊ ጽሁፍ (አርቲቲ) ጥሪ"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"በድምጽ ጥሪ ውስጥ መልዕክት መላክን ፍቀድ"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"አርቲቲ መስማት የተሳናቸው፣ የመስማት ችግር ያለባቸው፣ መስማት ያሚያዳግታቸው እና የንግግር አካል ጉዳት ያለባቸውን ወይም ከድምጽ በላይ የሚያስፈልጋቸውን ደዋዮች ይረዳል።&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;የበለጠ ለመረዳት&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - አርቲቲ ጥሪዎች እንደ የመልዕክት ጽሁፍ ግልባጭ ይቀመጣሉ\n       &lt;br&gt; - አርቲቲ ለቪዲዮ ጥሪዎች አይገኝም"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"RTTን አብራ ወይም አጥፋ"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY ጠፍቷል"</item>
     <item msgid="3971695875449640648">"TTY ሙሉ"</item>
@@ -606,8 +587,6 @@
     <string name="selectContact" msgid="781975788478987237">"ዕውቂያ ምረጥ"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"የድምፅ ጥሪ አይታገዝም"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"ደውል"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"የስልክ ሰሌዳ አሳይ"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"ያስቸኳይ ጊዜ መደወያ ሰሌዳ"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"ምስላዊ የድመጽ መልዕከት"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"ፒን ያዘጋጁ"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"ፒን ቀይር"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 7a6b3d2..fcab791 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -20,7 +20,7 @@
     <string name="phoneAppLabel" product="default" msgid="6790717591729922998">"خدمات الهاتف"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"طالب الطوارئ"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"الهاتف"</string>
-    <string name="fdnListLabel" msgid="8630418672279521003">"قائمة أرقام الاتصال الثابتة"</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>
@@ -58,7 +58,7 @@
     <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="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>
@@ -90,13 +90,13 @@
     <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" 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="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>
@@ -107,17 +107,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"الرقم عند الانشغال"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"إعادة التوجيه إلى <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="4913145177320506827">"تم الإيقاف"</string>
-    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"لا يتيح مشغل شبكة الجوال إيقاف اعادة توجيه المكالمة عندما يكون هاتفك مشغولاً."</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="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="2684474391807469832">"إيقاف"</string>
-    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"لا يتيح مشغل شبكة الجوال إيقاف اعادة توجيه المكالمة عند عدم التمكن من الوصول إلى هاتفك."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"لا يتيح مشغل شبكة الجوال تعطيل اعادة توجيه المكالمة عند عدم التمكن من الوصول إلى هاتفك."</string>
     <string name="updating_title" msgid="6146755386174019046">"إعدادات الاتصال"</string>
     <string name="call_settings_admin_user_only" msgid="4526094783818216374">"لا يمكن تغيير إعدادات المكالمات إلا بواسطة المستخدم الإداري."</string>
     <string name="call_settings_with_label" msgid="3401177261468593519">"الإعدادات (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"جارٍ إعادة الإعدادات..."</string>
     <string name="response_error" msgid="6674110501330139405">"رد غير متوقع من الشبكة."</string>
     <string name="exception_error" msgid="7027667130619518211">"‏خطأ في الشبكة أو في شريحة SIM"</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"‏تم تغيير طلب SS إلى مكالمة عادية"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"‏تم تغيير طلب SS إلى طلب USSD"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"‏تم التغيير إلى طلب SS جديد"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"‏تم تغيير طلب SS إلى مكالمة فيديو"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"‏تم تعديل طلب SS إلى طلب DIAL."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"‏تم تعديل طلب SS إلى طلب USSD."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"‏تم تعديل طلب SS إلى طلب SS جديد."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"‏تم تعديل طلب SS إلى طلب DIAL فيديو."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"تم تشغيل إعداد أرقام الاتصال الثابتة بالتطبيق المثبت على هاتفك. ونتيجة لذلك، لن تعمل بعض الميزات المرتبطة بالمكالمات."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"شغّل اللاسلكي قبل عرض هذه الإعدادات."</string>
     <string name="close_dialog" msgid="2365884406356986917">"موافق"</string>
@@ -138,7 +138,7 @@
     <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="5560134294467334594">"الشبكة الافتراضية"</item>
     <item msgid="7876195870037833661">"إخفاء الرقم"</item>
     <item msgid="1108394741608734023">"إظهار الرقم"</item>
   </string-array>
@@ -163,7 +163,7 @@
     <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="network_query_error" msgid="8466081377231178298">"تعذر العثور على شبكات. حاول مرة أخرى."</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>
@@ -172,15 +172,10 @@
     <string name="select_automatically" msgid="1046727200631770962">"تحديد الشبكة تلقائيًا"</string>
     <string name="network_select_title" msgid="7733107364757544558">"الشبكة"</string>
     <string name="register_automatically" msgid="6017849844573519637">"التسجيل التلقائي..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"نوع الشبكة المفضّل"</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_dialogtitle" msgid="4048082093347807230">"نوع الشبكة المفضل"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(محظور )"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"اختيار شبكة"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"غير متّصل"</string>
-    <string name="network_connected" msgid="1288589103624338857">"متصل"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"جارٍ الاتصال…"</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"تعذّر الاتصال"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"‏GSM/WCDMA المفضل"</item>
     <item msgid="8442633436636425221">"‏نظام GSM فقط"</item>
@@ -232,30 +227,29 @@
     <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="2526539326505354382">"‏وضع الشبكة المفضل: LTE/TDSCDMA/GSM/WCDMA"</string>
     <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8195248059196614939">"‏وضع الشبكة المفضل: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
     <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5596733053095592791">"‏وضع الشبكة المفضل: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="call_category" msgid="5863978196309462052">"الاتصال"</string>
+    <string name="call_category" msgid="5863978196309462052">"جارٍ الاتصال"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"الشبكة"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"‏وضع 4G LTE المحسّن"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"اتصال متقدم"</string>
     <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"‏استخدام خدمات LTE لتحسين الصوت والاتصالات الأخرى (مستحسن)"</string>
-    <string name="data_enabled" msgid="5972538663568715366">"تم تفعيل البيانات"</string>
+    <string name="data_enabled" msgid="5972538663568715366">"تم تمكين البيانات"</string>
     <string name="data_enable_summary" msgid="2382798156640007971">"السماح باستخدام البيانات"</string>
     <string name="dialog_alert_title" msgid="6751344986194435476">"تنبيه"</string>
     <string name="roaming" msgid="7894878421600247140">"تجوال"</string>
-    <string name="roaming_enable" msgid="7331106985174381987">"الاتصال بخدمات البيانات عند التجوال"</string>
-    <string name="roaming_disable" msgid="1843417228755568110">"الاتصال بخدمات البيانات عند التجوال"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"تم إيقاف تجوال البيانات. انقر للتفعيل."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"اتصال بيانات الجوّال مفقود"</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_check_price_warning" msgid="7497570906830902550">"راجع مقدم الشبكة للتعرف على الأسعار."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"السماح بتجوال البيانات؟"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"استخدام بيانات التطبيق"</string>
-    <string name="data_usage_template" msgid="8526428824844656364">"تم استخدام <xliff:g id="ID_1">%1$s</xliff:g> من بيانات الجوّال خلال الفترة بين <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"استخدام البيانات"</string>
+    <string name="data_usage_template" msgid="8526428824844656364">"تم استخدام <xliff:g id="ID_1">%1$s</xliff:g> من بيانات الجوال خلال الفترة بين <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"إعدادات متقدمة"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"مشغل شبكة الجوّال"</string>
     <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"‏مشغل شبكة الجوال، esim، شريحة sim، euicc، تبديل مشغلي شبكات الجوال، ومشغل شبكة الجوال"</string>
     <string name="carrier_settings_euicc_summary" msgid="5115001942761995457">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> — <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
     <string name="mobile_data_settings_title" msgid="4661165467914727157">"بيانات الجوّال"</string>
-    <string name="mobile_data_settings_summary" msgid="5087255915840576895">"الوصول إلى البيانات باستخدام شبكة الجوّال"</string>
+    <string name="mobile_data_settings_summary" msgid="5087255915840576895">"الوصول إلى البيانات باستخدام شبكة الجوال"</string>
     <string name="data_usage_disable_mobile" msgid="3577275288809667615">"هل تريد إيقاف تشغيل بيانات الجوّال؟"</string>
     <string name="sim_selection_required_pref" msgid="7049424902961844236">"يلزم التحديد"</string>
     <string name="sim_change_data_title" msgid="5332425991853799280">"‏هل تريد تغيير شريحة SIM للبيانات؟"</string>
@@ -277,34 +271,34 @@
     <string name="throttle_help_subtext" msgid="5217706521499010816">"مزيد من المعلومات حول سياسة استخدام بيانات شبكة جوال مشغل شبكة الجوال"</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="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="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="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="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="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="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="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="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">
@@ -327,41 +321,41 @@
   </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="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="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="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="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="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="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="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="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="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="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="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="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">"الجيل الرابع (مستحسن)"</string>
     <string name="network_global" msgid="1323190488685355309">"عام"</string>
@@ -383,30 +377,30 @@
     <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">"قائمة أرقام الاتصال الثابتة"</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">"تفعيل أرقام الاتصال الثابتة"</string>
-    <string name="disable_fdn" msgid="7944020890722540616">"‏إيقاف FDN"</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">"تفعيل أرقام الاتصال الثابتة"</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">"‏تغيير رمز PIN للدخول إلى أرقام الاتصال الثابتة"</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>
-    <string name="voice_privacy_summary" msgid="3159383389833516214">"تفعيل وضع الخصوصية المحسن"</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="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>
@@ -433,7 +427,7 @@
     <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">"‏تفعيل/إيقاف رمز PIN لبطاقة SIM"</string>
+    <string name="enable_pin" msgid="5422767284133234860">"‏تمكين/تعطيل رمز PIN لبطاقة SIM"</string>
     <string name="change_pin" msgid="9174186126330785343">"‏تغيير رمز PIN لبطاقة SIM"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"‏رمز PIN لبطاقة SIM:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"‏رمز PIN القديم"</string>
@@ -502,25 +496,13 @@
     <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"يتعذر تحرير المكالمات."</string>
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"يتعذر وضع المكالمات قيد الانتظار."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"اتصل بشبكة لاسلكية لإجراء مكالمة."</string>
-    <string name="incall_error_promote_wfc" msgid="106510757624022064">"‏يمكنك تفعيل اتصال Wi-Fi لإجراء مكالمة."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"معلومات الطوارئ"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"المالك"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"انقر مجددًا لعرض المعلومات."</string>
+    <string name="incall_error_promote_wfc" msgid="106510757624022064">"‏يمكنك تمكين اتصال Wi-Fi لإجراء مكالمة."</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"مكالمة الطوارئ"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"مكالمات طوارئ فقط"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"رقم الطوارئ"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"أرقام الطوارئ"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"انقر مجددًا للاتصال بالرقم <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"جارٍ تشغيل اللاسلكي..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"لا تتوفر خدمة. جارٍ إعادة المحاولة…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"لا يمكن دخول وضع الطائرة أثناء إجراء مكالمة طوارئ."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"مكالمة الطوارئ غير متوفرة"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"شرطة"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"سيارة إسعاف"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"حريق"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"‏%1$s، ‏%2$s‏"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"استخدام لوحة المفاتيح للطلب"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"تعليق"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"الانتهاء"</string>
@@ -540,12 +522,11 @@
     <string name="singleContactImportedMsg" msgid="6868483416182599206">"تم استيراد جهة اتصال"</string>
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"تعذّر استيراد جهة اتصال"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"أدوات السمع المساعدة"</string>
-    <string name="hac_mode_summary" msgid="6833851160514929341">"تفعيل التوافق مع أداة السمع"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"مكالمة باستخدام الميزة \"مراسلة نصية في الوقت الفعلي\""</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"السماح بالمراسلة داخل مكالمة صوتية"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"‏تعمل الميزة \"مراسلة نصية في الوقت الفعلي\" على مساعدة المتصلين الذين يعانون من فقدان حاسة السمع أو من ضعف في السمع أو ليست لديهم القدرة على التحدث أو يحتاجون إلى ما هو أكثر من الصوت فقط.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;معرفة المزيد&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - يتم حفظ المكالمات التي تتم عن طريق الميزة \"مراسلة نصية في الوقت الفعلي\" كنص رسالة \n       &lt;br&gt; - لا تتوفر الميزة \"مراسلة نصية في الوقت الفعلي\" لمكالمات الفيديو"</string>
+    <string name="hac_mode_summary" msgid="6833851160514929341">"تشغيل التوافق مع أداة السمع"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"‏تفعيل أو إيقاف RTT"</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>
@@ -558,22 +539,22 @@
   </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_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_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_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_successful" msgid="1880780692887077407">"تم تنشيط هاتفك الآن. قد يستغرق بدء الخدمة ما يصل إلى 15 دقيقة."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"لم يتم تنشيط الهاتف. \nربما يلزمك البحث عن منطقة بها تغطية أفضل (بجانب نافذة أو بالخارج). \n\nحاول مرة أخرى أو اتصل بخدمة العملاء للحصول على مزيد من الخيارات."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"إخفاقات في المواصفات الزائدة"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"رجوع"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"حاول مرة أخرى"</string>
@@ -581,7 +562,7 @@
     <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>
+    <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"تم تعطيل اتصال البيانات"</string>
     <string name="phone_in_ecm_notification_complete_time" msgid="7730376844178948351">"لا يوجد اتصال بيانات حتى <xliff:g id="COMPLETETIME">%s</xliff:g>"</string>
     <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
       <item quantity="zero">سيكون الهاتف في وضع الرد على مكالمة الطوارئ لمدة <xliff:g id="COUNT_1">%s</xliff:g> من الدقائق. وأثناء هذا الوضع، لا يمكن استخدام أي تطبيقات تستخدم اتصال بيانات. هل تريد الخروج الآن؟</item>
@@ -614,15 +595,13 @@
     <string name="selectContact" msgid="781975788478987237">"تحديد جهة اتصال"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"الاتصال الصوتي غير معتمد"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"طلب"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"عرض لوحة الاتصال"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"لوحة اتصال الطوارئ"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"بريد صوتي مرئي"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"تعيين رقم التعريف الشخصي"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"تغيير رقم التعريف الشخصي"</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_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>
@@ -681,13 +660,13 @@
     <string name="clh_callFailed_number_changed_txt" msgid="5127909898925154242">"تم تغيير الرقم"</string>
     <string name="clh_callFailed_pre_emption_txt" msgid="6864702416751338567">"حق الشفعة"</string>
     <string name="clh_callFailed_non_selected_user_clearing_txt" msgid="8725898326616836656">"محو المستخدم غير المحدد"</string>
-    <string name="clh_callFailed_destination_out_of_order_txt" msgid="6626355413556362437">"الوجهة غير مفعّلة"</string>
+    <string name="clh_callFailed_destination_out_of_order_txt" msgid="6626355413556362437">"الوجهة معطلة"</string>
     <string name="clh_callFailed_invalid_number_format_txt" msgid="6987646655639655370">"تنسيق الرقم غير صالح (الرقم ليس كاملاً)"</string>
     <string name="clh_callFailed_facility_rejected_txt" msgid="4539787567476563415">"تم رفض المرفق"</string>
     <string name="clh_callFailed_response_to_STATUS_ENQUIRY_txt" msgid="178503536263624366">"الرد على استفسار الحالة"</string>
     <string name="clh_callFailed_normal_unspecified_txt" msgid="2777574148560245427">"عادي، غير محدد"</string>
     <string name="clh_callFailed_no_circuit_available_txt" msgid="2894749820848784700">"لا تتوفر أي دائرة أو قناة"</string>
-    <string name="clh_callFailed_network_out_of_order_txt" msgid="807472585030492179">"الشبكة غير مفعّلة"</string>
+    <string name="clh_callFailed_network_out_of_order_txt" msgid="807472585030492179">"الشبكة معطلة"</string>
     <string name="clh_callFailed_temporary_failure_txt" msgid="1985847623937655151">"فشل مؤقت"</string>
     <string name="clh_callFailed_switching_equipment_congestion_txt" msgid="465517139462928431">"تبديل ازدحام المعدات"</string>
     <string name="clh_callFailed_access_information_discarded_txt" msgid="132851305339579892">"تم تجاهل الوصول إلى المعلومات"</string>
@@ -736,9 +715,9 @@
     <string name="call_barring_baicr" msgid="5728784220691481693">"مكالمات التجوال الدولية الواردة"</string>
     <string name="call_barring_baicr_enabled" msgid="6533336994391716127">"هل تريد إيقاف حظر كل مكالمات التجوال الدولية الواردة؟"</string>
     <string name="call_barring_baicr_disabled" msgid="6746329853943256566">"هل تريد حظر مكالمات التجوال الدولية الواردة؟"</string>
-    <string name="call_barring_deactivate_all" msgid="5269788384941003415">"إيقاف الكل"</string>
-    <string name="call_barring_deactivate_all_description" msgid="4972365443287257704">"إيقاف كل إعدادات منع الاتصال"</string>
-    <string name="call_barring_deactivate_success" msgid="8014685598632000936">"تم إيقاف منع الاتصال"</string>
+    <string name="call_barring_deactivate_all" msgid="5269788384941003415">"إلغاء تفعيل الكل"</string>
+    <string name="call_barring_deactivate_all_description" msgid="4972365443287257704">"إلغاء تفعيل كل إعدادات منع الاتصال"</string>
+    <string name="call_barring_deactivate_success" msgid="8014685598632000936">"تم إلغاء تفعيل منع الاتصال"</string>
     <string name="call_barring_change_pwd" msgid="6887420609726284232">"تغيير كلمة المرور"</string>
     <string name="call_barring_change_pwd_description" msgid="5505087790260233953">"تغيير كلمة مرور منع الاتصال"</string>
     <string name="call_barring_change_pwd_description_disabled" msgid="7630770327645349957">"يتعذر تغيير كلمة مرور منع الاتصال."</string>
@@ -750,7 +729,7 @@
     <string name="call_barring_confirm_pwd" msgid="1947167278466285411">"تأكيد كلمة المرور"</string>
     <string name="messageCallBarring" msgid="2412123220272136055">"إدخال كلمة المرور"</string>
     <string name="call_barring_settings" msgid="80766145008623645">"إعدادات منع الاتصال"</string>
-    <string name="call_barring_deactivate_all_no_password" msgid="920902774366557311">"هل تريد إيقاف كل إعدادات منع الاتصال؟"</string>
+    <string name="call_barring_deactivate_all_no_password" msgid="920902774366557311">"هل تريد إلغاء تفعيل كل إعدادات منع الاتصال؟"</string>
     <string name="supp_service_notification_call_deflected" msgid="9195460512875330926">"تم انحراف المكالمة."</string>
     <string name="supp_service_notification_call_forwarded" msgid="7818548630812124053">"تمت إعادة توجيه المكالمة."</string>
     <string name="supp_service_notification_call_waiting" msgid="789154111899572489">"المكالمة قيد الانتظار."</string>
diff --git a/res/values-as/arrays.xml b/res/values-as/arrays.xml
deleted file mode 100644
index 7b6e78c..0000000
--- a/res/values-as/arrays.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-     Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources 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-as/config.xml b/res/values-as/config.xml
deleted file mode 100644
index 509a3c8..0000000
--- a/res/values-as/config.xml
+++ /dev/null
@@ -1,28 +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.
- -->
-
-<!--  NOTE: Many variables that used to be in this file have been migrated to
-     CarrierConfigManager.java. Please consider whether new variables belong
-     there before adding to this file. Variables here should be more closely
-     related to devices than to networks.  -->
-
-<!--  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="system_visual_voicemail_client" msgid="1787338073957698459"></string>
-</resources>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
deleted file mode 100644
index f66131c..0000000
--- a/res/values-as/strings.xml
+++ /dev/null
@@ -1,763 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="tablet" msgid="8576272342240415145">"ম’বাইল ডেটা"</string>
-    <string name="phoneAppLabel" product="default" msgid="6790717591729922998">"ফ\'ন সেৱা"</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">"এইসমূহৰ দ্বাৰা ৱাইল্ড কেৰেক্টাৰ সলনি কৰক"</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="voice_number_setting_primary_user_only" msgid="6596604364907022416">"ভইচমেইল ছেটিংসমূহ কেৱল মুখ্য ব্যৱহাৰকাৰীয়ে হে সংশোধন কৰিব পাৰে।"</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="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_default_account_label" msgid="4183772241814460014">"কোনো নেটৱৰ্ক উপলব্ধ নহয়"</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="phone_accounts_all_calling_accounts" msgid="207619531589278471">"সকলো কলিং একাউণ্ট"</string>
-    <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"কোন কোনটো একাউণ্টে ফন কৰিব পাৰে বাছক"</string>
-    <string name="wifi_calling" msgid="739018212480165598">"ৱাই-ফাই কলিং"</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="voicemail_notifications_preference_title" msgid="4019728578955102213">"জাননীসমূহ"</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="2684474391807469832">"অফ"</string>
-    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"আপোনাৰ অপাৰেটৰে আপোনাৰ ফ\'নটো সংযোগ সীমাৰ পৰা বাহিৰত থাকোতে কল ফৰৱাৰ্ডিং অক্ষম কৰাৰ সুবিধা নিদিয়ে।"</string>
-    <string name="updating_title" msgid="6146755386174019046">"কল ছেটিংসমূহ"</string>
-    <string name="call_settings_admin_user_only" msgid="4526094783818216374">"কেৱল প্ৰশাসকে কল ছেটিংসমূহ সলনি কৰিব পাৰে।"</string>
-    <string name="call_settings_with_label" msgid="3401177261468593519">"ছেটিংসমূহ (<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="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS অনুৰোধ নিয়মীয়া কললৈ সলনি কৰা হ’ল"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS অনুৰোধ USSD অনুৰোধলৈ সলনি কৰা হ’ল"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"নতুন SS অনুৰোধলৈ সলনি কৰা হ’ল"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS অনুৰোধ ভিডিঅ\' কললৈ সলনি কৰা হ’ল"</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="vm_change_pin_old_pin" msgid="7295220109886682573">"পুৰণি পিন"</string>
-    <string name="vm_change_pin_new_pin" msgid="5412922262839438097">"নতুন পিন"</string>
-    <string name="vm_change_pin_progress_message" msgid="3977357361934350336">"অনুগ্রহ কৰি অপেক্ষা কৰক।"</string>
-    <string name="vm_change_pin_error_too_short" msgid="5974971097302710497">"নতুন পিনটো অতিকে চুটি।"</string>
-    <string name="vm_change_pin_error_too_long" msgid="8476870806115051865">"নতুন পিনটো অত্যধিক দীঘল।"</string>
-    <string name="vm_change_pin_error_too_weak" msgid="7883744811891784882">"নতুন পিনটো খুবেই দুৰ্বল। এটা জটিল পাছৱৰ্ড সেইটো য\'ত ধাৰাবাহিক বৰ্ণ বা সংখ্যা নাথাকে বা য\'ত একেটা সংখ্যাকে বাৰে বাৰে ব্যৱহাৰ কৰা নহয়।"</string>
-    <string name="vm_change_pin_error_mismatch" msgid="2754685537970757317">"পুৰণি পিনটো মিলা নাই।"</string>
-    <string name="vm_change_pin_error_invalid" msgid="3972205462701668653">"নতুন পিনটোত অমান্য বৰ্ণ আছে।"</string>
-    <string name="vm_change_pin_error_system_error" msgid="6610603326230000207">"পিন সলনি কৰিব পৰা নাই"</string>
-    <string name="vvm_unsupported_message_format" msgid="11795090778411977">"বাৰ্তাৰ প্ৰকাৰ সমৰ্থিত নহয়, শুনিবলৈ <xliff:g id="NUMBER">%s</xliff:g>ত কল কৰক।"</string>
-    <string name="network_settings_title" msgid="514120489499925574">"ম’বাইল নেটৱৰ্ক"</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="network_query_error" msgid="8466081377231178298">"নেটৱৰ্ক বিচাৰি পোৱা নগ\'ল। আকৌ চেষ্টা কৰক।"</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="already_auto" msgid="6067116884321285507">"স্বয়ংক্ৰিয় বাছনিত ইতিমধ্যে আছে।"</string>
-    <string name="select_automatically" msgid="1046727200631770962">"স্বয়ংক্ৰিয়ভাৱে নেটৱৰ্ক বাছনি কৰক"</string>
-    <string name="network_select_title" msgid="7733107364757544558">"নেটৱৰ্ক"</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="forbidden_network" msgid="4384929668343563440">"(নিষিদ্ধ)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"নেটৱৰ্ক বাছনি কৰক"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"সংযোগ বিচ্ছিন্ন"</string>
-    <string name="network_connected" msgid="1288589103624338857">"সংযোগ কৰা হ’ল"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"সংযোগ কৰি থকা হৈছে..."</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"সংযোগ কৰিব পৰা নগ\'ল"</string>
-  <string-array name="preferred_network_mode_choices">
-    <item msgid="3628460389382468528">"GSM/WCDMA অগ্ৰাধিকাৰ দিয়া হৈছে"</item>
-    <item msgid="8442633436636425221">"GSM মাত্ৰ"</item>
-    <item msgid="2032314385791760810">"WCDMA মাত্ৰ"</item>
-    <item msgid="6334554401059422303">"GSM/WCDMA স্বয়ংক্ৰিয়"</item>
-    <item msgid="1462198368200398663">"CDMA/EvDo স্বয়ংক্ৰিয়"</item>
-    <item msgid="3611460019185359968">"EvDo নোহোৱাকৈ CDMA"</item>
-    <item msgid="545430093607698090">"EvDo মাত্ৰ"</item>
-    <item msgid="4286774020869405140">"CDMA/EvDo/GSM/WCDMA"</item>
-    <item msgid="4006002265696868538">"CDMA + LTE/EvDo"</item>
-    <item msgid="8973936140318359205">"GSM/WCDMA/LTE"</item>
-    <item msgid="3471059554252610472">"গোলকীয়"</item>
-    <item msgid="2882615514545171802">"এলটিই"</item>
-    <item msgid="8076204422288290116">"LTE / WCDMA"</item>
-    <item msgid="3982984144824159726">"TDSCDMA মাত্ৰ"</item>
-    <item msgid="3686191974505922271">"TDSCDMA/WCDMA"</item>
-    <item msgid="7135671700201836475">"LTE/TDSCDMA"</item>
-    <item msgid="3736619459066330755">"TDSCDMA/GSM"</item>
-    <item msgid="4778666570887216861">"LTE/TDSCDMA/GSM"</item>
-    <item msgid="2952322596201849456">"TDSCDMA/GSM/WCDMA"</item>
-    <item msgid="115984258536697617">"LTE/TDSCDMA/WCDMA"</item>
-    <item msgid="7957991936217192636">"LTE/TDSCDMA/GSM/WCDMA"</item>
-    <item msgid="2828588917858484655">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
-    <item msgid="4989979948139945854">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
-  </string-array>
-    <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 name="preferred_network_mode_tdscdma_summary" msgid="8021016193718678775">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্ক ম\'ড: TDSCDMA"</string>
-    <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="2405154895437348623">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্ক ম\'ড: TDSCDMA / WCDMA"</string>
-    <string name="preferred_network_mode_lte_tdscdma_summary" msgid="2104702896644235637">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্ক ম\'ড: LTE / TDSCDMA"</string>
-    <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="4893784445338396204">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্ক ম\'ড: TDSCDMA / GSM"</string>
-    <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1815169717046729757">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্ক ম\'ড: LTE/GSM/TDSCDMA"</string>
-    <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="2195358773359424099">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্ক ম\'ড: TDSCDMA/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="1181424059695667803">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্ক ম\'ড: LTE/TDSCDMA/WCDMA"</string>
-    <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="2526539326505354382">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্ক ম\'ড: LTE/TDSCDMA/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8195248059196614939">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্ক ম\'ড: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5596733053095592791">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্ক ম\'ড: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="call_category" msgid="5863978196309462052">"কলিং"</string>
-    <string name="network_operator_category" msgid="4830701959205735636">"নেটৱৰ্ক"</string>
-    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"পৰিৱৰ্ধিত 4G এলটিই ম’ড"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
-    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"ধ্বনি আৰু অইন যোগাযোগ উন্নত কৰিবলৈ এলটিই সেৱা ব্যৱহাৰ কৰক (অনুমোদিত)"</string>
-    <string name="data_enabled" msgid="5972538663568715366">"ডেটা সক্ষম কৰা হ’ল"</string>
-    <string name="data_enable_summary" msgid="2382798156640007971">"ডেটাৰ ব্যৱহাৰৰ অনুমতি দিয়ক"</string>
-    <string name="dialog_alert_title" msgid="6751344986194435476">"মন কৰিব"</string>
-    <string name="roaming" msgid="7894878421600247140">"ৰ\'মিং"</string>
-    <string name="roaming_enable" msgid="7331106985174381987">"ৰ’মিঙৰ সময়ত ডেটা সেৱাৰ সৈতে সংযোগ কৰক"</string>
-    <string name="roaming_disable" msgid="1843417228755568110">"ৰ’মিঙৰ সময়ত ডেটা সেৱাৰ সৈতে সংযোগ কৰক"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"ডেটা ৰ\'মিং অফ হৈ আছে। অন কৰিবলৈ টিপক"</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"ম’বাইল ডেটা বিচ্ছিন্ন হৈছে"</string>
-    <string name="roaming_warning" msgid="1603164667540144353">"আপুনি যথেষ্ট পৰিমাণৰ খৰচ বহন কৰিবলগীয়া হ’ব পাৰে।"</string>
-    <string name="roaming_check_price_warning" msgid="7497570906830902550">"দৰ-দাম জানিবলৈ আপোনাৰ বাহকৰ সৈতে যোগাযোগ কৰক।"</string>
-    <string name="roaming_alert_title" msgid="3654815360303826008">"ডেটা ৰ\'মিঙৰ অনুমতি দিবনে?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"এপৰ ডেটা ব্যৱহাৰ"</string>
-    <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> ব্যৱহৃত ম’বাইল ডেটা <xliff:g id="ID_2">%2$s</xliff:g>"</string>
-    <string name="advanced_options_title" msgid="8074895510265488035">"উচ্চখাপৰ ছেটিংসমূহ"</string>
-    <string name="carrier_settings_euicc" msgid="6714062862127226405">"বাহক"</string>
-    <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"বাহক, ই-ছিম, ছিম, euicc, বাহক সলনি কৰক, বাহক যোগ কৰক"</string>
-    <string name="carrier_settings_euicc_summary" msgid="5115001942761995457">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> — <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
-    <string name="mobile_data_settings_title" msgid="4661165467914727157">"ম’বাইল ডেটা"</string>
-    <string name="mobile_data_settings_summary" msgid="5087255915840576895">"ম’বাইল নেটৱৰ্ক ব্যৱহাৰ কৰি থাকোঁতে ডেটা ব্যৱহাৰ কৰক"</string>
-    <string name="data_usage_disable_mobile" msgid="3577275288809667615">"ম’বাইল ডেটা অফ কৰিবনে?"</string>
-    <string name="sim_selection_required_pref" msgid="7049424902961844236">"বাছনি কৰা প্ৰয়োজন"</string>
-    <string name="sim_change_data_title" msgid="5332425991853799280">"ডেটা ছিম সলনি কৰিবনে?"</string>
-    <string name="sim_change_data_message" msgid="2163963581444907496">"<xliff:g id="OLD_SIM">%2$s</xliff:g>ৰ সলনি <xliff:g id="NEW_SIM">%1$s</xliff:g>ক ম’বাইল ডেটাৰ বাবে ব্যৱহাৰ কৰিব খোজে নেকি?"</string>
-    <string name="wifi_calling_settings_title" msgid="7741961465416430470">"ৱাই-ফাই কলিং"</string>
-    <string name="video_calling_settings_title" msgid="539714564273795574">"বাহকৰ ভিডিঅ\' কলিং"</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> কেবি/ছে-লৈ কম কৰা হৈছে"</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="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">"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 প্ৰৱেশৰ বাবে পিন সলনি কৰক"</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="menu_dial" msgid="3223106222819685808">"সম্পৰ্ক ডায়েল কৰক"</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 আপডে’ট কৰা নহ\'ল।"</string>
-    <string name="fdn_invalid_number" msgid="2062898833049589309">"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">"ছিম কাৰ্ডৰ পৰা পঢ়ি থকা হৈছে…"</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">"SIM PIN সক্ষম/অক্ষম কৰক"</string>
-    <string name="change_pin" msgid="9174186126330785343">"ছিমৰ পিন সলনি কৰক"</string>
-    <string name="enter_pin_text" msgid="8532615714751931951">"SIM PIN:"</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">"ছিম পিন মচক"</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="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">"৮টা সংখ্যাৰ এটা 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">"ভুল পাছৱৰ্ড। এতিয়া ছিম লক কৰা হৈছে। 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="pin2_error_exception" msgid="1088689322248996699">"নেটৱৰ্ক বা ছিম কাৰ্ডৰ আসোঁৱাহ।"</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_voicemail_title" msgid="8933468752045550523">"নতুন ভইচমেইল"</string>
-    <string name="notification_voicemail_title_count" msgid="4366360747660929916">"(<xliff:g id="COUNT">%d</xliff:g>)টা নতুন ভইচমেইল"</string>
-    <string name="notification_voicemail_text_format" msgid="4447323569453981685">"ডায়েল <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"ভইচমেইলৰ নম্বৰ অজ্ঞাত"</string>
-    <string name="notification_network_selection_title" msgid="4224455487793492772">"কোনো সেৱা নাই"</string>
-    <string name="notification_network_selection_text" msgid="2607085729661923269">"বাছনি কৰা (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) নেটৱৰ্কটো উপলব্ধ নহয়"</string>
-    <string name="incall_error_power_off" product="watch" msgid="2007450435656211658">"কল কৰিবৰ কাৰণে ম’বাইল নেটৱৰ্ক অন কৰক, এয়াৰপ্লেইন ম\'ড অফ কৰক বা বেটাৰি সঞ্চয়কাৰী ম\'ড অফ কৰক।"</string>
-    <string name="incall_error_power_off" product="default" msgid="2947938060513306698">"কল কৰিবৰ কাৰণে এয়াৰপ্লেইন ম\'ড অফ কৰক।"</string>
-    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"কল কৰিবৰ কাৰণে এয়াৰপ্লেইন ম\'ড অফ কৰক বা কোনো বেতাঁৰ নেটৱৰ্কৰ সৈতে সংযোগ কৰক।"</string>
-    <string name="incall_error_ecm_emergency_only" msgid="738708660612388692">"সাধাৰণ কল কৰিবৰ কাৰণে জৰুৰীকালীন কলবেক ম\'ডৰ পৰা বাহিৰ হওক।"</string>
-    <string name="incall_error_emergency_only" msgid="4678640422710818317">"নেটৱৰ্কত পঞ্জীকৃত নহয়।"</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"ম’বাইল নেটৱৰ্ক উপলব্ধ নহয়।"</string>
-    <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"ম’বাইল নেটৱৰ্ক উপলব্ধ নহয়। কল কৰিবৰ কাৰণে কোনো বেতাঁৰ নেটৱৰ্কৰ সৈতে সংযোগ কৰক।"</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"কল কৰিবৰ কাৰণে এটা মান্য নম্বৰ দিয়ক।"</string>
-    <string name="incall_error_call_failed" msgid="5891978320269774095">"কল বিফল হৈছে"</string>
-    <string name="incall_error_cannot_add_call" msgid="8878159278947023326">"এই মুহূৰ্তত কল যোগ কৰিব নোৱাৰি। আপুনি এটা বাৰ্তা পঠাই যোগাযোগ কৰিবলৈ চেষ্টা কৰি চাব পাৰে।"</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_supp_service_hold" msgid="7967020511232222078">"কলসমূহ হ\'ল্ডত ৰাখিব নোৱাৰি।"</string>
-    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"কল কৰিবলৈ কোনো বেতাঁৰ নেটৱৰ্কৰ সৈতে সংযোগ কৰক।"</string>
-    <string name="incall_error_promote_wfc" msgid="106510757624022064">"কল কৰিবৰ কাৰণে ৱাই-ফাই কলিং সুবিধা সক্ষম কৰক।"</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"জৰুৰীকালীন তথ্য"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"গৰাকী"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"তথ্য চাবলৈ পুনৰ টিপক"</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"জৰুৰীকালীন কল"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"জৰুৰীকালীন কল মাত্ৰ"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"জৰুৰীকালীন নম্বৰ"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"জৰুৰীকালীন নম্বৰসমূহ"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"<xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>ত কল কৰিবলৈ আকৌ টিপক"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"ৰেডিঅ\' অন কৰা হৈছে…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"কোনো সেৱা নাই। পুনৰ চেষ্টা কৰক…"</string>
-    <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"জৰুৰীকালীন কল চলি থাকোঁতে এয়াৰপ্লেইন ম\'ডত প্ৰৱেশ কৰিব নোৱাৰি।"</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"জৰুৰীকালীন কলিঙৰ সুবিধা উপলব্ধ নহয়"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"পুলিচ"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"এম্বুলেঞ্চ"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"জুই"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</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="singleContactImportedMsg" msgid="6868483416182599206">"আমদানি কৰা সম্পৰ্কসূচী"</string>
-    <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"সম্পৰ্ক আমদানি কৰিব পৰা নগ\'ল"</string>
-    <string name="hac_mode_title" msgid="8740268574688743289">"শ্ৰৱণ যন্ত্ৰ"</string>
-    <string name="hac_mode_summary" msgid="6833851160514929341">"শ্ৰৱণ যন্ত্ৰ খাপ খুউৱাৰ সুবিধা অন কৰক"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"প্ৰকৃত সময়ত বাৰ্তা (RTT) কল"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"ভইচ কল চলি থকাৰ সময়ত বাৰ্তা পঠিওৱাৰ অনুমতি দিয়ক"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"RTTয়ে বধিৰ বা শ্ৰৱণশক্তি কম থকা, বাকশক্তি সম্পৰ্কীয় দিব্য়াংগ বা কল কৰোঁতে কণ্ঠস্বৰতকৈ অধিক সুবিধাৰ প্ৰয়োজন হোৱা ব্য়ক্তিসকলক সহায় কৰে।&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;অধিক জানক&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - RTT কলসমূহক বাৰ্তাৰ ট্ৰান্সক্ৰিপ্ট হিচাপে ছেভ কৰা হয়\n       &lt;br&gt; - RTT ভিডিঅ\' কলৰ বাবে উপলব্ধ নহয়"</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এই কামটো সম্পূৰ্ণ হ\'বলৈ ৫ মিনিট পৰ্যন্ত সময় লাগিব পাৰে।"</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>
-    <string name="phone_in_ecm_notification_complete_time" msgid="7730376844178948351">"<xliff:g id="COMPLETETIME">%s</xliff:g>লৈকে কোনো ডেটা সংযোগ নাথাকে"</string>
-    <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="description_dialpad_button" msgid="5220006811894230590">"ডায়েলপেড দেখুৱাওক"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"জৰুৰীকালীন ডায়েলপেড"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"দৃশ্যগত ভইচমেইল"</string>
-    <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"পিন ছেট কৰক"</string>
-    <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"পিন সলনি কৰক"</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 এলটিই ম’ড সক্ষম কৰিব লাগিব।"</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="5932176406432044638">"এওঁৰ পৰা ৱাই-ফাই কল আহিছে"</string>
-    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"ৱাই-ফাই কল"</string>
-    <string name="emergency_action_launch_hint" msgid="4906759256275562674">"খুলিবলৈ পুনৰাই টিপক"</string>
-    <string name="message_decode_error" msgid="3456481534066924855">"বাৰ্তাটো ডিক\'ড কৰোঁতে আসোঁৱাহৰ সৃষ্টি হৈছিল।"</string>
-    <string name="callFailed_cdma_activation" msgid="2307989779233262164">"এখন ছিম কাৰ্ডে আপোনাৰ সেৱাসমূহ সক্ৰিয় কৰিছে আৰু আপোনাৰ ফ\'নটোৰ ৰ\'মিং সক্ষমতাসমূহো আপডে’ট কৰিছে।"</string>
-    <string name="callFailed_cdma_call_limit" msgid="1556916577171457086">"কেইবাটাও কল ইতিমধ্যে সক্ৰিয় হৈ আছে। নতুন কল এটা কৰাৰ আগেয়ে অনুগ্ৰহ কৰি সেইবোৰ একেলগ কৰক বা সমাপ্ত কৰক।"</string>
-    <string name="callFailed_imei_not_accepted" msgid="132192626901238542">"সংযোগ কৰিব পৰা নাই, অনুগ্ৰহ কৰি এখন মান্য ছিম কাৰ্ড ভৰাওক।"</string>
-    <string name="callFailed_wifi_lost" msgid="5968076625137297184">"ৱাই-ফাইৰ সৈতে সংযোগ বিচ্ছিন্ন হৈছে। কলৰ অন্ত পৰিছে।"</string>
-    <string name="dialFailed_low_battery" msgid="8760548177088774268">"বেটাৰি কম থকাৰ বাবে ভিডিঅ\' কল কৰিব নোৱাৰি।"</string>
-    <string name="callFailed_low_battery" msgid="4913582435905872616">"বেটাৰি কম থকাৰ বাবে ভিডিঅ\' কলৰ অন্ত পৰিছে।"</string>
-    <string name="change_pin_title" msgid="7790232089699034029">"ভইচমেইলৰ পিন সলনি কৰক"</string>
-    <string name="change_pin_continue_label" msgid="2135088662420163447">"অব্যাহত ৰাখক"</string>
-    <string name="change_pin_cancel_label" msgid="353535488390948596">"বাতিল কৰক"</string>
-    <string name="change_pin_ok_label" msgid="6204308560844889926">"ঠিক"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="419179847657548887">"আপোনাৰ পুৰণি পিন নিশ্চিত কৰক"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="8579171678763615453">"অব্যাহত ৰাখিবলৈ আপোনাৰ ভইচমেইল পিনটো দিয়ক।"</string>
-    <string name="change_pin_enter_new_pin_header" msgid="2611191814590251532">"এটা নতুন পিন ছেট কৰক"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="2322940054329689309">"পিন <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> অংকৰ হ\'বই লাগিব।"</string>
-    <string name="change_pin_confirm_pin_header" msgid="8113764019347322170">"আপোনাৰ পিন নিশ্চিত কৰক"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="4795052654904027909">"পিনসমূহ মিলা নাই"</string>
-    <string name="change_pin_succeeded" msgid="2022852286442211151">"ভইচমেইল পিন আপডে’ট কৰা হ’ল"</string>
-    <string name="change_pin_system_error" msgid="8308462387154257840">"পিন ছেট কৰিব পৰা নাই"</string>
-    <string name="mobile_data_status_roaming_turned_off_subtext" msgid="935636805765823307">"ডেটা ৰ\'মিং অফ কৰি থোৱা আছে"</string>
-    <string name="mobile_data_status_roaming_turned_on_subtext" msgid="1335176927083781041">"ডেটা ৰ\'মিং অন কৰি থোৱা আছে"</string>
-    <string name="mobile_data_status_roaming_without_plan_subtext" msgid="3568412513831673037">"বৰ্তমান ৰ\'মিঙত আছে, ডেটা আঁচনিৰ প্ৰয়োজন"</string>
-    <string name="mobile_data_status_roaming_with_plan_subtext" msgid="8721998948811064377">"বৰ্তমান ৰ\'মিঙত আছে, ডেটা আঁচনি সক্ৰিয় হৈ আছে"</string>
-    <string name="mobile_data_status_no_plan_subtext" msgid="4887747337017565725">"কোনো ম’বাইল ডেটা বাকী ৰোৱা নাই"</string>
-    <string name="mobile_data_activate_prepaid" msgid="7447025165850512683">"কোনো ম’বাইল ডেটা বাকী ৰোৱা নাই"</string>
-    <string name="mobile_data_activate_prepaid_summary" msgid="5705389791791637666">"<xliff:g id="PROVIDER_NAME">%s</xliff:g>ৰ জৰিয়তে ম’বাইল ডেটা যোগ কৰক"</string>
-    <string name="mobile_data_activate_roaming_plan" msgid="5998161536947086264">"কোনো ৰ\'মিং আঁচনি নাই"</string>
-    <string name="mobile_data_activate_roaming_plan_summary" msgid="511202908883425459">"<xliff:g id="PROVIDER_NAME">%s</xliff:g>ৰ জৰিয়তে ৰ\'মিং আঁচনি যোগ কৰক"</string>
-    <string name="mobile_data_activate_footer" msgid="5979019929980140594">"আপুনি আপোনাৰ বাহক <xliff:g id="PROVIDER_NAME">%s</xliff:g>ৰ জৰিয়তে ম’বাইল ডেটা বা ৰ\'মিং আঁচনি যোগ কৰিব পাৰে।"</string>
-    <string name="mobile_data_activate_diag_title" msgid="9044252207707864493">"ডেটা যোগ কৰেনে?"</string>
-    <string name="mobile_data_activate_diag_message" msgid="8216154678758451453">"আপুনি <xliff:g id="PROVIDER_NAME">%s</xliff:g>ৰ জৰিয়তে ডেটা যোগ কৰিবলগীয়া হ\'ব পাৰে"</string>
-    <string name="mobile_data_activate_button" msgid="3682400969184405446">"ডেটা যোগ কৰক"</string>
-    <string name="mobile_data_activate_cancel_button" msgid="1708022171547398765">"বাতিল কৰক"</string>
-    <string name="clh_card_title_call_ended_txt" msgid="4072101334811753823">"কল শেষ হ’ল"</string>
-    <string name="clh_callFailed_powerOff_txt" msgid="3773036949107147708">"ৰেডিঅ’ অফ হৈ আছে"</string>
-    <string name="clh_callFailed_simError_txt" msgid="757650590524277969">"কোনো ছিম কাৰ্ড নাই বা ছিম কাৰ্ডৰ আসোঁৱাহ"</string>
-    <string name="clh_incall_error_out_of_service_txt" msgid="3974373603657193827">"ম’বাইল নেটৱৰ্ক উপলব্ধ নহয়"</string>
-    <string name="clh_callFailed_unassigned_number_txt" msgid="7635996793232604064">"প্ৰদান কৰা নোহোৱা (আবণ্টিত নোহোৱা) নম্বৰ"</string>
-    <string name="clh_callFailed_no_route_to_destination_txt" msgid="8561586745288855167">"লক্ষ্যস্থানলৈ কোনো ৰাষ্টা নাই"</string>
-    <string name="clh_callFailed_channel_unacceptable_txt" msgid="8048626924246611459">"চ্চেনেল গ্ৰহণযোগ্য নহয়"</string>
-    <string name="clh_callFailed_operator_determined_barring_txt" msgid="6889705714244076823">"বাহকৰ দ্বাৰা নিৰ্দিষ্ট কৰা প্ৰতিবন্ধকতা"</string>
-    <string name="clh_callFailed_normal_call_clearing_txt" msgid="2810975267106345820">"সাধাৰণ কল ক্লিয়েৰিং"</string>
-    <string name="clh_callFailed_user_busy_txt" msgid="2736095995784746915">"ব্যৱহাৰকাৰী ব্যস্ত হৈ আছে"</string>
-    <string name="clh_callFailed_no_user_responding_txt" msgid="1421543095873040084">"ব্যৱহাৰকাৰীৰ ফাল পৰা কোনো সঁহাৰি নাই"</string>
-    <string name="clh_callFailed_user_alerting_txt" msgid="6606245970376797447">"ব্যৱহাৰকাৰীক আগজাননী দিয়া হৈছে, কোনো উত্তৰ নাই"</string>
-    <string name="clh_callFailed_call_rejected_txt" msgid="8001665478195793223">"কল নাকচ কৰা হৈছে"</string>
-    <string name="clh_callFailed_number_changed_txt" msgid="5127909898925154242">"নম্বৰ সলনি হৈছে"</string>
-    <string name="clh_callFailed_pre_emption_txt" msgid="6864702416751338567">"প্ৰি-এম্পশ্বন"</string>
-    <string name="clh_callFailed_non_selected_user_clearing_txt" msgid="8725898326616836656">"ব্যৱহাৰকাৰীৰ দ্বাৰা বাছনি নকৰা ক্লিয়েৰিং"</string>
-    <string name="clh_callFailed_destination_out_of_order_txt" msgid="6626355413556362437">"লক্ষ্যস্থান বিশৃংখলিত হৈ আছে"</string>
-    <string name="clh_callFailed_invalid_number_format_txt" msgid="6987646655639655370">"অমান্য নম্বৰ ফৰমেট (অসম্পূৰ্ণ নম্বৰ)"</string>
-    <string name="clh_callFailed_facility_rejected_txt" msgid="4539787567476563415">"ফেচিলিটি নাকচ কৰা হৈছে"</string>
-    <string name="clh_callFailed_response_to_STATUS_ENQUIRY_txt" msgid="178503536263624366">"স্থিতিৰ বিষয়ে অনুসন্ধানৰ প্ৰতি সঁহাৰি"</string>
-    <string name="clh_callFailed_normal_unspecified_txt" msgid="2777574148560245427">"সাধাৰণ, অনিৰ্দিষ্ট"</string>
-    <string name="clh_callFailed_no_circuit_available_txt" msgid="2894749820848784700">"কোনো আৱৰ্তনী/চ্চেনেল উপলব্ধ নহয়"</string>
-    <string name="clh_callFailed_network_out_of_order_txt" msgid="807472585030492179">"নেটৱৰ্ক বিকল"</string>
-    <string name="clh_callFailed_temporary_failure_txt" msgid="1985847623937655151">"সাময়িক বিফলতা"</string>
-    <string name="clh_callFailed_switching_equipment_congestion_txt" msgid="465517139462928431">"ছুইচ্ছিং ইকুইপমেণ্ট যঁত"</string>
-    <string name="clh_callFailed_access_information_discarded_txt" msgid="132851305339579892">"প্ৰৱেশৰ তথ্য পৰিত্যাগ কৰা হ’ল"</string>
-    <string name="clh_callFailed_requested_circuit_txt" msgid="2316345471851443847">"অনুৰোধ কৰা আৱৰ্তনী/চ্চেনেল উপলব্ধ নহয়"</string>
-    <string name="clh_callFailed_resources_unavailable_unspecified_txt" msgid="4460267429142724322">"সম্পদ উপলব্ধ নহয়, অনিৰ্দিষ্ট"</string>
-    <string name="clh_callFailed_quality_of_service_unavailable_txt" msgid="7315823047206338755">"সেৱাৰ গুণগত মান উপলব্ধ নহয়"</string>
-    <string name="clh_callFailed_requested_facility_not_subscribed_txt" msgid="1688438372518949530">"অনুৰোধ কৰা ফেচিলিটিৰ সদস্যভুক্ত হোৱা নাই"</string>
-    <string name="clh_callFailed_incoming_calls_barred_within_the_CUG_txt" msgid="3922231620226043342">"CUGৰ অন্তৰ্গত অন্তৰ্গামী কল প্ৰতিবন্ধিত কৰা হৈছে"</string>
-    <string name="clh_callFailed_bearer_capability_not_authorized_txt" msgid="6515594235334537340">"বহনকাৰীৰ সক্ষমতা প্ৰাধিকৃত নহয়"</string>
-    <string name="clh_callFailed_bearer_capability_not_presently_available_txt" msgid="8013567156449692135">"বহনকাৰীৰ সক্ষমতা বৰ্তমান উপলব্ধ নহয়"</string>
-    <string name="clh_callFailed_service_or_option_not_available_unspecified_txt" msgid="8663374141880847414">"সেৱা বা বিকল্প উপলব্ধ নহয়, অনিৰ্দিষ্ট"</string>
-    <string name="clh_callFailed_bearer_service_not_implemented_txt" msgid="2772484977847973583">"বহনকাৰীৰ সেৱা কাৰ্যকৰী কৰা হোৱা নাই"</string>
-    <string name="clh_callFailed_ACM_equal_to_or_greater_than_ACMmax_txt" msgid="2192709279981159761">"ACM ACMmaxৰ সমান বা বেছি"</string>
-    <string name="clh_callFailed_requested_facility_not_implemented_txt" msgid="406404292085779118">"অনুৰোধ কৰা ফেচিলিটি কাৰ্যকৰী কৰা হোৱা নাই"</string>
-    <string name="clh_callFailed_only_restricted_digital_information_bearer_capability_is_available_txt" msgid="4817899794531157207">"কেৱল সীমিত ডিজিটেল তথ্য বহনকাৰীৰ সক্ষমতা উপলব্ধ"</string>
-    <string name="clh_callFailed_service_or_option_not_implemented_unspecified_txt" msgid="2968655784896862505">"সেৱা বা বিকল্প কাৰ্যকৰী কৰা হোৱা নাই, অনিৰ্দিষ্ট"</string>
-    <string name="clh_callFailed_invalid_transaction_identifier_value_txt" msgid="3843478518660918642">"অমান্য ট্ৰানজেকশ্বন চিনাক্তকৰণ মান"</string>
-    <string name="clh_callFailed_user_not_member_of_CUG_txt" msgid="8462852903153938988">"ব্যৱহাৰকাৰী CUGৰ সদস্য নহয়"</string>
-    <string name="clh_callFailed_incompatible_destination_txt" msgid="2580750652910253219">"লক্ষ্যস্থান খাপ খোৱা নহয়"</string>
-    <string name="clh_callFailed_invalid_transit_network_selection_txt" msgid="6589916900457111005">"অমান্য ট্ৰানজিত নেটৱৰ্কৰ বাছনি"</string>
-    <string name="clh_callFailed_semantically_incorrect_message_txt" msgid="2329284157442218683">"ভুল অৰ্থৰ বাৰ্তা"</string>
-    <string name="clh_callFailed_invalid_mandatory_information_txt" msgid="9081556111928912676">"অমান্য বাধ্যতামূলক তথ্য"</string>
-    <string name="clh_callFailed_message_type_non_existent_or_not_implemented_txt" msgid="2641350895896546715">"বাৰ্তাৰ প্ৰকাৰ অস্তিত্বহীন বা কাৰ্যকৰী কৰা হোৱা নাই"</string>
-    <string name="clh_callFailed_message_type_not_compatible_with_protocol_state_txt" msgid="6598180735494982466">"প্ৰ\'ট\'কলৰ স্থিতিৰ সৈতে বাৰ্তাৰ প্ৰকাৰ খাপ নাই খোৱা"</string>
-    <string name="clh_callFailed_information_element_non_existent_or_not_implemented_txt" msgid="4725610801664706983">"তথ্য উপাদান অস্তিত্বহীন বা কাৰ্যকৰী কৰা হোৱা নাই"</string>
-    <string name="clh_callFailed_conditional_IE_error_txt" msgid="9140031076499566143">"চৰ্তসাপেক্ষ IE আসোঁৱাহ"</string>
-    <string name="clh_callFailed_message_not_compatible_with_protocol_state_txt" msgid="6586005128633024271">"প্ৰ\'ট\'কলৰ স্থিতিৰ সৈতে বাৰ্তা খাপ নাই খোৱা"</string>
-    <string name="clh_callFailed_recovery_on_timer_expiry_txt" msgid="3680765722923600294">"ৰিক\'ভাৰী অন টাইমাৰ উকলিছে"</string>
-    <string name="clh_callFailed_protocol_Error_unspecified_txt" msgid="8294907817156524790">"প্ৰ\'ট\'কলৰ আসোঁৱাহ, অনিৰ্দিষ্ট"</string>
-    <string name="clh_callFailed_interworking_unspecified_txt" msgid="8838850798491763729">"ইণ্টাৰৱৰ্কিং, অনিৰ্দিষ্ট"</string>
-    <string name="labelCallBarring" msgid="3452870940716226978">"কল প্ৰতিবন্ধকতা"</string>
-    <string name="sum_call_barring_enabled" msgid="6804489690436703488">"অন"</string>
-    <string name="sum_call_barring_disabled" msgid="5900772179198857783">"অফ"</string>
-    <string name="call_barring_baoc" msgid="1199843944333106035">"সকলো বহিৰ্গামী"</string>
-    <string name="call_barring_baoc_enabled" msgid="8112118391869380361">"সকলো বহিৰ্গামী কল অৱৰোধ কৰাটো অক্ষম কৰিবনে?"</string>
-    <string name="call_barring_baoc_disabled" msgid="7806697133004697974">"সকলো বহিৰ্গামী কল অৱৰোধ কৰিবনে?"</string>
-    <string name="call_barring_baoic" msgid="3162154267825211826">"আন্তঃৰাষ্ট্ৰীয় বহিৰ্গামী"</string>
-    <string name="call_barring_baoic_enabled" msgid="2634377543147258105">"আন্তঃৰাষ্ট্ৰীয় বহিৰ্গামী কল অৱৰোধ কৰাটো অক্ষম কৰিবনে?"</string>
-    <string name="call_barring_baoic_disabled" msgid="5817895648306183464">"আন্তঃৰাষ্ট্ৰীয় বহিৰ্গামী কল অৱৰোধ কৰিবনে?"</string>
-    <string name="call_barring_baoicr" msgid="8951699885885742076">"আন্তঃৰাষ্ট্ৰীয় বহিৰ্গামী ৰ\'মিং"</string>
-    <string name="call_barring_baoicr_enabled" msgid="2519630715322138317">"আন্তঃৰাষ্ট্ৰীয় বহিৰ্গামী ৰ\'মিং অৱৰোধ কৰাটো অক্ষম কৰিবনে?"</string>
-    <string name="call_barring_baoicr_disabled" msgid="5831267468931377699">"আন্তঃৰাষ্ট্ৰীয় বহিৰ্গামী ৰ\'মিং অৱৰোধ কৰিবনে?"</string>
-    <string name="call_barring_baic" msgid="5272726081458339912">"সকলো অন্তৰ্গামী"</string>
-    <string name="call_barring_baic_enabled" msgid="2457134916223203380">"সকলো অন্তৰ্গামী কল অৱৰোধ কৰাটো অক্ষম কৰিবনে?"</string>
-    <string name="call_barring_baic_disabled" msgid="6945604947500275636">"সকলো অন্তৰ্গামী কল অৱৰোধ কৰিবনে?"</string>
-    <string name="call_barring_baicr" msgid="5728784220691481693">"অন্তৰ্গামী আন্তঃৰাষ্ট্ৰীয় ৰ\'মিং"</string>
-    <string name="call_barring_baicr_enabled" msgid="6533336994391716127">"অন্তৰ্গামী আন্তঃৰাষ্ট্ৰীয় ৰ\'মিং অৱৰোধ কৰাটো অক্ষম কৰিবনে?"</string>
-    <string name="call_barring_baicr_disabled" msgid="6746329853943256566">"অন্তৰ্গামী আন্তঃৰাষ্ট্ৰীয় ৰ\'মিং অৱৰোধ কৰিবনে?"</string>
-    <string name="call_barring_deactivate_all" msgid="5269788384941003415">"সকলো নিষ্ক্ৰিয় কৰক"</string>
-    <string name="call_barring_deactivate_all_description" msgid="4972365443287257704">"সকলো কল প্ৰতিবন্ধক ছেটিং নিষ্ক্ৰিয় কৰক"</string>
-    <string name="call_barring_deactivate_success" msgid="8014685598632000936">"কল প্ৰতিবন্ধক নিষ্ক্ৰিয় কৰা হ’ল"</string>
-    <string name="call_barring_change_pwd" msgid="6887420609726284232">"পাছৱৰ্ড সলনি কৰক"</string>
-    <string name="call_barring_change_pwd_description" msgid="5505087790260233953">"কল প্ৰতিবন্ধক পাছৱৰ্ড সলনি কৰক"</string>
-    <string name="call_barring_change_pwd_description_disabled" msgid="7630770327645349957">"কল প্ৰতিবন্ধক পাছৱৰ্ড সলনি কৰিব নোৱাৰি।"</string>
-    <string name="call_barring_pwd_not_match" msgid="6716711689350314525">"পাছৱৰ্ডসমূহ মিলা নাই"</string>
-    <string name="call_barring_right_pwd_number" msgid="2902966502520410446">"৪টা সংখ্যাৰ এটা পাছৱৰ্ড লিখক"</string>
-    <string name="call_barring_change_pwd_success" msgid="3278310763742760321">"পাছৱৰ্ড সলনি কৰা হ’ল"</string>
-    <string name="call_barring_old_pwd" msgid="6080515987320238522">"পুৰণি পাছৱৰ্ড"</string>
-    <string name="call_barring_new_pwd" msgid="7048532299150269547">"নতুন পাছৱৰ্ড"</string>
-    <string name="call_barring_confirm_pwd" msgid="1947167278466285411">"পাছৱৰ্ড নিশ্চিত কৰক"</string>
-    <string name="messageCallBarring" msgid="2412123220272136055">"পাছৱৰ্ড দিয়ক"</string>
-    <string name="call_barring_settings" msgid="80766145008623645">"কল প্ৰতিবন্ধক ছেটিংসমূহ"</string>
-    <string name="call_barring_deactivate_all_no_password" msgid="920902774366557311">"সকলো কল প্ৰতিবন্ধক ছেটিং নিষ্ক্ৰিয় কৰেনে?"</string>
-    <string name="supp_service_notification_call_deflected" msgid="9195460512875330926">"কলটো বিচ্যুত কৰা হৈছে।"</string>
-    <string name="supp_service_notification_call_forwarded" msgid="7818548630812124053">"কলটো ফৰৱাৰ্ড কৰা হ’ল।"</string>
-    <string name="supp_service_notification_call_waiting" msgid="789154111899572489">"কল অপেক্ষাৰত।"</string>
-    <string name="supp_service_clir_suppression_rejected" msgid="1581851661582189045">"নম্বৰ অৱৰোধ প্ৰত্যাখান কৰা হৈছে।"</string>
-    <string name="supp_service_closed_user_group_call" msgid="5761735840904590950">"আৱদ্ধ ব্যৱহাৰকাৰীৰ দলৰ কল"</string>
-    <string name="supp_service_incoming_calls_barred" msgid="3248813207307882723">"অন্তৰ্গামী কল প্ৰতিবন্ধিত কৰি থোৱা হৈছে।"</string>
-    <string name="supp_service_outgoing_calls_barred" msgid="1962644621292054081">"বহিৰ্গামী কল প্ৰতিবন্ধিত কৰি থোৱা হৈছে।"</string>
-    <string name="supp_service_call_forwarding_active" msgid="1253134771682248735">"কল ফৰৱাৰ্ডিং সক্ৰিয় হৈ আছে।"</string>
-    <string name="supp_service_additional_call_forwarded" msgid="5228624725214727315">"অতিৰিক্ত কল ফৰৱাৰ্ড কৰা হ’ল।"</string>
-    <string name="supp_service_additional_ect_connected" msgid="6396964292513707102">"অশালীন কলৰ স্থানান্তৰণ সম্পূৰ্ণ হৈছে।"</string>
-    <string name="supp_service_additional_ect_connecting" msgid="5443373059716058480">"অশালীন কলৰ স্থানান্তৰণ চলি আছে।"</string>
-    <string name="supp_service_call_on_hold" msgid="1478976782361795422">"কল হ\'ল্ডত আছে।"</string>
-    <string name="supp_service_call_resumed" msgid="1656475289958070674">"কল পুনৰ আৰম্ভ কৰা হৈছে।"</string>
-    <string name="supp_service_deflected_call" msgid="138970419873492166">"কলটো বিচ্যুত কৰা হৈছে।"</string>
-    <string name="supp_service_forwarded_call" msgid="4509980341645679803">"ফৰৱাৰ্ড কৰা কল।"</string>
-    <string name="supp_service_conference_call" msgid="4448616364004466832">"কনফাৰেঞ্চ কলত অংশ গ্ৰহণ কৰিবলৈ লোৱা হৈছে।"</string>
-    <string name="supp_service_held_call_released" msgid="2030677825038709779">"হ’ল্ড কৰি থোৱা কলটো মুকলি কৰি দিয়া হ’ল।"</string>
-</resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index a40e0cf..850760e 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -60,7 +60,7 @@
     <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"CDMA zəng ayarları (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Çatma Nöqtəsi Adları"</string>
     <string name="settings_label" msgid="3876743539816984008">"Şəbəkə ayarları"</string>
-    <string name="phone_accounts" msgid="6376603393888116364">"Hesabların çağırılması"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Hesabların çağrılması"</string>
     <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Zənglər et"</string>
     <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"SIP zəngləri et"</string>
     <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Əvvəlcə soruş"</string>
@@ -74,13 +74,13 @@
     <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Hansı hesabların zəng edə biləcəyini seçin"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi zəngi"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Daxili bağlantı xidməti"</string>
-    <string name="voicemail" msgid="8693759337917898954">"Səsli məktub"</string>
+    <string name="voicemail" msgid="8693759337917898954">"Səsli poçt"</string>
     <string name="voicemail_settings_with_label" msgid="152724978380748296">"Səsli məktub (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"SP:"</string>
     <string name="voicemail_notifications_preference_title" msgid="4019728578955102213">"Bildirişlər"</string>
     <string name="cell_broadcast_settings" msgid="8740238216690502563">"Təcili yayımlar"</string>
     <string name="call_settings" msgid="6112441768261754562">"Zəng parametrləri"</string>
-    <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Əlavə ayarlar"</string>
+    <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Əlavə parametrlər"</string>
     <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Əlavə parametrlər (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Əlavə GSM yalnız zəng parametrləri"</string>
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Əlavə CDMA zəng parametrləri"</string>
@@ -90,10 +90,10 @@
     <string name="sum_loading_settings" msgid="1826692909391168620">"Parametrlər yüklənir…"</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Gedən zənglərdə nömrə gizlidir"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Gedən zənglərdə nömrə göstərilir"</string>
-    <string name="sum_default_caller_id" msgid="1954518825510901365">"Gedən zənglərdə nömrəmi göstərmək üçün varsayılan operator ayarlarını istifadə edin"</string>
+    <string name="sum_default_caller_id" msgid="1954518825510901365">"Gedən zənglərdə nömrəmi göstərmək üçün varsayılan operator parametrlərini istifadə edin"</string>
     <string name="labelCW" msgid="6120513814915920200">"Zəng gözləmək"</string>
-    <string name="sum_cw_enabled" msgid="8083061901633671397">"Zəng zamanı məni gələn zənglər haqda xəbərdar et"</string>
-    <string name="sum_cw_disabled" msgid="3648693907300104575">"Zəng zamanı məni gələn zənglər haqda xəbərdar et"</string>
+    <string name="sum_cw_enabled" msgid="8083061901633671397">"Zəng zamanı məni gələn zənglərdən xəbərdar et"</string>
+    <string name="sum_cw_disabled" msgid="3648693907300104575">"Zəng zamanı məni gələn zənglərdən xəbərdar et"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Zəng yönləndirmə parametrləri"</string>
     <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Zəngin yönləndirilməsi parametrləri (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Zəng yönləndirmə"</string>
@@ -102,16 +102,16 @@
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Bütün zənglər yönləndirilir"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Bütün zənglər <xliff:g id="PHONENUMBER">{0}</xliff:g> nömrəsinə yönləndirilir"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Nömrə əlçatmazdır"</string>
-    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Deaktiv"</string>
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Qeyri-aktiv"</string>
     <string name="labelCFB" msgid="6139853033106283172">"Məşğul olduqda"</string>
     <string name="messageCFB" msgid="3711089705936187129">"Məşğul olarkən yönləndiriləcək nömrə"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"<xliff:g id="PHONENUMBER">{0}</xliff:g> nömrəsinə yönləndirilir"</string>
-    <string name="sum_cfb_disabled" msgid="4913145177320506827">"Deaktiv"</string>
+    <string name="sum_cfb_disabled" msgid="4913145177320506827">"Qeyri-aktiv"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Sizin mobil operator telefon məşğul olduğu zaman zəng yönləndirməni deaktiv etməyi  dəstəkləmir."</string>
     <string name="labelCFNRy" msgid="1736067178393744351">"Cavab vermədikdə"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Cavabsız olarkən yönləndiriləcək nömrə"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"<xliff:g id="PHONENUMBER">{0}</xliff:g> nömrəsinə yönləndirilir"</string>
-    <string name="sum_cfnry_disabled" msgid="3884684060443538097">"Deaktiv"</string>
+    <string name="sum_cfnry_disabled" msgid="3884684060443538097">"Qeyri-aktiv"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Sizin mobil daşıyıcı telefona cavab verilmədiyi zaman zəng yönləndirməni deaktiv etməyi dəstəkləmir."</string>
     <string name="labelCFNRc" msgid="2614827454402079766">"Zəng çatmadıqda"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Əlçatmaz olarkən yönləndiriləcək nömrə"</string>
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Ayarlar qaytarılır..."</string>
     <string name="response_error" msgid="6674110501330139405">"Şəbəkədən gözlənilməz cavab."</string>
     <string name="exception_error" msgid="7027667130619518211">"Şəbəkə və ya SIM kart xətası"</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS sorğusu adi zəngə dəyişdirildi"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS sorğusu USSD sorğusuna dəyişdirildi"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Yeni SS sorğusuna dəyişdirildi"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS sorğusu video zəngə dəyişdirildi"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS sorğusu DIAL sorğusuna dəyişdirildi."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS sorğusu USSD sorğusuna dəyişdirildi."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS sorğusu yeni SS sorğusuna dəyişdirildi."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS sorğusu Video DIAL sorğusuna dəyişdirildi."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"Telefonunuzun Sabit Yığım Nömrələri parametri aktivdir. Buna görə də zəng ilə bağlı bəzi özəlliklər işləmir."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Bu ayarlara baxmadan öncə radionu yandırın."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
@@ -163,7 +163,7 @@
     <string name="label_available" msgid="1181658289009300430">"Əlçatımlı şəbəkələr"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Axtarılır..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Şəbəkə tapılmadı"</string>
-    <string name="network_query_error" msgid="8466081377231178298">"Şəbəkə tapılmadı. Yenidən cəhd edin."</string>
+    <string name="network_query_error" msgid="6828516148953325006">"Şəbəkə axtarışı zamanı xəta baş verdi."</string>
     <string name="register_on_network" msgid="9055203954040805084">"<xliff:g id="NETWORK">%s</xliff:g> şəbəkəsində qeydiyyatdan keçirilir…"</string>
     <string name="not_allowed" msgid="5613353860205691579">"Sizin SIM kart bu şəbəkəyə bağlantıya icazə vermir."</string>
     <string name="connect_later" msgid="2308119155752343975">"Hazırda bu şəbəkəyə qoşulmaq olmur. Sonra təkrar sınayın."</string>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Şəbəkə əməliyyat rejimini dəyişin"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Tərcih edilən şəbəkə növü"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(qadağandır)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Şəbəkəni seçin"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Bağlantı kəsildi"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Qoşuldu"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Qoşulur..."</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Qoşulmaq mümkün olmadı"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA\'ya üstünlük verilib"</item>
     <item msgid="8442633436636425221">"Yalnız GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Zəng edilir"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Şəbəkə"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Təkmil 4G LTE Rejimi"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Qabaqcıl Zəng"</string>
     <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Səs və digər kommunikasiyaları təkmilləşdirmək üçün LTE xidmətlərindən istifadə edin (tövsiyə olunur)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Data aktivdir"</string>
     <string name="data_enable_summary" msgid="2382798156640007971">"Data istifadəsinə icazə verin"</string>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"Rominq"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Rouminq zamanı data xidmətlərinə qoşulun"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Rouminq zamanı data xidmətlərinə qoşulun"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"Data rominqi deaktivdir. Aktiv etmək üçün klikləyin."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Mobil data bağlantısı itdi"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Siz deaktiv edilmiş rouminq ilə daxili şəbəkəni tərk etdiyiniz üçün data bağlantısını itirdiniz."</string>
     <string name="roaming_warning" msgid="1603164667540144353">"Sizə əhəmiyyətli xərclər tətbiq edilə bilər."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Qiymətləndirmə üçün şəbəkə provayderi ilə yoxlayın."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Məlumat rominqinə icazə verilsin?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Tətbiq data istifadəsi"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Data istifadəsi"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_2">%2$s</xliff:g> ərzində <xliff:g id="ID_1">%1$s</xliff:g> mobil data istifadə edildi"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Qabaqcıl"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Mobil Operator"</string>
@@ -391,19 +385,19 @@
     <string name="manage_fdn_list" msgid="8777755791892122369">"FDN siyahısı"</string>
     <string name="fdn_list_with_label" msgid="7437232552210469217">"FDN siyahısı (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FDN aktivasiya"</string>
-    <string name="fdn_enabled" msgid="5238109009915521240">"Sabit Yığım Nömrələri aktivdir"</string>
+    <string name="fdn_enabled" msgid="5238109009915521240">"Sabit Yığım Nömrələri aktivdir."</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Sabit Yığım Nömrələri deaktivdir"</string>
     <string name="enable_fdn" msgid="3740191529180493851">"FDN Aktivləşdirin"</string>
     <string name="disable_fdn" msgid="7944020890722540616">"FDN deaktiv edin"</string>
     <string name="change_pin2" msgid="2153563695382176676">"PIN2 kodu dəyişin"</string>
     <string name="enable_fdn_ok" msgid="7215588870329688132">"FDN Deaktivləşdirin"</string>
-    <string name="disable_fdn_ok" msgid="5727046928930740173">"FDN Aktivləşdirin"</string>
+    <string name="disable_fdn_ok" msgid="5727046928930740173">"FDN aktiv edin"</string>
     <string name="sum_fdn" msgid="1959399454900272878">"Sabit Yığım Nömrələrini İdarə Edin"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"FDN girişi üçün PIN dəyişin"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Telefon nömrəsi siyahısını idarə edin"</string>
     <string name="voice_privacy" msgid="3776841382844614716">"Səs konfidensiallığı"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Geniş konfidensiallıq rejimini aktivləşdirin"</string>
-    <string name="tty_mode_option_title" msgid="9033098925144434669">"Teletayp rejimi"</string>
+    <string name="tty_mode_option_title" msgid="9033098925144434669">"TTY rejimi"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"TTY rejimi ayarlayın"</string>
     <string name="auto_retry_mode_title" msgid="4073265511427813322">"Avtomatik yenidən sınama"</string>
     <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Avtomatik yenidən sınama rejimini aktivləşdirin"</string>
@@ -434,7 +428,7 @@
     <string name="simContacts_title" msgid="1861472842524839921">"İmport üçün kontaktlar seçin"</string>
     <string name="simContacts_airplaneMode" msgid="5254946758982621072">"SIM kartdan kontaktları import etmək üçün təyyarə rejimini deaktiv edin."</string>
     <string name="enable_pin" msgid="5422767284133234860">"SIM PIN aktivləşdirin/deaktivləşdirin"</string>
-    <string name="change_pin" msgid="9174186126330785343">"SIM PIN kodunu dəyişin"</string>
+    <string name="change_pin" msgid="9174186126330785343">"SIM PIN kodu dəyişin"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"SIM PIN:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"Köhnə PIN"</string>
     <string name="newPinLabel" msgid="207488227285336897">"Yeni PIN"</string>
@@ -468,7 +462,7 @@
     <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 artıq bloklanmayıb"</string>
     <string name="pin2_error_exception" msgid="1088689322248996699">"Şəbəkə və ya SIM kart xətası"</string>
     <string name="doneButton" msgid="2859593360997984240">"Tamam"</string>
-    <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Səsli poçtun nömrəsi"</string>
+    <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Səsli poçt nömrəsi"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Nömrə yığılır"</string>
     <string name="card_title_redialing" msgid="8253487008234167266">"Yenidən yığır"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Konfrans zəngi"</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Zənglər saxlanıla bilməz."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Zəng etmək üçün Wi-Fi şəbəkəsinə qoşulun."</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"Zəng etmək üçün Wi-Fi zəngini dəyişdirin."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Təcili məlumat"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Sahib"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Məlumata baxmaq üçün yenidən klikləyin"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Təcili zəng"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Yalnız təcili zənglər"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Fövqəladə nömrə"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Fövqəladə nömrələr"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"<xliff:g id="EMERGENCY_NUMBER">%s</xliff:g> nömrəsinə zəng etmək üçün yenidən klikləyin"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Radio yandırılır ..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Xidmət yoxdur. Yenidən cəhd edilir…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Fövqəladə zəng zamanı təyyarə rejimini daxil etmək mümkün deyil."</string>
     <string name="dial_emergency_error" msgid="1509085166367420355">"Zəng etmək mümkün deyil. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> fövqəladə nömrə deyil."</string>
     <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Zəng etmək mümkün deyil. Fövqəladə nömrəni yığ."</string>
-    <string name="dial_emergency_calling_not_available" msgid="5675557523782491826">"Təcili zəng əlçatan deyil"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Polis"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Təcili yardım"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Yanğın"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Yığmaq üçün klaviatura istifadə edin"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Saxlayın"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Son"</string>
@@ -541,14 +523,13 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Kontakt idxalı uğursuz oldu"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Eşitmə yardımı"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Eşitmə yardımı uyğunluğunu aktivləşdirin"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Real zaman mətn (RTT) zəngi"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Səsli zəng daxilində mesajlaşmaya icazə verin"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"RTT kar və ya eşitmə problemi olan, danışma qüsuru olan və ya səsdən daha çoxuna ehtiyac duyan şəxslərə dəstək olur.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Ətraflı məlumat&lt;/a&gt;\n &lt;br&gt;&lt;br&gt; - RTT zəngləri mesaj transkripsiyası kimi yadda saxlanılır\n &lt;br&gt; - RTT video zənglər üçün əlçatan deyil"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"RTT-ni aktiv və ya deaktiv edin"</string>
   <string-array name="tty_mode_entries">
-    <item msgid="512950011423868021">"Teletayp Deaktivdir"</item>
-    <item msgid="3971695875449640648">"Tam funksiyası Teletayp"</item>
-    <item msgid="1937509904407445684">"Dinləmə imkanlı Teletayp"</item>
-    <item msgid="5644925873488772224">"Səs ötürmə imkanlı Teletayp"</item>
+    <item msgid="512950011423868021">"TTY Deaktiv"</item>
+    <item msgid="3971695875449640648">"TTY Tam"</item>
+    <item msgid="1937509904407445684">"TTY HCO"</item>
+    <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
     <string name="dtmf_tones_title" msgid="5163153771291340803">"DTMF tonları"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"DTMF tonlarının uzunluğunu ayarlayın"</string>
@@ -606,8 +587,6 @@
     <string name="selectContact" msgid="781975788478987237">"kontakt seçin"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Səsli zəng dəstəklənmir"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"Yığ"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"yığım panelini göstərin"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Təcili Zəng Paneli"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Vizual Səsli Mesaj"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"PIN kodu ayarlayın"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"PIN kodu dəyişin"</string>
@@ -620,7 +599,7 @@
     <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Təcili zənglər"</string>
     <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Yalnız təcili zəng"</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">"Keçərlik"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Münasiblik"</string>
     <string name="status_hint_label_incoming_wifi_call" msgid="5932176406432044638">"Wi-Fi zəngi"</string>
     <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi zəng"</string>
     <string name="emergency_action_launch_hint" msgid="4906759256275562674">"Açmaq üçün yenidən tıklayın"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index d5192dd..2bd344e 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -58,7 +58,7 @@
     <string name="labelGsmMore_with_label" msgid="2674012918829238901">"Podešavanja GSM poziva (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA podešavanja poziva"</string>
     <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"Podešavanja CDMA poziva (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="apn_settings" msgid="9043423184895642077">"Nazivi pristupnih tačaka"</string>
+    <string name="apn_settings" msgid="9043423184895642077">"Nazivi prist. tačaka"</string>
     <string name="settings_label" msgid="3876743539816984008">"Mrežna podešavanja"</string>
     <string name="phone_accounts" msgid="6376603393888116364">"Nalozi za pozivanje"</string>
     <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Upućujte pozive pomoću"</string>
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Vraćanje podešavanja…"</string>
     <string name="response_error" msgid="6674110501330139405">"Neočekivani odgovor mreže."</string>
     <string name="exception_error" msgid="7027667130619518211">"Greška na mreži ili SIM kartici."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS zahtev je promenjen u običan poziv"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS zahtev je promenjen u USSD zahtev"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Promenjeno je u novi SS zahtev"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS zahtev je promenjen u video poziv"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS zahtev je promenjen u DIAL zahtev."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS zahtev je promenjen u USSD zahtev."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS zahtev je promenjen u novi SS zahtev."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS zahtev je promenjen u Video DIAL zahtev."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"Podešavanje Brojeva za fiksno biranje aplikacije Telefon je uključeno. Zbog toga neke funkcije u vezi sa pozivima ne funkcionišu."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Uključite radio pre pregledanja ovih podešavanja."</string>
     <string name="close_dialog" msgid="2365884406356986917">"Potvrdi"</string>
@@ -163,7 +163,7 @@
     <string name="label_available" msgid="1181658289009300430">"Dostupne mreže"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Pretražuje se…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Nisu pronađene mreže."</string>
-    <string name="network_query_error" msgid="8466081377231178298">"Ne možemo da pronađemo mreže. Probajte ponovo."</string>
+    <string name="network_query_error" msgid="6828516148953325006">"Greška tokom traženja mreža."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Registrovanje na <xliff:g id="NETWORK">%s</xliff:g>…"</string>
     <string name="not_allowed" msgid="5613353860205691579">"SIM kartica ne dozvoljava vezu sa ovom mrežom."</string>
     <string name="connect_later" msgid="2308119155752343975">"Trenutno nije moguće povezati se sa ovom mrežom. Probajte ponovo kasnije."</string>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Promena režima rada mreže"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Željeni tip mreže"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(zabranjeno)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Izaberite mrežu"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Veza je prekinuta"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Povezani ste"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Povezuje se..."</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Povezivanje nije uspelo"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA ima prednost"</item>
     <item msgid="8442633436636425221">"Samo GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Pozivanje"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Mreža"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Poboljšani 4G LTE režim"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Napredno pozivanje"</string>
     <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Korišćenje LTE usluga za poboljšanje glasovnih i drugih komunikacija (preporučeno)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Podaci su omogućeni"</string>
     <string name="data_enable_summary" msgid="2382798156640007971">"Omogućavanje potrošnje podataka"</string>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"Roming"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Povezivanje sa uslugom za podatke tokom rominga"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Povezivanje sa uslugom za podatke tokom rominga"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"Prenos podataka u romingu je isključen. Dodirnite da biste ga uključili."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Izgubili ste vezu za prenos mobilnih podataka"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Veza za prenos podataka je prekinuta zato što ste napustili kućnu mrežu sa isključenim prenosom podataka u romingu."</string>
     <string name="roaming_warning" msgid="1603164667540144353">"Mogu da nastanu značajni troškovi."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Cene proverite kod mobilnog operatera."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Dozvoljavate prenos podataka u romingu?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Potrošnja podataka aplikacije"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Upotreba podataka"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"Potrošili ste <xliff:g id="ID_1">%1$s</xliff:g> mobilnih podataka u periodu <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Napredno"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Mobilni operater"</string>
@@ -399,7 +393,7 @@
     <string name="enable_fdn_ok" msgid="7215588870329688132">"Onemogući broj za fiksno biranje"</string>
     <string name="disable_fdn_ok" msgid="5727046928930740173">"Omogući broj za fiksno biranje"</string>
     <string name="sum_fdn" msgid="1959399454900272878">"Upravljanje brojevima za fiksno biranje"</string>
-    <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Promena PIN-a za pristup broju za fiksno biranje"</string>
+    <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Promeni PIN za pristup broju za fiksno biranje"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Upravljanje listom telefonskih brojeva"</string>
     <string name="voice_privacy" msgid="3776841382844614716">"Privatnost glasa"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Omogući poboljšan režim privatnosti"</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Nije moguće stavljati pozive na čekanje."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Povežite se na bežičnu mrežu da biste uputili poziv."</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"Omogućite pozivanje preko Wi-Fi-ja da biste uputili poziv."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Informacije za hitne slučajeve"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Vlasnik"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Dodirnite ponovo da biste videli informacije"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Hitan poziv"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Samo hitni pozivi"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Broj hitne službe"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Brojevi telefona hitnih službi"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Dodirnite ponovo da biste pozvali <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Uključivanje radija…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Nema mreže. Ponovni pokušaj…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Ulazak u režim rada u avionu nije moguć tokom hitnog poziva."</string>
     <string name="dial_emergency_error" msgid="1509085166367420355">"Poziv nije uspeo. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nije broj za hitne slučajeve."</string>
     <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Poziv nije uspeo. Pozovite broj za hitne slučajeve."</string>
-    <string name="dial_emergency_calling_not_available" msgid="5675557523782491826">"Upućivanje hitnih poziva nije dostupno"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Policija"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Hitna pomoć"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Vatrogasci"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Koristite tastaturu za pozivanje"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Čekanje"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Završi"</string>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Uvoz kontakta nije uspeo"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Slušni aparat"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Uključi kompatibilnost sa slušnim aparatom"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Poziv sa tekstom u realnom vremenu (RTT)"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Dozvolite razmenu poruka u audio pozivu"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"Tekst u realnom vremenu (RTT) pomaže pozivaocima koji su gluvi, slabo čuju, imaju teškoće u govoru ili kojima je potrebno nešto više od glasa.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Saznajte više&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; – RTT pozivi se čuvaju kao transkript poruke\n       &lt;br&gt; – RTT nije dostupan za video pozive"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Uključite ili isključite RTT"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY je isključen"</item>
     <item msgid="3971695875449640648">"TTY je pun"</item>
@@ -608,8 +589,6 @@
     <string name="selectContact" msgid="781975788478987237">"izaberite kontakt"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Audio pozivi nisu podržani"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"biranje"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"prikažite numeričku tastaturu"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Numerička tastatura za hitne pozive"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Vizuelna govorna pošta"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Podesite PIN"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Promenite PIN"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 898722a..2a01818 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Вяртанне налад..."</string>
     <string name="response_error" msgid="6674110501330139405">"Нечаканы адказ ад сеткі."</string>
     <string name="exception_error" msgid="7027667130619518211">"Памылка сеткі ці SIM-карты."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS-запыт заменены на стандартны выклік"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS-запыт заменены на USSD-запыт"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Зроблена замена на новы SS-запыт"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS-запыт заменены на відэавыклік"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"Запыт SS зменены на запыт DIAL."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"Запыт SS зменены на запыт USSD."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"Запыт SS зменены на новы запыт SS."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"Запыт SS зменены на запыт відэа-DIAL."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"Уключаны дазволеныя нумары. У выніку некаторыя функцыі адносна званкоў не працуюць."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Перад праглядам гэтых параметраў уключыце радыё."</string>
     <string name="close_dialog" msgid="2365884406356986917">"ОК"</string>
@@ -163,7 +163,7 @@
     <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="network_query_error" msgid="8466081377231178298">"Не ўдалося знайсці сеткі. Паўтарыце спробу."</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>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Змяніць рэжым работы сеткі"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Прыярытэтны тып сеткі"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(забаронена)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Выбраць сетку"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Адключана"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Падключана"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Ідзе падключэнне..."</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Не атрымалася падключыцца"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"Прыярытэт GSM/WCDMA"</item>
     <item msgid="8442633436636425221">"Толькі GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Выклік"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Сетка"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Удасканалены рэжым 4G LTE"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Пашыраны выклік"</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>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"Роўмінг"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Падключацца да сэрвісаў перадачы даных у роўмінгу"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Падключацца да сэрвісаў перадачы даных у роўмінгу"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"Інтэрнэт-роўмінг выключаны. Націсніце, каб уключыць."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Страчана падключэнне да мабільнай перадачы даных"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Падлучэнне для перадачы дадзеных страчана, таму што вы выйшлі з зоны пакрыцця сваёй сеткі, а перадача дадзеных у роўмінгу адключана."</string>
     <string name="roaming_warning" msgid="1603164667540144353">"Гэта можа прывесці да значных выдаткаў."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Праверце цану ў свайго інтэрнэт-правайдара."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Дазволіць перадачу даных у роўмінгу?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Выкарыстанне трафіка"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Выкарыстанне даных"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> мабільнага трафіку выкарыстана ў перыяд <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Пашыраныя налады"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Аператар"</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Немагчыма ўтрымліваць выклікі."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Падлучыцеся да бесправадной сеткі, каб зрабіць выклік."</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"Дазволіць выклік па Wi-Fi-тэлефаніі."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Даныя для экстранных сітуацый"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Уладальнік"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Каб паглядзець інфармацыю, націсніце яшчэ раз"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Экстраны выклік"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Толькі экстраныя выклікі"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Нумар экстраннай службы"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Нумары экстраннай службы"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Каб патэлефанаваць на нумар <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>, націсніце яшчэ раз."</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Уключэнне радыё..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Не абслугоўваецца. Паўтор спробы..."</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Немагчыма ўвайсцi ў рэжым палёту падчас экстранага выклiку"</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Экстранныя выклікі недаступныя"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Паліцыя"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Хуткая дапамога"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Пажарная служба"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Выкарыстоўвайце клавіятуру, каб набраць нумар"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Утрымліваць"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Скончыць"</string>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Не ўдалося імпартаваць кантакт"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Слыхавы апарат"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Уключыць функцыю сумяшчальнасці са слыхавым апаратам"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Выклік з тэкстам у рэальным часе (RTT)"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Дазволіць абмен паведамленнямі ў галасавых выкліках"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"Функцыя RTT дапамагае абанентам з парушэннямі слыху і маўлення.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Даведацца больш&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - RTT-выклікі захоўваюцца ў выглядзе расшыфроўкі паведамленняў\n       &lt;br&gt; - Функцыя RTT недаступная для відэавыклікаў"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Уключыць або выключыць RTT"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"Тэлетайп выключаны"</item>
     <item msgid="3971695875449640648">"Поўнафункцыянальны тэлетайп"</item>
@@ -610,8 +591,6 @@
     <string name="selectContact" msgid="781975788478987237">"выбраць кантакт"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Галасавы выклік не падтрымліваецца"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"набор"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"паказаць панэль набору"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Панэль набору нумара экстраннай службы"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Візуальная галасавая пошта"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Задаць PIN-код"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Змяніць PIN-код"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index d720755..8cddb1c 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Настройките се променят в първоначалното състояние…"</string>
     <string name="response_error" msgid="6674110501330139405">"Неочакван отговор от мрежата."</string>
     <string name="exception_error" msgid="7027667130619518211">"Грешка в мрежата или SIM картата."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS заявката е променена на обикновено обаждане"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS заявката е променена на USSD заявка"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Променено на нова SS заявка"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS заявката е променена на видеообаждане"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS заявката е променена на DIAL заявка."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS заявката е променена на USSD заявка."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS заявката е променена на нова SS заявка."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"Заявката SS бе променена на заявка DIAL за видеообаждане."</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>
@@ -163,7 +163,7 @@
     <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="network_query_error" msgid="8466081377231178298">"Не бяха намерени мрежи. Опитайте отново."</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>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Промяна на операционния режим на мрежата"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Предпочитан тип мрежа"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(забранена)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Избиране на мрежа"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Връзката е прекратена"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Има връзка"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Свързва се…"</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Не можа да се установи връзка"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"Предпочита се GSM/WCDMA"</item>
     <item msgid="8442633436636425221">"Само GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Извършва се обаждане"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Мрежа"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Подобрен режим с 4G LTE"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Разширени обаждания"</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>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"Роуминг"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Свързване с услуги за данни при роуминг"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Свързване с услуги за данни при роуминг"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"Роумингът на данни е изключен. Докоснете за включване."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Мобилната връзка за данни прекъсна"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Изгубихте връзката за данни, защото сте излезли от домашната си мрежа при изключен роуминг."</string>
     <string name="roaming_warning" msgid="1603164667540144353">"Това може да доведе до високи такси."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"За цени се обърнете към оператора си."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Да се разреши ли роуминг на данни?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Пренос на данни от приложенията"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Използване на данни"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> мобилни данни са използвани за периода <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Разширени"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Оператор"</string>
@@ -399,7 +393,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"</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>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Активиране на разширен режим на поверителност"</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Не може да се извършват обаждания."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Свържете се с безжична мрежа, за да осъществите обаждане."</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"За да извършите обаждане, активирайте обажданията през Wi-Fi."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Информация за спешни случаи"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Собственик"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Докоснете отново, за да видите информация"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Спешно обаждане"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Само спешни обаждания"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Спешен номер"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Спешни номера"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Докоснете отново за обаждане на <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Радиото се включва…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Няма услуга. Извършва се нов опит…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Не може да се влезе в самолетен режим по време на спешно обаждане."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Не се предлагат спешни обаждания"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Полиция"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Линейка"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Пожар"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Използвайте клавиатурата за набиране"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Задържане"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Край"</string>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Импортирането на контакта не бе успешно"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Слухови апарати"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Включване на съвместимостта за слухов апарат"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Обаждане с текстово съобщение в реално време (RTT)"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Позволяване на съобщения в рамките на гласово обаждане"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"RTT подпомага обаждащи се, които са глухи, имат затруднения със слуха, говорно увреждане или се нуждаят от повече от само глас.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Научете повече&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; – RTT обажданията се запазват като препис на съобщение.\n       &lt;br&gt; – RTT не е налице за видеообаждания."</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Включване или изключване на RTT"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY е изкл."</item>
     <item msgid="3971695875449640648">"Пълен TTY режим"</item>
@@ -606,8 +587,6 @@
     <string name="selectContact" msgid="781975788478987237">"избиране на контакта"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Гласови обаждания не се поддържат"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"набиране"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"показване на клавиатурата за набиране"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Клавиатура за спешно обаждане"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Визуална гласова поща"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Задаване на ПИН"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Промяна на ПИН"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 8b8f28e..eba9f14 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -73,7 +73,7 @@
     <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"সমস্ত কলিং অ্যাকাউন্ট"</string>
     <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"কোন অ্যাকাউন্টগুলি কল করতে পারবে তা বেছে নিন"</string>
     <string name="wifi_calling" msgid="739018212480165598">"ওয়াই-ফাই কলিং"</string>
-    <string name="connection_service_default_label" msgid="1498481943805913754">"অন্তর্ভুক্ত সংযোগ পরিষেবা"</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>
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"সেটিংসের প্রত্যাবর্তন করা হচ্ছে…"</string>
     <string name="response_error" msgid="6674110501330139405">"নেটওয়ার্ক থেকে অপ্রত্যাশিত প্রতিক্রিয়া৷"</string>
     <string name="exception_error" msgid="7027667130619518211">"নেটওয়ার্ক বা সিম কার্ড ত্রুটি৷"</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS অনুরোধটি সাধারণ কলে পরিবর্তন করা হয়েছে"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS অনুরোধটি USSD অনুরোধে পরিবর্তন করা হয়েছে"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"নতুন SS অনুরোধে পরিবর্তন করা হয়েছে"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS অনুরোধটি ভিডিও কলে পরিবর্তন করা হয়েছে"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS অনুরোধটিকে DIAL অনুরোধে রুপান্তরিত করা হয়েছে৷"</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS অনুরোধটিকে USSD অনুরোধে রুপান্তরিত করা হয়েছে৷"</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS অনুরোধটিকে নতুন SS অনুরোধে রুপান্তরিত করা হয়েছে৷"</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS অনুরোধটিকে ভিডিও DIAL অনুরোধে পরিবর্তন করা হয়েছে।"</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"আপনার ফোন অ্যাপ্লিকেশনের স্থায়ী ডায়ালের নাম্বারগুলির সেটিং চালু করা হয়েছে৷ এর ফলে, কিছু কিছু কল সংক্রান্ত বৈশিষ্ট্য কাজ করছে না৷"</string>
     <string name="radio_off_error" msgid="2304459933248513376">"এই সেটিংস দেখার পূর্বে রেডিওটি চালু করুন৷"</string>
     <string name="close_dialog" msgid="2365884406356986917">"ঠিক আছে"</string>
@@ -161,9 +161,9 @@
     <string name="vvm_unsupported_message_format" msgid="11795090778411977">"এই ধরণের বার্তা সমর্থিত নয় , শুোনার জন্য <xliff:g id="NUMBER">%s</xliff:g> এ কল করুন৷"</string>
     <string name="network_settings_title" msgid="514120489499925574">"মোবাইল নেটওয়ার্ক"</string>
     <string name="label_available" msgid="1181658289009300430">"উপলব্ধ নেটওয়ার্কগুলি"</string>
-    <string name="load_networks_progress" msgid="5230707536168902952">"সার্চ করছে..."</string>
+    <string name="load_networks_progress" msgid="5230707536168902952">"অনুসন্ধান করছে..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"কোনো নেটওয়ার্ক পাওয়া যায়নি৷"</string>
-    <string name="network_query_error" msgid="8466081377231178298">"নেটওয়ার্ক পাওয়া যায়নি। আবার চেষ্টা করুন।"</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>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"নেটওয়ার্ক অপারেটিং মোড পরিবর্তন করুন"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"পছন্দের নেটওয়ার্ক"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(নিষিদ্ধ)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"নেটওয়ার্ক বেছে নিন"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"ডিসকানেক্ট আছে"</string>
-    <string name="network_connected" msgid="1288589103624338857">"কানেক্ট হয়েছে"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"কানেক্ট করা হচ্ছে..."</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"কানেক্ট করা যায়নি"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA ব্যবহার করতে চাই"</item>
     <item msgid="8442633436636425221">"শুধুমাত্র GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"কলিং"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"নেটওয়ার্ক"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"উন্নত 4G LTE মোড"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"উন্নত কলিং"</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>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"রোমিং"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"রোমিংয়ে থাকাকালীন ডেটা পরিষেবাগুলির সাথে সংযোগ স্থাপন করুন"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"রোমিংয়ে থাকাকালীন ডেটা পরিষেবাগুলির সাথে সংযোগ স্থাপন করুন"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"ডেটা রোমিং বন্ধ আছে। চালু করতে ট্যাপ করুন।"</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"মোবাইল ডেটার কানেকশন কেটে গেছে"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"আপনি ডেটা রোমিং বন্ধ করে আপনার হোম নেটওয়ার্কের বাইরে চলে আসায় আপনার ডেটা সংযোগ হারিয়ে ফেলেছেন৷"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"আপনাকে উল্লেখযোগ্য পরিমাণে চার্জ করা হতে পারে৷"</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"খরচের বিষয়ে জানতে নেটওয়ার্ক প্রদানকারীর সাথে যোগাযোগ করুন।"</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"ডেটা রোমিংয়ের অনুমতি দেবেন?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"অ্যাপ ডেটার ব্যবহার"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"ডেটার ব্যবহার"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_2">%2$s</xliff:g> এর মধ্যে <xliff:g id="ID_1">%1$s</xliff:g> মোবাইল ডেটা ব্যবহার করা হয়েছে"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"উন্নত"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"পরিষেবা প্রদানকারী"</string>
@@ -503,29 +497,17 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"কলগুলি ধরে রাখা যাবে না।"</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"একটি কল করতে কোনো ওয়্যারলেস নেটওয়ার্কে সংযোগ করুন৷"</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"কোনো কল করতে Wi-Fi কলিং সক্ষম করুন৷"</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"জরুরি তথ্য"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"মালিক"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"তথ্য দেখার জন্য আবার ট্যাপ করুন"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"জরুরি কল"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"শুধুমাত্র জরুরি কল"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"জরুরি নম্বর"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"জরুরি নম্বর"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"<xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>-এ আবার কল করার জন্য ট্যাপ করুন"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"রেডিও চালু করা হচ্ছে…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"কোন পরিষেবা নেই৷ আবার চেষ্টা করা হচ্ছে..."</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"কোনো জরুরী কলের সময় বিমান মোডে প্রবেশ করা যাবে না৷"</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"জরুরি কল করা যাবে না"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"পুলিশ"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"অ্যাম্বুলেন্স"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"আগুন"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</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="onscreenMuteText" msgid="5011369181754261374">"নিঃশব্দ করুন"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"কল যোগ করুন"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"কলগুলি মার্জ করুন"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"সোয়াপ করুন"</string>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"পরিচিতি আমদানি করতে ব্যর্থ হয়েছে"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"শ্রবণ যন্ত্রগুলি"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"শ্রবণ যন্ত্র উপযুক্ততা চালু করুন"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"রিয়েল-টাইম টেক্সট (RTT) কল"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"ভয়েস কলে মেসেজ পাঠানোর অনুমতি দিন"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"যে কলাররা বধির, কানে কম শোনেন, যাদের কথা বলতে অসুবিধা হয় অথবা যারা কণ্ঠস্বরের সাথে অন্য কোনও উপায়ে নিজেদের প্রকাশ করেন, RTT বৈশিষ্ট্যটি তাদের সাহায্য করে।&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;আরও জানুন&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - RTT কলগুলি মেসেজ ট্রান্সক্রিপ্ট হিসেবে সেভ করে রাখা হয়\n       &lt;br&gt; - ভিডিও কলে RTT বৈশিষ্ট্য ব্যবহার করা যায় না"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"RTT চালু বা বন্ধ করুন"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY বন্ধ"</item>
     <item msgid="3971695875449640648">"TTY পূর্ণ"</item>
@@ -606,13 +587,11 @@
     <string name="selectContact" msgid="781975788478987237">"পরিচিতি বেছে নিন"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"ভয়েস কলিং সমর্থিত নয়"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"ডায়াল করুন"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"ডায়ালপ্যাড দেখুন"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"জরুরি ডায়ালপ্যাড"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"ভিজ্যুয়াল ভয়েসমেল"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"PIN সেট করুন"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"পিন পরিবর্তন করুন"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"রিংটোন ও কম্পন"</string>
-    <string name="pstn_connection_service_label" msgid="1743245930577325900">"অন্তর্ভুক্ত সিম কার্ডগুলি"</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>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 7562902..e77a6da 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -30,7 +30,7 @@
     <string name="mmiCancelled" msgid="2771923949751842276">"MMI kȏd je otkazan"</string>
     <string name="cancel" msgid="5044513931633602634">"Otkaži"</string>
     <string name="enter_input" msgid="1810529547726803893">"USSD poruka mora imati između <xliff:g id="MIN_LEN">%d</xliff:g> i <xliff:g id="MAX_LEN">%d</xliff:g> znakova. Pokušajte ponovo."</string>
-    <string name="manageConferenceLabel" msgid="4691922394301969053">"Upravljanje konferencijskim pozivom"</string>
+    <string name="manageConferenceLabel" msgid="4691922394301969053">"Upravljaj konferencijskim pozivom"</string>
     <string name="ok" msgid="3811371167865772377">"Uredu"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Zvučnik"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Slušalice telefona"</string>
@@ -72,7 +72,7 @@
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Konfiguriraj postavke računa"</string>
     <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Svi računi za pozivanje"</string>
     <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Odaberite koji računi mogu upućivati pozive"</string>
-    <string name="wifi_calling" msgid="739018212480165598">"Pozivanje putem WiFi-ja"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi pozivanje"</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>
@@ -94,12 +94,12 @@
     <string name="labelCW" msgid="6120513814915920200">"Poziv na čekanju"</string>
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Tokom poziva, obavijesti me o dolaznim pozivima"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Tokom poziva, obavijesti me o dolaznim pozivima"</string>
-    <string name="call_forwarding_settings" msgid="3378927671091537173">"Postavke prosljeđivanja 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">"Prosljeđivanje poziva"</string>
-    <string name="labelCFU" msgid="8147177368148660600">"Uvijek proslijedi"</string>
+    <string name="call_forwarding_settings" msgid="3378927671091537173">"Postavke preusmjeravanja poziva"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Postavke preusmjeravanja 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">"Prosljeđivanje svih poziva"</string>
+    <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Preusmjeravanje svih poziva"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Preusmjeravaju se svi pozivi 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="8384177689501334080">"Isključeno"</string>
@@ -107,17 +107,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"Broj kada je zauzeto"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Preusmjerava se na <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="4913145177320506827">"Isključeno"</string>
-    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Vaš operater ne podržava onemogućavanje prosljeđivanja poziva kada je telefon zauzet."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Vaš operater ne podržava onemogućavanje preusmjeravanja poziva kada je telefon zauzet."</string>
     <string name="labelCFNRy" msgid="1736067178393744351">"Kada nema odgovora"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Broj kada nema odgovora"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Preusmjerava se na <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="3884684060443538097">"Isključeno"</string>
-    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Vaš operater ne podržava onemogućavanje prosljeđivanja poziva kada se ne odgovori na poziv."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Vaš operater ne podržava onemogućavanje preusmjeravanja poziva kada se ne odgovori na poziv."</string>
     <string name="labelCFNRc" msgid="2614827454402079766">"Kada je nedostupno"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Broj kada je nedostupno"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Preusmjerava se na <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="2684474391807469832">"Isključeno"</string>
-    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Vaš operater ne podržava onemogućavanje prosljeđivanja poziva kada ste nedostupni."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Vaš operater ne podržava onemogućavanje preusmjeravanja poziva kada ste nedostupni."</string>
     <string name="updating_title" msgid="6146755386174019046">"Postavke poziva"</string>
     <string name="call_settings_admin_user_only" msgid="4526094783818216374">"Postavke poziva može promijeniti samo administrator."</string>
     <string name="call_settings_with_label" msgid="3401177261468593519">"Postavke (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
@@ -127,11 +127,11 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Vraćanje postavki u toku…"</string>
     <string name="response_error" msgid="6674110501330139405">"Neočekivani odgovor mreže."</string>
     <string name="exception_error" msgid="7027667130619518211">"Greška na mreži ili SIM kartici."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS zahtjev je izmijenjen u obični poziv"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS zahtjev je izmijenjen u USSD zahtjev"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Izmijenjeno u novi SS zahtjev"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS zahtjev je izmijenjen u video poziv"</string>
-    <string name="fdn_check_failure" msgid="18200614306525434">"Uključena je postavka brojeva fiksnog biranja u aplikaciji Telefon. Zbog toga ne rade neke funkcije vezane za pozive."</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS zahtjev je izmijenjen u DIAL zahtjev."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS zahtjev je izmijenjen u USSD zahtjev."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS zahtjev je izmijenjen u novi SS zahtjev."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS zahtjev je izmijenjen u Video DIAL zahtjev."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"Uključena je postavka brojeva fiksnog biranja u Aplikaciji za telefon. Zbog toga ne rade neke funkcije vezane za pozive."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Uključite radio prije prikazivanja ovih postavki."</string>
     <string name="close_dialog" msgid="2365884406356986917">"Uredu"</string>
     <string name="enable" msgid="7248657275000173526">"Uključi"</string>
@@ -163,7 +163,7 @@
     <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 nijedna mreža."</string>
-    <string name="network_query_error" msgid="8466081377231178298">"Nisu pronađene mreže. Pokušajte ponovo."</string>
+    <string name="network_query_error" msgid="6828516148953325006">"Greška prilikom traženja mreža."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Registriranje na <xliff:g id="NETWORK">%s</xliff:g> u toku…"</string>
     <string name="not_allowed" msgid="5613353860205691579">"Vaša SIM kartica ne dozvoljava povezivanje na ovu mrežu."</string>
     <string name="connect_later" msgid="2308119155752343975">"Trenutno nije moguće povezati se s ovom mrežom. Pokušajte ponovo kasnije."</string>
@@ -171,16 +171,11 @@
     <string name="already_auto" msgid="6067116884321285507">"Automatski odabir se već koristi."</string>
     <string name="select_automatically" msgid="1046727200631770962">"Automatski odaberi mrežu"</string>
     <string name="network_select_title" msgid="7733107364757544558">"Mreža"</string>
-    <string name="register_automatically" msgid="6017849844573519637">"Automatska registracija…"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"Automatska registracija u toku…"</string>
     <string name="preferred_network_mode_title" msgid="2336624679902659306">"Preferirana vrsta mreže"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Promijeni način rada mreže"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Preferirana vrsta mreže"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(zabranjeno)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Odaberite mrežu"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Veza je prekinuta"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Povezan"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Povezivanje…"</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Povezivanje nije uspjelo"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"Preferiraj GSM/WCDMA"</item>
     <item msgid="8442633436636425221">"Samo GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Pozivanje"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Mreža"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Poboljšani 4G LTE način rada"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Napredno pozivanje"</string>
     <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Koristi LTE usluge 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="2382798156640007971">"Dozvoli korištenje podataka"</string>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"Roming"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Povezivanje na usluge prijenosa podataka u romingu"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Povezivanje na usluge prijenosa podataka u romingu"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"Roming podataka je isključen. Dodirnite da ga uključite."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Veza za prijenos podataka na mobilnoj mreži je izgubljena"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Izgubili ste vezu za prijenos podataka jer ste napustili matičnu mrežu dok je roming podataka isključen."</string>
     <string name="roaming_warning" msgid="1603164667540144353">"Može dovesti do značajnih troškova."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Raspitajte se kod svog mobilnog operatera za cijene."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Dozvoliti roming podataka?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Prijenos podataka u aplikaciji"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Prijenos podataka"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"Iskorišteno je <xliff:g id="ID_1">%1$s</xliff:g> prijenosa podataka u periodu <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Napredno"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Operater"</string>
@@ -260,7 +254,7 @@
     <string name="sim_selection_required_pref" msgid="7049424902961844236">"Potreban izbor"</string>
     <string name="sim_change_data_title" msgid="5332425991853799280">"Promijeniti podatkovni SIM?"</string>
     <string name="sim_change_data_message" msgid="2163963581444907496">"Koristiti SIM karticu <xliff:g id="NEW_SIM">%1$s</xliff:g> umjesto SIM kartice <xliff:g id="OLD_SIM">%2$s</xliff:g> za prijenos podataka na mobilnoj mreži?"</string>
-    <string name="wifi_calling_settings_title" msgid="7741961465416430470">"Pozivanje putem WiFi-ja"</string>
+    <string name="wifi_calling_settings_title" msgid="7741961465416430470">"Wi-Fi pozivanje"</string>
     <string name="video_calling_settings_title" msgid="539714564273795574">"Operater video pozivanja"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"GSM/UMTS opcije"</string>
     <string name="cdma_options" msgid="4016822858172249884">"CDMA opcije"</string>
@@ -403,11 +397,11 @@
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Upravljaj listom brojeva telefona"</string>
     <string name="voice_privacy" msgid="3776841382844614716">"Privatnost glasa"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Omogući poboljšani naćin rada za privatnost"</string>
-    <string name="tty_mode_option_title" msgid="9033098925144434669">"Način rada TTY"</string>
-    <string name="tty_mode_option_summary" msgid="1073835131534808732">"Postavi način rada TTY"</string>
+    <string name="tty_mode_option_title" msgid="9033098925144434669">"TTY način rada"</string>
+    <string name="tty_mode_option_summary" msgid="1073835131534808732">"Postavi TTY način rada"</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 rada za automatski ponovni pokušaj"</string>
-    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"Promjena načina rada TTY nije dozvoljena tokom video poziva"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"Promjena TTY načina rada nije dozvoljena tokom video poziva"</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>
@@ -502,30 +496,18 @@
     <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Nije moguće uputiti poziv(e)."</string>
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Nije moguće staviti pozive na čekanje."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Povežite se na bežičnu mrežu da uputite poziv."</string>
-    <string name="incall_error_promote_wfc" msgid="106510757624022064">"Omogućite pozivanje putem WiFi-ja da uputite poziv."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Informacije za hitne slučajeve"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Vlasnik"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Dodirnite ponovo da pogledate informacije"</string>
+    <string name="incall_error_promote_wfc" msgid="106510757624022064">"Omogućite Wi-Fi pozivanje da uputite poziv."</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Hitni poziv"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Samo hitni pozivi"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Broj za hitne slučajeve"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Brojevi za hitne slučajeve"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Dodirnite ponovo da pozovete <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Uključivanje radija u toku…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Nema mreže. Novi pokušaj u toku…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Nije moguće aktivirati način rada u avionu tokom hitnog poziva."</string>
     <string name="dial_emergency_error" msgid="1509085166367420355">"Nije moguće pozvati. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nije broj za hitne slučajeve."</string>
     <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Nije moguće pozvati. Birajte broj za hitne slučajeve."</string>
-    <string name="dial_emergency_calling_not_available" msgid="5675557523782491826">"Hitni pozivi nisu dostupni"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Policija"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Vozilo hitne pomoći"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Vatrogasci"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Koristi tastaturu za biranje"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Stavi na čekanje"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Prekini"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Telefonska tipkovnica"</string>
-    <string name="onscreenMuteText" msgid="5011369181754261374">"Isključi zvuk"</string>
+    <string name="onscreenMuteText" msgid="5011369181754261374">"Isključi zvuk poziva"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"Dodaj poziv"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Spoji pozive"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Zamijeni"</string>
@@ -541,12 +523,11 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Uvoz kontakta nije uspio"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Slušni aparat"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Uključi kompatibilnost za slušni aparat"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Pozivanje sa slanjem SMS-ova u stvarnom vremenu (RTT)"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Dozvolite razmjenu poruka tokom glasovnog poziva"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"RTT pomaže pozivaocima koji su gluhi, imaju probleme sa sluhom ili govorom te onima kojima treba više od samog glasa.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Saznajte više&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - RTT pozivi se pohranjuju kao transkripti poruka\n       &lt;br&gt; - RTT nije dostupan za video pozive"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Uključite ili isključite RTT"</string>
   <string-array name="tty_mode_entries">
-    <item msgid="512950011423868021">"TTY Off"</item>
-    <item msgid="3971695875449640648">"TTY Full"</item>
+    <item msgid="512950011423868021">"TTY je isključen"</item>
+    <item msgid="3971695875449640648">"TTY je pun"</item>
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
@@ -563,7 +544,7 @@
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Aktivacija u toku..."</string>
     <string name="ota_hfa_activation_dialog_message" msgid="8092479227918463415">"Telefon aktivira uslugu prijenosa mobilnih podataka.\n\nTo može potrajati do 5 minuta."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Preskočiti aktivaciju?"</string>
-    <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Ako preskočite aktivaciju, nećete moći upućivati pozive niti se povezati na mobilne podatkovne mreže (iako se možete povezati na WiFi mreže). Dok ne aktivirate telefon, prikazivat će se upit za aktivaciju svaki put kada upalite telefon."</string>
+    <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Ako preskočite aktivaciju, nećete moći upućivati pozive niti se povezati na mobilne podatkovne mreže (iako se možete povezati na Wi-Fi mreže). Dok ne aktivirate telefon, prikazivat će se upit za aktivaciju svaki put kada upalite telefon."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Preskoči"</string>
     <string name="ota_activate" msgid="1368528132525626264">"Aktiviraj"</string>
     <string name="ota_title_activate_success" msgid="6570240212263372046">"Telefon je aktiviran."</string>
@@ -608,8 +589,6 @@
     <string name="selectContact" msgid="781975788478987237">"odaberi kontakt"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Glasovni pozivi nisu podržani"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"biraj"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"prikaži telefonsku tipkovnicu"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Telefonska tipkovnica za hitne pozive"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Vizuelna govorna pošta"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Postavljanje PIN-a"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Promijeni PIN"</string>
@@ -623,14 +602,14 @@
     <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="5932176406432044638">"WiFi poziv od"</string>
-    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"WiFi poziv"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="5932176406432044638">"Wi-Fi poziv od"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi poziv"</string>
     <string name="emergency_action_launch_hint" msgid="4906759256275562674">"Dodirnite ponovo da otvorite"</string>
     <string name="message_decode_error" msgid="3456481534066924855">"Došlo je do greške prilikom dekodiranja poruke."</string>
     <string name="callFailed_cdma_activation" msgid="2307989779233262164">"SIM kartica je aktivirala vašu uslugu i ažurirala mogućnosti rominga za telefon."</string>
     <string name="callFailed_cdma_call_limit" msgid="1556916577171457086">"Previše aktivnih poziva. Prekinite ili spojite postojeće pozive prije upućivanja novog poziva."</string>
     <string name="callFailed_imei_not_accepted" msgid="132192626901238542">"Povezivanje nije uspjelo, umetnite važeću SIM karticu."</string>
-    <string name="callFailed_wifi_lost" msgid="5968076625137297184">"WiFi veza je prekinuta. Poziv je završen."</string>
+    <string name="callFailed_wifi_lost" msgid="5968076625137297184">"Wi-Fi veza je prekinuta. Poziv je završen."</string>
     <string name="dialFailed_low_battery" msgid="8760548177088774268">"Upućivanje video poziva nije moguće zbog istrošenosti baterije."</string>
     <string name="callFailed_low_battery" msgid="4913582435905872616">"Video poziv je završen zbog istrošenosti baterije."</string>
     <string name="change_pin_title" msgid="7790232089699034029">"Promijeni PIN govorne pošte"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 012fe55..67fbc5d 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -20,7 +20,7 @@
     <string name="phoneAppLabel" product="default" msgid="6790717591729922998">"Serveis del 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 d\'FDN"</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="4793877574636445118">"Telèfon públic"</string>
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"S\'està tornant la configuració als valors originals…"</string>
     <string name="response_error" msgid="6674110501330139405">"Resposta inesperada de la xarxa."</string>
     <string name="exception_error" msgid="7027667130619518211">"Error de xarxa o de targeta SIM."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"La sol·licitud SS s\'ha canviat per una trucada estàndard"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"La sol·licitud SS s\'ha canviat per una sol·licitud USSD"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"S\'ha canviat a una nova sol·licitud SS"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"La sol·licitud SS s\'ha canviat per una videotrucada"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"La sol·licitud SS s\'ha transformat en una sol·licitud DIAL."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"La sol·licitud SS s\'ha transformat en una sol·licitud USSD."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"La sol·licitud SS s\'ha transformat en una sol·licitud SS nova."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"La sol·licitud SS s\'ha transformat en una sol·licitud DIAL de vídeo."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"La configuració dels números de marcatge fix de l\'aplicació Telèfon està activada. En conseqüència, algunes funcions relacionades amb les trucades no funcionen."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Per veure aquesta configuració, has d\'activar el senyal mòbil."</string>
     <string name="close_dialog" msgid="2365884406356986917">"D\'acord"</string>
@@ -163,7 +163,7 @@
     <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>
-    <string name="network_query_error" msgid="8466081377231178298">"No s\'ha pogut trobar cap xarxa. Torna-ho a provar."</string>
+    <string name="network_query_error" msgid="6828516148953325006">"S\'ha produït un error en cercar xarxes."</string>
     <string name="register_on_network" msgid="9055203954040805084">"S\'està registrant a <xliff:g id="NETWORK">%s</xliff:g>..."</string>
     <string name="not_allowed" msgid="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>
@@ -176,11 +176,6 @@
     <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 preferit"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(prohibit)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Tria la xarxa"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Desconnectat"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Connectat"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"S\'està connectant..."</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"No s\'ha pogut connectar"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"Mode GSM/WCDMA preferit"</item>
     <item msgid="8442633436636425221">"Només GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Trucades"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Xarxa"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Mode 4G LTE millorat"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Trucades avançades"</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="2382798156640007971">"Permet l\'ús de dades"</string>
@@ -243,19 +238,18 @@
     <string name="roaming" msgid="7894878421600247140">"Itinerància"</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="6843814381576397939">"La itinerància de dades està desactivada. Toca per activar-la."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"S\'ha perdut la connexió de dades mòbils"</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_check_price_warning" msgid="7497570906830902550">"Contacta amb el proveïdor de xarxa per saber els preus."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Permetre la itinerància de dades?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Ús de dades de l\'aplicació"</string>
-    <string name="data_usage_template" msgid="8526428824844656364">"S\'han utilitzat <xliff:g id="ID_1">%1$s</xliff:g> en el període <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Ús de dades"</string>
+    <string name="data_usage_template" msgid="8526428824844656364">"Ús de dades mòbils en el període <xliff:g id="ID_2">%2$s</xliff:g>: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Configuració avançada"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Operador de telefonia mòbil"</string>
     <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"operador, eSIM, SIM, eUICC, canviar d\'operador, afegir un operador"</string>
     <string name="carrier_settings_euicc_summary" msgid="5115001942761995457">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> — <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
     <string name="mobile_data_settings_title" msgid="4661165467914727157">"Dades mòbils"</string>
-    <string name="mobile_data_settings_summary" msgid="5087255915840576895">"Accedeix a les dades amb la xarxa mòbil"</string>
+    <string name="mobile_data_settings_summary" msgid="5087255915840576895">"Accedeix a les dades amb una xarxa mòbil"</string>
     <string name="data_usage_disable_mobile" msgid="3577275288809667615">"Vols desactivar les dades mòbils?"</string>
     <string name="sim_selection_required_pref" msgid="7049424902961844236">"Has de seleccionar una preferència"</string>
     <string name="sim_change_data_title" msgid="5332425991853799280">"Vols canviar la SIM de dades?"</string>
@@ -384,22 +378,22 @@
     <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Activació del dispositiu"</string>
-    <string name="cdma_lte_data_service" msgid="4255018217292548962">"Configura el servei de dades"</string>
+    <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 d\'FDN"</string>
-    <string name="fdn_list_with_label" msgid="7437232552210469217">"Llista d\'FDN (<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">"Els números de marcatge fix estan activats"</string>
-    <string name="fdn_disabled" msgid="4700049736675368279">"Els números de marcatge fix estan desactivats"</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>
     <string name="enable_fdn" msgid="3740191529180493851">"Activa FDN"</string>
     <string name="disable_fdn" msgid="7944020890722540616">"Desactiva FDN"</string>
     <string name="change_pin2" msgid="2153563695382176676">"Canvia el PIN2"</string>
     <string name="enable_fdn_ok" msgid="7215588870329688132">"Desactiva FDN"</string>
     <string name="disable_fdn_ok" msgid="5727046928930740173">"Activa FDN"</string>
     <string name="sum_fdn" msgid="1959399454900272878">"Gestiona els números de marcatge fix"</string>
-    <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Canvia el PIN per a l\'accés d\'FDN"</string>
+    <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Canvia el PIN per a l\'accés FDN"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Gestiona la llista de números de telèfon"</string>
     <string name="voice_privacy" msgid="3776841382844614716">"Privadesa de veu"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Activa el mode de millora de la privadesa"</string>
@@ -471,7 +465,7 @@
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Número de la bústia de veu"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"S\'està marcant"</string>
     <string name="card_title_redialing" msgid="8253487008234167266">"S\'està tornant a marcar"</string>
-    <string name="card_title_conf_call" msgid="1162980346189744501">"Conferència telefònica"</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>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"No es poden posar les trucades en espera."</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="incall_error_promote_wfc" msgid="106510757624022064">"Activa les trucades per Wi-Fi per fer una trucada."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Informació d\'emergència"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Propietari"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Torna a tocar per veure la informació"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Trucada d\'emergència"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Només trucades d\'emergència"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Número d\'emergència"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Números d\'emergència"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Torna a tocar per trucar al número <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</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="5960061579996526883">"No hi ha servei. S\'està tornant a provar..."</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"No es pot activar el mode d\'avió durant una trucada d\'emergència."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Les trucades d\'emergència no estan disponibles"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Policia"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Ambulància"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Foc"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</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>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Error en importar el contacte"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Audiòfons"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Activa la compatibilitat amb audiòfons"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Trucada de text en temps real (RTT)"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Permet l\'ús de missatges en una trucada de veu"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"La funció RTT ofereix assistència als usuaris que són sords, tenen problemes d\'audició o alteracions de la parla, o bé que necessiten un text a banda de la veu.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Més informació&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - Les trucades RTT es desen en forma de transcripció.\n       &lt;br&gt; - Aquesta funció no està disponible per a videotrucades."</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"Missatges en temps real"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Activa o desactiva els missatges en temps real"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY desactivat"</item>
     <item msgid="3971695875449640648">"TTY complet"</item>
@@ -561,7 +542,7 @@
     <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>
-    <string name="ota_hfa_activation_dialog_message" msgid="8092479227918463415">"El telèfon està activant el vostre servei de dades mòbils.\n\nAquest procés pot durar fins a 5 minuts."</string>
+    <string name="ota_hfa_activation_dialog_message" msgid="8092479227918463415">"El telèfon està activant el vostre servei de dades per a mòbils.\n\nAquest procés pot durar fins a 5 minuts."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Voleu ometre l\'activació?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Si ometeu l\'activació, no podreu fer trucades ni connectar-vos a xarxes de dades mòbils (tot i que podreu connectar-vos a xarxes Wi-fi). Fins que activeu el telèfon, se us demanarà que ho feu cada cop que l\'engegueu."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Omet"</string>
@@ -606,8 +587,6 @@
     <string name="selectContact" msgid="781975788478987237">"selecciona el contacte"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"No s\'admeten les trucades de veu"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"marca"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"mostra el teclat"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Teclat d\'emergència"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Bústia de veu visual"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Defineix el PIN"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Canvia el PIN"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 777a06c..ff4a4a8 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Probíhá vrácení předchozích nastavení…"</string>
     <string name="response_error" msgid="6674110501330139405">"Neočekávaná odpověď sítě."</string>
     <string name="exception_error" msgid="7027667130619518211">"Došlo k chybě sítě nebo SIM karty."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"Požadavek SS byl změněn na běžný hovor"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"Požadavek SS byl změněn na požadavek USSD"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Změněno na nový požadavek SS"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"Požadavek SS byl změněn na videohovor"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"Požadavek SS byl změněn na požadavek DIAL."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"Požadavek SS byl změněn na požadavek USSD."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"Požadavek SS byl změněn na nový požadavek SS."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"Požadavek SS byl změněn na požadavek Video DIAL."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"Nastavení Povolených telefonních čísel v aplikaci vašeho telefonu je zapnuto. Z tohoto důvodu nefungují některé funkce spojené s voláním."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Před zobrazením těchto nastavení prosím zapněte bezdrátový modul."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
@@ -163,7 +163,7 @@
     <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>
-    <string name="network_query_error" msgid="8466081377231178298">"Nebyla nalezena žádná síť. Zkuste to znovu."</string>
+    <string name="network_query_error" msgid="6828516148953325006">"Při vyhledávání sítí došlo k chybě."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Probíhá registrace v síti <xliff:g id="NETWORK">%s</xliff:g>..."</string>
     <string name="not_allowed" msgid="5613353860205691579">"Vaše SIM karta nepovoluje připojení k této síti."</string>
     <string name="connect_later" msgid="2308119155752343975">"K této síti se momentálně nelze přihlásit. Zkuste to znovu později."</string>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Změnit provozní režim sítě"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Preferovaný typ sítě"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(zakázáno)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Vybrat síť"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Odpojeno"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Připojeno"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Připojování…"</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Nelze se připojit"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA – preferováno"</item>
     <item msgid="8442633436636425221">"Pouze GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Volání"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Síť"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Vylepšený režim 4G LTE"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Rozšířené volání"</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="2382798156640007971">"Povolit používání dat"</string>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"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="6843814381576397939">"Datový roaming je vypnutý. Klepnutím ho zapnete."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Mobilní datové připojení bylo ztraceno"</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="1603164667540144353">"Mohou vám být účtovány vysoké poplatky."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Ceny vám sdělí poskytovatel datových služeb."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Povolit datový roaming?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Využití dat aplikací"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Využití dat"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"V období <xliff:g id="ID_2">%2$s</xliff:g> jste využili <xliff:g id="ID_1">%1$s</xliff:g> mobilních dat"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Rozšířená nastavení"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Operátor"</string>
@@ -449,7 +443,7 @@
     <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 teď zablokován. Je požadován kód PUK."</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>
@@ -461,8 +455,8 @@
     <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 teď zablokován. Chcete-li to zkusit znovu, změňte PIN 2."</string>
-    <string name="puk2_requested" msgid="5831015200030161434">"Nesprávné heslo. SIM karta je teď uzamčena. 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="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>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Hovory nelze podržet."</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="incall_error_promote_wfc" msgid="106510757624022064">"Pokud chcete provést hovor, povolte volání přes připojení Wi-Fi."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Nouzové informace"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Vlastník"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Údaje zobrazíte dalším klepnutím"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Tísňové volání"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Pouze tísňová volání"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Tísňová linka"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Tísňové linky"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Dalším klepnutím zavoláte na číslo <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Zapínání rádia..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Služba je nedostupná. Probíhá další pokus…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Během nouzového volání není možné zapnout režim letadla."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Tísňové volání není dostupné"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Policie"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Záchranka"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Hasiči"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</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>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Kontakt se nepodařilo importovat"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Naslouchátka"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Zapnout režim kompatibility s naslouchátkem"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Hovor, během něhož můžete posílat zprávy (RTT)"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Povolit posílání zpráv během hlasového hovoru"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"Funkce SMS během hovoru (RTT) pomáhá volajícím, kteří neslyší, jsou nedoslýchaví, mají řečovou vadu, případně potřebují víc než jen hlas z jiného důvodu.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Další informace&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; – Text poslaný během hovoru se uloží jako přepis zpráv\n       &lt;br&gt; – Tato funkce není dostupná při videohovorech"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Zapnout nebo vypnout RTT"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY vypnuto"</item>
     <item msgid="3971695875449640648">"Úplný režim TTY"</item>
@@ -572,7 +553,7 @@
     <string name="ota_speaker" msgid="6904589278542719647">"Hlasitě"</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 teď aktivován. Spuštění služby může trvat až 15 minut."</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>
     <string name="ota_call_end" msgid="4537279738134612388">"Zpět"</string>
@@ -584,16 +565,16 @@
     <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Datové spojení zakázáno"</string>
     <string name="phone_in_ecm_notification_complete_time" msgid="7730376844178948351">"Datové připojení nebude dostupné do <xliff:g id="COMPLETETIME">%s</xliff:g>"</string>
     <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 teď 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 teď 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 teď 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 teď ukončit?</item>
+      <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 teď 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 teď 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 teď 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 teď ukončit?</item>
+      <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>
@@ -610,8 +591,6 @@
     <string name="selectContact" msgid="781975788478987237">"vybrat kontakt"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Hlasové volání není podporováno"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"vytáčení"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"zobrazit číselník"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Tísňový číselník"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Vizuální hlasová schránka"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Nastavte kód PIN"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Změnit kód PIN"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 8f3ccdc..7bddd01 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Tilbagefører indstillinger …"</string>
     <string name="response_error" msgid="6674110501330139405">"Uventet svar fra netværk."</string>
     <string name="exception_error" msgid="7027667130619518211">"Fejl på netværk eller SIM-kort."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS-anmodningen blev ændret til et almindeligt opkald"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS-anmodningen blev ændret til en USSD-anmodning"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Der blev ændret til en SS-anmodning"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS-anmodningen blev ændret til et videoopkald"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS-anmodningen blev ændret til en DIAL-anmodning."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS-anmodningen blev ændret til en USSD-anmodning."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS-anmodningen blev ændret til en ny SS-anmodning."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS-anmodningen er ændret til en DIAL-anmodning."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"Indstillingen Begrænset opkald i appen Opkald 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>
@@ -163,7 +163,7 @@
     <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>
-    <string name="network_query_error" msgid="8466081377231178298">"Der kunne ikke findes netværk. Prøv igen."</string>
+    <string name="network_query_error" msgid="6828516148953325006">"Der opstod en fejl, mens der blev søgt efter netværk."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Registrerer på <xliff:g id="NETWORK">%s</xliff:g> ..."</string>
     <string name="not_allowed" msgid="5613353860205691579">"Dit SIM-kort tillader ikke en forbindelse til dette netværk."</string>
     <string name="connect_later" msgid="2308119155752343975">"Der kan ikke oprettes forbindelse til dette netværk lige nu. Prøv igen senere."</string>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Skift netværksdriftstilstand"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Foretrukken netværkstype"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(forbudt)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Vælg netværk"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Afbrudt"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Forbundet"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Forbindelsen oprettes…"</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Der kunne ikke oprettes forbindelse"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA foretrækkes"</item>
     <item msgid="8442633436636425221">"Kun GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Opkald"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Netværk"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Udvidet 4G LTE-tilstand"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Avancerede opkald"</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="2382798156640007971">"Tillad dataforbrug"</string>
@@ -243,19 +238,18 @@
     <string name="roaming" msgid="7894878421600247140">"Roaming"</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="6843814381576397939">"Dataroaming er deaktiveret. Tryk for at aktivere."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Mobildataforbindelsen blev afbrudt"</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="1603164667540144353">"Du kan risikere at skulle betale høje gebyrer."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Kontakt din netværksudbyder for at få oplyst priser."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Vil du tillade dataroaming?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Dataforbrug fra apps"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Dataforbrug"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> mobildata er brugt i perioden <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Avanceret"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Mobilselskab"</string>
     <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"mobilselskab, esim, sim-kort, euicc, skift mobilselskab, tilføj mobilselskab"</string>
     <string name="carrier_settings_euicc_summary" msgid="5115001942761995457">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> – <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
     <string name="mobile_data_settings_title" msgid="4661165467914727157">"Mobildata"</string>
-    <string name="mobile_data_settings_summary" msgid="5087255915840576895">"Brug data via mobilnetværk"</string>
+    <string name="mobile_data_settings_summary" msgid="5087255915840576895">"Få adgang til data via mobilnetværk"</string>
     <string name="data_usage_disable_mobile" msgid="3577275288809667615">"Vil du deaktivere mobildata?"</string>
     <string name="sim_selection_required_pref" msgid="7049424902961844236">"Du har ikke valgt endnu"</string>
     <string name="sim_change_data_title" msgid="5332425991853799280">"Skift SIM-kortet til data?"</string>
@@ -390,7 +384,7 @@
     <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Aktivér enhed"</string>
-    <string name="cdma_lte_data_service" msgid="4255018217292548962">"Konfiguration af datatjeneste"</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">"Numre til begrænset opkald"</string>
     <string name="fdn_with_label" msgid="187084204115493366">"Begrænset opkald (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
@@ -417,8 +411,8 @@
     <string name="menu_add" msgid="1882023737425114762">"Tilføj kontakt"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Rediger kontakt"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Slet kontakt"</string>
-    <string name="menu_dial" msgid="3223106222819685808">"Ring til kontakt"</string>
-    <string name="get_pin2" msgid="8204677063922225311">"Angiv PIN2-kode"</string>
+    <string name="menu_dial" msgid="3223106222819685808">"Ring til kontaktperson"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"Indtast PIN2-kode"</string>
     <string name="name" msgid="7329028332786872378">"Navn"</string>
     <string name="number" msgid="7905950798349903858">"Nummer"</string>
     <string name="save" msgid="4094274636321939086">"Gem"</string>
@@ -447,7 +441,7 @@
     <string name="confirmPinLabel" msgid="257597715098070206">"Bekræft ny pinkode"</string>
     <string name="badPin" msgid="8955102849303984935">"Den gamle pinkode, du har indtastet, er forkert. Prøv igen."</string>
     <string name="mismatchPin" msgid="5923253370683071889">"PIN-koderne, som du har indtastet, stemmer ikke overens. Prøv igen."</string>
-    <string name="invalidPin" msgid="5981171102258684792">"Angiv en pinkode på mellem 4 og 8 tal."</string>
+    <string name="invalidPin" msgid="5981171102258684792">"Indtast en pinkode på mellem 4 og 8 tal."</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>
@@ -463,12 +457,12 @@
     <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">"Angiv en pinkode 2, som indeholder 4 til 8 cifre."</string>
-    <string name="invalidPuk2" msgid="7059081153334815973">"Angiv en PUK-kode 2, som indeholder 8 cifre."</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">"Angiv PUK-kode 2"</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. Angiv PUK-kode 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="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>
@@ -496,7 +490,7 @@
     <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_out_of_service_wfc" msgid="8741629779555132471">"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">"Angiv et gyldigt nummer 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="5891978320269774095">"Opkald mislykkedes."</string>
     <string name="incall_error_cannot_add_call" msgid="8878159278947023326">"Opkaldet kan ikke tilføjes lige nu. Du kan prøve at sende en besked i stedet."</string>
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Tjenesten er ikke understøttet"</string>
@@ -509,24 +503,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Opkald kan ikke sættes i venteposition."</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="incall_error_promote_wfc" msgid="106510757624022064">"Aktivér Wi-Fi-opkald for at foretage et opkald."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Info til nødsituationer"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Ejer"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Tryk igen for at se oplysninger"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Nødopkald"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Kun nødopkald"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Alarmnummer"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Alarmnumre"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Tryk igen for at ringe til <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Tænder for radio ..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Ingen tjeneste. Prøver igen..."</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Flytilstand kan ikke slås til under et nødopkald."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Det er ikke muligt at foretage nødopkald"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Politi"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Ambulance"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Brand"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</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>
@@ -547,9 +529,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Kontaktpersonen kunne ikke importeres"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Høreapparater"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Slå høreapparatskompatibilitet til"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Opkald via sms i realtid"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Tillad afsendelse af sms-beskeder i et taleopkald"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"Sms i realtid hjælper personer, som er døve, hørehæmmede, talehandicappede, eller som har brug for mere end bare tale, med at foretage opkald.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Få flere oplysninger&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; – Opkald via sms i realtid gemmes som en beskedtransskription\n       &lt;br&gt; – Sms i realtid er ikke tilgængeligt til videoopkald"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Slå RTT til eller fra"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY fra"</item>
     <item msgid="3971695875449640648">"Fuld TTY-tilstand"</item>
@@ -590,8 +571,8 @@
     <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Dataforbindelsen er deaktiveret"</string>
     <string name="phone_in_ecm_notification_complete_time" msgid="7730376844178948351">"Der er ingen dataforbindelse før kl. <xliff:g id="COMPLETETIME">%s</xliff:g>"</string>
     <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 apps, 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 apps, der kræver dataforbindelse. Vil du afslutte denne tilstand nu?</item>
+      <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>
@@ -607,13 +588,11 @@
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Ikke angivet&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"Andre indstillinger for opkald"</string>
     <string name="calling_via_template" msgid="4839419581866928142">"Opkald via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contactPhoto" msgid="4713193418046639466">"billede af kontakt"</string>
+    <string name="contactPhoto" msgid="4713193418046639466">"billede af kontaktperson"</string>
     <string name="goPrivate" msgid="865837794424530980">"gør privat"</string>
-    <string name="selectContact" msgid="781975788478987237">"vælg kontakt"</string>
+    <string name="selectContact" msgid="781975788478987237">"vælg kontaktperson"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Taleopkald understøttes ikke"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"ring op"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"vis numerisk tastatur"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Numerisk tastatur til nødopkald"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Visuel telefonsvarer"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Angiv pinkode"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Skift pinkode"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index d0ed79a..5df2aea 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -29,7 +29,7 @@
     <string name="ussdRunning" msgid="485588686340541690">"USSD-Code wird ausgeführt..."</string>
     <string name="mmiCancelled" msgid="2771923949751842276">"MMI-Code abgebrochen"</string>
     <string name="cancel" msgid="5044513931633602634">"Abbrechen"</string>
-    <string name="enter_input" msgid="1810529547726803893">"Die USSD-Nachricht muss zwischen <xliff:g id="MIN_LEN">%d</xliff:g> und <xliff:g id="MAX_LEN">%d</xliff:g> Zeichen lang sein. Bitte versuche es noch einmal."</string>
+    <string name="enter_input" msgid="1810529547726803893">"Die USSD-Nachricht muss zwischen <xliff:g id="MIN_LEN">%d</xliff:g> und <xliff:g id="MAX_LEN">%d</xliff:g> Zeichen lang sein. Bitte versuche es erneut."</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Telefonkonferenz verwalten"</string>
     <string name="ok" msgid="3811371167865772377">"OK"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Lautsprecher"</string>
@@ -72,7 +72,7 @@
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Kontoeinstellungen konfigurieren"</string>
     <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Alle Anrufkonten"</string>
     <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Auswählen, welche Konten Anrufe tätigen können"</string>
-    <string name="wifi_calling" msgid="739018212480165598">"WLAN-Telefonie"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Anrufe über WLAN"</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>
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Einstellungen werden zurückgesetzt..."</string>
     <string name="response_error" msgid="6674110501330139405">"Unerwartete Antwort von Netzwerk"</string>
     <string name="exception_error" msgid="7027667130619518211">"Netzwerk- oder SIM-Kartenfehler."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS-Anfrage wurde in normalen Anruf geändert"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS-Anfrage wurde in USSD-Anfrage geändert"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"In neue SS-Anfrage geändert"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS-Anfrage wurde in Videoanruf geändert"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS-Anfrage wurde in DIAL-Anfrage geändert."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS-Anfrage wurde in USSD-Anfrage geändert."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS-Anfrage wurde in neue SS-Anfrage geändert."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS-Anfrage wurde in Video-DIAL-Anfrage geändert."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"Da die Anrufbegrenzung in deiner Telefon-App aktiviert ist, funktionieren nicht alle Anruffunktionen."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Aktiviere deine Mobilfunkverbindung, bevor du diese Einstellungen anzeigst."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
@@ -163,10 +163,10 @@
     <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>
-    <string name="network_query_error" msgid="8466081377231178298">"Netzwerke nicht gefunden. Bitte versuche es noch einmal."</string>
+    <string name="network_query_error" msgid="6828516148953325006">"Fehler bei der Netzwerksuche"</string>
     <string name="register_on_network" msgid="9055203954040805084">"Registrierung in <xliff:g id="NETWORK">%s</xliff:g> läuft..."</string>
     <string name="not_allowed" msgid="5613353860205691579">"Deine SIM-Karte unterstützt keine Verbindung mit diesem Netzwerk."</string>
-    <string name="connect_later" msgid="2308119155752343975">"Momentan kann keine Verbindung zu diesem Netzwerk aufgebaut werden. Bitte versuche es später noch einmal."</string>
+    <string name="connect_later" msgid="2308119155752343975">"Momentan kann keine Verbindung zu diesem Netzwerk aufgebaut werden. Bitte versuche es später erneut."</string>
     <string name="registration_done" msgid="495135664535876612">"In Netzwerk registriert."</string>
     <string name="already_auto" msgid="6067116884321285507">"Bereits automatisch ausgewählt."</string>
     <string name="select_automatically" msgid="1046727200631770962">"Netzwerk automatisch auswählen"</string>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Netzwerkbetriebsmodus ändern"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Bevorzugter Netzwerktyp"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(nicht zulässig)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Netzwerk auswählen"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Nicht verbunden"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Verbunden"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Verbindung wird hergestellt..."</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Verbindung nicht möglich"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA bevorzugt"</item>
     <item msgid="8442633436636425221">"Nur GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Anrufe"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Netzwerk"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Erweiterter 4G LTE-Modus"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Erweiterte Anruffunktionen"</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="2382798156640007971">"Datennutzung zulassen"</string>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"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="6843814381576397939">"Daten-Roaming ist deaktiviert. Zum Aktivieren tippen."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Keine mobile Datenverbindung"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Die Datenverbindung wurde unterbrochen, weil du dein privates Netzwerk verlassen hast und Daten-Roaming nicht aktiviert ist."</string>
     <string name="roaming_warning" msgid="1603164667540144353">"Es können hohe Gebühren anfallen."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Wende dich an deinen Netzwerkanbieter, um Preisinformationen zu erhalten."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Daten-Roaming zulassen?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Datennutzung durch Apps"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Datennutzung"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"Im Zeitraum <xliff:g id="ID_2">%2$s</xliff:g> genutzte mobile Daten: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Erweitert"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Mobilfunkanbieter"</string>
@@ -260,7 +254,7 @@
     <string name="sim_selection_required_pref" msgid="7049424902961844236">"Auswahl erforderlich"</string>
     <string name="sim_change_data_title" msgid="5332425991853799280">"SIM für mobile Daten ändern?"</string>
     <string name="sim_change_data_message" msgid="2163963581444907496">"<xliff:g id="NEW_SIM">%1$s</xliff:g> anstelle von <xliff:g id="OLD_SIM">%2$s</xliff:g> für mobile Daten verwenden?"</string>
-    <string name="wifi_calling_settings_title" msgid="7741961465416430470">"WLAN-Telefonie"</string>
+    <string name="wifi_calling_settings_title" msgid="7741961465416430470">"Anrufe über WLAN"</string>
     <string name="video_calling_settings_title" msgid="539714564273795574">"Videoanrufe über Mobilfunkanbieter"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"GSM-/UMTS-Optionen"</string>
     <string name="cdma_options" msgid="4016822858172249884">"CDMA-Optionen"</string>
@@ -376,9 +370,9 @@
     <item msgid="176474317493999285">"Nur Heimatnetz"</item>
     <item msgid="1205664026446156265">"Automatisch"</item>
   </string-array>
-    <string name="cdma_subscription_title" msgid="1162564010076763284">"CDMA-Abo"</string>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"CDMA-Abonnement"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"Zwischen RUIM/SIM und NV wechseln"</string>
-    <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"Abo"</string>
+    <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"Abonnement"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
@@ -443,8 +437,8 @@
     <string name="oldPinLabel" msgid="5287773661246368314">"Alte PIN"</string>
     <string name="newPinLabel" msgid="207488227285336897">"Neue PIN"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"Neue PIN bestätigen"</string>
-    <string name="badPin" msgid="8955102849303984935">"Die eingegebene alte PIN ist nicht korrekt. Bitte versuche es noch einmal."</string>
-    <string name="mismatchPin" msgid="5923253370683071889">"Die eingegebenen PIN-Codes stimmen nicht überein. Bitte versuche es noch einmal."</string>
+    <string name="badPin" msgid="8955102849303984935">"Die eingegebene alte PIN ist nicht korrekt. Bitte versuche es erneut."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"Die eingegebenen PIN-Codes stimmen nicht überein. Bitte versuche es erneut."</string>
     <string name="invalidPin" msgid="5981171102258684792">"Gib eine 4- bis 8-stellige PIN ein."</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>
@@ -458,9 +452,9 @@
     <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="7910064009531541708">"Falscher PUK2. Bitte versuche es noch einmal."</string>
-    <string name="badPin2" msgid="6646896629970023109">"Falsche PIN2. Bitte versuche es noch einmal."</string>
-    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2-Eingaben stimmen nicht überein. Bitte versuche es noch einmal."</string>
+    <string name="badPuk2" msgid="7910064009531541708">"Falscher PUK2. Bitte versuche es erneut."</string>
+    <string name="badPin2" msgid="6646896629970023109">"Falsche PIN2. Bitte versuche es erneut."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2-Eingaben stimmen nicht überein. Bitte versuche es erneut."</string>
     <string name="invalidPin2" msgid="1757045131429105595">"Gib eine 4- bis 8-stellige PIN2 ein."</string>
     <string name="invalidPuk2" msgid="7059081153334815973">"Gib einen 4- bis 8-stelligen PUK2 ein."</string>
     <string name="pin2_changed" msgid="3724522579945610956">"PIN2 aktualisiert"</string>
@@ -506,25 +500,13 @@
     <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Anrufe können nicht freigegeben werden."</string>
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Anrufe können nicht gehalten werden."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Stelle zum Telefonieren eine WLAN-Verbindung her."</string>
-    <string name="incall_error_promote_wfc" msgid="106510757624022064">"Aktiviere WLAN-Telefonie, um anzurufen."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Notfallinformationen"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Eigentümer"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Noch einmal tippen, um Informationen anzuzeigen"</string>
+    <string name="incall_error_promote_wfc" msgid="106510757624022064">"Aktiviere Anrufe über WLAN, um anzurufen."</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Notruf"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Nur Notrufe"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Notrufnummer"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Notrufnummern"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Noch einmal tippen, um <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g> anzurufen"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Mobilfunkverbindung wird aktiviert..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Kein Service. Erneuter Versuch..."</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Während eines Notrufs ist das Wechseln in den Flugmodus nicht möglich."</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ähle eine Notrufnummer."</string>
-    <string name="dial_emergency_calling_not_available" msgid="5675557523782491826">"Notruf nicht verfügbar"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Polizei"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Krankenwagen"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Feuerwehr"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</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>
@@ -545,9 +527,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Fehler beim Importieren des Kontakts"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Hörhilfen"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Hörhilfekompatibilität aktivieren"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"RTT-Anruf"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Nachrichten in Sprachanrufen erlauben"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"Echtzeittext (Real-Time Text, RTT) dient als Unterstützung für Anrufer, die gehörlos, schwerhörig oder sprachgeschädigt sind oder zusätzlich zur gesprochenen Sprache weitere Informationen benötigen.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Weitere Informationen&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; – RTT-Anrufe werden als Nachrichtentranskripte gespeichert\n       &lt;br&gt; – RTT ist nicht für Videoanrufe verfügbar"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"RTT aktivieren/deaktivieren"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY aus"</item>
     <item msgid="3971695875449640648">"TTY (vollständig)"</item>
@@ -610,8 +591,6 @@
     <string name="selectContact" msgid="781975788478987237">"Kontakt wählen"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Sprachanruf wird nicht unterstützt."</string>
     <string name="description_dial_button" msgid="7459705245418435351">"Wählen"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"Wähltasten anzeigen"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Wähltasten für Notruf"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Visuelle Mailbox"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"PIN festlegen"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"PIN ändern"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 2cf3453..53396e3 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Επαναφορά ρυθμίσεων…"</string>
     <string name="response_error" msgid="6674110501330139405">"Μη αναμενόμενη απάντηση από το δίκτυο."</string>
     <string name="exception_error" msgid="7027667130619518211">"Σφάλμα δικτύου ή κάρτας SIM."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"Το αίτημα SS άλλαξε σε κανονική κλήση"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"Το αίτημα SS άλλαξε σε αίτημα USSD"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Άλλαξε σε νέο αίτημα SS"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"Το αίτημα SS άλλαξε σε βιντεοκλήση"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"Το αίτημα SS τροποποιήθηκε σε αίτημα DIAL."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"Το αίτημα SS τροποποιήθηκε σε αίτημα USSD."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"Το αίτημα SS τροποποιήθηκε σε νέο αίτημα SS."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"Το αίτημα SS τροποποιήθηκε σε αίτημα Video DIAL."</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>
@@ -163,7 +163,7 @@
     <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="network_query_error" msgid="8466081377231178298">"Δεν ήταν δυνατή η εύρεση δικτύων. Δοκιμάστε ξανά."</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>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Αλλαγή κατάστασης λειτουργίας δικτύου"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Προτιμώμενος τύπος δικτύου"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(απαγορευμένο)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Επιλογή δικτύου"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Αποσυνδεδεμένο"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Συνδέθηκε"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Σύνδεση…"</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Αδυναμία σύνδεσης"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"Προτιμώνται GSM/WCDMA"</item>
     <item msgid="8442633436636425221">"Μόνο GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Κλήση"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Δίκτυο"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Βελτιωμένη λειτουργία 4G LTE"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Προηγμένες λειτουργίες κλήσης"</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>
@@ -243,13 +238,12 @@
     <string name="roaming" msgid="7894878421600247140">"Περιαγωγή"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Σύνδεση στις υπηρεσίες δεδομένων κατά την περιαγωγή"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Σύνδεση στις υπηρεσίες δεδομένων κατά την περιαγωγή"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"Η περιαγωγή δεδομένων είναι απενεργοποιημένη. Πατήστε για να την ενεργοποιήσετε."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Απώλεια σύνδεσης δεδομένων κινητής τηλεφωνίας"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Χάσατε τη σύνδεση δεδομένων επειδή φύγατε από το οικείο δίκτυο έχοντας την περιαγωγή δεδομένων απενεργοποιημένη."</string>
     <string name="roaming_warning" msgid="1603164667540144353">"Ενδέχεται να επιβαρυνθείτε με σημαντικές χρεώσεις."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Επικοινωνήστε με τον πάροχο του δικτύου για τις τιμές."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Να επιτρέπεται η περιαγωγή δεδομένων;"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Χρήση δεδομένων εφαρμογής"</string>
-    <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> δεδομένων κινητής τηλεφωνίας χρησιμοποιήθηκαν μεταξύ <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Χρήση δεδομένων"</string>
+    <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> δεδομένα κινητής τηλεφωνίας σε χρήση μεταξύ <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Σύνθετες ρυθμίσεις"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Εταιρεία κινητής τηλεφωνίας"</string>
     <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"εταιρεία κινητής τηλεφωνίας, esim, sim, euicc, αλλαγή εταιρείας κινητής τηλεφωνίας, προσθήκη εταιρείας κινητής τηλεφωνίας"</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Δεν είναι δυνατή η αναμονή κλήσεων."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Συνδεθείτε σε ασύρματο δίκτυο για να πραγματοποιήσετε μια κλήση."</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"Ενεργοποιήστε τη δυνατότητα κλήσεων μέσω Wi-Fi για να πραγματοποιήσετε μια κλήση."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Πληροφορίες έκτακτης ανάγκης"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Κάτοχος"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Πατήστε ξανά για προβολή πληροφοριών"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Κλήσεις επείγουσας ανάγκης"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Μόνο κλήσεις έκτακτης ανάγκης"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Αριθμός έκτακτης ανάγκης"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Αριθμοί έκτακτης ανάγκης"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Πατήστε ξανά για να καλέσετε τον αριθμό <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Ενεργοποίηση πομπού..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Δεν υπάρχει υπηρεσία. Νέα προσπάθεια…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Δεν είναι δυνατή η ενεργοποίηση της λειτουργίας πτήσης κατά τη διάρκεια μιας κλήσης έκτακτης ανάγκης."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Η δυνατότητα κλήσεων έκτακτης ανάγκης δεν είναι διαθέσιμη"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Αστυνομία"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Ασθενοφόρο"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Πυροσβεστική"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Χρησιμοποιήστε το πληκτρολόγιο για να πραγματοποιήσετε καλέσετε έναν αριθμό"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Αναμονή"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Τέλος"</string>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Αποτυχία εισαγωγής επαφής"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Βοηθήματα ακρόασης"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Ενεργοποίηση συμβατότητας βοηθήματος ακρόασης"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Κλήση με αποστολή κειμένου σε πραγματικό χρόνο (RTT)"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Να επιτρέπεται η ανταλλαγή μηνυμάτων σε μια φωνητική κλήση"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"Η λειτουργία RTT υποβοηθά καλούντες που αντιμετωπίζουν προβλήματα ακοής ή ομιλίας ή θέλουν κάτι περισσότερο από απλή φωνητική επικοινωνία.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Μάθετε περισσότερα&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - Οι κλήσεις RTT αποθηκεύονται ως μεταγραφές μηνυμάτων\n       &lt;br&gt; - Η λειτουργία RTT δεν είναι διαθέσιμη για βιντεοκλήσεις"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Ενεργοποίηση ή απενεργοποίηση RTT"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY Απενεργοποιήθηκε"</item>
     <item msgid="3971695875449640648">"TTY Full"</item>
@@ -606,8 +587,6 @@
     <string name="selectContact" msgid="781975788478987237">"επιλογή επαφής"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Η φωνητική κλήση δεν υποστηρίζεται"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"κλήση"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"εμφάνιση πληκτρολογίου κλήσης"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Πληκτρολόγιο έκτακτης ανάγκης"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Οπτικός αυτόματος τηλεφ."</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Ορισμός PIN"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Αλλαγή PIN"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 8f01e06..cce7ebc 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -127,10 +127,10 @@
     <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="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS request changed to regular call"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS request changed to USSD request"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Changed to new SS request"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS request changed to video call"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS request modified to DIAL request."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS request modified to USSD request."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS request modified to new SS request."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS request modified to Video DIAL request."</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>
@@ -163,7 +163,7 @@
     <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="network_query_error" msgid="8466081377231178298">"Couldn\'t find networks. Try again."</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>
@@ -176,11 +176,6 @@
     <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="forbidden_network" msgid="4384929668343563440">"(forbidden)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Choose network"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Disconnected"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Connected"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Connecting…"</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Couldn’t connect"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA preferred"</item>
     <item msgid="8442633436636425221">"GSM only"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Calling"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Network"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Enhanced 4G LTE Mode"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Advanced calling"</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>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"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="6843814381576397939">"Data roaming is turned off. Tap to turn on."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Lost mobile data connection"</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_check_price_warning" msgid="7497570906830902550">"Check with your network provider for pricing."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Allow data roaming?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"App data usage"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Data usage"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> mobile data used <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Advanced"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Operator"</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Can\'t hold calls."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Connect to a wireless network to make a call."</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"Enable Wi-Fi calling to make a call."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Emergency information"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Owner"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Tap again to view info"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Emergency call"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Emergency calls only"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Emergency number"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Emergency numbers"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Tap again to call <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</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="radio_off_during_emergency_call" msgid="2535800034010306830">"Cannot enter aeroplane mode during an emergency call."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Emergency calling not available"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Police"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Ambulance"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Fire"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</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>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Failed to import contact"</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 name="rtt_mode_title" msgid="6954652435543570121">"Real-time text (RTT) call"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Allow messaging within a voice call"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"RTT assists callers who are deaf, hard of hearing, have a speech disability or need more than voice alone.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Learn more&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; – RTT calls are saved as a message transcript\n       &lt;br&gt; – RTT is not available for video calls"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Turn RTT on or off"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY off"</item>
     <item msgid="3971695875449640648">"TTY full"</item>
@@ -606,8 +587,6 @@
     <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="description_dialpad_button" msgid="5220006811894230590">"show dial pad"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Emergency dial pad"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Visual Voicemail"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Set PIN"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Change PIN"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 8f01e06..cce7ebc 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -127,10 +127,10 @@
     <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="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS request changed to regular call"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS request changed to USSD request"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Changed to new SS request"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS request changed to video call"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS request modified to DIAL request."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS request modified to USSD request."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS request modified to new SS request."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS request modified to Video DIAL request."</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>
@@ -163,7 +163,7 @@
     <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="network_query_error" msgid="8466081377231178298">"Couldn\'t find networks. Try again."</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>
@@ -176,11 +176,6 @@
     <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="forbidden_network" msgid="4384929668343563440">"(forbidden)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Choose network"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Disconnected"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Connected"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Connecting…"</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Couldn’t connect"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA preferred"</item>
     <item msgid="8442633436636425221">"GSM only"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Calling"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Network"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Enhanced 4G LTE Mode"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Advanced calling"</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>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"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="6843814381576397939">"Data roaming is turned off. Tap to turn on."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Lost mobile data connection"</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_check_price_warning" msgid="7497570906830902550">"Check with your network provider for pricing."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Allow data roaming?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"App data usage"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Data usage"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> mobile data used <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Advanced"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Operator"</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Can\'t hold calls."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Connect to a wireless network to make a call."</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"Enable Wi-Fi calling to make a call."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Emergency information"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Owner"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Tap again to view info"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Emergency call"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Emergency calls only"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Emergency number"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Emergency numbers"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Tap again to call <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</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="radio_off_during_emergency_call" msgid="2535800034010306830">"Cannot enter aeroplane mode during an emergency call."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Emergency calling not available"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Police"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Ambulance"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Fire"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</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>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Failed to import contact"</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 name="rtt_mode_title" msgid="6954652435543570121">"Real-time text (RTT) call"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Allow messaging within a voice call"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"RTT assists callers who are deaf, hard of hearing, have a speech disability or need more than voice alone.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Learn more&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; – RTT calls are saved as a message transcript\n       &lt;br&gt; – RTT is not available for video calls"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Turn RTT on or off"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY off"</item>
     <item msgid="3971695875449640648">"TTY full"</item>
@@ -606,8 +587,6 @@
     <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="description_dialpad_button" msgid="5220006811894230590">"show dial pad"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Emergency dial pad"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Visual Voicemail"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Set PIN"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Change PIN"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 8f01e06..cce7ebc 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -127,10 +127,10 @@
     <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="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS request changed to regular call"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS request changed to USSD request"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Changed to new SS request"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS request changed to video call"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS request modified to DIAL request."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS request modified to USSD request."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS request modified to new SS request."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS request modified to Video DIAL request."</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>
@@ -163,7 +163,7 @@
     <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="network_query_error" msgid="8466081377231178298">"Couldn\'t find networks. Try again."</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>
@@ -176,11 +176,6 @@
     <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="forbidden_network" msgid="4384929668343563440">"(forbidden)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Choose network"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Disconnected"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Connected"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Connecting…"</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Couldn’t connect"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA preferred"</item>
     <item msgid="8442633436636425221">"GSM only"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Calling"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Network"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Enhanced 4G LTE Mode"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Advanced calling"</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>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"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="6843814381576397939">"Data roaming is turned off. Tap to turn on."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Lost mobile data connection"</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_check_price_warning" msgid="7497570906830902550">"Check with your network provider for pricing."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Allow data roaming?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"App data usage"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Data usage"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> mobile data used <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Advanced"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Operator"</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Can\'t hold calls."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Connect to a wireless network to make a call."</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"Enable Wi-Fi calling to make a call."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Emergency information"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Owner"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Tap again to view info"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Emergency call"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Emergency calls only"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Emergency number"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Emergency numbers"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Tap again to call <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</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="radio_off_during_emergency_call" msgid="2535800034010306830">"Cannot enter aeroplane mode during an emergency call."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Emergency calling not available"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Police"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Ambulance"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Fire"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</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>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Failed to import contact"</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 name="rtt_mode_title" msgid="6954652435543570121">"Real-time text (RTT) call"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Allow messaging within a voice call"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"RTT assists callers who are deaf, hard of hearing, have a speech disability or need more than voice alone.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Learn more&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; – RTT calls are saved as a message transcript\n       &lt;br&gt; – RTT is not available for video calls"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Turn RTT on or off"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY off"</item>
     <item msgid="3971695875449640648">"TTY full"</item>
@@ -606,8 +587,6 @@
     <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="description_dialpad_button" msgid="5220006811894230590">"show dial pad"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Emergency dial pad"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Visual Voicemail"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Set PIN"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Change PIN"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 8f01e06..cce7ebc 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -127,10 +127,10 @@
     <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="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS request changed to regular call"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS request changed to USSD request"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Changed to new SS request"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS request changed to video call"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS request modified to DIAL request."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS request modified to USSD request."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS request modified to new SS request."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS request modified to Video DIAL request."</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>
@@ -163,7 +163,7 @@
     <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="network_query_error" msgid="8466081377231178298">"Couldn\'t find networks. Try again."</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>
@@ -176,11 +176,6 @@
     <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="forbidden_network" msgid="4384929668343563440">"(forbidden)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Choose network"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Disconnected"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Connected"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Connecting…"</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Couldn’t connect"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA preferred"</item>
     <item msgid="8442633436636425221">"GSM only"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Calling"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Network"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Enhanced 4G LTE Mode"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Advanced calling"</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>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"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="6843814381576397939">"Data roaming is turned off. Tap to turn on."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Lost mobile data connection"</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_check_price_warning" msgid="7497570906830902550">"Check with your network provider for pricing."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Allow data roaming?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"App data usage"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Data usage"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> mobile data used <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Advanced"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Operator"</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Can\'t hold calls."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Connect to a wireless network to make a call."</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"Enable Wi-Fi calling to make a call."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Emergency information"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Owner"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Tap again to view info"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Emergency call"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Emergency calls only"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Emergency number"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Emergency numbers"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Tap again to call <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</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="radio_off_during_emergency_call" msgid="2535800034010306830">"Cannot enter aeroplane mode during an emergency call."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Emergency calling not available"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Police"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Ambulance"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Fire"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</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>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Failed to import contact"</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 name="rtt_mode_title" msgid="6954652435543570121">"Real-time text (RTT) call"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Allow messaging within a voice call"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"RTT assists callers who are deaf, hard of hearing, have a speech disability or need more than voice alone.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Learn more&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; – RTT calls are saved as a message transcript\n       &lt;br&gt; – RTT is not available for video calls"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Turn RTT on or off"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY off"</item>
     <item msgid="3971695875449640648">"TTY full"</item>
@@ -606,8 +587,6 @@
     <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="description_dialpad_button" msgid="5220006811894230590">"show dial pad"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Emergency dial pad"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Visual Voicemail"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Set PIN"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Change PIN"</string>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index fee2214..097e36b 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -127,10 +127,10 @@
     <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="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‏‎‏‏‎‎‏‏‏‏‎‎‎‏‎‏‏‏‏‏‏‎‎‎‏‎‏‎‏‎‏‏‎‏‎‏‎‏‏‎‎‎‏‏‎‎‎‏‎‏‎‏‏‎‏‎‎‎‏‎SS request changed to regular call‎‏‎‎‏‎"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‎‏‏‎‎‎‏‎‏‎‏‏‎‏‎‏‎‏‎‏‏‏‎‎‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‎‏‏‎‏‏‏‎‎‏‏‎‎‎‎‎SS request changed to USSD request‎‏‎‎‏‎"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‎‏‎‏‏‏‏‎‏‎‎‎‎‏‏‎‏‏‎‏‏‏‏‏‎‏‏‏‏‏‎‏‎‎‎‏‎‎‎‏‎‎‏‏‏‎‎‎‎‎‎‏‎‎Changed to new SS request‎‏‎‎‏‎"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‎‏‏‎‎‎‏‎‏‏‎‎‎‎‏‎‏‎‎‎‎‎‏‎‏‏‎‏‎‎‎‏‎‏‎‎‏‎‏‎SS request changed to video call‎‏‎‎‏‎"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‎‏‏‏‎‎‎‏‎‏‏‏‎‎‏‏‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‏‎‎‎‏‎‎‎‎‏‏‎‏‎‏‏‎‏‏‎‎‎‎‏‏‎‎SS request modified to DIAL request.‎‏‎‎‏‎"</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‎‎‏‏‎‏‎‎‏‎‏‎‎‎‎‏‏‏‏‎‏‎‏‎‎‏‎‎‏‎‏‏‎‏‎‎‎‏‏‏‎‎‎SS request modified to USSD request.‎‏‎‎‏‎"</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‏‏‎‎‎‏‎‎‎‏‎‏‎‎‏‏‎‏‎‎‏‏‏‏‎‏‎‎‎‎‏‏‏‎‎‏‎‎‎‏‎‎‎‏‏‎‎‎‏‏‏‏‏‏‎SS request modified to new SS request.‎‏‎‎‏‎"</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‎‏‎‏‏‏‎‎‏‏‎‎‎‎‏‏‎‎‏‎‏‏‏‏‏‏‎‎‏‏‎‏‏‎‎‎‎‎‏‏‎‏‎‏‎‏‎‎‏‏‏‎‎‏‎‎‎‏‏‎SS request modified to Video DIAL request.‎‏‎‎‏‎"</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‎‎‎‎‎‎‏‎‏‎‏‎‎‏‎‏‎‏‏‏‎‎‏‎‏‏‏‏‏‎‎‏‏‎‏‏‏‏‎‎‏‏‎‎‎‎‏‏‏‏‏‎‏‎‎Your Phone app\'s Fixed Dialing Numbers setting is turned on. As a result, some call-related features aren\'t working.‎‏‎‎‏‎"</string>
     <string name="radio_off_error" msgid="2304459933248513376">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‏‎‎‎‎‏‏‎‎‏‏‎‎‎‏‎‎‎‎‏‏‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‏‎‎‎‎‎‎Turn on the radio before viewing these settings.‎‏‎‎‏‎"</string>
     <string name="close_dialog" msgid="2365884406356986917">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‎‎‎‎‏‏‎‏‎‏‎‏‎‏‎‎‏‏‏‏‎‏‎‏‎‏‎‏‎‎‏‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‎‎‏‏‎‎‎‎‏‎‎‏‎‏‎OK‎‏‎‎‏‎"</string>
@@ -163,7 +163,7 @@
     <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="network_query_error" msgid="8466081377231178298">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‎‎‏‎‏‎‎‎‎‏‎‎‏‎‎‏‎‏‏‎‏‎‏‎‎‎‎‎‏‎‏‎‎‎‏‏‏‎‏‎‎Couldn\'t find networks. Try again.‎‏‎‎‏‎"</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 right now. Try again later.‎‏‎‎‏‎"</string>
@@ -176,11 +176,6 @@
     <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="forbidden_network" msgid="4384929668343563440">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‎‏‏‎‏‎‎‏‏‎‎‏‏‎‎‏‎‎‏‏‎‏‎‎‎‎‏‏‏‎‏‎‏‏‎‎‎‎‏‎‎‎‎‏‎‎‏‎‏‏‎‎‎‎‎(forbidden)‎‏‎‎‏‎"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‎‏‏‏‎‏‎‎‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‎‏‎‎‎‎‎‎‎‏‎‎‎‏‎‎‎‏‏‎‎Choose network‎‏‎‎‏‎"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‏‏‎‎‏‎‎‏‏‎‎‎‏‎‎‏‏‎‏‏‎‏‎‎‎‎‏‏‏‎‎‏‏‏‎‏‏‎‏‎‏‎‎‏‏‎‏‎‎Disconnected‎‏‎‎‏‎"</string>
-    <string name="network_connected" msgid="1288589103624338857">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‎‎‎‏‏‏‏‎‎‎‎‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‎‎‏‏‎‎‏‏‎‏‏‏‏‎‏‏‏‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‏‎Connected‎‏‎‎‏‎"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‏‎‎‎‎‎‏‏‏‏‎‎‎‏‎‎‎‏‏‏‎‎‏‎‎‎‏‏‎‏‏‏‎‎‏‎‏‎‎‎‎‏‏‎‏‏‏‏‎‏‎‏‏‏‎Connecting...‎‏‎‎‏‎"</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‎‏‏‎‎‎‎‏‎‎‎‎‏‏‏‎‎‏‎‎‏‎‏‎‏‏‏‎‏‏‎‏‏‏‎‎‎‎‎‎‏‏‏‏‎‏‏‎‎‏‎‏‏‎Couldn’t connect‎‏‎‎‏‎"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‏‏‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‎‏‏‏‏‎‏‏‎‎‏‏‏‎‏‏‎‎‎‎‎GSM/WCDMA preferred‎‏‎‎‏‎"</item>
     <item msgid="8442633436636425221">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‏‎‏‎‎‏‎‎‎‎‏‎‎‏‏‎‎‎‎‏‎‎‏‎‏‏‏‏‏‎‎‎‏‏‎‎‏‎‏‎‏‏‎‎‎‎‎‎‎‏‎‏‎GSM only‎‏‎‎‏‎"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‏‎‎‎‎‏‎‎‎‎‏‎‎‏‎‎‎‏‏‎‎‏‏‏‎‏‎‎‎‏‏‎‏‎‏‎‎‏‎‏‎‎‏‏‎‎‎‎‏‎‎‏‎‎‎Calling‎‏‎‎‏‎"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‎‎‏‎‏‎‎‎‎‏‏‎‎‏‏‏‎‏‎‏‏‎‎‏‏‏‎‏‏‎‎‎‏‏‏‏‎‏‏‏‎‎‏‏‎‎‏‏‎‏‎‏‎‎‎Network‎‏‎‎‏‎"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‏‏‎‎‏‏‏‏‏‏‎‎‏‏‎‎‏‎‏‎‎‎‏‎‏‎‎‎‎‎‏‎‎‎‎‎‏‏‏‎‏‏‎‎‏‏‎‎‎‎‎‎‎‎‎‎‏‏‎Enhanced 4G LTE Mode‎‏‎‎‏‎"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‎‏‏‎‎‏‏‎‏‏‎‏‏‏‎‏‎‏‎‎‎‎‏‎‏‎‎‎‎‏‎‎‏‎‏‏‎‏‎‎‏‏‏‏‎‏‎‏‏‏‏‏‏‎‎Advanced Calling‎‏‎‎‏‎"</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>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‏‎‎‎‎‎‎‏‏‏‏‏‎‎‎‎‏‏‎‎‎‎‏‏‏‏‎‎‎‎‏‏‎‎‎‎‏‎‎‎‏‏‏‎‏‎‏‏‎‎‏‎‎‎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="6843814381576397939">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‏‎‎‏‏‏‎‏‎‏‏‏‎‎‎‎‎‏‎‏‎‎‏‎‎‏‎‎‎‏‎‎‏‎‎‎‏‏‏‎‎‏‏‎Data roaming is turned off. Tap to turn on.‎‏‎‎‏‎"</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‎‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‎‎‎‏‎‏‎‏‎‎‏‎‎‎‎‏‎‏‎‎‎‎‎‏‏‏‏‎‎‎‏‏‎‎Lost mobile data connection‎‏‎‎‏‎"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‏‏‏‏‏‏‎‎‏‏‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‏‎‏‎‏‎‎‏‏‏‏‎‎‏‏‎‏‏‏‎‎‎‎‏‏‎You\'ve 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_check_price_warning" msgid="7497570906830902550">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‎‏‏‎‎‏‎‏‏‏‎‎‏‎‎‎‎‎‏‎‎‎‎‎‏‎‎‏‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‎‏‎‎‎‏‎‏‏‎‎Check with your network provider for pricing.‎‏‎‎‏‎"</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‎‎‏‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‎‏‏‎‏‎‎‏‏‎‎‎‏‏‎‏‎‎‎‏‏‎‏‎‎‎‎‎‏‎‎‎‏‎‏‏‎‎‎‎Allow data roaming?‎‏‎‎‏‎"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‎‎‎‎‎‎‏‏‎‎‎‏‏‎‎‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‏‎‎‎‏‎‎‏‎‏‏‏‎‏‏‎App data usage‎‏‎‎‏‎"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‎‎‎‎‏‏‎‏‎‏‏‎‎‏‎‏‎‏‏‎‏‏‎‏‏‏‎‎‏‏‏‏‎‏‎‎‏‎‎‏‏‏‎‏‏‎‎‏‎‏‎‎Data usage‎‏‎‎‏‎"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‎‎‏‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‏‏‎‏‎‏‏‎‏‏‏‎‎‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‎‎‎‏‎‎‏‏‎<xliff:g id="ID_1">%1$s</xliff:g>‎‏‎‎‏‏‏‎ mobile data used ‎‏‎‎‏‏‎<xliff:g id="ID_2">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‏‏‏‏‏‏‎‎‏‎‏‎‏‎‏‎‏‏‏‏‎‎‎‏‎‏‏‏‏‏‎‎‎‏‎‏‎‏‏‎‎‎‏‎‏‎‏‎‎‎‏‏‎Advanced‎‏‎‎‏‎"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‏‏‎‏‎‎‏‎‎‏‎‎‏‎‎‏‏‎‎‏‏‎‏‏‏‎‎‎‏‎‏‏‏‏‎‎‎‏‎‏‏‏‏‎‎‎‏‎‎‏‎‏‎Carrier‎‏‎‎‏‎"</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‎‎‎‏‎‎‎‏‎‏‎‏‏‏‏‎‎‎‏‏‎‏‎‎‎‏‎‎‎‏‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎Can\'t hold calls.‎‏‎‎‏‎"</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‎‎‎‎‎‏‎‏‏‏‏‏‎‎‏‎‎‎‏‏‎‏‎‎‎‎‎‏‎‏‎‏‎‏‎‏‎‏‏‎‎‏‎Connect to a wireless network to make a call.‎‏‎‎‏‎"</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‎‎‏‏‎‏‏‏‏‎‏‎‎‏‏‎‎‏‏‎‏‏‏‏‏‎‎‎‎‏‎‎‎‎‎‎‏‏‏‏‎‎‎‎‎‎‎‎‎‏‎‎‎‎‏‏‎‎‎‎‎Enable Wi-Fi calling to make a call.‎‏‎‎‏‎"</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‎‏‏‎‎‎‏‎‎‏‏‎‎‏‎‎‏‎‏‏‏‎‎‎‎‎‎‎‎‏‎‎‎‎‎‎‎‎‎‏‏‎‏‎‏‏‎‏‎‏‏‎‏‏‏‏‏‏‎Emergency information‎‏‎‎‏‎"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‎‏‎‎‏‏‎‎‎‏‏‎‏‎‏‏‏‎‎‎‏‏‏‎‏‎‎‏‏‏‎‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‎‏‎‎‏‏‏‏‎‎‏‏‏‎‏‎Owner‎‏‎‎‏‎"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‎‎‎‎‎‎‎‏‏‎‏‎‏‏‏‎‏‎‎‏‎‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‎‎‏‎‏‎‎‎‏‎‎‎‏‏‏‎‎‏‏‎‎Tap again to view info‎‏‎‎‏‎"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‏‏‏‎‎‏‎‏‏‎‏‏‎‏‎‎‎‎‎‏‏‎‎‏‏‏‎‏‏‏‎‎‎‎‏‏‏‎‏‎‏‏‎‎‎‏‎‏‎‏‎‎‎‏‎Emergency call‎‏‎‎‏‎"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‏‏‎‎‎‏‎‎‎‎‎‎‏‏‎‎‏‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‏‎‎‎‏‎Emergency calls only‎‏‎‎‏‎"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‎‏‎‎‏‎‏‎‏‎‎‎‎‎‏‏‏‏‏‎‎‎‏‎‏‏‎‎‏‏‏‎‏‎‎‎‎‏‏‏‎‎‏‏‎‏‎‏‏‎‎‎‏‏‎Emergency number‎‏‎‎‏‎"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‎‏‎‏‎‎‏‏‏‎‏‏‏‎‏‎‎‏‏‏‎‏‏‎‎‏‎‏‏‏‎‏‏‎‏‏‎‎‏‎‎‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‏‎‏‎‎Emergency numbers‎‏‎‎‏‎"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‎‎‏‎‏‎‏‎‎‎‏‏‎‎‏‎‎‏‏‏‏‏‏‎‏‎‏‎‏‏‏‎‎‏‏‏‎‏‎‏‎‎‏‏‎‏‎‎‏‏‏‏‎‎‎Tap again to call ‎‏‎‎‏‏‎<xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</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="radio_off_during_emergency_call" msgid="2535800034010306830">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‏‎‎‎‎‏‏‏‏‏‎‎‎‏‎‏‏‎‎‏‎‎‎‎‏‏‎‎‎‏‎‎‏‏‎‏‏‏‎‎‏‏‎‎‏‎‎‎‎‏‏‏‎‎Cannot enter airplane mode during an emergency call.‎‏‎‎‏‎"</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‎‏‎‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‎‏‎‏‏‎‎‏‏‏‎‏‏‏‏‎‏‎‏‏‎‎‏‎‎Emergency calling not available‎‏‎‎‏‎"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‏‎‎‏‎‎‎‎‎‏‏‎‏‏‎‏‏‎‏‎‎‏‏‎‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‎‎‏‎‎‏‎‏‎‏‏‏‏‎‏‎Police‎‏‎‎‏‎"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‎‎‏‎‎‎‏‏‎‏‎‏‏‎‎‎‎‏‎‎‏‏‏‎‏‏‎‏‏‏‎‎‎‎‏‏‏‏‎‎‎‏‏‏‎‎‏‏‏‏‏‎‎‎‎‏‎‏‎‎Ambulance‎‏‎‎‏‎"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‏‎‏‏‏‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‎‏‏‎‏‎‏‏‎‏‏‎‎‎‏‎‎‎‎‎‎‎‏‎‎‎‎‎‎‏‏‎‎Fire‎‏‎‎‏‎"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‏‏‎‏‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‎‏‎‏‎‎‎‏‎‏‎‏‎‏‏‏‏‎‎‏‏‏‎‎‏‏‏‎‎‎‎‏‎%1$s, %2$s‎‏‎‎‏‎"</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>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‎‏‏‏‎‎‎‎‏‏‏‏‎‎‏‎‏‏‎‏‏‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎Failed to import contact‎‏‎‎‏‎"</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 name="rtt_mode_title" msgid="6954652435543570121">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‏‏‏‏‎‎‎‏‏‏‎‎‎‏‎‏‎‏‏‏‏‎‏‎‎‏‏‏‎‎‎‎‏‎‎‏‏‎‏‏‎‏‏‎‎‏‎‎‏‎Real-time text (RTT) call‎‏‎‎‏‎"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‏‎‏‎‏‏‎‏‏‏‏‏‎‎‏‏‎‏‏‎‏‎‏‎‎‎‏‎‎‏‎‎‏‎‎‏‎‏‎‎‎‎‏‎‏‎‏‏‎‎‎‏‎‎‎Allow messaging within a voice call‎‏‎‎‏‎"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‎‏‎‏‏‎‎‏‏‏‏‎‏‎‏‎‏‏‎‏‏‎‎RTT assists callers who are deaf, hard of hearing, have a speech disability, or need more than voice alone.&lt;br&gt; &lt;a href=‎‏‎‎‏‏‎<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>‎‏‎‎‏‏‏‎&gt;Learn more&lt;/a&gt;‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎       &lt;br&gt;&lt;br&gt; - RTT calls are saved as a message transcript‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎       &lt;br&gt; - RTT is not available for video calls‎‏‎‎‏‎"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‏‏‏‎‎‏‎‏‎‎‏‎‏‏‎‏‏‏‏‎‏‏‎‏‎‏‎‏‏‎‏‏‏‎‏‎‎‏‎RTT‎‏‎‎‏‎"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‏‎‎‏‏‏‏‎‎‏‏‎‏‏‏‏‎‎‎‎‏‎‎‎‎‎‎‎‎‎‏‏‎‏‎‏‎‏‏‎‏‎‏‎‏‎‏‏‏‎‎‏‏‎Turn RTT on or off‎‏‎‎‏‎"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‏‏‎‎‎‏‏‏‏‎‎‏‎‏‏‏‎‏‎‏‎‏‎‎‎‏‎‏‎‏‎‎‏‎‎‏‏‏‎‎‏‏‏‏‎‎‎‏‎‎‎‏‏‏‎‏‎‏‎TTY Off‎‏‎‎‏‎"</item>
     <item msgid="3971695875449640648">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‎‏‏‏‎‎‎‏‏‏‏‎‎‏‎‎‏‏‎‎‎‏‎‏‏‎‏‏‎‎‎‏‎‏‎‎‎‎‎‎‏‏‏‏‎‏‎‏‎‏‏‎‏‏‎‎‏‎‎‎‎TTY Full‎‏‎‎‏‎"</item>
@@ -606,8 +587,6 @@
     <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="description_dialpad_button" msgid="5220006811894230590">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‏‏‎‎‎‏‎‎‏‏‎‎‎‎‏‎‎‎‏‎‎‏‏‏‏‎‎‏‎‎‎‎‎‏‎‎‏‏‎‎‏‎‏‏‏‎‎‎‏‏‏‏‏‎‎show dialpad‎‏‎‎‏‎"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‏‏‏‏‏‎‎‏‎‏‏‎‏‏‏‏‎‎‎‏‎‎‎‏‏‏‏‎‏‏‎‎‏‏‏‎‎‏‎‎‏‏‏‎‎Emergency Dialpad‎‏‎‎‏‎"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‏‎‎‎‎‎‏‏‎‏‎‎‏‎‏‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‎‎‎‎‎‎‎‎‎‏‎Visual Voicemail‎‏‎‎‏‎"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‎‏‏‎‏‏‎‏‎‏‎‎‎‎‏‏‏‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‏‎‎‎‎‎‎‎‎‎‏‏‏‏‏‏‎‎‎‏‏‏‎‎‏‏‎‏‎Set PIN‎‏‎‎‏‎"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‎‎‎‏‎‎‎‏‎‎‎‎‎‎‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‎‏‎‏‎‎‏‎‎‎‏‏‎‏‎‏‏‏‎‎‎Change PIN‎‏‎‎‏‎"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 0e8ea04..8685648 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -116,7 +116,7 @@
     <string name="labelCFNRc" msgid="2614827454402079766">"Cuando no esté disponible"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Número cuando no se puede establecer la llamada"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Reenviar a <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
-    <string name="sum_cfnrc_disabled" msgid="2684474391807469832">"Desactivado"</string>
+    <string name="sum_cfnrc_disabled" msgid="2684474391807469832">"Desactivar"</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_admin_user_only" msgid="4526094783818216374">"Solo el usuario administrador puede cambiar la configuración de llamadas."</string>
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Revirtiendo configuraciones..."</string>
     <string name="response_error" msgid="6674110501330139405">"Respuesta inesperada de la red."</string>
     <string name="exception_error" msgid="7027667130619518211">"Error en la red o en la tarjeta SIM."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"Se cambió la solicitud SS por una llamada normal"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"Se cambió la solicitud SS por una solicitud USSD"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Se cambió a una nueva solicitud SS"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"Se cambió la solicitud SS por una videollamada"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"La solicitud SS cambió por una solicitud DIAL."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"La solicitud SS cambió por una solicitud USSD."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"La solicitud SS cambió por una nueva solicitud SS."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"Se cambió la solicitud SS por una solicitud DIAL de video."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"Está activada la configuración de los números de marcación fija de tu teléfono. Por lo tanto, algunas de las características relacionados con las llamadas no funcionan."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Enciende la radio antes de ver esta configuración."</string>
     <string name="close_dialog" msgid="2365884406356986917">"Aceptar"</string>
@@ -163,7 +163,7 @@
     <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>
-    <string name="network_query_error" msgid="8466081377231178298">"No se encontraron redes disponibles. Vuelve a intentarlo."</string>
+    <string name="network_query_error" msgid="6828516148953325006">"Error al buscar redes."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Registrando en <xliff:g id="NETWORK">%s</xliff:g>..."</string>
     <string name="not_allowed" msgid="5613353860205691579">"Tu tarjeta SIM no permite una conexión con esta red."</string>
     <string name="connect_later" msgid="2308119155752343975">"No se puede establecer una conexión con la red en este momento. Vuelve a intentarlo más adelante."</string>
@@ -176,11 +176,6 @@
     <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="forbidden_network" msgid="4384929668343563440">"(prohibido)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Elegir una red"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Desconectado"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Conectado"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Conectando…"</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"No se pudo establecer conexión"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA preferido"</item>
     <item msgid="8442633436636425221">"Solo GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Llamando"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Red"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Modo 4G LTE mejorado"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Llamadas avanzadas"</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="2382798156640007971">"Permitir el uso de datos"</string>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"Roaming"</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="6843814381576397939">"El roaming de datos está desactivado. Presiona para activarlo."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Se perdió la conexión de datos móviles"</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="1603164667540144353">"Puede ocasionar gastos importantes."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Para saber los precios, consulta con tu proveedor de red."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"¿Deseas permitir el roaming de datos?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Uso de datos de la app"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Uso de datos"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"Datos móviles usados: <xliff:g id="ID_1">%1$s</xliff:g>, <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Avanzada"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Proveedor"</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"No es posible poner las llamadas en espera."</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="incall_error_promote_wfc" msgid="106510757624022064">"Habilita las llamadas con Wi-Fi para hacer una llamada."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Información de emergencia"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Propietario"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Vuelve a presionar para ver la información"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Llamada de emergencia"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Solo llamadas de emergencia"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Número de emergencia"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Números de emergencia"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Vuelve a presionar para llamar al <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Encendiendo radio..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"No hay servicio. Vuelve a intentarlo."</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"No se puede entrar en modo de avión durante una llamada de emergencia."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Las llamadas de emergencia no están disponibles"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Policía"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Ambulancia"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Bomberos"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</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>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"No se pudo importar el contacto"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Audífonos"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Activar compatibilidad con audífono"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Llamada de Texto en tiempo real (RTT)"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Permitir la mensajería en las llamadas de voz"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"El RTT brinda asistencia a las personas sordas o hipoacúsicas, que tienen algún trastorno del habla o necesitan una transcripción además de la voz.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Más información&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - Las llamadas de RTT se guardan como las transcripciones de los mensajes\n       &lt;br&gt; - El RTT no está disponible para las videollamadas"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Activar o desactivar RTT"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY desactivado"</item>
     <item msgid="3971695875449640648">"TTY completo"</item>
@@ -606,8 +587,6 @@
     <string name="selectContact" msgid="781975788478987237">"seleccionar contacto"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"No admite llamadas de voz."</string>
     <string name="description_dial_button" msgid="7459705245418435351">"marcar"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"mostrar teclado"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Teclado de emergencia"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Buzón de voz visual"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Establecer PIN"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Cambiar PIN"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index b32e237..f3a7954 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -49,7 +49,7 @@
     <string name="puk_unlocked" msgid="2284912838477558454">"La tarjeta SIM se ha desbloqueado. El teléfono se está desbloqueando..."</string>
     <string name="label_ndp" msgid="780479633159517250">"PIN de desbloqueo de red de tarjeta SIM"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Desbloquear"</string>
-    <string name="sim_ndp_dismiss_text" msgid="1604823375752456947">"Cerrar"</string>
+    <string name="sim_ndp_dismiss_text" msgid="1604823375752456947">"Descartar"</string>
     <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>
@@ -96,14 +96,14 @@
     <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">"Desvío de llamadas (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="labelCF" msgid="2574386948026924737">"Desvío de llamadas"</string>
+    <string name="labelCF" msgid="2574386948026924737">"Desvío de llamada"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Desviar siempre"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Usar 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="8384177689501334080">"Desactivado"</string>
-    <string name="labelCFB" msgid="6139853033106283172">"Cuando esté comunicando"</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="4913145177320506827">"Desactivado"</string>
@@ -113,11 +113,11 @@
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Desviando a <xliff:g id="PHONENUMBER">{0}</xliff:g>"</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="2614827454402079766">"Cuando esté apagado o sin cobertura"</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="2684474391807469832">"Desactivado"</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="disable_cfnrc_forbidden" msgid="5646361343094064333">"Tu operador no permite inhabilitar el desvío de llamada si no se puede establecer la llamada."</string>
     <string name="updating_title" msgid="6146755386174019046">"Ajustes de llamadas"</string>
     <string name="call_settings_admin_user_only" msgid="4526094783818216374">"El administrador es el único usuario que puede cambiar los ajustes de llamada."</string>
     <string name="call_settings_with_label" msgid="3401177261468593519">"Ajustes (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Restableciendo ajustes…"</string>
     <string name="response_error" msgid="6674110501330139405">"Respuesta inesperada de la red"</string>
     <string name="exception_error" msgid="7027667130619518211">"Error en la tarjeta SIM o en la red."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"Se ha cambiado la solicitud SS a una llamada normal"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"Se ha cambiado la solicitud SS a una solicitud USSD"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Se ha cambiado a una nueva solicitud SS"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"Se ha cambiado la solicitud SS a una videollamada"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"Se ha modificado la solicitud SS para la solicitud DIAL."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"Se ha modificado la solicitud SS para la solicitud USSD."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"Se ha modificado la solicitud SS para la nueva solicitud SS."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"Se ha modificado la solicitud SS a una solicitud DIAL de vídeo."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"La opción de marcación fija de la aplicación Teléfono está activada. Por ello, algunas funciones relacionadas con las llamadas no funcionan correctamente."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Para ver esta configuración, debes activar la señal móvil."</string>
     <string name="close_dialog" msgid="2365884406356986917">"Aceptar"</string>
@@ -163,7 +163,7 @@
     <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>
-    <string name="network_query_error" msgid="8466081377231178298">"No se ha encontrado ninguna red. Inténtalo de nuevo."</string>
+    <string name="network_query_error" msgid="6828516148953325006">"Se ha producido un error al buscar redes."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Registrándose en <xliff:g id="NETWORK">%s</xliff:g>..."</string>
     <string name="not_allowed" msgid="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>
@@ -176,11 +176,6 @@
     <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 preferida"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(prohibida)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Elegir red"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Desconectada"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Conectada"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Conectando..."</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"No se ha podido conectar"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"Preferencia: GSM o WCDMA"</item>
     <item msgid="8442633436636425221">"Solo GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Llamadas"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Red"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Modo 4G LTE mejorado"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Llamadas avanzadas"</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="2382798156640007971">"Permitir uso de datos"</string>
@@ -243,14 +238,13 @@
     <string name="roaming" msgid="7894878421600247140">"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="6843814381576397939">"La itinerancia de datos está desactivada. Toca para activarla."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Se ha perdido la conexión de datos móviles"</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="1603164667540144353">"El coste de este servicio puede ser significativo."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Ponte en contacto con tu proveedor de red para consultar el precio."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"¿Permitir itinerancia de datos?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Uso de datos de la aplicación"</string>
-    <string name="data_usage_template" msgid="8526428824844656364">"Se han usado <xliff:g id="ID_1">%1$s</xliff:g> en el periodo del <xliff:g id="ID_2">%2$s</xliff:g>"</string>
-    <string name="advanced_options_title" msgid="8074895510265488035">"Avanzado"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Uso de datos"</string>
+    <string name="data_usage_template" msgid="8526428824844656364">"Se han utilizado <xliff:g id="ID_1">%1$s</xliff:g> en el periodo del <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="advanced_options_title" msgid="8074895510265488035">"Avanzados"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Operador"</string>
     <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"operador, esim, sim, euicc, cambiar de operador, añadir operador"</string>
     <string name="carrier_settings_euicc_summary" msgid="5115001942761995457">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>: <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
@@ -507,24 +501,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"No se pueden retener 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="incall_error_promote_wfc" msgid="106510757624022064">"Para llamar, tienes que habilitar las llamadas por Wi-Fi."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Información de emergencia"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Propietario"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Tocar de nuevo para ver la información"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Llamada de emergencia"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Solo llamadas de emergencia"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Número de emergencia"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Números de emergencia"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Tocar de nuevo para llamar al <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Activando señal móvil…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Sin servicio. Reintentado…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Durante una llamada de emergencia no se puede entrar en el modo avión."</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. Marca un número de emergencia."</string>
-    <string name="dial_emergency_calling_not_available" msgid="5675557523782491826">"No se pueden hacer llamadas de emergencia"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Policía"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Ambulancia"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Bomberos"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</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>
@@ -545,9 +527,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Error al importar contactos"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Audífonos"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Activar compatibilidad con audífonos"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Llamada de texto en tiempo real (TTR)"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Permitir mensajes en una llamada de voz"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"La función TTR (texto en tiempo real) ofrece asistencia a las personas sordas o con discapacidades auditivas, que tienen algún trastorno del habla o que necesitan una transcripción además de la voz para comunicarse.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Más información&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - Las llamadas de TTR se guardan como la transcripción de un mensaje.\n       &lt;br&gt; - La función TTR no está disponible en videollamadas."</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Activar o desactivar RTT"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY desactivado"</item>
     <item msgid="3971695875449640648">"TTY completo"</item>
@@ -568,7 +549,7 @@
     <string name="ota_hfa_activation_dialog_message" msgid="8092479227918463415">"El teléfono está activando el servicio de datos móviles.\n\nEste proceso puede tardar hasta 5 minutos."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"¿Quieres omitir la activación?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Si omites la activación, no podrás realizar llamadas ni conectarte a las redes de datos móviles (aunque sí podrás conectarte a las redes Wi-Fi). Se te pedirá que actives el teléfono cada vez que lo enciendas hasta que realices la activación."</string>
-    <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Saltar"</string>
+    <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Omitir"</string>
     <string name="ota_activate" msgid="1368528132525626264">"Activar"</string>
     <string name="ota_title_activate_success" msgid="6570240212263372046">"El teléfono está activado."</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Problema con la activación"</string>
@@ -599,7 +580,7 @@
     <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Saliendo del modo de devolución de llamada de emergencia"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Sí"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"No"</string>
-    <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Cerrar"</string>
+    <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Descartar"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Servicio"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Configuración"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;No definido&gt;"</string>
@@ -610,8 +591,6 @@
     <string name="selectContact" msgid="781975788478987237">"seleccionar contacto"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Llamadas de voz no admitidas"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"marcar"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"mostrar teclado"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Teclado de emergencia"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Buzón de voz visual"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Configurar el PIN"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Cambiar PIN"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index b3e9068..080f664 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Seadete ennistamine…"</string>
     <string name="response_error" msgid="6674110501330139405">"Ootamatu vastus võrgust."</string>
     <string name="exception_error" msgid="7027667130619518211">"Võrgu või SIM-kaardi viga."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS-taotlus muudeti tavaliseks kõneks"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS-taotlus muudeti USSD-taotluseks"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Muudeti uueks SS-taotluseks"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS-taotlus muudeti videokõneks"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS-taotlus muudeti DIAL-taotluseks."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS-taotlus muudeti USSD-taotluseks."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS-taotlus muudeti uueks SS-taotluseks."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS-taotlus muudeti video DIAL-taotluseks."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"Telefoni rakenduse Fikseeritud numbrite valimine seaded on sisse lülitatud. Selle tulemusena ei tööta kõik kõnega seotud funktsioonid."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Enne nende seadete vaatamist lülitage raadio sisse."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
@@ -163,7 +163,7 @@
     <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>
-    <string name="network_query_error" msgid="8466081377231178298">"Võrke ei õnnestunud leida. Proovige uuesti."</string>
+    <string name="network_query_error" msgid="6828516148953325006">"Viga võrkude otsimisel."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Registreerimine võrku <xliff:g id="NETWORK">%s</xliff:g> ..."</string>
     <string name="not_allowed" msgid="5613353860205691579">"Teie SIM-kaart ei võimalda ühendust selle võrguga."</string>
     <string name="connect_later" msgid="2308119155752343975">"Võrguga ei saa praegu ühendust. Proovige hiljem uuesti."</string>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Muuda võrgu töörežiimi"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Eelistatud võrgutüüp"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(keelatud)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Vali võrk"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Ühendus on katkestatud"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Ühendatud"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Ühendamine …"</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Ühendust ei õnnestunud luua"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"Eelistatud: GSM/WCDMA"</item>
     <item msgid="8442633436636425221">"Ainult GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Helistamine"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Võrk"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Tõhustatud 4G LTE režiim"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Täpsem helistamine"</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>
@@ -243,19 +238,18 @@
     <string name="roaming" msgid="7894878421600247140">"Rä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="6843814381576397939">"Andmeside rändlus on välja lülitatud. Puudutage sisselülitamiseks."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Mobiilne andmesideühendus katkes"</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_check_price_warning" msgid="7497570906830902550">"Hinnakirja küsige oma võrguteenuse pakkujalt."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Kas lubada andmeside rändlus?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Rakenduste andmekasutus"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Andmekasutus"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"Vahemikus <xliff:g id="ID_2">%2$s</xliff:g> on kasutatud <xliff:g id="ID_1">%1$s</xliff:g> mobiilset andmesidet"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Täpsemad"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Operaator"</string>
     <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"operaator, esim, sim, euicc, vaheta operaatorit, lisa operaator"</string>
     <string name="carrier_settings_euicc_summary" msgid="5115001942761995457">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> – <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
     <string name="mobile_data_settings_title" msgid="4661165467914727157">"Mobiilne andmeside"</string>
-    <string name="mobile_data_settings_summary" msgid="5087255915840576895">"Andmesideühendus mobiilsidevõrgu abil"</string>
+    <string name="mobile_data_settings_summary" msgid="5087255915840576895">"Juurdepääs andmetele mobiilsidevõrgu abil"</string>
     <string name="data_usage_disable_mobile" msgid="3577275288809667615">"Kas lülitada mobiilne andmeside välja?"</string>
     <string name="sim_selection_required_pref" msgid="7049424902961844236">"Valik on tegemata"</string>
     <string name="sim_change_data_title" msgid="5332425991853799280">"Muuta andmeside SIM-kaarti?"</string>
@@ -395,11 +389,11 @@
     <string name="fdn_disabled" msgid="4700049736675368279">"Fikseeritud valimisnumbrid on keelatud"</string>
     <string name="enable_fdn" msgid="3740191529180493851">"Luba FDN"</string>
     <string name="disable_fdn" msgid="7944020890722540616">"Keela FDN"</string>
-    <string name="change_pin2" msgid="2153563695382176676">"PIN2-koodi muutmine"</string>
+    <string name="change_pin2" msgid="2153563695382176676">"Muuda PIN2-koodi"</string>
     <string name="enable_fdn_ok" msgid="7215588870329688132">"Keela FDN"</string>
     <string name="disable_fdn_ok" msgid="5727046928930740173">"Luba FDN"</string>
     <string name="sum_fdn" msgid="1959399454900272878">"Fikseeritud valimisnumbrite haldamine"</string>
-    <string name="sum_fdn_change_pin" msgid="6666549734792827932">"FDN-juurdepääsuks PIN-koodi muutmine"</string>
+    <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Muuda FDN-juurdepääsuks PIN-koodi"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Telefoninumbrite loendi haldamine"</string>
     <string name="voice_privacy" msgid="3776841382844614716">"Häälvestluse privaatsus"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Luba täiendatud privaatsusrežiim"</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Kõnesid ei saa ootele panna."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Helistamiseks looge ühendus traadita võrguga."</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"Lubage helistamiseks WiFi-kõned."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Hädaabiteave"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Omanik"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Teabe vaatamiseks puudutage uuesti"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Hädaabikõne"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Ainult hädaabikõned"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Hädaabinumber"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Hädaabinumbrid"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Puudutage uuesti, et helistada numbril <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Raadioside sisselülitamine ..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Teenus puudub. Uuesti proovimine ..."</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Hädaabikõne ajal ei saa lennurežiimi aktiveerida."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Hädaabikõned pole saadaval"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Politsei"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Kiirabiauto"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Tuletõrje"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</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>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Kontakti importimine ebaõnnestus"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Kuuldeaparaadid"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Lülita kuuldeaparaadi ühilduvus sisse"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Reaalajas teksti saatmise (RTT) kõne"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Häälkõnes sõnumside lubamine"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"RTT aitab kurte, kuulmis- või kõnepuudega helistajaid või neid, kes vajavad lisaks häälele muud abi.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Lisateave&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; – RTT-kõned salvestatakse sõnumi trankriptsioonina\n       &lt;br&gt; – RTT pole saadaval videokõnede puhul"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"RTT sisse- või väljalülitamine"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY väljas"</item>
     <item msgid="3971695875449640648">"TTY-täisrežiim"</item>
@@ -600,14 +581,12 @@
     <string name="voicemail_settings" msgid="72448049107749316">"Seadistus"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Määramata&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"Muud kõneseaded"</string>
-    <string name="calling_via_template" msgid="4839419581866928142">"Operaator: <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"Kõne edastab <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"kontakti foto"</string>
     <string name="goPrivate" msgid="865837794424530980">"aktiveeri privaatrežiim"</string>
     <string name="selectContact" msgid="781975788478987237">"vali kontakt"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Tavakõnesid ei toetata"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"helista"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"kuva valimisklahvistik"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Hädaabi valimisklahvistik"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Visuaalne kõnepost"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"PIN-koodi määramine"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"PIN-koodi muutmine"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 824e9c2..80e12dc 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -86,7 +86,7 @@
     <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>
     <string name="labelNwService" msgid="4699970172021870983">"Sareko zerbitzuen ezarpenak"</string>
-    <string name="labelCallerId" msgid="3888899447379069198">"Deitzailearen IDa"</string>
+    <string name="labelCallerId" msgid="3888899447379069198">"Deien identifikazio-zerbitzua"</string>
     <string name="sum_loading_settings" msgid="1826692909391168620">"Ezarpenak kargatzen…"</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Ezkutatu zenbakia irteerako deietan"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Erakutsi zenbakia irteerako deietan"</string>
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Ezarpenak leheneratzen…"</string>
     <string name="response_error" msgid="6674110501330139405">"Ez zen sarearen horrelako erantzunik espero."</string>
     <string name="exception_error" msgid="7027667130619518211">"Sarearen edo SIM txartelaren errorea."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS eskaera ohiko deira aldatu da"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS eskaera USSD eskaerara aldatu da"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"SS eskaera berrira aldatu da"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS eskaera bideo-deira aldatu da"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS eskaera DIAL eskaerara aldatu da."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS eskaera USSD eskaerara aldatu da."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS eskaera SS eskaera berrira aldatu da."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS eskaera Video DIAL eskaerara aldatu da."</string>
     <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>
@@ -163,7 +163,7 @@
     <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>
-    <string name="network_query_error" msgid="8466081377231178298">"Ezin izan da aurkitu sarerik. Saiatu berriro."</string>
+    <string name="network_query_error" msgid="6828516148953325006">"Errore bat gertatu da sareak bilatzean."</string>
     <string name="register_on_network" msgid="9055203954040805084">"<xliff:g id="NETWORK">%s</xliff:g> sarean erregistratzen…"</string>
     <string name="not_allowed" msgid="5613353860205691579">"SIM txartelak ez dizu sare honetara konektatzea baimentzen."</string>
     <string name="connect_later" msgid="2308119155752343975">"Une honetan, ezin da sare horretara konektatu. Saiatu berriro geroago."</string>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Aldatu sarearen funtzionamendu modua"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Sare mota hobetsia"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(debekatuta)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Aukeratu sarea"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Deskonektatuta"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Konektatuta"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Konektatzen…"</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Ezin izan da konektatu"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA hobetsita"</item>
     <item msgid="8442633436636425221">"GSM soilik"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Deiak"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Sarea"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"4G LTE modu hobetua"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Deitzeko aukera aurreratuak"</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="2382798156640007971">"Onartu datuak erabiltzea"</string>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"Ibiltaritza"</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="6843814381576397939">"Datu-ibiltaritza desaktibatuta dago. Sakatu aktibatzeko."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Galdu da datu-konexioa"</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="1603164667540144353">"Baliteke kostu handiak ordaindu behar izatea."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Eskatu prezioari buruzko informazioa sare-hornitzaileari."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Ibiltaritzako datuak baimendu nahi dituzu?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Aplikazioak erabilitako datuak"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Datuen erabilera"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"Datuen <xliff:g id="ID_1">%1$s</xliff:g> erabili dira data hauen artean: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Ezarpen aurreratuak"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Operadorea"</string>
@@ -489,7 +483,7 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Erantzungailuaren zenbakia ezezaguna da"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Ez dago zerbitzurik"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Hautatutako sarea (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) ez dago erabilgarri"</string>
-    <string name="incall_error_power_off" product="watch" msgid="2007450435656211658">"Deitzeko, aktibatu sare mugikorra, desaktibatu hegaldi modua edo desaktibatu bateria-aurrezlea."</string>
+    <string name="incall_error_power_off" product="watch" msgid="2007450435656211658">"Deitzeko, aktibatu sare mugikorra, desaktibatu hegaldi modua edo desaktibatu bateria aurrezteko modua."</string>
     <string name="incall_error_power_off" product="default" 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_ecm_emergency_only" msgid="738708660612388692">"Larrialdikoak ez diren deiak egiteko, irten larrialdi-deiak soilik jasotzeko modutik."</string>
@@ -509,24 +503,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Ezin dira zain utzi deiak."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Deia egiteko, konektatu haririk gabeko sare batera."</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"Deia egiteko, gaitu Wi-Fi bidezko deiak."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Larrialdietarako informazioa"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Jabea"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Informazioa ikusteko, sakatu berriro"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Larrialdi-deia"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Larrialdi-deiak soilik"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Larrialdietarako zenbakia"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Larrialdietarako zenbakiak"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Sakatu berriro <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g> zenbakira deitzeko"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Irratia pizten…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Ez dago zerbitzurik. Berriro saiatzen…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Ezin da erabili hegaldi modua larrialdi-deietan."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Ezin da egin larrialdi-deirik"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Polizia"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Anbulantzia"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Sua"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</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>
@@ -545,11 +527,10 @@
     <string name="importToFDNfromContacts" msgid="2130620207013368580">"Inportatu kontaktuetatik"</string>
     <string name="singleContactImportedMsg" msgid="6868483416182599206">"Inportatu da kontaktua"</string>
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Ezin izan da inportatu kontaktua"</string>
-    <string name="hac_mode_title" msgid="8740268574688743289">"Audifonoak"</string>
-    <string name="hac_mode_summary" msgid="6833851160514929341">"Aktibatu audifonoen bateragarritasuna"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Deietan testua bidaltzeko eginbidea"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Baimendu mezuak bidali eta jasotzea ahots-deien barruan"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"Deietan testua bidaltzeko eginbideak deitzaile gorrei, entzumen-arazoak dituztenei, hitz egiteko ezintasunen bat dutenei edota ahotsaz gain beste makuluren bat behar dutenei laguntzen die.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Lortu informazio gehiago&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - Deietan testua bidaltzeko eginbidearekin egindako deiak mezu-transkripzio gisa gordetzen dira.\n       &lt;br&gt; - Deietan testua bidaltzeko eginbidea ez da bateragarria bideo-deiekin."</string>
+    <string name="hac_mode_title" msgid="8740268574688743289">"Audiofonoak"</string>
+    <string name="hac_mode_summary" msgid="6833851160514929341">"Aktibatu audiofonoen bateragarritasuna"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT txata"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Aktibatu edo desaktibatu RTT txata"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY desaktibatuta"</item>
     <item msgid="3971695875449640648">"TTY osoa"</item>
@@ -567,9 +548,9 @@
     <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>
-    <string name="ota_hfa_activation_dialog_message" msgid="8092479227918463415">"Telefonoa datu-konexioaren zerbitzua aktibatzen ari da.\n\nEragiketa 5 minutura arte luza daiteke."</string>
+    <string name="ota_hfa_activation_dialog_message" msgid="8092479227918463415">"Telefonoa datu mugikorren zerbitzua aktibatzen ari da.\n\nEragiketa 5 minutura arte luza daiteke."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Aktibazioa saltatu nahi duzu?"</string>
-    <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Aktibazioa saltatzen baduzu, ezingo duzu deirik egin, ez eta datu-konexioaren sareetara konektatu ere, baina Wi-Fi sareetara konektatu ahal izango duzu. Telefonoa aktibatzen duzun arte, pizten duzun bakoitzean eskatuko zaizu aktibatzeko."</string>
+    <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Aktibazioa saltatzen baduzu, ezingo dituzu deiak egin eta ezingo duzu datu mugikorren sareetara konektatu, baina Wi-Fi sareetara konektatu ahal izango duzu. Telefonoa aktibatzen duzun arte, pizten duzun bakoitzean eskatuko zaizu aktibatzeko."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Saltatu"</string>
     <string name="ota_activate" msgid="1368528132525626264">"Aktibatu"</string>
     <string name="ota_title_activate_success" msgid="6570240212263372046">"Telefonoa aktibatuta dago."</string>
@@ -612,8 +593,6 @@
     <string name="selectContact" msgid="781975788478987237">"hautatu kontaktua"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Ez dira ahots-deiak onartzen"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"markatu"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"erakutsi markagailua"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Larrialdietarako markagailua"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Ikusizko erantzungailua"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Ezarri PIN kodea"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Aldatu PIN kodea"</string>
@@ -631,7 +610,7 @@
     <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi deia"</string>
     <string name="emergency_action_launch_hint" msgid="4906759256275562674">"Irekitzeko, sakatu berriro"</string>
     <string name="message_decode_error" msgid="3456481534066924855">"Errore bat gertatu mezua deskodetzean."</string>
-    <string name="callFailed_cdma_activation" msgid="2307989779233262164">"SIM txartel batek zerbitzua aktibatu du eta telefonoaren ibiltaritza-gaitasunak eguneratu ditu."</string>
+    <string name="callFailed_cdma_activation" msgid="2307989779233262164">"SIM txartel batek zerbitzua aktibatu du eta telefonoaren ibiltaritza-gaitasunak aldatu ditu."</string>
     <string name="callFailed_cdma_call_limit" msgid="1556916577171457086">"Dei gehiegi daude aktibo. Amaitu edo bateratu abian diren deiak beste bat egin aurretik."</string>
     <string name="callFailed_imei_not_accepted" msgid="132192626901238542">"Ezin da konektatu. Erabili balio duen SIM txartel bat."</string>
     <string name="callFailed_wifi_lost" msgid="5968076625137297184">"Galdu egin da Wi-Fi konexioa. Amaitu da deia."</string>
@@ -658,7 +637,7 @@
     <string name="mobile_data_activate_prepaid_summary" msgid="5705389791791637666">"Gehitu datu-konexioa <xliff:g id="PROVIDER_NAME">%s</xliff:g> operadorearen bidez"</string>
     <string name="mobile_data_activate_roaming_plan" msgid="5998161536947086264">"Ez dago ibiltaritza-planik"</string>
     <string name="mobile_data_activate_roaming_plan_summary" msgid="511202908883425459">"Gehitu ibiltaritza-plan bat <xliff:g id="PROVIDER_NAME">%s</xliff:g> operadorearen bidez"</string>
-    <string name="mobile_data_activate_footer" msgid="5979019929980140594">"Datu-konexioa edo ibiltaritza-plan bat gehitzeko, jarri harremanetan zure operadorearekin (<xliff:g id="PROVIDER_NAME">%s</xliff:g>)."</string>
+    <string name="mobile_data_activate_footer" msgid="5979019929980140594">"Datu mugikorrak edo ibiltaritza-plan bat gehitzeko, jarri harremanetan zure operadorearekin (<xliff:g id="PROVIDER_NAME">%s</xliff:g>)."</string>
     <string name="mobile_data_activate_diag_title" msgid="9044252207707864493">"Datuak gehitu nahi dituzu?"</string>
     <string name="mobile_data_activate_diag_message" msgid="8216154678758451453">"Agian datuak gehitu beharko dituzu <xliff:g id="PROVIDER_NAME">%s</xliff:g> operadorearen bidez"</string>
     <string name="mobile_data_activate_button" msgid="3682400969184405446">"GEHITU DATUAK"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 7d577f9..cc88755 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -97,7 +97,7 @@
     <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="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>
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"در حال بازیابی تنظیمات..."</string>
     <string name="response_error" msgid="6674110501330139405">"پاسخ پیش‌بینی نشده از شبکه."</string>
     <string name="exception_error" msgid="7027667130619518211">"خطای شبکه یا سیم کارت."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"‏درخواست SS به تماس معمولی تغییر کرد"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"‏درخواست SS به‌درخواست USSD تغییر کرد"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"‏به‌درخواست SS جدید تغییر کرد"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"‏درخواست SS به تماس ویدیویی تغییر کرد"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"‏درخواست SS به درخواست DIAL تغییر کرد."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"‏درخواست SS به درخواست USSD تغییر کرد."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"‏درخواست SS به درخواست جدید SS تغییر کرد."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"‏درخواست SS به درخواست Video DIAL تغییر کرد."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"تنظیم اعداد شماره‌گیری ثابت برنامه‌های تلفن شما غیرفعال است. درنتیجه، برخی از ویژگی‌های مربوط به تماس کار نمی‌کند."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"قبل از مشاهدهٔ این تنظیمات، رادیو را روشن کنید."</string>
     <string name="close_dialog" msgid="2365884406356986917">"تأیید"</string>
@@ -163,7 +163,7 @@
     <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="network_query_error" msgid="8466081377231178298">"شبکه پیدا نشد. دوباره امتحان کنید."</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>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"تغییر حالت عملکرد شبکه"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"نوع شبکه برگزیده"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(ممنوع است)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"انتخاب شبکه"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"قطع اتصال"</string>
-    <string name="network_connected" msgid="1288589103624338857">"متصل"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"درحال اتصال…"</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"متصل نشد"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"‏GSM/WCDMA برگزیده"</item>
     <item msgid="8442633436636425221">"‏فقط GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"درحال تماس"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"شبکه"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"‏حالت پیشرفته 4G LTE"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"تماس پیشرفته"</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>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"رومینگ"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"اتصال به سرویس‌های داده هنگام رومینگ"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"اتصال به سرویس‌های داده هنگام رومینگ"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"رومینگ داده خاموش شده است. برای روشن کردن آن، ضربه بزنید."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"اتصال داده تلفن همراه قطع شد"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"اتصال داده خود را از دست داده‌اید، زیرا از شبکه اصلی خود خارج شدید و رومینگ داده خاموش است،"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"شاید هزینه زیادی برای شما داشته باشد."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"برای قیمت با ارائه‌دهنده شبکه‌تان بررسی کنید."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"رومینگ داده مجاز است؟"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"مصرف داده برنامه"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"مصرف داده"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> داده تلفن همراه مصرف‌شده در <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"پیشرفته"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"شرکت مخابراتی"</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"نگه‌داشتن تماس‌ها ممکن نیست."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"برای برقراری تماس، به یک شبکه بی‌سیم وصل شوید"</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"‏برای برقراری تماس، تماس Wi-Fi را فعال کنید."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"اطلاعات اضطراری"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"مالک"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"برای دیدن اطلاعات، دوباره ضربه بزنید"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"تماس اضطراری"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"فقط تماس‌های اضطراری"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"شماره تلفن اضطراری"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"شماره تلفن‌های اضطراری"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"برای تماس با <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g> دوباره ضربه بزنید"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"در حال روشن کردن رادیو..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"سرویسی در دسترس نیست. دوباره امتحان کنید..."</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"در طول تماس اضطراری نمی‌توانید به حالت هواپیما بروید."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"تماس اضطراری دردسترس نیست"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"پلیس"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"آمبولانس"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"آتش"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"‏%1$s،‏ %2$s"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"استفاده از صفحه‌کلید برای شماره گیری"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"نگهداشت"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"پایان"</string>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"مخاطب وارد نشد"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"دستگاه‌های کمک‌شنوایی"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"روشن کردن سازگاری دستگاه کمک‌شنوایی"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"‏تماس نوشتار هم‌زمان (RTT)"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"پیام‌رسانی در تماس صوتی مجاز است"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"‏«نوشتار هم‌زمان» به تماس گیرندگان ناشنوا، دارای مشکل شنوایی، دارای ناتوانی گفتاری یا افرادی که به چیزی بیش از صدا نیاز دارند کمک می‌کند.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;بیشتر بدانید&lt;/a&gt;\n       ‏&lt;br&gt;&lt;br&gt; تماس‌های «نوشتار هم‌زمان» به‌صورت ترانویسی پیام ذخیره می‌شود\n       &lt;br&gt; «نوشتار هم‌زمان» برای تماس‌های ویدیویی دردسترس نیست"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"‏روشن یا خاموش کردن RTT"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"‏TTY خاموش"</item>
     <item msgid="3971695875449640648">"‏TTY پر است"</item>
@@ -606,8 +587,6 @@
     <string name="selectContact" msgid="781975788478987237">"انتخاب حساب"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"تماس صوتی پشتیبانی نمی‌شود"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"شماره گیری"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"نمایش صفحه شماره گیری"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"صفحه شماره‌گیری اضطراری"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"پست صوتی تصویری"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"تنظیم پین"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"تغییر پین"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 1e7952b..a61b9b3 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Palautetaan asetuksia…"</string>
     <string name="response_error" msgid="6674110501330139405">"Odottamaton vastaus verkosta."</string>
     <string name="exception_error" msgid="7027667130619518211">"Verkko- tai SIM-korttivirhe."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS-pyyntö vaihdettu tavalliseksi puheluksi"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS-pyyntö vaihdettu USSD-pyynnöksi"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Vaihdettu uudeksi SS-pyynnöksi"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS-pyyntö vaihdettu videopuheluksi"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS-pyyntö muutettiin DIAL-pyynnöksi."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS-pyyntö muutettiin USSD-pyynnöksi."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS-pyyntö muutettiin uudeksi SS-pyynnöksi."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS-pyyntö muutettiin Video DIAL ‑pyynnöksi."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"Puhelimesi sovelluksen sallitut numerot -toiminto on käytössä. Osa puheluihin liittyvistä ominaisuuksista ei toimi."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Käynnistä radio ennen näiden asetuksien tarkastelua."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
@@ -163,7 +163,7 @@
     <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>
-    <string name="network_query_error" msgid="8466081377231178298">"Verkkoja ei löytynyt. Yritä uudelleen."</string>
+    <string name="network_query_error" msgid="6828516148953325006">"Virhe haettaessa verkkoja."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Rekisteröidään verkkoon <xliff:g id="NETWORK">%s</xliff:g>…"</string>
     <string name="not_allowed" msgid="5613353860205691579">"SIM-kortti ei anna muodostaa yhteyttä tähän verkkoon."</string>
     <string name="connect_later" msgid="2308119155752343975">"Tähän verkkoon ei saa yhteyttä juuri nyt. Yritä myöhemmin uudelleen."</string>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Vaihda verkon käyttötilaa"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Ensisijainen verkko"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(kielletty)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Valitse verkko"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Yhteys katkaistu"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Yhdistetty"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Yhdistetään…"</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Yhdistäminen epäonnistui"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"Ensisijaisesti GSM/WCDMA"</item>
     <item msgid="8442633436636425221">"Vain GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Soitetaan"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Verkko"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Enhanced 4G LTE -tila"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Puhelujen lisävaihtoehdot"</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="2382798156640007971">"Salli tiedonsiirto"</string>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"Roaming"</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="6843814381576397939">"Roaming ei ole käytössä. Ota käyttöön napauttamalla."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Mobiilidatayhteys katkesi"</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="1603164667540144353">"Siitä voi aiheutua huomattavia kuluja."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Pyydä hintatiedot verkkopalvelun tarjoajaltasi."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Sallitaanko tiedonsiirto roaming-tilassa?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Sovelluksen datan käyttö"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Datan käyttö"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> mobiilidataa käytetty <xliff:g id="ID_2">%2$s</xliff:g>."</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Lisäasetukset"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Operaattori"</string>
@@ -507,24 +501,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Puhelujen pito ei onnistu."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Yhdistä langattomaan verkkoon, jos haluat soittaa puhelun."</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"Ota Wi-Fi-puhelut käyttöön soittaaksesi."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Hätätilannetiedot"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Omistaja"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Katso tiedot napauttamalla uudelleen"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Hätäpuhelu"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Vain hätäpuhelut"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Hätänumero"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Hätänumerot"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Soita numeroon <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g> napauttamalla uudelleen."</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Käynnistetään radiota…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Ei yhteyttä. Yritetään uudelleen…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Lentokonetilaa ei voi ottaa käyttöön hätäpuhelun aikana."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Hätäpuhelut eivät ole käytettävissä"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Poliisi"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Ambulanssi"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Palokunta"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</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>
@@ -545,9 +527,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Kontaktin tuominen epäonnistui"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Kuulolaitteet"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Ota kuulolaitteen yhteensopivuustoiminto käyttöön"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"RTT-puhelu (puhelusta lähetettävä teksti)"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Salli viestit äänipuheluissa"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"RTT-toiminto auttaa kuuroja sekä käyttäjiä, joilla on kuulo‑ tai puhehäiriöitä tai jotka tarvitsevat muuta tukea pelkän puheen lisäksi.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Lisätietoja&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; – RTT-puhelut tallennetaan litterointiviestinä.\n       &lt;br&gt; – RTT ei ole käytettävissä videopuheluissa."</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"Reaaliaikaiset tekstipuhelut"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Reaaliaikaiset tekstipuhelut käyttöön tai pois käytöstä"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY pois käytöstä"</item>
     <item msgid="3971695875449640648">"TTY täynnä"</item>
@@ -610,8 +591,6 @@
     <string name="selectContact" msgid="781975788478987237">"valitse yhteystieto"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Äänipuheluita ei tueta"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"soita"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"Näytä näppäimistö"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Hätänäppäimistö"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Visuaalinen puhelinvastaaja"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Aseta PIN-koodi."</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Vaihda PIN-koodi"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index e8e952d..3a86f89 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="tablet" msgid="8576272342240415145">"Données cellulaires"</string>
+    <string name="phoneAppLabel" product="tablet" msgid="8576272342240415145">"Données mobiles"</string>
     <string name="phoneAppLabel" product="default" msgid="6790717591729922998">"Services téléphoniques"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Appels d\'urgence"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Téléphone"</string>
@@ -90,7 +90,7 @@
     <string name="sum_loading_settings" msgid="1826692909391168620">"Chargement des paramètres…"</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Numéro masqué pour les appels sortants"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Numéro affiché pour les appels sortants"</string>
-    <string name="sum_default_caller_id" msgid="1954518825510901365">"Utiliser les paramètres opérateur pour afficher mon numéro dans les appels sortants"</string>
+    <string name="sum_default_caller_id" msgid="1954518825510901365">"Utiliser les paramètres opérateur pour afficher mon numéro pour les appels sortants"</string>
     <string name="labelCW" msgid="6120513814915920200">"Appel en attente"</string>
     <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>
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Rétablissement des paramètres…"</string>
     <string name="response_error" msgid="6674110501330139405">"Réponse inattendue du réseau"</string>
     <string name="exception_error" msgid="7027667130619518211">"Erreur de réseau ou de carte SIM."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"Demande SS remplacée par un appel ordinaire"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"Demande SS remplacée par une demande USSD"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Remplacement par une nouvelle demande SS"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"Demande SS remplacée par un appel vidéo"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"La demande SS a été remplacée par une demande DIAL."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"La demande SS a été remplacée par une demande USSD."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"La demande SS a été remplacée par une nouvelle demande SS."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"La demande SS a été remplacée par une demande Video DIAL."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"Les numéros autorisés sont activés dans l\'application de votre téléphone. Par conséquent, certaines fonctionnalités d\'appel ne fonctionnent pas."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Activez le signal radio avant d\'afficher ces paramètres."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
@@ -163,7 +163,7 @@
     <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>
-    <string name="network_query_error" msgid="8466081377231178298">"Impossible de trouver des réseaux. Réessayez."</string>
+    <string name="network_query_error" msgid="6828516148953325006">"Une erreur s\'est produite lors de la recherche de réseaux."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Enregistrement sur <xliff:g id="NETWORK">%s</xliff:g>…"</string>
     <string name="not_allowed" msgid="5613353860205691579">"Votre carte SIM ne permet pas de vous connecter à ce réseau."</string>
     <string name="connect_later" msgid="2308119155752343975">"Impossible de se connecter à ce réseau pour le moment. Veuillez réessayer plus tard."</string>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Changer le mode de fonctionnement du réseau"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Type de réseau préféré"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(interdit)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Choisir un réseau"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Déconnecté"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Connecté"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Connexion en cours…"</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Impossible de se connecter"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA de préférence"</item>
     <item msgid="8442633436636425221">"GSM uniquement"</item>
@@ -235,20 +230,19 @@
     <string name="call_category" msgid="5863978196309462052">"Appels"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Réseau"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Mode LTE 4G avancé"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
-    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Utiliser les services LTE pour améliorer les communications vocales et autres (recommandé)"</string>
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Appel 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="2382798156640007971">"Autoriser l\'utilisation des données"</string>
     <string name="dialog_alert_title" msgid="6751344986194435476">"Attention"</string>
     <string name="roaming" msgid="7894878421600247140">"Itinérance"</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="6843814381576397939">"L\'itinérance des données est désactivée. Touchez pour l\'activer."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Connexion de données cellulaires perdue"</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="1603164667540144353">"Des frais importants peuvent s\'appliquer."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Communiquez avec votre fournisseur réseau pour connaître les tarifs."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Autoriser les données en itinérance?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Utilisation des données des applications"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Utilisation de données"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> de données mobiles utilisées pendant la période suivante : <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Avancés"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Opérateur"</string>
@@ -259,7 +253,7 @@
     <string name="data_usage_disable_mobile" msgid="3577275288809667615">"Désactiver les données mobiles?"</string>
     <string name="sim_selection_required_pref" msgid="7049424902961844236">"Sélection requise"</string>
     <string name="sim_change_data_title" msgid="5332425991853799280">"Changer de SIM pour les données?"</string>
-    <string name="sim_change_data_message" msgid="2163963581444907496">"Utiliser la carte SIM <xliff:g id="NEW_SIM">%1$s</xliff:g> au lieu de la carte <xliff:g id="OLD_SIM">%2$s</xliff:g> pour les données cellulaires?"</string>
+    <string name="sim_change_data_message" msgid="2163963581444907496">"Utiliser la carte SIM <xliff:g id="NEW_SIM">%1$s</xliff:g> au lieu de la carte <xliff:g id="OLD_SIM">%2$s</xliff:g> pour les données mobiles?"</string>
     <string name="wifi_calling_settings_title" msgid="7741961465416430470">"Appels Wi-Fi"</string>
     <string name="video_calling_settings_title" msgid="539714564273795574">"Appels vidéo par l\'entremise du fournisseur de services"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"Options GSM/UMTS"</string>
@@ -472,7 +466,7 @@
     <string name="pin2_unblocked" msgid="7791600368153469078">"Le NIP2 n\'est plus bloqué."</string>
     <string name="pin2_error_exception" msgid="1088689322248996699">"Erreur de réseau ou de carte SIM"</string>
     <string name="doneButton" msgid="2859593360997984240">"Terminé"</string>
-    <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Numéro de messagerie vocale"</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="8253487008234167266">"Recomposition en cours..."</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Conférence téléphonique"</string>
@@ -507,24 +501,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Impossible de mettre les appels en attente."</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="incall_error_promote_wfc" msgid="106510757624022064">"Activez les appels Wi-Fi pour faire un appel."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Renseignements en cas d\'urgence"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Propriétaire"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Touchez à nouveau pour afficher les renseignements"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Appel d\'urgence"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Appels d\'urgence uniquement"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Numéro d\'urgence"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Numéros d\'urgence"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Touchez à nouveau pour composer le <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Activation du signal radio..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Aucun service. Nouvel essai en cours..."</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Impossible d\'activer le mode Avion durant un appel d\'urgence."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Appels d\'urgence non disponibles"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Police"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Ambulance"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Incendie"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</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>
@@ -545,9 +527,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Impossible d\'importer le contact"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Assistance auditive"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Activer la compatibilité du service d\'assistance auditive"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Appel texte en temps réel (TTR)"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Autoriser l\'utilisation de la messagerie lors des appels vocaux"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"La fonctionnalité TTR aide les appelants qui sont sourds ou malentendants, qui ont un trouble de la parole ou pour qui la voix ne suffit pas.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;En savoir plus&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - Les appels TTR sont enregistrés en tant que transcriptions de messages\n       &lt;br&gt; - La fonctionnalité TTR n\'est pas disponible pour les appels vidéo"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"Texte en temps réel"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Activer ou désactiver le mode « Texte en temps réel »"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY désactivé"</item>
     <item msgid="3971695875449640648">"TTY complet"</item>
@@ -567,7 +548,7 @@
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Activation en cours…"</string>
     <string name="ota_hfa_activation_dialog_message" msgid="8092479227918463415">"Le téléphone est en train d\'activer votre service de données cellulaires.\n\nCela peut prendre jusqu\'à cinq minutes."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Ignorer l\'activation?"</string>
-    <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Si vous poursuivez sans activer votre appareil mobile, vous ne pourrez ni téléphoner, ni vous connecter à des réseaux de données cellulaires. La connexion à un réseau Wi-Fi reste possible. Vous serez invité à effectuer l\'activation à chaque démarrage du téléphone."</string>
+    <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Si vous poursuivez sans activer votre mobile, vous ne pourrez ni téléphoner, ni vous connecter à des réseaux de données mobiles. La connexion à un réseau Wi-Fi reste possible. Vous serez invité à effectuer l\'activation à chaque démarrage du téléphone."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Passer"</string>
     <string name="ota_activate" msgid="1368528132525626264">"Activer"</string>
     <string name="ota_title_activate_success" msgid="6570240212263372046">"Votre téléphone est activé"</string>
@@ -610,8 +591,6 @@
     <string name="selectContact" msgid="781975788478987237">"sélectionner un contact"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Appels vocaux non pris en charge"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"composer"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"afficher le clavier numérique"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Clavier numérique d\'urgence"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Messagerie vocale visuelle"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Définir le NIP"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Modifier le NIP"</string>
@@ -651,12 +630,12 @@
     <string name="mobile_data_status_roaming_turned_on_subtext" msgid="1335176927083781041">"L\'itinérance de données est activée"</string>
     <string name="mobile_data_status_roaming_without_plan_subtext" msgid="3568412513831673037">"En itinérance. Un forfait de données est requis"</string>
     <string name="mobile_data_status_roaming_with_plan_subtext" msgid="8721998948811064377">"En itinérance. Le forfait de données est actif"</string>
-    <string name="mobile_data_status_no_plan_subtext" msgid="4887747337017565725">"Il ne reste plus de données cellulaires"</string>
-    <string name="mobile_data_activate_prepaid" msgid="7447025165850512683">"Il ne reste plus de données cellulaires"</string>
-    <string name="mobile_data_activate_prepaid_summary" msgid="5705389791791637666">"Ajouter des données cellulaires par l\'intermédiaire de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="mobile_data_status_no_plan_subtext" msgid="4887747337017565725">"Il ne reste plus de données mobiles"</string>
+    <string name="mobile_data_activate_prepaid" msgid="7447025165850512683">"Il ne reste plus de données mobiles"</string>
+    <string name="mobile_data_activate_prepaid_summary" msgid="5705389791791637666">"Ajouter des données mobiles par l\'intermédiaire de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="mobile_data_activate_roaming_plan" msgid="5998161536947086264">"Aucun forfait d\'itinérance"</string>
     <string name="mobile_data_activate_roaming_plan_summary" msgid="511202908883425459">"Ajouter un forfait d\'itinérance par l\'intermédiaire de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="mobile_data_activate_footer" msgid="5979019929980140594">"Vous pouvez ajouter des données cellulaires ou un forfait d\'itinérance par l\'intermédiaire de votre fournisseur de services, <xliff:g id="PROVIDER_NAME">%s</xliff:g>."</string>
+    <string name="mobile_data_activate_footer" msgid="5979019929980140594">"Vous pouvez ajouter des données mobiles ou un forfait d\'itinérance par l\'intermédiaire de votre fournisseur de services, <xliff:g id="PROVIDER_NAME">%s</xliff:g>."</string>
     <string name="mobile_data_activate_diag_title" msgid="9044252207707864493">"Ajouter des données?"</string>
     <string name="mobile_data_activate_diag_message" msgid="8216154678758451453">"Vous devrez peut-être ajouter des données par l\'intermédiaire de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="mobile_data_activate_button" msgid="3682400969184405446">"AJOUTER DES DONNÉES"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 9700e4b..1a1c4f7 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -90,7 +90,7 @@
     <string name="sum_loading_settings" msgid="1826692909391168620">"Chargement des paramètres…"</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Numéro masqué pour les appels sortants"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Numéro affiché pour les appels sortants"</string>
-    <string name="sum_default_caller_id" msgid="1954518825510901365">"Utiliser les paramètres opérateur pour afficher mon numéro dans les appels sortants"</string>
+    <string name="sum_default_caller_id" msgid="1954518825510901365">"Utiliser les paramètres opérateur pour afficher mon numéro pour les appels sortants"</string>
     <string name="labelCW" msgid="6120513814915920200">"Appel en attente"</string>
     <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>
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Rétablissement des paramètres…"</string>
     <string name="response_error" msgid="6674110501330139405">"Réponse inattendue du réseau"</string>
     <string name="exception_error" msgid="7027667130619518211">"Erreur de réseau ou de carte SIM."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"Requête SS transformée en appel standard"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"Requête SS transformée en requête USSD"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Remplacement par une nouvelle requête SS"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"Requête SS transformée en appel vidéo"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"La requête SS a été remplacée par une requête DIAL."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"La requête SS a été remplacée par une requête USSD."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"La requête SS a été remplacée par une autre requête SS."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"La requête SS a été remplacée par une requête vidéo DIAL."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"Les numéros autorisés sont activés dans l\'application de votre téléphone. Par conséquent, certaines fonctionnalités d\'appel ne fonctionnent pas."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Activez le signal radio avant d\'afficher ces paramètres."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
@@ -163,7 +163,7 @@
     <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>
-    <string name="network_query_error" msgid="8466081377231178298">"Réseaux introuvables. Veuillez réessayer."</string>
+    <string name="network_query_error" msgid="6828516148953325006">"Une erreur s\'est produite lors de la recherche de réseaux."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Enregistrement sur <xliff:g id="NETWORK">%s</xliff:g>..."</string>
     <string name="not_allowed" msgid="5613353860205691579">"Votre carte SIM ne permet pas de vous connecter à ce réseau."</string>
     <string name="connect_later" msgid="2308119155752343975">"Impossible de se connecter à ce réseau pour le moment. Veuillez réessayer ultérieurement."</string>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Changer le mode de fonctionnement du réseau"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Type de réseau préféré"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(interdit)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Sélectionner un réseau"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Déconnecté"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Connecté"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Connexion…"</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Connexion impossible"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA de préférence"</item>
     <item msgid="8442633436636425221">"GSM uniquement"</item>
@@ -235,20 +230,19 @@
     <string name="call_category" msgid="5863978196309462052">"Appels"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Réseau"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Mode LTE 4G avancé"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
-    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Utiliser les services LTE pour améliorer les communications vocales et autres (recommandé)"</string>
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Appel 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="2382798156640007971">"Autoriser la consommation des données"</string>
     <string name="dialog_alert_title" msgid="6751344986194435476">"Avertissement"</string>
     <string name="roaming" msgid="7894878421600247140">"Itinérance"</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="6843814381576397939">"L\'itinérance des données est désactivée. Appuyez pour l\'activer."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Perte de la connexion des données mobiles"</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="1603164667540144353">"Des frais importants peuvent s\'appliquer."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Vérifiez le tarif auprès de votre opérateur."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Autoriser l\'itinérance des données ?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Consommation des données par les applications"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Consommation des données"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> de données mobiles utilisées pendant la période suivante : <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Paramètres avancés"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Opérateur"</string>
@@ -399,7 +393,7 @@
     <string name="enable_fdn_ok" msgid="7215588870329688132">"Désactiver numéros autorisés"</string>
     <string name="disable_fdn_ok" msgid="5727046928930740173">"Activer les numéros autorisés"</string>
     <string name="sum_fdn" msgid="1959399454900272878">"Gérer la liste de numéros autorisés"</string>
-    <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Modifier le code pour l\'accès aux numéros autorisés"</string>
+    <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Modifier le code PIN pour l\'accès aux numéros autorisés"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Gérer la liste des numéros de téléphone"</string>
     <string name="voice_privacy" msgid="3776841382844614716">"Confidentialité voix"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Activer le mode de confidentialité amélioré"</string>
@@ -468,12 +462,12 @@
     <string name="pin2_unblocked" msgid="7791600368153469078">"Le code PIN2 n\'est plus bloqué."</string>
     <string name="pin2_error_exception" msgid="1088689322248996699">"Erreur de réseau ou de carte SIM."</string>
     <string name="doneButton" msgid="2859593360997984240">"OK"</string>
-    <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Numéro de messagerie vocale"</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="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">"Appel terminé"</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>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Impossible de mettre les appels en attente."</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="incall_error_promote_wfc" msgid="106510757624022064">"Pour passer un appel, veuillez activer les appels Wi-Fi."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Informations d\'urgence"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Propriétaire"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Appuyer à nouveau pour afficher les informations"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Appel d\'urgence"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Appels d\'urgence uniquement"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Numéro d\'urgence"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Numéros d\'urgence"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Appuyez à nouveau pour appeler le <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Activation du signal radio..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Aucun service disponible. Nouvelle tentative en cours…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Vous ne pouvez pas activer le mode Avion au cours d\'un appel d\'urgence."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Appels d\'urgence non disponibles"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Police"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Ambulance"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Pompiers"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</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>
@@ -540,10 +522,9 @@
     <string name="singleContactImportedMsg" msgid="6868483416182599206">"Contact importé"</string>
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Échec de l\'importation du contact."</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Assistance auditive"</string>
-    <string name="hac_mode_summary" msgid="6833851160514929341">"Activer la compatibilité avec les appareils auditifs"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Appel texte en temps réel"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Autoriser l\'échange de messages pendant les appels vocaux"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"La fonctionnalité de texte en temps réel vient en aide aux personnes sourdes, malentendantes, qui ont un trouble de la parole, ou qui ont besoin d\'une transcription en plus de la voix.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;En savoir plus&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - Les appels texte en temps réel sont enregistrés sous forme transcrite\n       &lt;br&gt; - Le mode texte en temps réel n\'est pas disponible pour les appels vidéo"</string>
+    <string name="hac_mode_summary" msgid="6833851160514929341">"Activer la compatibilité avec les prothèses auditives"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"Texte en temps réel"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Activer ou désactiver le mode \"Texte en temps réel\""</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"Mode TTY désactivé"</item>
     <item msgid="3971695875449640648">"TTY complet"</item>
@@ -606,8 +587,6 @@
     <string name="selectContact" msgid="781975788478987237">"sélectionner un contact"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Appels vocaux non pris en charge"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"composer"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"afficher le clavier"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Clavier d\'appel d\'urgence"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Messagerie vocale visuelle"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Définir un code"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Modifier le code"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index d55bd2a..b239d03 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -94,8 +94,8 @@
     <string name="labelCW" msgid="6120513814915920200">"Chamada en espera"</string>
     <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">"Axustes de desvío de chamadas"</string>
-    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Axustes de desvío de chamadas (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="call_forwarding_settings" msgid="3378927671091537173">"Config. desvío de chamadas"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Config. 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>
@@ -103,17 +103,17 @@
     <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="8384177689501334080">"Desactivado"</string>
-    <string name="labelCFB" msgid="6139853033106283172">"Cando estea comunicando"</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="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="1736067178393744351">"Cando non responda"</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="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="2614827454402079766">"Cando estea apagado ou sen conbertura"</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="2684474391807469832">"Desactivado"</string>
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Revertendo configuración..."</string>
     <string name="response_error" msgid="6674110501330139405">"Resposta inesperada da rede"</string>
     <string name="exception_error" msgid="7027667130619518211">"Erro de rede ou da tarxeta SIM."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"A solicitude SS cambiouse nunha chamada normal"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"A solicitude SS cambiouse nunha solicitude USSD"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Cambiouse a unha nova solicitude SS"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"A solicitude SS cambiouse nunha videochamada"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"A solicitude SS transformouse nunha solicitude DIAL."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"A solicitude SS transformouse nunha solicitude USSD."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"A solicitude SS transformouse nunha nova solicitude SS."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"A solicitude SS transformouse nunha solicitude DIAL de vídeo."</string>
     <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>
@@ -156,14 +156,14 @@
     <string name="vm_change_pin_error_too_long" msgid="8476870806115051865">"O PIN novo é demasiado longo."</string>
     <string name="vm_change_pin_error_too_weak" msgid="7883744811891784882">"O novo PIN é pouco seguro. Para que sexa seguro, non debe conter secuencias continuas nin díxitos repetidos."</string>
     <string name="vm_change_pin_error_mismatch" msgid="2754685537970757317">"O PIN antigo non coincide."</string>
-    <string name="vm_change_pin_error_invalid" msgid="3972205462701668653">"O novo PIN contén caracteres non-válidos."</string>
+    <string name="vm_change_pin_error_invalid" msgid="3972205462701668653">"O novo PIN contén caracteres non válidos."</string>
     <string name="vm_change_pin_error_system_error" msgid="6610603326230000207">"Non se puido cambiar o PIN."</string>
     <string name="vvm_unsupported_message_format" msgid="11795090778411977">"Tipo de mensaxe non compatible. Chama ao <xliff:g id="NUMBER">%s</xliff:g> para escoitala."</string>
     <string name="network_settings_title" msgid="514120489499925574">"Rede de telefonía 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>
-    <string name="network_query_error" msgid="8466081377231178298">"Non se puido encontrar ningunha rede. Téntao de novo."</string>
+    <string name="network_query_error" msgid="6828516148953325006">"Produciuse un erro durante a busca de redes."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Rexistrando en <xliff:g id="NETWORK">%s</xliff:g>…"</string>
     <string name="not_allowed" msgid="5613353860205691579">"A tarxeta SIM non permite unha conexión a esta rede."</string>
     <string name="connect_later" msgid="2308119155752343975">"Non se pode conectar con esta rede agora. Téntao de novo máis tarde."</string>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Cambiar o modo de funcionamento da rede"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Tipo de rede preferido"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(non permitido)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Escoller rede"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Desconectada"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Conectada"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Conectando…"</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Non se puido establecer conexión"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"Preferencia: GSM/WCDMA"</item>
     <item msgid="8442633436636425221">"Só GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Chamando"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Rede"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Modo LTE 4G mellorado"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Chamadas avanzadas"</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="2382798156640007971">"Permitir o uso de datos"</string>
@@ -243,14 +238,13 @@
     <string name="roaming" msgid="7894878421600247140">"Itinerancia"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Conectarse a servizos de datos en itinerancia"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Conectarse a servizos de datos en itinerancia"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"A itinerancia de datos está desactivada. Toca para activala."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Perdeuse a conexión de datos móbiles"</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="1603164667540144353">"É posible que se apliquen custos elevados."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Consulta os prezos co teu provedor de rede."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Permitir a itinerancia de datos?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Uso de datos da aplicación"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Uso de datos"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"Datos móbiles usados no período do <xliff:g id="ID_2">%2$s</xliff:g>: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="advanced_options_title" msgid="8074895510265488035">"Configuración avanzada"</string>
+    <string name="advanced_options_title" msgid="8074895510265488035">"Avanzado"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Operador"</string>
     <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"operador, esim, sim, euicc, cambiar operadores, engadir operador"</string>
     <string name="carrier_settings_euicc_summary" msgid="5115001942761995457">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>: <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
@@ -327,8 +321,8 @@
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"Idiomas"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"Tempo local"</string>
-    <string name="local_weather_enable" msgid="6199315114382448922">"O tempo local activado"</string>
-    <string name="local_weather_disable" msgid="2510158089142626480">"O tempo local desactivado"</string>
+    <string name="local_weather_enable" msgid="6199315114382448922">"Información meteorolóxica local activada"</string>
+    <string name="local_weather_disable" msgid="2510158089142626480">"Información meteorolóxica local desactivada"</string>
     <string name="enable_disable_atr" msgid="8339572391278872343">"Informes de tráfico de zona"</string>
     <string name="atr_enable" msgid="5541757457789181799">"Informes de tráfico de zona activados"</string>
     <string name="atr_disable" msgid="7085558154727596455">"Informes de tráfico de zona desactivados"</string>
@@ -392,7 +386,7 @@
     <string name="fdn_list_with_label" msgid="7437232552210469217">"Lista de NMF (<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">"Os números de marcación fixa están activados"</string>
-    <string name="fdn_disabled" msgid="4700049736675368279">"Os números de marcación fixa (NMF) están desactivados"</string>
+    <string name="fdn_disabled" msgid="4700049736675368279">"Os números de marcación fixa están desactivados"</string>
     <string name="enable_fdn" msgid="3740191529180493851">"Activar NMF"</string>
     <string name="disable_fdn" msgid="7944020890722540616">"Desactivar NMF"</string>
     <string name="change_pin2" msgid="2153563695382176676">"Cambiar PIN2"</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Non se poden poñer as chamadas en espera."</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="incall_error_promote_wfc" msgid="106510757624022064">"Activa as chamadas por wifi para facer unha chamada."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Información de urxencia"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Propietario"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Toca de novo para consultar a información"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Chamada de urxencia"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Só chamadas de urxencia"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Número de urxencia"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Números de urxencia"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Toca de novo para chamar ao <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Activando radio..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Sen servizo. Tentando de novo…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Non se pode activar o modo avión durante unha chamada de urxencia."</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 urxencia."</string>
     <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Non se pode chamar. Marcar un número de urxencia."</string>
-    <string name="dial_emergency_calling_not_available" msgid="5675557523782491826">"As chamadas de urxencia non están dispoñibles"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Policía"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Ambulancia"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Bombeiros"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</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>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Produciuse un erro ao importar o contacto"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Audiófonos"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Activar a compatibilidade con audiófonos"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Chamada RTT (texto en tempo real)"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Permitir uso de mensaxes durante unha chamada de voz"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"A función RTT constitúe unha axuda para todos aqueles emisores de chamadas que padezan xordeira ou outros problemas auditivos, teñan algún trastorno da fala ou necesiten algo máis que a voz para comunicarse.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Máis información&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - As chamadas RTT gárdanse como transcricións de mensaxes\n       &lt;br&gt; - Non se pode utilizar a función RTT nas videochamadas"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Activar ou desactivar RTT"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY desactivado"</item>
     <item msgid="3971695875449640648">"TTY completo"</item>
@@ -606,8 +587,6 @@
     <string name="selectContact" msgid="781975788478987237">"seleccionar contacto"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Chamadas de voz non compatibles"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"marcar"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"mostrar teclado de marcación"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Teclado de urxencia"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Correo de voz visual"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Establecer PIN"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Cambiar PIN"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 4daeae4..d0d1f1b 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"સેટિંગ્સ પાછી ફરાવી રહ્યાં છે…"</string>
     <string name="response_error" msgid="6674110501330139405">"નેટવર્ક તરફથી અનપેક્ષિત પ્રતિસાદ."</string>
     <string name="exception_error" msgid="7027667130619518211">"નેટવર્ક અથવા SIM કાર્ડ ભૂલ."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS વિનંતીને નિયમિત કૉલમાં બદલવામાં આવી છે"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS વિનંતીને USSD વિનંતીમાં બદલવામાં આવી છે"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"નવી SS વિનંતીમાં બદલવામાં આવી છે"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS વિનંતીને વીડિઓ કૉલમાં બદલવામાં આવી છે"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS વિનંતીને DIAL વિનંતી પર સંશોધિત કરી."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS વિનંતીને USSD વિનંતી પર સંશોધિત કરી."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS વિનંતીને નવી SS વિનંતી પર સંશોધિત કરી."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS વિનંતીને વીડિઓ DIAL વિનંતીમાં સંશોધિત કરી."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"તમારી ફોન એપ્લિકેશનની ફિક્સ્ડ ડાયલિંગ નંબર્સ સેટિંગ ચાલુ છે. પરિણામ રૂપે, કેટલીક કૉલ સંબંધિત સુવિધાઓ કાર્ય કરતી નથી."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"આ સેટિંગ્સ જોતા પહેલાં રેડિઓ ચાલુ કરો."</string>
     <string name="close_dialog" msgid="2365884406356986917">"ઓકે"</string>
@@ -163,7 +163,7 @@
     <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="network_query_error" msgid="8466081377231178298">"નેટવર્ક શોધી શક્યા નથી. ફરી પ્રયાસ કરો."</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>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"નેટવર્ક ઓપરેટિંગ મોડ બદલો"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"પસંદગીનો નેટવર્ક પ્રકાર"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(પ્રતિબંધિત)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"નેટવર્ક પસંદ કરો"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"ડિસ્કનેક્ટ કર્યું"</string>
-    <string name="network_connected" msgid="1288589103624338857">"કનેક્ટેડ"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"કનેક્ટ થઈ રહ્યું છે…"</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"કનેક્ટ કરી શકાયું નથી"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA પસંદ કરેલ છે"</item>
     <item msgid="8442633436636425221">"ફક્ત GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"કૉલિંગ"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"નેટવર્ક"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"વિસ્તૃત 4G LTE મોડ"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"વિગતવાર કૉલિંગ"</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>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"રોમિંગ"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"જ્યારે રોમિંગ હોય ત્યારે ડેટા સેવાઓથી કનેક્ટ કરો"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"જ્યારે રોમિંગ હોય ત્યારે ડેટા સેવાઓથી કનેક્ટ કરો"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"ડેટા રોમિંગ બંધ છે. ચાલુ કરવા માટે ટૅપ કરો."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"કોઈ મોબાઇલ ડેટા કનેક્શન રહ્યું નથી"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"તમે ડેટા કનેક્ટિવિટી ગુમાવી છે કારણ કે તમે તમારા હોમ નેટવર્કને બંધ ડેટા રોમિંગ સાથે છોડ્યું છે."</string>
     <string name="roaming_warning" msgid="1603164667540144353">"તમારાથી આંશિક શુલ્ક લઈ શકાય છે."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"કિંમત માટે તમારા નેટવર્ક પ્રદાતા સાથે તપાસો."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"ડેટા રોમિંગને મંજૂરી આપીએ?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"ઍપ ડેટા વપરાશ"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"ડેટા વપરાશ"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> મોબાઇલ ડેટાનો ઉપયોગ <xliff:g id="ID_2">%2$s</xliff:g> ના રોજ સુધી કરવામાં આવ્યો"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"વિગતવાર"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"કૅરિઅર"</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"કૉલ્સને હોલ્ડ કરી શકતાં નથી."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"કૉલ કરવા માટે વાયરલેસ નેટવર્કથી કનેક્ટ કરો."</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"કૉલ કરવા માટે Wi-Fi કૉલિંગ સક્ષમ કરો."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"કટોકટીની માહિતી"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"માલિક"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"માહિતી જોવા માટે ફરીથી ટૅપ કરો"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"કટોકટીનો કૉલ"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"ફક્ત કટોકટીના કૉલ"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"કટોકટીનો નંબર"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"કટોકટીના નંબર"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"<xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>ને ફરીથી કૉલ કરવા માટે ટૅપ કરો"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"રેડિઓ ચાલુ કરી રહ્યાં છે…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"કોઈ સેવા નથી. ફરી પ્રયાસ કરી રહ્યાં છે…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"કટોકટીના કૉલ દરમિયાન એરપ્લેન મોડમાં દાખલ થઈ શકતાં નથી."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"કટોકટીમાં કૉલ કરવાની સુવિધા ઉપલબ્ધ નથી"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"પોલીસ"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"એમ્બ્યુલન્સ"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"આગ"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"ડાયલ કરવા માટે કીબોર્ડનો ઉપયોગ કરો"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"હોલ્ડ કરો"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"સમાપ્ત"</string>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"સંપર્ક આયાત કરવામાં નિષ્ફળ થયાં"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"સાંભળવામાં સહાયતા"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"સાંભળવામાં સહાયતા સુસંગતતા ચાલુ કરો"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"રિઅલ-ટાઇમ ટેક્સ્ટ(RTT) કૉલ"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"વૉઇસ કૉલ અંતર્ગત સંદેશ મોકલવાની મંજૂરી આપો"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"RTT બહેરા, સાંભળવા અને બોલવામાં મુશ્કેલી પડતી હોય અથવા વૉઇસ કરતાં પણ વધુ કંઈકની જરૂર હોય એવા કૉલરની સહાય કરે છે.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;વધુ જાણો&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - RTT કૉલને સંદેશ ટ્રાન્સક્રિપ્ટ તરીકે સાચવવામાં આવે છે\n       &lt;br&gt; - RTT વીડિઓ કૉલ માટે ઉપલબ્ધ નથી"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"RTT ચાલુ અથવા બંધ કરો"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY બંધ"</item>
     <item msgid="3971695875449640648">"TTY સંપૂર્ણ"</item>
@@ -606,8 +587,6 @@
     <string name="selectContact" msgid="781975788478987237">"સંપર્ક પસંદ કરો"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"વૉઇસ કૉલિંગ સમર્થિત નથી"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"ડાયલ કરો"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"ડાયલપૅડ બતાવો"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"ઇમર્જન્સી ડાયલપૅડ"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"વિઝ્યુઅલ વૉઇસમેઇલ"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"PIN સેટ કરો"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"PIN બદલો"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 8351607..6d61bf0 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -77,7 +77,7 @@
     <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="voicemail_notifications_preference_title" msgid="4019728578955102213">"सूचनाएं"</string>
+    <string name="voicemail_notifications_preference_title" msgid="4019728578955102213">"नोटिफ़िकेशन"</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>
@@ -91,9 +91,9 @@
     <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="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>
@@ -104,17 +104,17 @@
     <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="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="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="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="2684474391807469832">"बंद"</string>
     <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"जब आपका फ़ोन पहुंच योग्य न हो, तो आपका कैरियर कॉल अग्रेषण अक्षम करने का समर्थन नहीं करता."</string>
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"सेटिंग वापस ला रहा है..."</string>
     <string name="response_error" msgid="6674110501330139405">"नेटवर्क से अनपेक्षित प्रतिसाद."</string>
     <string name="exception_error" msgid="7027667130619518211">"नेटवर्क या सिम कार्ड गड़बड़ी."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS अनुरोध को सामान्य कॉल में बदला गया"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS अनुरोध को USSD अनुरोध में बदला गया"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"नए SS अनुरोध में बदला गया"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS अनुरोध को वीडियो कॉल में बदला गया"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS अनुरोध को DIAL अनुरोध में बदल दिया गया है."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS अनुरोध को USSD अनुरोध में बदल दिया गया है."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS अनुरोध को नए SS अनुरोध में बदल दिया गया है."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS अनुरोध को वीडियो DIAL में बदल दिया गया."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"आपके फ़ोन ऐप्स की फ़िक्‍स्‍ड डायलिंग नंबर सेटिंग चालू है. इसके परिणामस्‍वरूप, कॉल से संबंधित कुछ सुविधाएं कार्य नहीं कर रही हैं."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"इन सेटिंग को देखने के पहले रेडियो चालू करें."</string>
     <string name="close_dialog" msgid="2365884406356986917">"ठीक है"</string>
@@ -148,7 +148,7 @@
     <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="voicemail_default" msgid="2001233554889016880">"आपका वाहक"</string>
     <string name="vm_change_pin_old_pin" msgid="7295220109886682573">"पुराना पिन"</string>
     <string name="vm_change_pin_new_pin" msgid="5412922262839438097">"नया पिन"</string>
     <string name="vm_change_pin_progress_message" msgid="3977357361934350336">"कृपया प्रतीक्षा करें."</string>
@@ -163,7 +163,7 @@
     <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="network_query_error" msgid="8466081377231178298">"नेटवर्क नहीं मिले. फिर से कोशिश करें."</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>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"नेटवर्क संचालन मोड बदलें"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"पसंदीदा नेटवर्क प्रकार"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(मना है)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"नेटवर्क चुनें"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"डिसकनेक्ट है"</string>
-    <string name="network_connected" msgid="1288589103624338857">"कनेक्ट है"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"कनेक्ट हो रहा है..."</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"कनेक्ट नहीं हो सका"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA पसंदीदा"</item>
     <item msgid="8442633436636425221">"केवल GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"कॉलिंग"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"नेटवर्क"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"उन्नत 4G LTE मोड"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"उन्नत कॉलिंग"</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>
@@ -243,14 +238,13 @@
     <string name="roaming" msgid="7894878421600247140">"रोमिंग"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"रोमिंग के समय डेटा सेवाएं कनेक्ट करें"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"रोमिंग के समय डेटा सेवाएं कनेक्ट करें"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"डेटा रोमिंग बंद है. चालू करने के लिए टैप करें."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"मोबाइल डेटा कनेक्शन उपलब्ध नहीं है"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"आपकी डेटा कनेक्टिविटी खो गई है क्योंकि आप डेटा रोमिंग बंद करके अपने होम नेटवर्क से बाहर आ गए हैं."</string>
     <string name="roaming_warning" msgid="1603164667540144353">"आपको बहुत अधिक शुल्‍क देना पड़ सकता है."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"कीमतों की जानकारी के लिए आपको नेटवर्क सेवा देने वाली कंपनी से संपर्क करें."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"डेटा रोमिंग की अनुमति दें?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"ऐप्लिकेशन का डेटा खर्च"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"डेटा उपयोग"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_2">%2$s</xliff:g> में <xliff:g id="ID_1">%1$s</xliff:g> मोबाइल डेटा का उपयोग किया गया"</string>
-    <string name="advanced_options_title" msgid="8074895510265488035">"बेहतर विकल्प"</string>
+    <string name="advanced_options_title" msgid="8074895510265488035">"उन्नत"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"वाहक"</string>
     <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी, eSIM, सिम, euicc, मोबाइल और इंटरनेट सेवा देने वाली कंपनी स्विच करें, मोबाइल और इंटरनेट सेवा देने वाली कंपनी जोड़ें"</string>
     <string name="carrier_settings_euicc_summary" msgid="5115001942761995457">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> — <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
@@ -335,9 +329,9 @@
     <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_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>
@@ -388,22 +382,22 @@
     <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="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">"एफ़डीएन चालू करें"</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">"एफ़डीएन एक्सेस के लिए पिन बदलें"</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_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>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"कॉल होल्ड नहीं किए जा सकते."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"कॉल करने के लिए किसी वायरलेस नेटवर्क से कनेक्‍ट करें."</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"कॉल करने के लिए वाई-फ़ाई कॉलिंग सक्षम करें."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"आपातकालीन जानकारी"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"मालिक"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"जानकारी देखने के लिए फिर से टैप करें"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"आपातकालीन कॉल"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"सिर्फ़ आपातकालीन कॉल"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"आपातकालीन नंबर"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"आपातकालीन नंबर"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"<xliff:g id="EMERGENCY_NUMBER">%s</xliff:g> पर कॉल करने के लिए दोबारा टैप करें"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"रेडियो चालू कर रहा है..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"कोई सेवा नहीं. पुन: प्रयास किया जा रहा है…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"आपातकालीन कॉल के दौरान हवाई जहाज़ मोड चालू नहीं किया जा सकता."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"आपातकालीन कॉल करने की सुविधा उपलब्ध नहीं है"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"पुलिस"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"एम्बुलेंस"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"आग"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"डायल करने के लिए कीबोर्ड का उपयोग करें"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"होल्ड करें"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"समाप्त"</string>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"संपर्क आयात करने में विफल"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"श्रवण सहायक साधन"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"श्रवण सहायक साधन संगतता चालू करें"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"(आरटीटी) कॉल से रीयल-टाइम में मैसेज भेजें"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"वॉइस कॉल में मैसेज भेजने की अनुमति दें"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"आरटीटी उन कॉल करने वालों की मदद करता है, जो सुन नहीं सकते हैं, ऊंचा सुनते हैं, जिन्हें बोलने में दिक्कत है या जिनके लिए सिर्फ़ आवाज़ काफ़ी नहीं होती.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;ज़्यादा  जानें&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - आरटीटी कॉल, मैसेज लेख के रूप में सेव किए जाते हैं\n       &lt;br&gt; - वीडियो कॉल के लिए आरटीटी उपलब्ध नहीं है"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"RTT को चालू या बंद करें"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY बंद"</item>
     <item msgid="3971695875449640648">"TTY पूर्ण"</item>
@@ -576,7 +557,7 @@
     <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_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>
@@ -606,8 +587,6 @@
     <string name="selectContact" msgid="781975788478987237">"संपर्क को चुनें"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"ध्वनि कॉल करना समर्थित नहीं है"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"डायल करें"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"डायलपैड देखें"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"आपातकालीन डायलपैड"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"विज़ुअल वॉइसमेल"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"पिन सेट करें"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"पिन बदलें"</string>
@@ -620,7 +599,7 @@
     <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="accessibility_settings_activity_title" msgid="8562004288733103868">"सरल उपयोग"</string>
     <string name="status_hint_label_incoming_wifi_call" msgid="5932176406432044638">"इससे वाई-फ़ाई कॉल"</string>
     <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"वाई-फ़ाई कॉल"</string>
     <string name="emergency_action_launch_hint" msgid="4906759256275562674">"खोलने के लिए पुन: टैप करें"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index e21bf03..29985df 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Povrat postavki…"</string>
     <string name="response_error" msgid="6674110501330139405">"Neočekivan mrežni odgovor."</string>
     <string name="exception_error" msgid="7027667130619518211">"Pogreška mreže ili SIM kartice."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS zahtjev promijenjen je u običan poziv"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS zahtjev promijenjen je u USSD zahtjev"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Promijenjeno u novi SS zahtjev"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS zahtjev promijenjen je u videopoziv"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS zahtjev izmijenjen je u DIAL zahtjev."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS zahtjev izmijenjen je u USSD zahtjev."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS zahtjev izmijenjen je u novi SS zahtjev."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS zahtjev izmijenjen je u Video DIAL zahtjev."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"Uključena je postavka fiksnog biranja u aplikaciji telefona. Zbog toga ne rade neke značajke u vezi s pozivima."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Uključite radio prije pregleda ovih postavki."</string>
     <string name="close_dialog" msgid="2365884406356986917">"U redu"</string>
@@ -163,7 +163,7 @@
     <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>
-    <string name="network_query_error" msgid="8466081377231178298">"Nije pronađena nijedna mreža. Pokušajte ponovno."</string>
+    <string name="network_query_error" msgid="6828516148953325006">"Pogreška tijekom pretraživanja mreža."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Prijava na <xliff:g id="NETWORK">%s</xliff:g>…"</string>
     <string name="not_allowed" msgid="5613353860205691579">"Vaša SIM kartica ne dopušta povezivanje s ovom mrežom."</string>
     <string name="connect_later" msgid="2308119155752343975">"Povezivanje s tom mrežom trenutačno nije moguće. Pokušajte kasnije."</string>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Promijenite način rada mreže"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Željena vrsta mreže"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(zabranjeno)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Odaberite mrežu"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Veza je prekinuta"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Povezano"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Povezivanje..."</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Povezivanje nije uspjelo"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"Preporučeno: GSM/WCDMA"</item>
     <item msgid="8442633436636425221">"Samo GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Pozivanje"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Mreža"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Poboljšan 4G LTE način"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Napredno pozivanje"</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="2382798156640007971">"Dopusti upotrebu podataka"</string>
@@ -243,19 +238,18 @@
     <string name="roaming" msgid="7894878421600247140">"Roaming"</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="6843814381576397939">"Roaming podataka je isključen. Dodirnite da biste ga uključili."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Izgubljena podatkovna veza mobilnog uređaja"</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="1603164667540144353">"To se može skupo naplaćivati."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Podatke o cijeni možete saznati od svojeg mrežnog operatera."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Želite li dopustiti roaming podataka?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Potrošnja podatkovnog prometa za aplikacije"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Potrošnja podataka"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"Potrošeno je <xliff:g id="ID_1">%1$s</xliff:g> mobilnih podataka u sljedećem razdoblju: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Napredno"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Davatelj usluge"</string>
     <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"mobilni operater, esim, sim, euicc, promjena mobilnog operatera, dodavanje mobilnog operatera"</string>
     <string name="carrier_settings_euicc_summary" msgid="5115001942761995457">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> – <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
     <string name="mobile_data_settings_title" msgid="4661165467914727157">"Mobilni podaci"</string>
-    <string name="mobile_data_settings_summary" msgid="5087255915840576895">"Pristupi podacima pomoću mobilne mreže"</string>
+    <string name="mobile_data_settings_summary" msgid="5087255915840576895">"Pristupanje podacima pomoću mobilne mreže"</string>
     <string name="data_usage_disable_mobile" msgid="3577275288809667615">"Želite li isključiti mobilne podatke?"</string>
     <string name="sim_selection_required_pref" msgid="7049424902961844236">"Odabir je obvezan"</string>
     <string name="sim_change_data_title" msgid="5332425991853799280">"Promijeniti podatkovni SIM?"</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Pozivi se ne mogu stavljati na čekanje."</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="incall_error_promote_wfc" msgid="106510757624022064">"Omogućite pozivanje putem Wi-Fi veze da biste uspostavili poziv."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Podaci za hitne slučajeve"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Vlasnik"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Dodirnite ponovno da biste vidjeli informacije"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Hitni poziv"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Samo hitni pozivi"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Broj hitne službe"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Brojevi za hitne slučajeve"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Dodirnite ponovo da biste nazvali <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Uključivanje radija…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Nema usluge. Pokušavamo ponovo…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Nije moguće uključiti način rada u zrakoplovu tijekom hitnog poziva."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Hitni pozivi nisu dostupni"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Policija"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Hitna pomoć"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Vatrogasci"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</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>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Uvoz kontakta nije uspio"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Pomoć za osobe oštećenog sluha"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Uključi kompatibilnost za pomoć osobama oštećenog sluha"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"RTT (tekst u stvarnom vremenu) poziv"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Omogućavanje slanja poruka u glasovnom pozivu"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"RTT pomaže pozivateljima koji su gluhi, imaju oštećenje sluha, govornu manu ili im treba više od samo glasa.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Saznajte više&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; – RTT pozivi spremaju se kao prijepis poruke\n       &lt;br&gt; – RTT nije dostupan za videopozive"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Uključivanje ili isključivanje RTT-a"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"Isključen je TTY"</item>
     <item msgid="3971695875449640648">"TTY je pun"</item>
@@ -608,8 +589,6 @@
     <string name="selectContact" msgid="781975788478987237">"odabir kontakta"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Glasovni pozivi nisu podržani"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"biraj"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"prikaži površinu za biranje brojeva"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"površina za biranje brojeva hitne službe"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Vizualna govorna pošta"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Postavljanje PIN-a"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Promjena PIN-a"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 2ce19c8..bda15ae 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -127,10 +127,10 @@
     <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">"Hiba a hálózatban vagy a SIM-kártyánál."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"Az SS-kérés módosítva hagyományos hívásra"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"Az SS-kérés módosítva USSD-kérésre"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Új SS-kérésre módosítva"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"Az SS-kérés módosítva videohívásra"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"Az SS-kérés módosítva DIAL-kérésre."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"Az SS-kérés módosítva USSD-kérésre."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"Az USSD-kérés módosítva új SS-kérésre."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"Az SS kérés módosítva Video DIAL kérésre."</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>
@@ -163,7 +163,7 @@
     <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>
-    <string name="network_query_error" msgid="8466081377231178298">"Nincs hálózat. Próbálkozzon újra."</string>
+    <string name="network_query_error" msgid="6828516148953325006">"Hiba történt a hálózatok keresése közben."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Regisztrálás a(z) <xliff:g id="NETWORK">%s</xliff:g> hálózaton..."</string>
     <string name="not_allowed" msgid="5613353860205691579">"SIM kártyája nem teszi lehetővé a kapcsolódást ehhez a hálózathoz."</string>
     <string name="connect_later" msgid="2308119155752343975">"Most nem lehet csatlakozni a hálózathoz. Próbálja meg később."</string>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"A hálózati üzemmód megváltoztatása"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Preferált hálózattípus"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(tiltott)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Hálózat kiválasztása"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Nincs kapcsolat"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Csatlakoztatva"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Csatlakozás…"</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Nem sikerült csatlakozni"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA a preferált"</item>
     <item msgid="8442633436636425221">"Csak GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Hívás"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Hálózat"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Javított 4G LTE mód"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Továbbfejlesztett telefonhívás"</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="2382798156640007971">"Adatforgalom engedélyezése"</string>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"Barangolá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="6843814381576397939">"Az adatbarangolás ki van kapcsolva. Koppintson a bekapcsolásához."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Nincs mobiladat-kapcsolat"</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="1603164667540144353">"Lehet, hogy jelentős összeget számítanak fel érte."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Az árakat a szolgáltatótól tudhatja meg."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Engedélyezi az adatbarangolást?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Alkalmazás adathasználata"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Adathasználat"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> mobiladat felhasználva a következő dátumok között: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Speciális"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Szolgáltató"</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"A hívások nem tarthatók."</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="incall_error_promote_wfc" msgid="106510757624022064">"Engedélyezze a Wi-Fi-hívást a hívásindításhoz."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Segélyhívási információk"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Tulajdonos"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Koppints újra az információk megtekintéséhez"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Segélyhívás"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Csak segélyhívások"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Segélyhívó szám"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Segélyhívó számok"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Koppintson újra a következő hívásához: <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Rádió bekapcsolása..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Nincs szolgáltatás. Újrapróbálkozás folyamatban…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Segélyhívás során nem engedélyezheti a Repülős üzemmódot."</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 segélyhívószám."</string>
     <string name="dial_emergency_empty_error" msgid="9130194953830414638">"A hívás sikertelen. Tárcsázzon segélyhívószámot."</string>
-    <string name="dial_emergency_calling_not_available" msgid="5675557523782491826">"A segélyhívási funkció nem áll rendelkezésre"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Rendőrség"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Mentők"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Tűzoltóság"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</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>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Névjegy importálása sikertelen"</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>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Valós idejű szöveg (RTT) típusú hívás"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Üzenetküldés engedélyezése a hangalapú hívásokban"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"Az RTT funkció a siket, hallássérült, beszédzavaros vagy a hangalapú kommunikáción kívül más kommunikációt is igénylő hívóknak lehet segítségére.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;További információ.&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - Az RTT-hívásokat a rendszer üzenetátiratként menti.\n       &lt;br&gt; - Az RTT funkció nem áll rendelkezésre videohívásokban."</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Az RTT be- vagy kikapcsolása"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY kikapcsolva"</item>
     <item msgid="3971695875449640648">"Teljes TTY"</item>
@@ -606,8 +587,6 @@
     <string name="selectContact" msgid="781975788478987237">"névjegy kijelölése"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"A hanghívás nem támogatott"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"tárcsázás"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"tárcsázó megjelenítése"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Segélyhívás tárcsázója"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Vizuális hangpostaüzenet"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"PIN-kód beállítása"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"PIN-kód módosítása"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 645f685..c5576d4 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -58,7 +58,7 @@
     <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="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>
@@ -90,7 +90,7 @@
     <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>
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Կարգավորւմները հետադարձվում են..."</string>
     <string name="response_error" msgid="6674110501330139405">"Անակնկալ պատասխան ցանցից:"</string>
     <string name="exception_error" msgid="7027667130619518211">"Ցանցի կամ SIM քարտի սխալ"</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS հարցումը փոխվել է սովորական զանգի"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS հարցումը փոխվել է USSD հարցման"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Փոխվել է նոր SS հարցման"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS հարցումը փոխվել է տեսազանգի"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS հարցումը փոխվել է DIAL հարցման:"</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS հարցումը փոխվել է USSD հարցման:"</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS հարցումը փոխվել է նոր SS հարցման:"</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS հարցումը փոխվել է Video DIAL հարցման:"</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"Ձեր հեռախոսի հավելվածների ամրակայված հեռախոսահամարների կարգավորումները միացված են: Արդյունքում զանգերին առնչվող որոշ գործիքներ չեն աշխատի:"</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Միացրեք ռադիոն նախքան այս կարգավորումների դիտումը:"</string>
     <string name="close_dialog" msgid="2365884406356986917">"Լավ"</string>
@@ -163,7 +163,7 @@
     <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="network_query_error" msgid="8466081377231178298">"Չհաջողվեց ցանցեր գտնել: Նորից փորձեք:"</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>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Փոխել ցանցային գործավար ռեժիմը"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Ցանցի նախընտրելի տեսակը"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(արգելված)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Ընտրել ցանց"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Անջատված է"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Միացված է"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Միացում..."</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Չհաջողվեց միանալ"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA նախընտրելի"</item>
     <item msgid="8442633436636425221">"Միայն GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Զանգ"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Ցանց"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Ընդլայնված 4G LTE ռեժիմ"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Ընդլայնված զանգ"</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>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"Ռոումինգ"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Միանալ տվյալների փոխանցման ծառայություններին ռոումինգում"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Միանալ տվյալների փոխանցման ծառայություններին ռոումինգում"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"Ռոումինգում բջջային ինտերնետն անջատած է: Հպեք՝ միացնելու համար:"</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Բջջային ինտերնետը կորավ"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Դուք կորցրել եք տվյալների կապը, քանի որ անջատված եք թողել ձեր գլխավոր ցանցի տվյալների ռոումինգը:"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"Դրա համար ձեզանից կարող են խոշոր վճարներ գանձվել:"</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Գների վերաբերյալ տեղեկություններ ստանալու համար դիմեք ձեր օպերատորին:"</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Թույլատրե՞լ տվյալների ռոումինգը:"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Թրաֆիկի օգտագործումը հավելվածի կողմից"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Թրաֆիկի օգտագործում"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"Oգտագործվել է <xliff:g id="ID_1">%1$s</xliff:g> բջջային ինտերնետ (<xliff:g id="ID_2">%2$s</xliff:g>)"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Լրացուցիչ"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Օպերատոր"</string>
@@ -275,11 +269,11 @@
     <!-- 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_rate_subtext" msgid="2149102656120726855">"Տվյալների ծավալը կնվազի մինչև <xliff:g id="USED">%1$d</xliff:g> ԿԲ/վ, եթե տվյալների օգտագործման սահմանաչափը գերազանցվի"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"Լրացուցիչ տեղեկություններ ձեր սպասարկողի բջջային ցանցի տվյալների օգտագործման քաղաքականության մասին"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"Բջջային հեռարձակման SMS"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"Բջջային հեռարձակման SMS"</string>
@@ -509,24 +503,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Հնարավոր չէ հետաձգել զանգերը:"</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Զանգ կատարելու համար միացեք անլար ցանցին:"</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"Զանգ կատարելու համար միացրեք «Զանգեր Wi-Fi ցանցի միջոցով» գործառույթը:"</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Անհետաձգելի բուժօգնության տվյալներ"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Սեփականատեր"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Կրկին հպեք՝ տեղեկությունները դիտելու համար"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Շտապ կանչ"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Միայն շտապ կանչեր"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Արտակարգ ծառայություն"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Արտակարգ ծառայությունների հեռախոսահամարներ"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Կրկին հպեք՝ <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g> համարին զանգելու համար"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Ռադիոն միացվում է..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Ծառայությունը մատչելի չէ: Նորից փորձեք…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Շտապ կանչի ժամանակ հնարավոր չէ մտնել ինքնաթիռի ռեժիմ:"</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Շտապ կանչերը հասանելի չեն"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Ոստիկանություն"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Շտապ օգնություն"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Հրշեջ ծառայություն"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Օգտագործեք ստեղնաշարը՝ համարհավաքման համար"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Պահել"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Ավարտել"</string>
@@ -547,12 +529,11 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Չհաջողվեց ներմուծել կոնտակտը"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Լսողական ապարատ"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Միացնել լսողական ապարատի աջակցումը"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"RTT զանգ (հաղորդագրություն զանգի միջոցով)"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Թույլատրել հաղորդագրությունների ուղարկումն ու ստացումը զանգի միջոցով"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"RTT-ն օգնում է այն բաժանորդներին, ովքեր լսողության և խոսքի դժվարություններ ունեն, կամ ովքեր լոկ ձայնով չեն բավարարվում:&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Իմանալ ավելին&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; – RTT զանգերը պահվում են որպես հաղորդագրության տառադրումներ\n       &lt;br&gt; – RTT-ն հասանելի չէ տեսազանգի ժամանակ"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Միացնել կամ անջատել RTT գործառույթը"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY-ն անջատված է"</item>
-    <item msgid="3971695875449640648">"Լիարժեք TTY"</item>
+    <item msgid="3971695875449640648">"TTY Full"</item>
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
@@ -612,9 +593,7 @@
     <string name="selectContact" msgid="781975788478987237">"ընտրել կոնտակտ"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Ձայնային զանգերը չեն սպասարկվում"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"համարհավաքել"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"ցուցադրել թվաշարը"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Շտապ կանչերի թվաշար"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Վիզուալ ձայնային փոստ"</string>
+    <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Տեսողական ձայնային փոստ"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Ընտրեք PIN"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Փոխել PIN-ը"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Ձայներանգ &amp; Թրթռոց"</string>
@@ -626,7 +605,7 @@
     <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="accessibility_settings_activity_title" msgid="8562004288733103868">"Մատչելիություն"</string>
     <string name="status_hint_label_incoming_wifi_call" msgid="5932176406432044638">"Wi-Fi զանգ այս օգտվողից՝"</string>
     <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Զանգ Wi-Fi-ի միջոցով"</string>
     <string name="emergency_action_launch_hint" msgid="4906759256275562674">"Կրկին հպեք՝ բացելու համար"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 4468d4a..55abebb 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -30,7 +30,7 @@
     <string name="mmiCancelled" msgid="2771923949751842276">"Kode MMI dibatalkan"</string>
     <string name="cancel" msgid="5044513931633602634">"Batal"</string>
     <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 konferensi telepon"</string>
+    <string name="manageConferenceLabel" msgid="4691922394301969053">"Kelola penggilan telewicara"</string>
     <string name="ok" msgid="3811371167865772377">"Oke"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Speaker"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Earpiece handset"</string>
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Mengembalikan setelan..."</string>
     <string name="response_error" msgid="6674110501330139405">"Tanggapan tak terduga dari jaringan."</string>
     <string name="exception_error" msgid="7027667130619518211">"Kesalahan jaringan atau kartu SIM."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"Permintaan SS diubah ke panggilan reguler"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"Permintaan SS diubah ke permintaan USSD"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Diubah ke permintaan SS baru"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"Permintaan SS diubah ke video call"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"Permintaan SS diubah menjadi permintaan DIAL."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"Permintaan SS diubah menjadi permintaan USSD."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"Permintaan SS diubah menjadi permintaan SS baru."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"Permintaan SS diubah menjadi permintaan Video DIAL."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"Setelan Nomor Panggilan Tetap aplikasi Ponsel Anda diaktifkan. Akibatnya, beberapa fitur yang terkait dengan panggilan tidak bekerja."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Keluar dari mode pesawat sebelum melihat setelan ini."</string>
     <string name="close_dialog" msgid="2365884406356986917">"Oke"</string>
@@ -163,7 +163,7 @@
     <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>
-    <string name="network_query_error" msgid="8466081377231178298">"Tidak dapat menemukan jaringan. Coba lagi."</string>
+    <string name="network_query_error" msgid="6828516148953325006">"Kesalahan ketika menelusuri jaringan."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Mendaftarkan pada <xliff:g id="NETWORK">%s</xliff:g>…"</string>
     <string name="not_allowed" msgid="5613353860205691579">"Kartu SIM Anda tidak mengizinkan sambungan ke jaringan ini."</string>
     <string name="connect_later" msgid="2308119155752343975">"Tidak dapat terhubung ke jaringan ini sekarang. Coba lagi nanti."</string>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Ubah mode pengoperasian jaringan"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Jenis jaringan yang dipilih"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(terlarang)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Pilih jaringan"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Tidak tersambung"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Tersambung"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Menyambungkan..."</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Tidak dapat tersambung"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA lebih disukai"</item>
     <item msgid="8442633436636425221">"GSM saja"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Memanggil"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Jaringan"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Mode LTE 4G yang Ditingkatkan"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Panggilan Telepon Lanjutan"</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="2382798156640007971">"Izinkan penggunaan data"</string>
@@ -243,19 +238,18 @@
     <string name="roaming" msgid="7894878421600247140">"Roaming"</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="6843814381576397939">"Roaming data dinonaktifkan. Tap untuk mengaktifkan."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Koneksi data seluler terputus"</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="1603164667540144353">"Anda dapat dikenakan biaya yang cukup besar."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Hubungi penyedia jaringan untuk mengetahui harganya."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Izinkan roaming data?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Penggunaan data aplikasi"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Penggunaan data"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> data seluler digunakan pada <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Lanjutan"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Operator"</string>
     <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"operator, esim, sim, euicc, beralih operator, tambahkan operator"</string>
     <string name="carrier_settings_euicc_summary" msgid="5115001942761995457">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> — <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
     <string name="mobile_data_settings_title" msgid="4661165467914727157">"Data seluler"</string>
-    <string name="mobile_data_settings_summary" msgid="5087255915840576895">"Akses data menggunakan jaringan seluler"</string>
+    <string name="mobile_data_settings_summary" msgid="5087255915840576895">"Mengakses data menggunakan jaringan seluler"</string>
     <string name="data_usage_disable_mobile" msgid="3577275288809667615">"Nonaktifkan data seluler?"</string>
     <string name="sim_selection_required_pref" msgid="7049424902961844236">"Perlu memilih SIM"</string>
     <string name="sim_change_data_title" msgid="5332425991853799280">"Ubah SIM data?"</string>
@@ -386,13 +380,13 @@
     <string name="cdma_activate_device" msgid="3793805892364814518">"Aktifkan perangkat"</string>
     <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">"Panggilan Terbatas (FDN)"</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">"Panggilan Terbatas (FDN) diaktifkan"</string>
-    <string name="fdn_disabled" msgid="4700049736675368279">"Panggilan Terbatas (FDN) dinonaktifkan"</string>
+    <string name="fdn_enabled" msgid="5238109009915521240">"Nomor Panggilan Tetap diaktifkan"</string>
+    <string name="fdn_disabled" msgid="4700049736675368279">"Nomor Panggilan Tetap dinonaktifkan"</string>
     <string name="enable_fdn" msgid="3740191529180493851">"Aktifkan FDN"</string>
     <string name="disable_fdn" msgid="7944020890722540616">"Nonaktifkan FDN"</string>
     <string name="change_pin2" msgid="2153563695382176676">"Ubah PIN2"</string>
@@ -471,7 +465,7 @@
     <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="8253487008234167266">"Memanggil ulang"</string>
-    <string name="card_title_conf_call" msgid="1162980346189744501">"Konferensi telepon"</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>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Tidak dapat menahan panggilan."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Sambungkan ke jaringan nirkabel untuk melakukan panggilan"</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"Aktifkan panggilan Wi-Fi untuk melakukan panggilan."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Informasi darurat"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Pemilik"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Tap lagi untuk melihat info"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Panggilan darurat"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Panggilan darurat saja"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Nomor darurat"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Nomor darurat"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Tap lagi untuk menelepon <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Menghidupkan radio..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Tidak ada layanan. Mencoba lagi…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Tidak dapat masuk ke mode pesawat selama panggilan darurat."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Panggilan darurat tidak tersedia"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Kantor Polisi"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Ambulans"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Pemadam Kebakaran"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</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>
@@ -540,10 +522,9 @@
     <string name="singleContactImportedMsg" msgid="6868483416182599206">"Kontak diimpor"</string>
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Gagal mengimpor kontak"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Alat bantu dengar"</string>
-    <string name="hac_mode_summary" msgid="6833851160514929341">"Aktifkan kompatibilitas alat bantu dengar"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Panggilan pesan real-time (RTT)"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Izinkan pengiriman pesan pada saat panggilan suara berlangsung"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"RTT membantu penelepon yang tunarungu, kesulitan mendengar, memiliki gangguan berbicara, atau memerlukan lebih dari sekadar suara.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Pelajari lebih lanjut&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - Panggilan RTT disimpan sebagai transkrip pesan\n       &lt;br&gt; - RTT tidak tersedia untuk video call"</string>
+    <string name="hac_mode_summary" msgid="6833851160514929341">"Hidupkan kompatibilitas alat bantu dengar"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Aktifkan atau nonaktifkan RTT"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY Nonaktif"</item>
     <item msgid="3971695875449640648">"TTY Penuh"</item>
@@ -606,8 +587,6 @@
     <string name="selectContact" msgid="781975788478987237">"pilih kontak"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Panggilan suara tidak didukung"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"panggil"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"tampilkan dialpad"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Tombol Nomor Darurat"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Kotak Pesan Visual"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Setel PIN"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Ubah PIN"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index e481889..7730643 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Afturkallar stillingar…"</string>
     <string name="response_error" msgid="6674110501330139405">"Óvænt svar frá símkerfi."</string>
     <string name="exception_error" msgid="7027667130619518211">"Villa í símkerfi eða á SIM-korti."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS-beiðni breytt í venjulegt símtal"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS-beiðni breytt í USSD-beiðni"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Breytt í nýja SS-beiðni"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS-beiðni breytt í myndsímtal"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS-beiðni breytt í DIAL-beiðni."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS-beiðni breytt í USSD-beiðni."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS-beiðni breytt í nýja SS-beiðni."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS-beiðni breytt í Video DIAL-beiðni."</string>
     <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>
@@ -163,7 +163,7 @@
     <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>
-    <string name="network_query_error" msgid="8466081377231178298">"Símkerfi fundust ekki. Reyndu aftur."</string>
+    <string name="network_query_error" msgid="6828516148953325006">"Villa kom upp við símkerfaleit."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Skráning á <xliff:g id="NETWORK">%s</xliff:g>…"</string>
     <string name="not_allowed" msgid="5613353860205691579">"SIM-kortið leyfir ekki tengingu við þetta símkerfi."</string>
     <string name="connect_later" msgid="2308119155752343975">"Ekki næst tenging við þetta kerfi á þessari stundu. Reyndu aftur síðar."</string>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Breyta virknihætti símkerfis"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Valin símkerfistegund"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(bannað)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Velja netkerfi"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Aftengt"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Tengt"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Tengist..."</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Ekki tókst að tengjast"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA fyrsta val"</item>
     <item msgid="8442633436636425221">"GSM eingöngu"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Hringir"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Netkerfi"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"endurbætt 4G LTE-stilling"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Betri símtöl"</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="2382798156640007971">"Leyfa gagnanotkun"</string>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"Reiki"</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="6843814381576397939">"Slökkt er á gagnareiki. Ýttu til að kveikja."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Farsímagagnatenging rofnaði"</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="1603164667540144353">"Þetta getur haft mikinn kostnað í för með sér."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Upplýsingar um verð fást hjá símafyrirtækinu."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Leyfa gagnareiki?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Gagnanotkun forrits"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Gagnanotkun"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> af farsímagögnum notuð <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Ítarlegt"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Símafyrirtæki"</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Getur ekki sett símtöl í bið."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Tengstu þráðlausu neti til að hringja."</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"Virkjaðu Wi-Fi símtöl til að hringja."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Neyðarupplýsingar"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Eigandi"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Ýttu aftur til að skoða upplýsingar"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Neyðarsímtal"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Aðeins neyðarsímtöl"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Neyðarnúmer"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Neyðarnúmer"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Ýttu aftur til að hringja í <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Kveikir á loftneti…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Ekkert samband. Reynir aftur…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Ekki er hægt að fara í flugstillingu meðan neyðarsímtal er í gangi."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Neyðarsímtöl eru ekki í boði"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Lögregla"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Sjúkrabíll"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Eldur"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</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>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Mistókst að flytja inn tengilið"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Heyrnartæki"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Kveikja á samhæfi við heyrnartæki"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"RTT-símtal (með texta í rauntíma)"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Leyfa skilaboðasendingar í símtölum"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"RTT (símtöl með texta í rauntíma) aðstoðar heyrnarlausa og fólk með heyrnarskerðingu eða skerta talgetu og þá sem þurfa að styðja sig við meira en bara hljóð.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Frekari upplýsingar&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - RTT-símtöl eru vistuð í umrituðum skilaboðum\n       &lt;br&gt; - RTT er ekki í boði fyrir myndsímtöl"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Kveikja og slökkva á RTT"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"Slökkt á TTY"</item>
     <item msgid="3971695875449640648">"TTY að fullu"</item>
@@ -606,8 +587,6 @@
     <string name="selectContact" msgid="781975788478987237">"velja tengilið"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Símtöl eru ekki studd"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"hringja"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"sýna símatakkaborð"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Takkaborð fyrir neyðarsíma"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Myndrænt talhólf"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Stilla PIN-númer"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Breyta PIN-númeri"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index d2fc14f..544c7ff 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -20,7 +20,7 @@
     <string name="phoneAppLabel" product="default" msgid="6790717591729922998">"Phone Services"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Chiamata di emergenza"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Telefono"</string>
-    <string name="fdnListLabel" msgid="8630418672279521003">"Elenco numeri consentiti"</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="4793877574636445118">"Cabina telefonica"</string>
@@ -90,7 +90,7 @@
     <string name="sum_loading_settings" msgid="1826692909391168620">"Caricamento impostazioni…"</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Numero nascosto per chiamate in uscita"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Numero visualizzato in chiamate in uscita"</string>
-    <string name="sum_default_caller_id" msgid="1954518825510901365">"Usa impostazioni dell\'operatore per mostrare il mio numero nelle chiamate in uscita"</string>
+    <string name="sum_default_caller_id" msgid="1954518825510901365">"Usa impostazioni operatore per visualizzare il mio numero in chiamate in uscita"</string>
     <string name="labelCW" msgid="6120513814915920200">"Avviso di chiamata"</string>
     <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>
@@ -102,21 +102,21 @@
     <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="8384177689501334080">"Off"</string>
-    <string name="labelCFB" msgid="6139853033106283172">"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="4913145177320506827">"Off"</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="1736067178393744351">"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="3884684060443538097">"Off"</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="2614827454402079766">"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="2684474391807469832">"Off"</string>
+    <string name="sum_cfnrc_disabled" msgid="2684474391807469832">"Non attiva"</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_admin_user_only" msgid="4526094783818216374">"Le impostazioni delle chiamate possono essere modificate solo dall\'utente amministratore."</string>
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Annullamento impostazioni..."</string>
     <string name="response_error" msgid="6674110501330139405">"Risposta imprevista dalla rete."</string>
     <string name="exception_error" msgid="7027667130619518211">"Errore di rete o della SIM."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"Richiesta SS modificata in chiamata normale"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"Richiesta SS modificata in richiesta USSD"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Modificata in nuova richiesta SS"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"Richiesta SS modificata in videochiamata"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"Richiesta SS modificata in richiesta DIAL."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"Richiesta SS modificata in richiesta USSD."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"Richiesta SS modificata in nuova richiesta SS."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"Richiesta SS modificata in richiesta Video DIAL."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"L\'impostazione relativa ai numeri di selezione fissa dell\'applicazione sul tuo telefono è attiva. Di conseguenza, alcune funzioni legate alle chiamate non funzionano."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Attiva il segnale cellulare per visualizzare queste impostazioni."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
@@ -163,24 +163,19 @@
     <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>
-    <string name="network_query_error" msgid="8466081377231178298">"Impossibile trovare reti. Riprova."</string>
+    <string name="network_query_error" msgid="6828516148953325006">"Errore durante la ricerca di reti."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Registrazione su <xliff:g id="NETWORK">%s</xliff:g>..."</string>
     <string name="not_allowed" msgid="5613353860205691579">"La scheda SIM non consente la connessione a questa rete."</string>
     <string name="connect_later" msgid="2308119155752343975">"Impossibile connettersi a questa rete in questo momento. Riprova più tardi."</string>
     <string name="registration_done" msgid="495135664535876612">"Registrato sulla rete."</string>
     <string name="already_auto" msgid="6067116884321285507">"Già in selezione automatica."</string>
-    <string name="select_automatically" msgid="1046727200631770962">"Seleziona rete automaticamente"</string>
+    <string name="select_automatically" msgid="1046727200631770962">"Seleziona automaticamente la rete"</string>
     <string name="network_select_title" msgid="7733107364757544558">"Rete"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Registrazione automatica..."</string>
     <string name="preferred_network_mode_title" msgid="2336624679902659306">"Tipo di rete preferito"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Cambia la modalità di funzionamento della rete"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Tipo di rete preferito"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(vietato)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Scegli rete"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Disconnesso"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Connesso"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Connessione…"</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Impossibile connettersi."</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA preferito"</item>
     <item msgid="8442633436636425221">"Solo GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Chiamata in corso"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Rete"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Modalità 4G LTE avanzata"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Chiamata 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="2382798156640007971">"Consenti l\'utilizzo dei dati"</string>
@@ -243,13 +238,12 @@
     <string name="roaming" msgid="7894878421600247140">"Roaming"</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="6843814381576397939">"Disattivazione del roaming dati in corso. Tocca per attivarlo."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Connessione dati mobile interrotta"</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="1603164667540144353">"I costi potrebbero essere elevati."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Verifica i costi con il tuo fornitore di rete."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Consentire il roaming dei dati?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Utilizzo dei dati delle app"</string>
-    <string name="data_usage_template" msgid="8526428824844656364">"Dati mobili usati: <xliff:g id="ID_1">%1$s</xliff:g> nel periodo <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Utilizzo dati"</string>
+    <string name="data_usage_template" msgid="8526428824844656364">"Utilizzo dati mobili: <xliff:g id="ID_1">%1$s</xliff:g> nel periodo <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Avanzate"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Operatore"</string>
     <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"operatore, esim, sim, euicc, cambia operatore, aggiungi operatore"</string>
@@ -390,20 +384,20 @@
     <string name="cdma_activate_device" msgid="3793805892364814518">"Attiva dispositivo"</string>
     <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 consentiti"</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 numeri consentiti"</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 numeri consentiti"</string>
+    <string name="fdn" msgid="7878832555095183202">"Numeri selezione fissa (FDN)"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Numeri selezione fissa (<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 FDN (<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">"La funzionalità Numeri consentiti non è attiva"</string>
-    <string name="enable_fdn" msgid="3740191529180493851">"Attiva numeri consentiti"</string>
-    <string name="disable_fdn" msgid="7944020890722540616">"Disattiva numeri consentiti"</string>
+    <string name="fdn_disabled" msgid="4700049736675368279">"Numeri di selezione fissa non attivi"</string>
+    <string name="enable_fdn" msgid="3740191529180493851">"Attiva FDN"</string>
+    <string name="disable_fdn" msgid="7944020890722540616">"Disattiva FDN"</string>
     <string name="change_pin2" msgid="2153563695382176676">"Cambia PIN2"</string>
-    <string name="enable_fdn_ok" msgid="7215588870329688132">"Disattiva numeri consentiti"</string>
-    <string name="disable_fdn_ok" msgid="5727046928930740173">"Attiva numeri consentiti"</string>
+    <string name="enable_fdn_ok" msgid="7215588870329688132">"Disattiva FDN"</string>
+    <string name="disable_fdn_ok" msgid="5727046928930740173">"Attiva FDN"</string>
     <string name="sum_fdn" msgid="1959399454900272878">"Gestisci numeri di selezione fissa"</string>
-    <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Cambia PIN per accesso ai numeri consentiti"</string>
+    <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Cambia PIN per accesso FDN"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Gestisci elenco numeri"</string>
     <string name="voice_privacy" msgid="3776841382844614716">"Privacy pacchetti vocali"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Attiva modalità privacy ottimizzata"</string>
@@ -429,10 +423,10 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"Elimina numero selezione fissa"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Eliminazione numero selezione fissa..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Numero di selezione fissa eliminato."</string>
-    <string name="pin2_invalid" msgid="5470854099230755944">"Numeri consentiti non aggiornati perché il PIN inserito non è corretto."</string>
-    <string name="fdn_invalid_number" msgid="2062898833049589309">"I numeri consentiti non sono stati aggiornati perché il numero supera le 20 cifre."</string>
-    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Numeri consentiti non aggiornati. Il codice PIN2 non era corretto o il numero di telefono è stato rifiutato."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"Operazione numeri consentiti non riuscita."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"FDN non aggiornato perché il PIN inserito non è corretto."</string>
+    <string name="fdn_invalid_number" msgid="2062898833049589309">"FDN non è stato aggiornato perché il numero supera le 20 cifre."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN non aggiornato. Il codice PIN2 non era corretto o il numero di telefono è stato rifiutato."</string>
+    <string name="fdn_failed" msgid="540018079008319747">"Operazione FDN non riuscita."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Lettura da SIM..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Nessun contatto presente nella SIM."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Seleziona contatti da importare"</string>
@@ -507,24 +501,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Impossibile mettere in attesa le chiamate."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Connettiti a una rete wireless per effettuare una chiamata."</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"Attiva le chiamate tramite Wi-Fi per effettuare una chiamata."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Informazioni per le emergenze"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Proprietario"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Tocca di nuovo per visualizzare le informazioni"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Chiamata di emergenza"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Solo chiamate di emergenza"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Numero di emergenza"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Numeri di emergenza"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Tocca ancora per chiamare <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Attivazione segnale cellulare..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Nessun servizio. Nuovo tentativo…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Impossibile attivare la modalità aereo durante una chiamata di emergenza."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Chiamate di emergenza non disponibili"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Polizia"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Ambulanza"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Vigili del fuoco"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Usa tastiera"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"In attesa"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Chiudi"</string>
@@ -545,9 +527,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Importazione contatto non riuscita"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Apparecchi acustici"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Attiva la compatibilità con apparecchi acustici"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Chiamate con Real-time text (RTT)"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Consenti l\'utilizzo di messaggi durante le chiamate vocali"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"RTT aiuta i chiamanti con disabilità uditive o del linguaggio e le persone che hanno bisogno di un supporto scritto oltre alla voce.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Ulteriori informazioni&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - Le chiamate RTT vengono salvare come una trascrizione in messaggi\n       &lt;br&gt; - RTT non è disponibile per le videochiamate"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Attiva o disattiva RTT"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY disattivato"</item>
     <item msgid="3971695875449640648">"TTY completo"</item>
@@ -610,8 +591,6 @@
     <string name="selectContact" msgid="781975788478987237">"seleziona contatto"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Chiamate vocali non supportate"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"componi"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"mostra tastierino"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Tastierino di emergenza"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Leggi la segreteria"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Imposta PIN"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Cambia PIN"</string>
@@ -715,7 +694,7 @@
     <string name="clh_callFailed_protocol_Error_unspecified_txt" msgid="8294907817156524790">"Errore protocollo, non specificato"</string>
     <string name="clh_callFailed_interworking_unspecified_txt" msgid="8838850798491763729">"Interfunzionamento, non specificato"</string>
     <string name="labelCallBarring" msgid="3452870940716226978">"Blocco chiamate"</string>
-    <string name="sum_call_barring_enabled" msgid="6804489690436703488">"On"</string>
+    <string name="sum_call_barring_enabled" msgid="6804489690436703488">"Attivo"</string>
     <string name="sum_call_barring_disabled" msgid="5900772179198857783">"Non attivo"</string>
     <string name="call_barring_baoc" msgid="1199843944333106035">"Tutte le chiamate in uscita"</string>
     <string name="call_barring_baoc_enabled" msgid="8112118391869380361">"Disattivare il blocco di tutte le chiamate in uscita?"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 2fe1587..49755cb 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -30,7 +30,7 @@
     <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="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>
@@ -38,10 +38,10 @@
     <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="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="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>
@@ -90,10 +90,10 @@
     <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="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>
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"מאחזר הגדרות הקודמות…"</string>
     <string name="response_error" msgid="6674110501330139405">"תגובה לא צפויה מהרשת."</string>
     <string name="exception_error" msgid="7027667130619518211">"‏שגיאת רשת או שגיאה של כרטיס SIM."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"‏בקשת SS שונתה לשיחה רגילה"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"‏בקשת SS שונתה לבקשת USSD"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"‏היה שינוי לבקשת SS חדשה"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"‏בקשת SS שונתה לשיחת וידאו"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"‏בקשת SS שונתה לבקשת DIAL."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"‏בקשת SS שונתה לבקשת USSD."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"‏בקשת SS שונתה לבקשת SS חדשה."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"‏בקשת SS שונתה לבקשת Video DIAL."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"הגדרת מספרי החיוג הקבועים של אפליקציית הטלפון שלך מופעלת. כתוצאה מכך, חלק מהתכונות הקשורות לשיחות לא פועלות."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"הפעל את הרדיו לפני ההצגה של הגדרות אלה."</string>
     <string name="close_dialog" msgid="2365884406356986917">"אישור"</string>
@@ -163,7 +163,7 @@
     <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="network_query_error" msgid="8466081377231178298">"לא נמצאו רשתות. אפשר לנסות שוב."</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>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"שנה את מצב ההפעלה של הרשת"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"סוג רשת מועדף"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(אסור)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"בחירת רשת"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"המכשיר מנותק"</string>
-    <string name="network_connected" msgid="1288589103624338857">"המכשיר מחובר"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"המכשיר מתחבר…"</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"לא ניתן להתחבר"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"‏GSM/WCDMA מועדפת"</item>
     <item msgid="8442633436636425221">"‏GSM בלבד"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"שיחות"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"רשת"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"‏מצב 4G LTE משופר"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"שיחה משופרת"</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>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"נדידה"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"התחבר לשירותי נתונים בעת נדידה"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"התחבר לשירותי נתונים בעת נדידה"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"הנדידה מושבתת. אפשר להקיש כדי להפעיל אותה."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"המכשיר התנתק מחבילת הגלישה"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"איבדת את קישוריות הנתונים כיוון שעזבת את הרשת הביתית כשהנדידה כבויה."</string>
     <string name="roaming_warning" msgid="1603164667540144353">"ייתכנו שיעורי חיוב גבוהים."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"למידע נוסף על המחירים, יש לפנות לספק השירות."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"האם לאפשר נדידה?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"שימוש בחבילת הגלישה דרך אפליקציות"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"שימוש בחבילת הגלישה"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"השתמשת ב-<xliff:g id="ID_1">%1$s</xliff:g> מחבילת הגלישה בתאריכים <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"הגדרות מתקדמות"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"ספק"</string>
@@ -373,7 +367,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>
@@ -398,9 +392,9 @@
     <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" msgid="1959399454900272878">"נהל מספרי חיוג קבועים"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"שנה את קוד הגישה למספרי חיוג קבועים"</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>
@@ -461,7 +455,7 @@
     <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="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>
@@ -503,34 +497,22 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"לא ניתן להחזיק שיחות."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"התחבר לרשת אלחוטית כדי לבצע שיחה."</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"‏הפעל את \'שיחות Wi-Fi\' כדי להתקשר."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"מידע למקרה חירום"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"בעלים"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"אפשר להקיש שוב כדי להציג את הפרטים"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"שיחת חירום"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"שיחות חירום בלבד"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"מספר חירום"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"מספרי חירום"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"אפשר להקיש שוב כדי להתקשר אל <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"מפעיל את הרדיו…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"אין שירות. מנסה שוב..."</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"אי אפשר לעבור למצב טיסה בזמן שיחת חירום."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"אי אפשר לבצע שיחות חירום"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"משטרה"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"אמבולנס"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"אש"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"‏%1$s,‏ %2$s"</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="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>
@@ -540,10 +522,9 @@
     <string name="singleContactImportedMsg" msgid="6868483416182599206">"איש הקשר יובא"</string>
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"ייבוא איש הקשר נכשל"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"מכשירי שמיעה"</string>
-    <string name="hac_mode_summary" msgid="6833851160514929341">"הפעלת תאימות למכשיר שמיעה"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"‏שיחת RTT (טקסט בזמן אמת)"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"אפשר לשלוח הודעות טקסט בזמן שיחה"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"‏RTT (טקסט בזמן אמת) היא תכונת נגישות שעוזרת לחרשים, לקויי שמיעה, לקויי דיבור או אנשים שלא יכולים להסתפק רק בשיחות קוליות.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;למידע נוסף&lt;/a&gt;‏\n      &lt;br&gt;&lt;br&gt; - שיחות RTT מתומללות ונשמרות כהודעות\n &lt;br&gt; - אי אפשר להשתמש ב-RTT לשיחות וידאו"</string>
+    <string name="hac_mode_summary" msgid="6833851160514929341">"הפעל תאימות למכשיר שמיעה"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"‏הפעלה או השבתה של RTT"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"‏TTY כבוי"</item>
     <item msgid="3971695875449640648">"‏TTY מלא"</item>
@@ -610,8 +591,6 @@
     <string name="selectContact" msgid="781975788478987237">"בחר איש קשר"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"חיוג קולי אינו נתמך"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"חייג"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"הצגת לוח החיוג"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"לוח חיוג לחירום"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"דואר קולי ויזואלי"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"הגדרת קוד גישה"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"שינוי קוד הגישה"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 83e9387..51f9e90 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -90,7 +90,7 @@
     <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>
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"設定を元に戻しています..."</string>
     <string name="response_error" msgid="6674110501330139405">"ネットワークから予期しない応答が返されました。"</string>
     <string name="exception_error" msgid="7027667130619518211">"ネットワークまたはSIMカードのエラーです。"</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS リクエストは通常の通話に変更されました"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS リクエストは USSD リクエストに変更されました"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"新しい SS リクエストに変更されました"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS リクエストはビデオハングアウトに変更されました"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SSリクエストはDIALリクエストに変更されました。"</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SSリクエストはUSSDリクエストに変更されました。"</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SSリクエストは新しいSSリクエストに変更されました。"</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS リクエストが Video DIAL リクエストに変更されました。"</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"電話アプリの発信番号制限設定がONになっているため、通話関連の機能の一部を使用できません。"</string>
     <string name="radio_off_error" msgid="2304459933248513376">"これらの設定を表示するには無線通信をONにしてください。"</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
@@ -163,7 +163,7 @@
     <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="network_query_error" msgid="8466081377231178298">"ネットワークが見つかりませんでした。もう一度お試しください。"</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>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"ネットワーク動作モードの変更"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"優先ネットワークタイプ"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"（禁止）"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"ネットワークを選択"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"未接続"</string>
-    <string name="network_connected" msgid="1288589103624338857">"接続中"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"接続処理中..."</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"接続できませんでした"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM / WCDMA を優先"</item>
     <item msgid="8442633436636425221">"GSM のみ"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"通話"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"ネットワーク"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"4G LTE拡張モード"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"高度な通話機能"</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>
@@ -243,13 +238,12 @@
     <string name="roaming" msgid="7894878421600247140">"ローミング"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"ローミング時にデータサービスに接続する"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"ローミング時にデータサービスに接続する"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"データ ローミングが OFF になっています。タップして ON にしてください。"</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"モバイルデータ通信が切断されました"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"データローミングをOFFにしてホームネットワークを離れたため、データ接続が切断されました。"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"高額な通信料が発生することがあります。"</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"価格設定については、ネットワーク プロバイダにお問い合わせください。"</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"データ ローミングを許可しますか？"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"アプリのデータ使用量"</string>
-    <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_2">%2$s</xliff:g>のモバイルデータ使用量: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"データ使用量"</string>
+    <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_2">%2$s</xliff:g> のモバイルデータ使用量: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"詳細設定"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"携帯通信会社"</string>
     <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"携帯通信会社, eSIM, SIM, eUICC, 携帯通信会社を切り替える, 携帯通信会社を追加"</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"通話を保留にできません。"</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"電話をかけるには無線ネットワークに接続してください。"</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"電話をかけるには Wi-Fi 通話を有効にしてください。"</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"緊急時情報"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"所有者"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"もう一度タップすると情報を確認できます"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"緊急通報"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"緊急通報のみ"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"緊急通報番号"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"緊急通報番号一覧"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"もう一度タップすると <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g> 宛に発信できます"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"無線通信をONにしています..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"通信サービスはありません。もう一度お試しください…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"緊急通報中に機内モードに切り替えることはできません。"</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"緊急通報はご利用いただけません"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"警察"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"救急車"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"消防車"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s、%2$s"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"キーボードで番号を入力してください"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"保留"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"終了"</string>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"連絡先をインポートできませんでした"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"補聴機能"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"補聴機能の互換をON"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"リアルタイム テキスト（RTT）通話"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"音声通話中のメッセージ送信を許可する"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"RTT は、聴覚障害や言語障害があるなど、音声だけではコミュニケーションを取ることが困難なユーザーをサポートする機能です。&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;詳細&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - RTT 通話は文字に変換して保存されます\n       &lt;br&gt; - RTT はビデオ通話ではご利用いただけません"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"RTT を ON または OFF にする"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY OFF"</item>
     <item msgid="3971695875449640648">"TTY フル"</item>
@@ -606,8 +587,6 @@
     <string name="selectContact" msgid="781975788478987237">"連絡先を選択"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"音声通話はサポートされていません"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"発信"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"ダイヤルパッドを表示"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"緊急通報ダイヤルパッド"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"ビジュアルボイスメール"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"PIN の設定"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"PIN の変更"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index f1f5cac..7b7ce39 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"პარამეტრების დაბრუნება…"</string>
     <string name="response_error" msgid="6674110501330139405">"მოულოდნელი პასუხი ქსელიდან."</string>
     <string name="exception_error" msgid="7027667130619518211">"ქსელის ან SIM ბარათის შეცდომა."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS მოთხოვნა შეიცვალა ჩვეულებრივი ზარით"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS მოთხოვნა შეიცვალა USSD მოთხოვნით"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"შეიცვალა ახალი SS მოთხოვნით"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS მოთხოვნა შეიცვალა ვიდეოზარით"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS მოთხოვნა შეიცვალა DIAL მოთხოვნით."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS მოთხოვნა შეიცვალა USSD მოთხოვნით."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS მოთხოვნა შეიცვალა ახალი SS მოთხოვნით."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS მოთხოვნა შეიცვალა Video DIAL მოთხოვნით."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"თქვენი ტელეფონის აპის დაშებული ნომრების პარამეტრი ჩართულია. შედეგად, ზართან დაკავშორებული ზოგიერთი ფუნქცია არ მუშაობს."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"ჩართეთ გადამცემი, სანამ ამ პარამეტრებს იხილავდეთ."</string>
     <string name="close_dialog" msgid="2365884406356986917">"კარგი"</string>
@@ -163,7 +163,7 @@
     <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="network_query_error" msgid="8466081377231178298">"ქსელები ვერ მოიძებნა. სცადეთ ხელახლა."</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>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"ქსელის ოპერირების რეჟიმის შეცვლა"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"ქსელის სასურველი ტიპი"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(აკრძალული)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"ქსელის არჩევა"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"კავშირი გაწყდა"</string>
-    <string name="network_connected" msgid="1288589103624338857">"დაკავშირებულია"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"უკავშირდება..."</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"ვერ დაუკავშირდა"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA უპირატესობით"</item>
     <item msgid="8442633436636425221">"მხოლოდ GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"დარეკვა"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"ქსელი"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"გაუმჯობესებული 4G LTE რეჟიმი"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"გაუმჯობესებული დარეკვა"</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>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"როუმინგი"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"როუმინგში ყოფნისას მობილურ მონაცემთა გადაცემის სერვისებთან დაკავშირება"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"როუმინგში ყოფნისას მობილურ მონაცემთა გადაცემის სერვისებთან დაკავშირება"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"ინტერნეტის როუმინგი გამორთულია. შეეხეთ ჩასართავად."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"მობილურ ინტერნეტთან კავშირი დაიკარგა"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"ინტერნეტთან კავშირი გაწყდა, რადგან საშინაო ქსელში აღარ ხართ ჩართული, ხოლო მობილური ინტერნეტის როუმინგი გამორთული გაქვთ."</string>
     <string name="roaming_warning" msgid="1603164667540144353">"თქვენ შეიძლება წარმოგეშვათ მნიშვნელოვანი ხარჯები."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"ფასები შეამოწმეთ თქვენი ქსელი პროვაიდერთან."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"გსურთ, ჩაირთოს ინტერნეტის როუმინგი?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"აპის მონაცემთა გამოყენება"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"მონაცემთა გამოყენება"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> მობილური ინტერნეტი გამოყენებულია: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"გაფართოებული"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"ოპერატორი"</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"ზარების დაყოვნება ვერ ხერხდება."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"ზარის განსახორციელებლად, დაუკავშირდით უსადენო ქსელს."</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"ზარის განსახორციელებლად ჩართეთ Wi-Fi დარეკვა."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"საგანგებო ინფორმაცია"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"მფლობელი"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"ინფორმაციის სანახავად შეეხეთ ხელახლა"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"გადაუდებელი ზარი"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"მხოლოდ გადაუდებელი დახმარების ზარები"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"გადაუდებელი დახმარების სამსახურის ნომერი"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"გადაუდებელი დახმარების სამსახურების ნომრები"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"შეეხეთ ხელახლა <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>-ზე დასარეკად"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"გადამცემის ჩართვა…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"მომხსახურება არ არის. სცადეთ ხელხლა..."</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"საგანგებო ზარის დროს თვითმფრინავის რეჟიმში ვერ შეხვალთ."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"გადაუდებელი ზარი მიუწვდომელია"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"პოლიცია"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"სასწრაფო"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"სახანძრო"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"კლავიატურის გამოყენება დასარეკად"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"შეყოვნება"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"დასრულება"</string>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"კონტაქტის იმპორტი ვერ მოხერხდა"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"სმენის დახმარებები"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"სმენის დახმარების თავსებადობის ჩართვა"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"ზარი შეტყობინებით რეალურ დროში (RTT)"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"შეტყობინებების დაშვება ხმოვან ზარში"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"RTT დახმარებას უწევს ყრუ, სმენადაქვეითებულ, შეზღუდული მეტყველების მქონე აბონენტებს, ან მათ, ვისაც სჭირდება მეტი, ვიდრე მხოლოდ ხმაა.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;შეიტყვეთ მეტი&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; — RTT ზარები ინახება შეტყობინების ტრანსკრიპტის სახით\n       &lt;br&gt; — RTT არ არის ხელმისაწვდომი ვიდეოზარებისთვის"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"RTT-ის ჩართვა ან გამორთვა"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY გამორთულია"</item>
     <item msgid="3971695875449640648">"TTY სრული"</item>
@@ -606,8 +587,6 @@
     <string name="selectContact" msgid="781975788478987237">"კონტაქტის არჩევა"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"ხმოვანი ზარი მხარდაჭრილი არ არის"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"დარეკვა"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"ციფერბლატის ჩვენება"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"საგანგებო ციფერბლატი"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"ვიზუალური ხმოვანი ფოსტა"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"დააყენეთ PIN-კოდი"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"PIN-კოდის შეცვლა"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 01991ee..fa1e41f 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -58,7 +58,7 @@
     <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="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>
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Параметрлер қайтарылуда…"</string>
     <string name="response_error" msgid="6674110501330139405">"Желіден күтпеген жауап келді."</string>
     <string name="exception_error" msgid="7027667130619518211">"Желі немесе SIM картасының қателігі."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS сұрауы қалыпты қоңырауға өзгертілді"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS сұрауы USSD сұрауына өзгертілді"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Жаңа SS сұрауына өзгертілді"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS сұрауы бейне қоңырауға өзгертілді"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS сұрауы DIAL сұрауына өзгертілді."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS сұрауы USSD сұрауына өзгертілді."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS сұрауы жаңа SS сұрауына өзгертілді."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS сұрауы бейне ТЕРУ сұрауына өзгертілді."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"Телефоныңыздың қолданбасындағы тұрақты теру нөмірлерінің параметрлері қосулы. Нәтижесінде қоңырауға қатысты кейбір функциялар жұмыс істемейді."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Бұл параметрлерді көруге дейін радионы қосыңыз."</string>
     <string name="close_dialog" msgid="2365884406356986917">"Жарайды"</string>
@@ -163,7 +163,7 @@
     <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="network_query_error" msgid="8466081377231178298">"Желілер табылмады. Қайталап көріңіз."</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>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Желі жұмысының режимін өзгерту"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Қалаулы желі түрі"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(тыйым салынған)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Желі таңдау"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Желіге жалғанбаған"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Қосылды"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Қосылуда…"</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Қосылмады"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA таңдалған"</item>
     <item msgid="8442633436636425221">"Тек қана GSM"</item>
@@ -235,20 +230,19 @@
     <string name="call_category" msgid="5863978196309462052">"Қоңырау"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Желі"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Жақсартылған 4G LTE режимі"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Кеңейтілген қоңырау шалу мүмкіндіктері"</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="dialog_alert_title" msgid="6751344986194435476">"Назар аударыңыз"</string>
     <string name="roaming" msgid="7894878421600247140">"Роуминг"</string>
-    <string name="roaming_enable" msgid="7331106985174381987">"Роуминг кезінде дерек тасымалдау қызметтеріне қосылу"</string>
-    <string name="roaming_disable" msgid="1843417228755568110">"Роуминг кезінде дерек тасымалдау қызметтеріне қосылу"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"Роуминг өшірулі. Қосу үшін түртіңіз."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Ұялы байланыс жоғалып кетті"</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_check_price_warning" msgid="7497570906830902550">"Бағасын желі провайдерінен біліңіз."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Деректер роумингіне рұқсат берілсін бе?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Қолданба деректерінің трафигі"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Деректер трафигі"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_2">%2$s</xliff:g> аралығында <xliff:g id="ID_1">%1$s</xliff:g> мобильдік дерек қолданылды"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Қосымша"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Оператор"</string>
@@ -263,8 +257,8 @@
     <string name="wifi_calling_settings_title" msgid="7741961465416430470">"Wi-Fi қоңыраулары"</string>
     <string name="video_calling_settings_title" msgid="539714564273795574">"Оператор бейне қоңыраулары"</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="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>
@@ -372,7 +366,7 @@
     <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_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">
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Қоңырауларды ұстау мүмкін емес."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Қоңырау шалу үшін сымсыз желіге қосылыңыз."</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"Қоңырау шалу үшін, Wi-Fi желісін қосыңыз."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Төтенше жағдайда қолданылатын деректер"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Иесі"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Ақпаратты көру үшін қайта түртіңіз"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Төтенше қоңырау"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Тек қана төтенше жағдай қоңыраулары"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Төтенше жағдай қызметі"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Төтенше жағдай қызметтері"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"<xliff:g id="EMERGENCY_NUMBER">%s</xliff:g> нөміріне қоңырау шалу үшін, түймені қайта түртіңіз"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Радионы қосуда…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Қызмет жоқ. Әрекет қайталануда…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Жедел қызметке қоңырау шалу кезінде ұшақ режимін қолдану мүмкін емес."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Төтенше жағдай қызметіне қоңырау шалу мүмкіндігі жоқ"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Полиция"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Жедел жәрдем"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Өрт"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Теру үшін пернетақтаны қолдану"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Күту"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Аяқтау"</string>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Контактіні импорттау сәтсіз аяқталды"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Есту аппараттары"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Есту аппаратының қолдауын қосу"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Хабар жіберу функциясы бар қоңырау (RTT)"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Дауыстық қоңырау кезінде хабар жіберу мүмкіндігін қосу"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"RTT функциясы керең немесе есту не сөйлеу қабілеті төмен адамдарға көмек ретінде не дауысқа қосымша функциялар қажет болғанда қолданылады. <xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>Толығырақ ақпарат\n RTT қоңыраулары хабар транскрипциясы ретінде сақталады\nRTT функциясы бейне қоңыраулар үшін қолданылмайды"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"RTT қосу/өшіру"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"Tелетайп өшірулі"</item>
     <item msgid="3971695875449640648">"Tелетайп толық функциялы"</item>
@@ -598,7 +579,7 @@
     <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="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>
@@ -606,8 +587,6 @@
     <string name="selectContact" msgid="781975788478987237">"контакт таңдау"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Дауыс арқылы қоңырау шалу қолдауы жоқ"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"теру"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"теру тақтасын көрсету"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Төтенше қызмет нөмірін теру тақтасы"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Визуалды дауыс поштасы"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"PIN кодын орнату"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"PIN кодты өзгерту"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index cd6b2dc..e114c39 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -19,7 +19,7 @@
     <string name="phoneAppLabel" product="tablet" msgid="8576272342240415145">"ទិន្នន័យ​ទូរសព្ទចល័ត"</string>
     <string name="phoneAppLabel" product="default" msgid="6790717591729922998">"សេវាកម្មទូរស័ព្ទ"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"អ្នក​ហៅ​នៅ​ពេល​មាន​អាសន្ន"</string>
-    <string name="phoneIconLabel" msgid="2331230813161304895">"ទូរសព្ទ"</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>
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"ត្រឡប់​ការ​កំណត់…"</string>
     <string name="response_error" msgid="6674110501330139405">"ការ​ឆ្លើយ​តប​ដែល​មិន​រំពឹង​ទុក​ពី​​បណ្ដាញ​។"</string>
     <string name="exception_error" msgid="7027667130619518211">"បញ្ហា​ស៊ីមកាត ឬ​បណ្ដាញ។"</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"សំណើ SS បាន​ប្ដូរ​ទៅ​ការហៅ​ជា​ប្រចាំ"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"សំណើ SS បាន​ប្ដូរ​ទៅ​សំណើ USSD"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"បាន​ប្ដូរ​ទៅ​សំណើ SS ថ្មី"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"សំណើ SS បាន​ប្ដូរ​ទៅ​ការហៅ​ជា​វីដេអូ"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"សំណើ SS ត្រូវបានកែសម្រួលទៅសំណើនៃការហៅ។"</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"សំណើ SS ត្រូវបានកែសម្រួលទៅសំណើសារ USSD។"</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"សំណើ SS ត្រូវបានកែសម្រួលទៅតាមសំណើ SS ថ្មី។"</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"បាន​កែប្រែ​សំណើ SS ទៅជា​សំណើ DIAL ជា​វីដេអូ។"</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"បាន​បើក​ការ​កំណត់​លេខ​ហៅ​​ថេរ​​​នៃ​កម្មវិធី​ទូរស័ព្ទ​របស់​អ្នក។ ជា​លទ្ធផល លក្ខណៈ​មួយ​ចំនួន​ដែល​ទាក់ទង​នឹង​ការ​ហៅ​មិន​ដំណើរការ។"</string>
     <string name="radio_off_error" msgid="2304459933248513376">"បើក​​វិទ្យុ​មុន​ពេល​មើល​ការ​កំណត់​ទាំង​នេះ​។"</string>
     <string name="close_dialog" msgid="2365884406356986917">"យល់​ព្រម​"</string>
@@ -163,7 +163,7 @@
     <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="network_query_error" msgid="8466081377231178298">"មិន​អាច​រក​ឃើញ​បណ្ដាញ​ទេ។ ព្យាយាម​ម្ដង​ទៀត។"</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>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"ប្ដូរ​របៀប​ប្រតិបត្តិការ​បណ្ដាញ"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"ប្រភេទ​បណ្ដាញ​​ដែល​​ពេញចិត្ត"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(ហាម)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"ជ្រើសរើសបណ្តាញ"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"បាន​ផ្ដាច់"</string>
-    <string name="network_connected" msgid="1288589103624338857">"បានភ្ជាប់"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"កំពុង​ភ្ជាប់..."</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"មិន​អាចភ្ជាប់​បានទេ"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"ប្រើ GSM/WCDMA ជា​អាទិភាព"</item>
     <item msgid="8442633436636425221">"GSM ប៉ុណ្ណោះ"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"កំពុង​ហៅ"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"បណ្ដាញ"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"​របៀប 4G LTE ធ្វើឲ្យ​ប្រសើរ​ឡើង"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"ការ​ហៅ​ទូរសព្ទ​កម្រិត​ខ្ពស់"</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>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"រ៉ូ​មីង"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"តភ្ជាប់​ទៅ​កាន់​សេវា​កម្ម​ទិន្នន័យ​នៅ​ពេល​ដែល​រ៉ូ​មីង"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"តភ្ជាប់​ទៅ​កាន់​សេវា​កម្ម​ទិន្នន័យ​នៅ​ពេល​ដែល​រ៉ូ​មីង"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"ការរ៉ូមីង​ទិន្នន័យ​ត្រូវ​បាន​បិទ។ ចុច ដើម្បី​បើក។"</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"ដាច់​ការតភ្ជាប់​ទិន្នន័យ​ចល័ត"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"អ្នក​បាន​បាត់បង់​ការ​តភ្ជាប់​ទិន្នន័យ ពីព្រោះ​អ្នក​បាន​ចាកចេញ​ពី​បណ្ដាញ​ដើម​របស់​អ្នក​ជាមួយ​រ៉ូមីង​ទិន្នន័យ​បាន​បិទ។"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"អាចនាំឲ្យមានការគិតប្រាក់ច្រើនពីអ្នក។"</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"ពិនិត្យមើល​តម្លៃ​ជាមួយ​ក្រុមហ៊ុន​ផ្ដល់​សេវា​​បណ្ដាញ​​របស់​អ្នក។"</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"អនុញ្ញាតឲ្យរ៉ូមីងទិន្នន័យ?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"ការប្រើប្រាស់​ទិន្នន័យកម្មវិធី"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"ការ​ប្រើ​ប្រាស់ទិន្នន័យ"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"បានប្រើទិន្នន័យទូរសព្ទអស់ <xliff:g id="ID_1">%1$s</xliff:g> នៅថ្ងៃទី <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"កម្រិតខ្ពស់"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"ក្រុមហ៊ុន​បម្រើ​សេវា​ទូរសព្ទ"</string>
@@ -471,7 +465,7 @@
     <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_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>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"មិនអាចរង់ចាំការហៅទេ"</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"ភ្ជាប់ទៅបណ្តាញឥតខ្សែដើម្បីធ្វើការហៅ។"</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"បើក​ការ​ហៅ​តាម​​វ៉ាយហ្វាយ​ដើម្បី​ធ្វើ​ការ​ហៅ។"</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"ព័ត៌មានសង្គ្រោះបន្ទាន់"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"ម្ចាស់"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"ចុច​ម្ដង​ទៀត ដើម្បីមើល​ព័ត៌មាន"</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"ការហៅ​ទូរសព្ទសង្គ្រោះ​បន្ទាន់"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"តែ​ការហៅទៅលេខសង្គ្រោះបន្ទាន់​ប៉ុណ្ណោះ"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"លេខសង្គ្រោះបន្ទាន់"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"លេខសង្គ្រោះបន្ទាន់"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"ចុច​ម្ដង​ទៀត ដើម្បី​ហៅ​ <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</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="radio_off_during_emergency_call" msgid="2535800034010306830">"មិន​អាច​ចូល​ជា​របៀប​លើ​យន្តហោះ​​នៅ​អំឡុង​ការ​ហៅ​បន្ទាន់​បាន​ទេ។"</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"មិន​អាច​ហៅ​បន្ទាន់​បាន​ទេ"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"ប៉ូលិស"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"រថយន្ត​សង្គ្រោះ​បន្ទាន់"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"អគ្គិភ័យ"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"ប្រើ​​ក្ដារចុច​ដើម្បី​ចុច​លេខ"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"រង់ចាំ"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"បញ្ចប់"</string>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"បានបរាជ័យក្នុងការនាំចូលទំនាក់ទំនង"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"ឧបករណ៍​ជំនួយការ​ស្ដាប់"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"បើក​មុខងារដែលត្រូវគ្នានឹងឧបករណ៍​ជំនួយ​ការ​ស្ដាប់"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"ការហៅ​តាម​សារ​ជា​អក្សរ​ក្នុង​ពេល​ជាក់ស្ដែង"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"អនុញ្ញាត​ការផ្ញើសារ​នៅ​ក្នុង​ការហៅ​ជា​សំឡេង"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"RTT ជួយ​អ្នក​ហៅ​ទូរសព្ទ​ដែល​​ថ្លង់ ពិបាក​ក្នុង​ការស្ដាប់ មិន​អាច​និយាយ​បាន ឬ​​មាន​តម្រូវការ​ក្រៅ​ពី​សំឡេង។&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;ស្វែងយល់​បន្ថែម&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - ការហៅ​ទូរសព្ទតាម RTT ត្រូវ​បាន​រក្សាទុក​ជា​ប្រតិចារឹក​សារ\n       &lt;br&gt; - RTT មិន​មានសម្រាប់ការហៅ​ជា​វីដេអូ​​ទេ"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"បើក ឬ​បិទ RTT"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"បិទ TTY"</item>
     <item msgid="3971695875449640648">"TTY ពេញ"</item>
@@ -606,8 +587,6 @@
     <string name="selectContact" msgid="781975788478987237">"ជ្រើស​ទំនាក់ទំនង"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"មិន​គាំទ្រ​ការ​ហៅ​ជា​សំឡេង"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"ចុច"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"បង្ហាញ​បន្ទះ​លេខ"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"បន្ទះ​លេខ​​សង្គ្រោះបន្ទាន់"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"សារជាសំឡេងអាចមើលឃើញ"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"កំណត់លេខកូដ PIN"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"ប្ដូរ​​លេខ​កូដ PIN"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 55a2fee..fbe40d7 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಹಿಂತಿರುಗಿಸಲಾಗುತ್ತಿದೆ…"</string>
     <string name="response_error" msgid="6674110501330139405">"ನೆಟ್‌ವರ್ಕ್‌ನಿಂದ ಅನಿರೀಕ್ಷಿತ ಪ್ರತಿಕ್ರಿಯೆ."</string>
     <string name="exception_error" msgid="7027667130619518211">"ನೆಟ್‌ವರ್ಕ್‌ ಅಥವಾ ಸಿಮ್‌ ಕಾರ್ಡ್‌ ದೋಷ."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS ವಿನಂತಿಯನ್ನು ಸಾಮಾನ್ಯ ಕರೆಗೆ ಬದಲಾಯಿಸಲಾಗಿದೆ"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS ವಿನಂತಿಯನ್ನು USSD ವಿನಂತಿಗೆ ಬದಲಾಯಿಸಲಾಗಿದೆ"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"ಹೊಸ SS ವಿನಂತಿಗೆ ಬದಲಾಯಿಸಲಾಗಿದೆ"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS ವಿನಂತಿಯನ್ನು ವೀಡಿಯೊ ಕರೆಗೆ ಬದಲಾಯಿಸಲಾಗಿದೆ"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS ವಿನಂತಿಯನ್ನು DIAL ವಿನಂತಿಗೆ ಮಾರ್ಪಡಿಸಲಾಗಿದೆ."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS ವಿನಂತಿಯನ್ನು USSD ವಿನಂತಿಗೆ ಮಾರ್ಪಡಿಸಲಾಗಿದೆ."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS ವಿನಂತಿಯನ್ನು ಹೊಸ SS ವಿನಂತಿಗೆ ಮಾರ್ಪಡಿಸಲಾಗಿದೆ."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS ವಿನಂತಿಯನ್ನು ವೀಡಿಯೊ DIAL ವಿನಂತಿಗೆ ಮಾರ್ಪಡಿಸಲಾಗಿದೆ."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"ನಿಮ್ಮ ಫೋನ್‌ ಅಪ್ಲಿಕೇಶನ್‌‌ನ ಸ್ಥಿರ ಡಯಲಿಂಗ್‌‌ ಸಂಖ್ಯೆಗಳ ಸೆಟ್ಟಿಂಗ್‌ ಅನ್ನು ಆನ್‌ ಮಾಡಲಾಗಿದೆ. ಪರಿಣಾಮ, ಕೆಲವು ಕರೆ ಸಂಬಂಧಿತ ವೈಶಿಷ್ಟ್ಯಗಳು ಕಾರ್ಯ ನಿರ್ವಹಿಸುತ್ತಿಲ್ಲ."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"ಈ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ವೀಕ್ಷಿಸುವ ಮೊದಲು ರೇಡಿಯೋ ಆನ್ ಮಾಡಿ."</string>
     <string name="close_dialog" msgid="2365884406356986917">"ಸರಿ"</string>
@@ -163,7 +163,7 @@
     <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="network_query_error" msgid="8466081377231178298">"ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ಹುಡುಕಲಾಗಲಿಲ್ಲ. ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</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>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"ನೆಟ್‌ವರ್ಕ್‌ ಕಾರ್ಯಾಚರಣಾ ಮೋಡ್‌ ಬದಲಿಸಿ"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"ಬಯಸಿದ ನೆಟ್‌ವರ್ಕ್‌ ಪ್ರಕಾರ"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(ನಿಷೇಧಿತ)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"ನೆಟ್‌ವರ್ಕ್ ಆಯ್ಕೆಮಾಡಿ"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಲಾಗಿದೆ"</string>
-    <string name="network_connected" msgid="1288589103624338857">"ಸಂಪರ್ಕಗೊಂಡಿದೆ"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"ಸಂಪರ್ಕಿಸಲಾಗುತ್ತಿದೆ..."</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"ಸಂಪರ್ಕಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA ಗೆ ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಲಾಗಿದೆ"</item>
     <item msgid="8442633436636425221">"GSM ಮಾತ್ರ"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"ಕರೆಮಾಡಲಾಗುತ್ತಿದೆ"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"ನೆಟ್‌ವರ್ಕ್"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"ವರ್ಧಿಸಲಾದ 4G LTE ಮೋಡ್"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"ಸುಧಾರಿತ ಕರೆ"</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>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"ರೋಮಿಂಗ್"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"ರೋಮಿಂಗ್‌ನಲ್ಲಿರುವಾಗ ಡೇಟಾ ಸೇವೆಗಳಿಗೆ ಸಂಪರ್ಕಿಸು"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"ರೋಮಿಂಗ್‌ನಲ್ಲಿರುವಾಗ ಡೇಟಾ ಸೇವೆಗಳಿಗೆ ಸಂಪರ್ಕಿಸು"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"ಡೇಟಾ ರೋಮಿಂಗ್ ಆಫ್ ಮಾಡಲಾಗಿದೆ. ಆನ್ ಮಾಡಲು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"ಮೊಬೈಲ್ ಡೇಟಾ ಸಂಪರ್ಕ ಕಡಿತಗೊಂಡಿದೆ"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"ಡೇಟಾ ರೋಮಿಂಗ್ ಅನ್ನು ಆಫ್‌ ಮಾಡಿರುವ ಸ್ಥಿತಿಯಲ್ಲಿ ನಿಮ್ಮ ಮುಖಪುಟ‌ ನೆಟ್‌ವರ್ಕ್‌ ಅನ್ನು ನೀವು ಇರಿಸಿರುವ ಕಾರಣ ನೀವು ಡೇಟಾ ಸಂಪರ್ಕವನ್ನು ಕಳೆದುಕೊಂಡಿರುವಿರಿ."</string>
     <string name="roaming_warning" msgid="1603164667540144353">"ನೀವು ಗಣನೀಯವಾಗಿ ಶುಲ್ಕಗಳನ್ನು ತೆರಬೇಕಾಗಬಹುದು."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"ಬೆಲೆ ನಿಗದಿಗಾಗಿ ನಿಮ್ಮ ನೆಟ್‌ವರ್ಕ್ ಒದಗಿಸುವವರೊಂದಿಗೆ ಪರಿಶೀಲಿಸಿ."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"ಡೇಟಾ ರೋಮಿಂಗ್ ಅನುಮತಿಸುವುದೇ?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"ಅಪ್ಲಿಕೇಶನ್‌ ಡೇಟಾ ಬಳಕೆ"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"ಡೇಟಾ ಬಳಕೆ"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> ಬಳಸಲಾದ ಮೊಬೈಲ್ ಡೇಟಾ <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"ಸುಧಾರಿತ"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"ವಾಹಕ"</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"ಕರೆಗಳನ್ನು ಹೋಲ್ಡ್ ಮಾಡಲಾಗುವುದಿಲ್ಲ."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"ಕರೆ ಮಾಡಲು ವೈರ್‌ಲೆಸ್ ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಂಪರ್ಕಿಸಿ."</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"ಕರೆ ಮಾಡಲು ವೈ-ಫೈ ಕರೆ ಮಾಡುವಿಕೆಯನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"ತುರ್ತು ಮಾಹಿತಿ"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"ಮಾಲೀಕರು"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"ಮಾಹಿತಿಯನ್ನು ವೀಕ್ಷಿಸಲು ಮತ್ತೆ ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"ತುರ್ತು ಕರೆಗಳು"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"ತುರ್ತು ಕರೆಗಳು ಮಾತ್ರ"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"ತುರ್ತು ಸಂಖ್ಯೆ"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"ತುರ್ತು ಸಂಖ್ಯೆಗಳು"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"<xliff:g id="EMERGENCY_NUMBER">%s</xliff:g> ಗೆ ಕರೆ ಮಾಡಲು ಪುನಃ ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"ರೇಡಿಯೋ ಆನ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"ಯಾವುದೇ ಸೇವೆ ಇಲ್ಲ. ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಲಾಗುತ್ತಿದೆ..."</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"ತುರ್ತು ಕರೆ ಸಮಯದಲ್ಲಿ ಏರ್‌ಪ್ಲೇನ್ ಮೋಡ್‌ಗೆ ಪ್ರವೇಶಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"ತುರ್ತು ಕರೆ ಮಾಡುವಿಕೆ ಲಭ್ಯವಿಲ್ಲ"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"ಪೊಲೀಸ್"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"ಆಂಬುಲೆನ್ಸ್"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"ಬೆಂಕಿ"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"ಡಯಲ್‌ ಮಾಡಲು ಕೀಬೋರ್ಡ್‌ ಬಳಸಿ"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"ಹೋಲ್ಡ್‌‌ ಮಾಡು"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"ಮುಕ್ತಾಯ"</string>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"ಸಂಪರ್ಕ ಆಮದು ಮಾಡುವಲ್ಲಿ ವಿಫಲವಾಗಿದೆ"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"ಕೇಳುವಿಕೆ ಸಾಧನಗಳು"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"ಶ್ರವಣ ಸಾಧನ ಹೊಂದಾಣಿಕೆಯನ್ನು ಆನ್‌ ಮಾಡಿ"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"ನೈಜ-ಸಮಯ ಪಠ್ಯ (RTT) ಕರೆ"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"ಧ್ವನಿ ಕರೆಯ ಒಳಗೆ ಸಂದೇಶ ಕಳುಹಿಸುವಿಕೆಗೆ ಅನುಮತಿಸಿ"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"ಕಿವುಡರು, ಆಲಿಸುವಿಕೆಯ ದೋಷಗಳನ್ನು ಹೊಂದಿದವರು, ಮಾತನಾಡುವಿಕೆಯಲ್ಲಿ ದೋಷಗಳನ್ನು ಹೊಂದಿದವರು ಅಥವಾ ಧ್ವನಿ ಮೀರಿ ಬೇರೆ ರೀತಿಯಲ್ಲಿ ಕರೆ ಮಾಡಲು ಕಠಿಣರಾಗಿರುವವರಿಗೆ RTT ಮೋಡ್ ಸಹಾಯ ಮಾಡುತ್ತದೆ.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ&lt;/a&gt;\n   &lt;br&gt;&lt;br&gt; - RTT ಕರೆಗಳನ್ನು ಸಂದೇಶ ಪ್ರತಿಲಿಪಿಗಳಂತೆ ಉಳಿಸಲಾಗಿದೆ \n    &lt;br&gt; - ವೀಡಿಯೊ ಕರೆಗಳಿಗೆ RTT ಲಭ್ಯವಿಲ್ಲ"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"RTT ಆನ್‌ ಅಥವಾ ಆಫ್‌ ಮಾಡಿ"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY ಆಫ್"</item>
     <item msgid="3971695875449640648">"TTY ಪೂರ್ಣ"</item>
@@ -606,8 +587,6 @@
     <string name="selectContact" msgid="781975788478987237">"ಸಂಪರ್ಕವನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"ಧ್ವನಿ ಕರೆ ಮಾಡುವಿಕೆ ಬೆಂಬಲಿತವಾಗಿಲ್ಲ"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"ಡಯಲ್"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"ಡಯಲ್‌ಪ್ಯಾಡ್ ತೋರಿಸಿ"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"ತುರ್ತು ಡಯಲ್‌ಪ್ಯಾಡ್‌"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"ದೃಶ್ಯ ಧ್ವನಿಮೇಲ್"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"ಪಿನ್ ಹೊಂದಿಸಿ"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"ಪಿನ್ ಬದಲಾಯಿಸಿ"</string>
@@ -645,14 +624,14 @@
     <string name="change_pin_system_error" msgid="8308462387154257840">"ಪಿನ್ ಹೊಂದಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="mobile_data_status_roaming_turned_off_subtext" msgid="935636805765823307">"ಡೇಟಾ ರೋಮಿಂಗ್‌ ಆಫ್ ಮಾಡಲಾಗಿದೆ"</string>
     <string name="mobile_data_status_roaming_turned_on_subtext" msgid="1335176927083781041">"ಡೇಟಾ ರೋಮಿಂಗ್‌ ಆನ್ ಮಾಡಲಾಗಿದೆ"</string>
-    <string name="mobile_data_status_roaming_without_plan_subtext" msgid="3568412513831673037">"ಪ್ರಸ್ತುತ ರೋಮಿಂಗ್‌‌ನಲ್ಲಿದೆ, ಡೇಟಾ ಪ್ಲಾನ್ ಅಗತ್ಯವಿದೆ"</string>
-    <string name="mobile_data_status_roaming_with_plan_subtext" msgid="8721998948811064377">"ಪ್ರಸ್ತುತ ರೋಮಿಂಗ್‌, ಡೇಟಾ ಪ್ಲಾನ್ ಸಕ್ರಿಯವಾಗಿದೆ"</string>
+    <string name="mobile_data_status_roaming_without_plan_subtext" msgid="3568412513831673037">"ಪ್ರಸ್ತುತ ರೋಮಿಂಗ್‌‌ನಲ್ಲಿದೆ, ಡೇಟಾ ಪ್ಲ್ಯಾನ್ ಅಗತ್ಯವಿದೆ"</string>
+    <string name="mobile_data_status_roaming_with_plan_subtext" msgid="8721998948811064377">"ಪ್ರಸ್ತುತ ರೋಮಿಂಗ್‌, ಡೇಟಾ ಪ್ಲ್ಯಾನ್ ಸಕ್ರಿಯವಾಗಿದೆ"</string>
     <string name="mobile_data_status_no_plan_subtext" msgid="4887747337017565725">"ಯಾವುದೇ ಮೊಬೈಲ್ ಡೇಟಾ ಉಳಿದಿಲ್ಲ"</string>
     <string name="mobile_data_activate_prepaid" msgid="7447025165850512683">"ಯಾವುದೇ ಮೊಬೈಲ್ ಡೇಟಾ ಉಳಿದಿಲ್ಲ"</string>
     <string name="mobile_data_activate_prepaid_summary" msgid="5705389791791637666">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> ಮೂಲಕ ಮೊಬೈಲ್ ಡೇಟಾ ಸೇರಿಸಿ"</string>
-    <string name="mobile_data_activate_roaming_plan" msgid="5998161536947086264">"ಯಾವುದೇ ರೋಮಿಂಗ್ ಪ್ಲಾನ್ ಇಲ್ಲ"</string>
-    <string name="mobile_data_activate_roaming_plan_summary" msgid="511202908883425459">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> ಮೂಲಕ ರೋಮಿಂಗ್ ಪ್ಲಾನ್ ಸೇರಿಸಿ"</string>
-    <string name="mobile_data_activate_footer" msgid="5979019929980140594">"ನಿಮ್ಮ ವಾಹಕ <xliff:g id="PROVIDER_NAME">%s</xliff:g> ಮೂಲಕ ನೀವು ಮೊಬೈಲ್ ಡೇಟಾ ಅಥವಾ ರೋಮಿಂಗ್ ಪ್ಲಾನ್ ಸೇರಿಸಬಹುದು."</string>
+    <string name="mobile_data_activate_roaming_plan" msgid="5998161536947086264">"ಯಾವುದೇ ರೋಮಿಂಗ್ ಪ್ಲ್ಯಾನ್ ಇಲ್ಲ"</string>
+    <string name="mobile_data_activate_roaming_plan_summary" msgid="511202908883425459">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> ಮೂಲಕ ರೋಮಿಂಗ್ ಪ್ಲ್ಯಾನ್ ಸೇರಿಸಿ"</string>
+    <string name="mobile_data_activate_footer" msgid="5979019929980140594">"ನಿಮ್ಮ ವಾಹಕ <xliff:g id="PROVIDER_NAME">%s</xliff:g> ಮೂಲಕ ನೀವು ಮೊಬೈಲ್ ಡೇಟಾ ಅಥವಾ ರೋಮಿಂಗ್ ಪ್ಲ್ಯಾನ್ ಸೇರಿಸಬಹುದು."</string>
     <string name="mobile_data_activate_diag_title" msgid="9044252207707864493">"ಡೇಟಾ ಸೇರಿಸುವುದೇ?"</string>
     <string name="mobile_data_activate_diag_message" msgid="8216154678758451453">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> ಮೂಲಕ ನೀವು ಡೇಟಾ ಸೇರಿಸಬೇಕಾಗಬಹುದು"</string>
     <string name="mobile_data_activate_button" msgid="3682400969184405446">"ಡೇಟಾ ಸೇರಿಸಿ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 0a5f683..f79d059 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -20,7 +20,7 @@
     <string name="phoneAppLabel" product="default" msgid="6790717591729922998">"전화 서비스"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"긴급 통화"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"휴대전화"</string>
-    <string name="fdnListLabel" msgid="8630418672279521003">"발신 허용 번호 목록"</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>
@@ -60,7 +60,7 @@
     <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="phone_accounts" msgid="6376603393888116364">"통화 계정"</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>
@@ -86,7 +86,7 @@
     <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="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>
@@ -127,11 +127,11 @@
     <string name="reverting_settings" msgid="4752151682666912828">"원래 설정으로 되돌리는 중..."</string>
     <string name="response_error" msgid="6674110501330139405">"네트워크에서 예기치 않은 응답이 전송되었습니다."</string>
     <string name="exception_error" msgid="7027667130619518211">"네트워크 또는 SIM 카드 오류입니다."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS 요청이 일반 통화로 변경됨"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS 요청이 USSD 요청으로 변경됨"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"새 SS 요청으로 변경됨"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS 요청이 화상 통화로 변경됨"</string>
-    <string name="fdn_check_failure" msgid="18200614306525434">"전화 앱의 발신 제한 번호 설정을 사용하기 때문에 일부 통화 관련 기능이 작동되지 않습니다."</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS 요청이 DIAL 요청으로 수정되었습니다."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS 요청이 USSD 요청으로 수정되었습니다."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS 요청이 새로운 SS 요청으로 수정되었습니다."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS 요청이 동영상 DIAL 요청으로 수정되었습니다."</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>
@@ -163,7 +163,7 @@
     <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="network_query_error" msgid="8466081377231178298">"네트워크를 찾을 수 없습니다. 다시 시도해 보세요."</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>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"네트워크 작동 모드 변경"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"기본 네트워크 유형"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(금지됨)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"네트워크 선택"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"연결 끊김"</string>
-    <string name="network_connected" msgid="1288589103624338857">"연결됨"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"연결 중..."</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"연결할 수 없음"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA로 기본 설정"</item>
     <item msgid="8442633436636425221">"GSM 전용"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"통화"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"네트워크"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"향상된 4G LTE 모드"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"고급 통화"</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>
@@ -243,13 +238,12 @@
     <string name="roaming" msgid="7894878421600247140">"로밍"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"로밍 시 데이터 서비스에 연결"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"로밍 시 데이터 서비스에 연결"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"데이터 로밍이 사용 중지되었습니다. 사용 설정하려면 탭하세요."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"모바일 데이터 연결 끊김"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"데이터 로밍을 사용 중지한 상태에서 홈 네트워크를 벗어났으므로 데이터 연결이 끊어졌습니다."</string>
     <string name="roaming_warning" msgid="1603164667540144353">"많은 요금이 부과될 수 있습니다."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"요금은 이동통신사에 문의하세요."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"데이터 로밍을 허용하시겠습니까?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"앱 데이터 사용량"</string>
-    <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_2">%2$s</xliff:g>에 사용된 모바일 데이터: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"데이터 사용량"</string>
+    <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_2">%2$s</xliff:g> 기간에 사용된 모바일 데이터: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"고급"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"이동통신사"</string>
     <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"이동통신사, esim, sim, euicc, 이동통신사 전환, 이동통신사 추가"</string>
@@ -388,18 +382,18 @@
     <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="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">"발신 허용 번호 사용"</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">"발신 허용 번호 사용"</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">"발신 허용 번호 액세스를 위해 PIN 변경"</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>
@@ -483,7 +477,7 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"알 수 없는 음성사서함 번호"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"서비스 불가"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"선택한 네트워크(<xliff:g id="OPERATOR_NAME">%s</xliff:g>)를 사용할 수 없음"</string>
-    <string name="incall_error_power_off" product="watch" msgid="2007450435656211658">"전화를 걸려면 모바일 네트워크를 사용 설정하고 비행기 모드 또는 절전 모드를 사용 중지하세요."</string>
+    <string name="incall_error_power_off" product="watch" msgid="2007450435656211658">"전화를 걸려면 모바일 네트워크를 사용 설정하고 비행기 모드 또는 배터리 세이버 모드를 사용 중지하세요."</string>
     <string name="incall_error_power_off" product="default" msgid="2947938060513306698">"전화를 걸려면 비행기 모드를 사용 중지하세요."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"전화를 걸려면 비행기 모드를 사용 중지하거나 무선 네트워크에 연결하세요."</string>
     <string name="incall_error_ecm_emergency_only" msgid="738708660612388692">"일반 전화를 걸려면 긴급 콜백 모드를 해제하세요."</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"통화를 보류할 수 없습니다."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"전화를 걸려면 무선 네트워크에 연결하세요."</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"전화를 걸려면 Wi-Fi 통화를 사용 설정하세요."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"긴급 상황 정보"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"소유자"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"정보를 보려면 다시 탭하세요."</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"긴급 전화"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"긴급 전화 전용"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"긴급 전화번호"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"긴급 전화번호"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"<xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>(으)로 전화하려면 다시 탭하세요."</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"무선을 켜는 중..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"서비스를 사용할 수 없습니다. 다시 시도 중..."</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"긴급 통화 중에는 비행기 모드를 사용할 수 없습니다."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"긴급 전화를 사용할 수 없음"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"경찰서"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"구급차"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"화재"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"키보드를 사용하여 전화걸기"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"대기"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"종료"</string>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"연락처를 가져오지 못했습니다."</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"보청기"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"보청기 호환 사용"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"실시간 문자 메시지(RTT) 통화"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"음성 통화 중 메시지 허용"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"RTT는 청각 장애, 난청, 언어 장애가 있거나 음성 이외의 의사소통 수단이 필요한 발신자에게 도움이 됩니다.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;자세히 알아보기&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - RTT 통화는 메시지 스크립트로 저장됩니다.\n       &lt;br&gt; - 화상 통화에서는 RTT를 사용할 수 없습니다."</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"RTT 사용 또는 사용 중지"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY 사용 안함"</item>
     <item msgid="3971695875449640648">"TTY 전체"</item>
@@ -606,8 +587,6 @@
     <string name="selectContact" msgid="781975788478987237">"연락처 선택"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"음성통화 지원되지 않음"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"전화걸기"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"다이얼패드 표시"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"긴급 다이얼패드"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"시각적 음성사서함"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"PIN 설정"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"PIN 변경"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index cf2e874..48e4334 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -61,7 +61,7 @@
     <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="phone_accounts" msgid="6376603393888116364">"Чалуу аккаунттары"</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>
@@ -69,7 +69,7 @@
     <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_add_sip_account" msgid="2023821743341923271">"SIP каттоо эсебин кошуу"</string>
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Каттоо эсеп жөндөөлөрүн конфигурациялоо"</string>
     <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Бардык чалуу каттоо эсептери"</string>
     <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Чалуулар жасала турган каттоо эсептерин тандаңыз"</string>
@@ -91,13 +91,13 @@
     <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="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>
@@ -128,10 +128,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Жөндөөлөр артка кайтарылууда…"</string>
     <string name="response_error" msgid="6674110501330139405">"Тармактан күтүлбөгөн жооп алынды."</string>
     <string name="exception_error" msgid="7027667130619518211">"Тармак же SIM карта катасы."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS сурамы демейки чалууга өзгөртүлдү"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS сурамы USSD сурамына өзгөртүлдү"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Жаңы SS сурамына өзгөртүлдү"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS сурамы видео чалууга өзгөртүлдү"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS сурамы DIAL сурамына өзгөртүлдү."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS сурамы USSD сурамына өзгөртүлдү."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS сурамы жаңы SS сурамына өзгөртүлдү."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS сурамы Видео DIAL сурамына өзгөртүлдү."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"Сиздин телефонуңуздун Бекитилген Номурду Терүү колдонмосу жандырылган. Натыйжасында, чалууга байланыштуу айрым мүмкүнчүлүктөр иштебей турат."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Бул тууралоолорду көрүш үчүн, алгач радиону иштетишиңиз керек."</string>
     <string name="close_dialog" msgid="2365884406356986917">"Жарайт"</string>
@@ -164,24 +164,19 @@
     <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="network_query_error" msgid="8466081377231178298">"Тармактар табылбай койду. Кайра аракет кылыңыз."</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="already_auto" msgid="6067116884321285507">"Мурунтан эле автоматтык түрдө тандоодо."</string>
-    <string name="select_automatically" msgid="1046727200631770962">"Тармак автоматтык түрдө тандалат"</string>
+    <string name="select_automatically" msgid="1046727200631770962">"Тармакты автоматтык түрдө тандоо"</string>
     <string name="network_select_title" msgid="7733107364757544558">"Тармак"</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="forbidden_network" msgid="4384929668343563440">"(тыюу салынган)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Тармакты тандоо"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Ажыратылды"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Туташты"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Туташууда…"</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Туташпай койду"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA артыкчылыктуу"</item>
     <item msgid="8442633436636425221">"GSM гана"</item>
@@ -236,7 +231,7 @@
     <string name="call_category" msgid="5863978196309462052">"Чалуулар"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Тармак"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Жакшыртылган 4G LTE режими"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Өркүндөтүлгөн чалуу"</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>
@@ -244,12 +239,11 @@
     <string name="roaming" msgid="7894878421600247140">"Роуминг"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Роуминг учурунда мобилдик Интернетке туташат"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Роуминг учурунда мобилдик Интернетке туташат"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"Интернет-роуминг өчүрүлгөн. Күйгүзүү үчүн басыңыз."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Мобилдик интернет туташуусу үзүлдү"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Мобилдик берүү байланышын жоготтуңуз, анткени сиз мобилдик интернет роумингин иштетпестен, өзүңүздүн түйүнүңүздөн сырткары чыгып кеттиңиз."</string>
     <string name="roaming_warning" msgid="1603164667540144353">"Көп акча төлөп калышыңыз мүмкүн."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Бааларын байланыш операторуңуздан сурашыңыз керек."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Интернет-роумингди иштетесизби?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Колдонмолордун трафиги"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Дайындардын өткөрүлүшү"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_2">%2$s</xliff:g> аралыгында <xliff:g id="ID_1">%1$s</xliff:g> мобилдик трафик колдонулду"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Өркүндөтүлгөн"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Байланыш оператору"</string>
@@ -401,7 +395,7 @@
     <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_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>
@@ -506,24 +500,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Чалууну кармап туруу мүмкүн эмес."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Чалуу үчүн зымсыз тармакка туташыңыз."</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"Wi-Fi аркылуу чалыңыз."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Өзгөчө кырдаал маалыматы"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Ээси"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Маалыматты көрүү үчүн кайра таптап коюңуз"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Шашылыш чалуу"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Өзгөчө кырдаалда гана чалууга болот"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Өзгөчө кырдаал номери"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Өзгөчө кырдаал номерлери"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"<xliff:g id="EMERGENCY_NUMBER">%s</xliff:g> ноерине чалуу үчүн кайра таптап коюңуз"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Радио күйгүзүлүүдө…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Кызмат жок. Кайра аракет кылууда…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Шашылыш чалуу учурунда учак режимине өтүүгө болбойт."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Шашылыш чалуу жеткиликсиз"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Полиция"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Тез жардам машинасы"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Өрт"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Баскычтоп менен териңиз"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Күттүрүү"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Бүтүрүү"</string>
@@ -543,10 +525,9 @@
     <string name="singleContactImportedMsg" msgid="6868483416182599206">"Байланыш импорттолду"</string>
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Байланыш импорттолбой калды"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Угуу аппараты"</string>
-    <string name="hac_mode_summary" msgid="6833851160514929341">"Угуу аппараты иштетилет"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Чалуу учурунда анык убакыттагы билдирүү (RTT)"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Үн чалуунун учурунда жазышууга уруксат берүү"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"RTT функциясы угуу жана сүйлөө жөндөмдүүлүгү бузулган адамдарга арналат.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Кеңири маалымат&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - RTT функциясында чалуулар транскрипциялар катары сакталат\n       &lt;br&gt; - RTT функациясы видео чалууда жеткиликсиз болот"</string>
+    <string name="hac_mode_summary" msgid="6833851160514929341">"Угуу аппаратын колдоого алуу"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"RTT\'ни күйгүзүү же өчүрүү"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"Телетайп түзмөгү өчүк"</item>
     <item msgid="3971695875449640648">"Телетайп түзмөгү толуп калды"</item>
@@ -601,7 +582,7 @@
     <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="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>
@@ -609,8 +590,6 @@
     <string name="selectContact" msgid="781975788478987237">"байланыш тандоо"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Үн менен чалуу колдоого алынбайт"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"терүү"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"номер тергичти көрсөтүү"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Шашылыш номер тергич"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Визуалдык үн почтасы"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"PIN код коюу"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"PIN кодду өзгөртүү"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index c5362d4..28b927b 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"ກຳລັງຖອນຄືນການຕັ້ງຄ່າ..."</string>
     <string name="response_error" msgid="6674110501330139405">"ໄດ້ຮັບການຕອບກັບທີ່ບໍ່ຄາດຄິດຈາກເຄືອຂ່າຍ."</string>
     <string name="exception_error" msgid="7027667130619518211">"ເຄືອຂ່າຍ ຫຼື ຊິມກາດຜິດພາດ."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"ປ່ຽນການຮ້ອງຂໍ SS ເປັນການໂທທຳມະດາແລ້ວ"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"ປ່ຽນຄຳຂໍ SS ເປັນຄຳຂໍ USSD ແລ້ວ"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"ປ່ຽນຄຳຂໍ SS ໃໝ່ແລ້ວ"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"ປ່ຽນການຮ້ອງຂໍ SS ເປັນການໂທວິດີໂອແລ້ວ"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"ການ​ຂໍ SS ຖືກ​ປ່ຽນ​ແປງ​ເປັນ​ການ​ຂໍ DIAL ແລ້ວ."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"ການ​ຂໍ SS ຖືກ​ປ່ຽນແປງ​ເປັນ​ການ​ຂໍ  USSD ແລ້ວ."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"ການ​ຂໍ SS ຖືກ​ປ່ຽນແປງ​ເປັນ​ການ​ຂໍ SS ໃໝ່​ແລ້ວ."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"ການຂໍ SS ຖືກປ່ຽນແປງເປັນການຂໍ DIAL ວິດີໂອແລ້ວ."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"ການຕັ້ງຄ່າແອັບຯໝາຍເລກຈຳກັດການໂທອອກ ຂອງໂທລະສັບທ່ານຖືກເປີດໃຊ້ຢູ່ ເຊິ່ງຈະເຮັດໃຫ້ຄຸນສົມບັດທີ່ກ່ຽວກັບການໂທບາງຢ່າງ ບໍ່ສາມາດໃຊ້ໄດ້."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"ເປີດໃຊ້ວິທະຍຸກ່ອນການເບິ່ງການຕັ້ງຄ່າເຫຼົ່ານີ້."</string>
     <string name="close_dialog" msgid="2365884406356986917">"ຕົກລົງ"</string>
@@ -163,7 +163,7 @@
     <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="network_query_error" msgid="8466081377231178298">"ບໍ່ພົບເຄືອຂ່າຍ. ກະລຸນາລອງໃໝ່ອີກຄັ້ງ."</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 card ຂອງທ່ານບໍ່ອະນຸຍາດໃຫ້ເຊື່ອມຕໍ່ກັບເຄືອຂ່າຍນີ້."</string>
     <string name="connect_later" msgid="2308119155752343975">"ບໍ່ສາມາດເຊື່ອມຕໍ່ຫາເຄືອຂ່າຍນີ້ໃນເວລານີ້ໄດ້. ກະລຸນາລອງໃໝ່ໃນພາຍຫຼັງ."</string>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"ປ່ຽນຮູບແບບປະຕິບັດການຂອງເຄືອຂ່າຍ"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"ປະ​ເພດ​ເຄືອ​ຂ່າຍທີ່ຕ້ອງການ"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(ຂໍ້ມູນຕ້ອງຫ້າມ)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"ເລືອກເຄືອຂ່າຍ"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"ຕັດການເຊື່ອມຕໍ່ແລ້ວ"</string>
-    <string name="network_connected" msgid="1288589103624338857">"ເຊື່ອມຕໍ່ແລ້ວ"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"ກຳລັງເຊື່ອມຕໍ່..."</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"ບໍ່ສາມາດເຊື່ອມຕໍ່ໄດ້"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"ຕ້ອງການ GSM/WCDMA"</item>
     <item msgid="8442633436636425221">"GSM ເທົ່ານັ້ນ"</item>
@@ -235,20 +230,19 @@
     <string name="call_category" msgid="5863978196309462052">"ກຳລັງໂທ"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"ເຄືອຂ່າຍ"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"ໂໝດ Enhanced 4G LTE"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"ການໂທຂັ້ນສູງ"</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="dialog_alert_title" msgid="6751344986194435476">"ກະລຸນາຮັບຊາບ"</string>
     <string name="roaming" msgid="7894878421600247140">"ໂຣມມິງ"</string>
-    <string name="roaming_enable" msgid="7331106985174381987">"ເຊື່ອມຕໍ່ບໍລິການອິນເຕີເນັດເມື່ອໂຣມມິງຢູ່"</string>
-    <string name="roaming_disable" msgid="1843417228755568110">"ເຊື່ອມຕໍ່ບໍລິການອິນເຕີເນັດເມື່ອໂຣມມິງຢູ່"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"ການໂຣມມິງອິນເຕີເນັດຖືກປິດໄວ້ຢູ່. ແຕະເພື່ອເປີດໃຊ້."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"ສູນເສຍການເຊື່ອມຕໍ່ອິນເຕີເນັດມືຖືແລ້ວ"</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_check_price_warning" msgid="7497570906830902550">"ກະລຸນາກວດສອບລາຄາກັບຜູ້ໃຫ້ບໍລິການເຄືອຂ່າຍຂອງທ່ານ."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"ອະນຸຍາດໃຫ້ໂຣມມິງຂໍ້ມູນບໍ?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"ການໃຊ້ຂໍ້ມູນແອັບ"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"ການນຳໃຊ້ຂໍ້ມູນ"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"ໃຊ້ອິນເຕີເນັດໄປແລ້ວ <xliff:g id="ID_1">%1$s</xliff:g> ລະຫວ່າງ <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"ຂັ້ນສູງ"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"ຜູ່ໃຫ້ບໍລິການ"</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"ບໍ່ສາມາດພັກສາຍໄດ້."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"ເຊື່ອມຕໍ່ກັບເຄືອຂ່າຍໄຮ້ສາຍເພື່ອເຮັດການໂທ."</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"ກະລຸນາເປີດໃຊ້ການໂທ Wi-Fi ເພື່ອໂທ."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"ຂໍ້ມູນສຸກເສີນ"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"ເຈົ້າຂອງ"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"ແຕະອີກເທື່ອໜຶ່ງເພື່ອເບິ່ງຂໍ້ມູນ"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"ໂທສຸກເສີນ"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"ໂທສຸກເສີນເທົ່ານັ້ນ"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"ເບີໂທສຸກເສີນ"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"ເບີໂທສຸກເສີນ"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"ແຕະອີກຄັ້ງເພື່ອໂທ <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"ກຳລັງເປີດໃຊ້ວິທະຍຸ..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"ບໍ່​ມີ​ການ​ບໍ​ລິ​ການ. ກຳ​ລັງ​ລອງ​ໃໝ່​ອີກ…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"ບໍ່ສາມາດເຂົ້າໃຊ້ໂໝດຢູ່ໃນຍົນໄດ້ໃນລະຫວ່າງການໂທສຸກເສີນ."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"ບໍ່ສາມາດໂທສຸກເສີນໄດ້"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"ຕຳຫຼວດ"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"ລົດໂຮງໝໍ"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"ໄຟ"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"ໃຊ້ແປ້ນພິມເພື່ອກົດໂທ"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"ພັກສາຍຊົ່ວຄາວ"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"ວາງສາຍ"</string>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"ນຳ​ລາຍ​ຊື່​ຕິດ​ຕໍ່​ເຂົ້າ​ບໍ່​ສຳ​ເລັດ"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"ການຊ່ວຍໄດ້ຍິນ"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"ເປີດໃຊ້ການຊ່ວຍໄດ້ຍິນ"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"ການໂທ Real-time text (RTT)"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"ອະນຸຍາດໃຫ້ສົ່ງຂໍ້ຄວາມພາຍໃນການໂທສຽງໄດ້"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"RTT ຈະຊ່ວຍຜູ້ໂທທີ່ຫູໜວກ, ມີບັນຫາໃນການໄດ້ຍິນ, ຂາດຄວາມສາມາດໃນການເວົ້າ ຫຼື ຕ້ອງການຫຼາຍກວ່າສຽງ.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;ສຶກສາເພີ່ມເຕີມ&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - ການໂທ RTT ຈະຖືກບັນທຶກເປັນການຖອດຂໍ້ຄວາມ\n       &lt;br&gt; - RTT ບໍ່ສາມາດໃຊ້ກັບການໂທວິດີໂອໄດ້"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"ປິດ ຫຼື ເປີດ RTT"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY ປິດ"</item>
     <item msgid="3971695875449640648">"TTY ເຕັມ"</item>
@@ -606,8 +587,6 @@
     <string name="selectContact" msgid="781975788478987237">"ເລືອກລາຍຊື່ຜູ່ຕິດຕໍ່"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"ບໍ່ຮອງຮັບການໂທດ້ວຍສຽງ"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"ປຸ່ມໂທ"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"ສະແດງປຸ່ມກົດ"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"ແປ້ນກົດສຸກເສີນ"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"ຂໍ້​ຄວາມ​ສຽງ​ປະ​ກອບ​ພາບ"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"ຕັ້ງລະຫັດ PIN"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"​ປ່ຽນ​ລະຫັດ PIN"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index fd88ae0..a5faa8f 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Grąžinami nustatymai…"</string>
     <string name="response_error" msgid="6674110501330139405">"Netikėtas atsakas iš tinklo."</string>
     <string name="exception_error" msgid="7027667130619518211">"Tinklo ar SIM kortelės klaida."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS užklausa pakeista į įprastą skambutį"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS užklausa pakeista į USSD užklausą"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Pakeista į naują SS užklausą"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS užklausa pakeista į vaizdo skambutį"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS užklausa pakeista į DIAL užklausą."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS užklausa pakeista į USSD užklausą."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS užklausa pakeista į naują SS užklausą."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS užklausa pakeista į „Video DIAL“ užklausą."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"Įjungtas jūsų telefono programos fiksuotojo rinkimo numerių nustatymas. Todėl neveikia kai kurios su skambinimu susijusios funkcijos."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Prieš žiūrėdami šiuos nustatymus, įjunkite radiją."</string>
     <string name="close_dialog" msgid="2365884406356986917">"Gerai"</string>
@@ -163,7 +163,7 @@
     <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>
-    <string name="network_query_error" msgid="8466081377231178298">"Nepavyko rasti tinklų. Bandykite dar kartą."</string>
+    <string name="network_query_error" msgid="6828516148953325006">"Klaida ieškant tinklų."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Registruojama <xliff:g id="NETWORK">%s</xliff:g>..."</string>
     <string name="not_allowed" msgid="5613353860205691579">"SIM kortelė neleidžia užmegzti ryšio su šiuo tinklu."</string>
     <string name="connect_later" msgid="2308119155752343975">"Dabar prie šio tinklo prisijungti nepavyksta. Bandykite dar kartą vėliau."</string>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Pakeisti tinklo veikimo režimą"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Pageidaujamas tinklo tipas"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(uždrausta)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Pasirinkti tinklą"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Atsijungta"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Prisijungta"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Prisijungiama..."</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Nepavyko prisijungti"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"Pageidaujama GSM / WCDMA"</item>
     <item msgid="8442633436636425221">"Tik GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Skambinama"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Tinklas"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Patobulintas 4G LTE režimas"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Išplėstinės skambinimo parinktys"</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="2382798156640007971">"Leisti naudoti duomenis"</string>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"Tarptinklinis 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="6843814381576397939">"Tarptinklinis duomenų ryšys išjungtas. Jei norite įjungti, palieskite."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Nutrūko mobilusis duomenų ryšys"</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="1603164667540144353">"Galite būti apmokestinti dideliais mokesčiais."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Daugiau kainodaros informacijos galite gauti susisiekę su tinklo paslaugų teikėju."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Leisti tarptinklinį duomenų ryšį?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Programos duomenų naudojimas"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Duomenų naudojimas"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_2">%2$s</xliff:g> išnaudota mobiliojo ryšio duomenų: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Išplėstiniai"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Operatorius"</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Negalima sulaikyti skambučių."</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="incall_error_promote_wfc" msgid="106510757624022064">"Įgalinkite „Wi-Fi“ skambinimą, kad galėtumėte skambinti."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Kritinės padėties informacija"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Savininkas"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Palieskite dar kartą, kad peržiūrėtumėte informaciją"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Skambutis pagalbos numeriu"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Tik skambučiai pagalbos numeriu"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Pagalbos numeris"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Pagalbos numeriai"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Palieskite dar kartą, kad paskambintumėte numeriu <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Įjungiamas radijas…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Nėra ryšio. Bandoma dar kartą…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Neįmanoma įjungti lėktuvo režimo per skambutį pagalbos numeriu."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Skambučių pagalbos numeriu paslauga nepasiekiama"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Policija"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Greitoji medicinos pagalba"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Gaisras"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</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>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Nepavyko importuoti kontakto"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Klausos aparatai"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Įjungti klausos aparato suderinamumą"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Tikralaikių teksto pranešimų (RTT) skambutis"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Leisti susirašinėti dalyvaujant balso skambutyje"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"RTT padeda skambintojams, kurie yra kurti, neprigirdintys, sunkiai kalba arba kuriems reikia ne tik kalbėti.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Sužinokite daugiau&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; – RTT skambučiai išsaugomi kaip pranešimų nuorašai\n       &lt;br&gt; – RTT paslauga nepasiekiama dalyvaujant vaizdo skambučiuose"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Įjungti arba išjungti RTT"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY išjungta"</item>
     <item msgid="3971695875449640648">"TTY pilnas"</item>
@@ -610,8 +591,6 @@
     <string name="selectContact" msgid="781975788478987237">"pasirinkti kontaktą"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Skambinimas balsu nepalaikomas"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"rinkti numerį"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"rodyti numerio rinkimo klaviatūrą"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Skambinimo pagalbos numeriu skydelis"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Vaizdinis balso paštas"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"PIN kodo nustatymas"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Keisti PIN kodą"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 7166b2d..5d13a1d 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Notiek iestatījumu atsaukšana..."</string>
     <string name="response_error" msgid="6674110501330139405">"Neparedzēta atbilde no tīkla."</string>
     <string name="exception_error" msgid="7027667130619518211">"Tīkla vai SIM kartes kļūda."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS pieprasījums mainīts uz parastu zvanu"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS pieprasījums mainīts uz USSD pieprasījumu"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Mainīts uz jaunu SS pieprasījumu"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS pieprasījums mainīts uz videozvanu"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS pieprasījums tika mainīts uz DIAL pieprasījumu."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS pieprasījums tika mainīts uz USSD pieprasījumu."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS pieprasījums tika mainīts uz jaunu SS pieprasījumu."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS pieprasījums tika mainīts uz Video DIAL pieprasījumu."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"Jūsu tālrunī ir ieslēgta fiksēto numuru sastādīšanas lietotne. Tādēļ dažas zvanu funkcijas nav pieejamas."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Pirms šo iestatījumu skatīšanas ieslēdziet radio."</string>
     <string name="close_dialog" msgid="2365884406356986917">"Labi"</string>
@@ -163,7 +163,7 @@
     <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>
-    <string name="network_query_error" msgid="8466081377231178298">"Neizdevās atrast tīklus. Mēģiniet vēlreiz."</string>
+    <string name="network_query_error" msgid="6828516148953325006">"Tīklu meklēšanas laikā radās kļūda."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Notiek reģistrēšana šādā tīklā: <xliff:g id="NETWORK">%s</xliff:g>..."</string>
     <string name="not_allowed" msgid="5613353860205691579">"SIM karte neļauj izveidot savienojumu ar šo tīklu."</string>
     <string name="connect_later" msgid="2308119155752343975">"Pašlaik nevar izveidot savienojumu ar šo tīklu. Vēlāk mēģiniet vēlreiz."</string>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Mainiet tīkla darbības režīmu"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Ieteicamais tīkla veids"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(aizliegts)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Izvēlēties tīklu"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Savienojums pārtraukts"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Savienojums izveidots"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Notiek savienojuma izveide..."</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Nevarēja izveidot savienojumu"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"Ieteicamais režīms: GSM/WCDMA"</item>
     <item msgid="8442633436636425221">"Tikai GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Zvanīšana"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Tīkls"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Uzlabota 4G LTE režīms"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Paplašināta zvanīšana"</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="2382798156640007971">"Atļaut datu izmantošanu"</string>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"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="6843814381576397939">"Datu viesabonēšana ir izslēgta. Pieskarieties, lai to ieslēgtu."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Zaudēts mobilais datu savienojums"</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="1603164667540144353">"Var rasties ievērojamas izmaksas."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Sazinieties ar savu tīkla pakalpojumu sniedzēju, lai uzzinātu par tarifiem."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Vai atļaut datu viesabonēšanu?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Lietotnes datu lietojums"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Datu lietojums"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> mobilo datu izmantoti šādā laika periodā: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Papildu"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Mobilo sakaru operators"</string>
@@ -505,24 +499,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Nevar aizturēt zvanus."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Lai veiktu zvanu, izveidojiet savienojumu ar bezvadu tīklu."</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"Lai veiktu zvanu, iespējojiet Wi-Fi zvanus."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Ārkārtas informācija"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Īpašnieks"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Pieskarieties vēlreiz, lai skatītu informāciju."</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Ārkārtas zvans"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Tikai ārkārtas izsaukumi"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Ārkārtas numurs"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Ārkārtas numuri"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Pieskarieties vēlreiz, lai zvanītu uz numuru <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Notiek radio ieslēgšana..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Nav pakalpojuma. Notiek atkārtots mēģinājums…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Ārkārtas izsaukuma laikā nevar ieslēgt lidojuma režīmu."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Ārkārtas izsaukumi nav pieejami"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Policija"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Ātrā palīdzība"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Ugunsgrēks"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</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>
@@ -543,9 +525,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Neizdevās importēt kontaktpersonu."</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Dzirdes aparāti"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Ieslēgt saderību ar dzirdes aparātiem"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Reāllaika teksta (RTT) zvans"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Atļaut ziņojumapmaiņu balss zvanā"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"RTT funkcionalitāte palīdz nedzirdīgiem un vājdzirdīgiem zvanītājiem, kā arī zvanītājiem, kuriem ir runas traucējumi vai ir nepieciešama ne tikai balss skaņa.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Uzzināt vairāk&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - RTT zvani tiek saglabāti ziņojumu transkripcijas formātā.\n       &lt;br&gt; - RTT funkcionalitāte nav pieejama videozvaniem."</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"RTT ieslēgšana vai izslēgšana"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"Teletaips ir izslēgts"</item>
     <item msgid="3971695875449640648">"Viss teletaips"</item>
@@ -610,8 +591,6 @@
     <string name="selectContact" msgid="781975788478987237">"atlasīt kontaktpersonu"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Balss zvani netiek atbalstīti"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"sastādīt numuru"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"rādīt numuru sastādīšanas tastatūru"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Ārkārtas numura sastādīšanas tastatūra"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Vizuālais balss pasts"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"PIN koda iestatīšana"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Mainīt PIN"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 572eb53..c3c1e02 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -30,7 +30,7 @@
     <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="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>
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Враќање поставки..."</string>
     <string name="response_error" msgid="6674110501330139405">"Неочекуван одговор од мрежата."</string>
     <string name="exception_error" msgid="7027667130619518211">"Грешка со мрежа или SIM картичка."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"Барањето SS е променето во стандарден повик"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"Барањето SS е променето во барање USSD"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Променето на ново барање SS"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"Барањето SS е променето во видеоповик"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"Барањето SS е изменето во барање DIAL."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"Барањето SS е изменето во барање USSD."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"Барањето SS е изменето во ново барање SS."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"Барањето SS е изменето во барање Видео DIAL."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"Апликацијата на вашиот телефон за броеви на фиксно бирање е вклучена. Како резултат на тоа, некои функции поврзани со повици не работат."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Вклучете го радиото пред да ги гледате овие поставки."</string>
     <string name="close_dialog" msgid="2365884406356986917">"Во ред"</string>
@@ -163,7 +163,7 @@
     <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="network_query_error" msgid="8466081377231178298">"Не можеше да се најдат мрежи. Обидете се повторно."</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>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Промени го режимот на работа на мрежата"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Претпочитан тип мрежа"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(забрането)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Изберете мрежа"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Исклучено"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Поврзано"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Се поврзува…"</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Не можеше да се поврзе"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"Претпочитан: GSM/WCDMA"</item>
     <item msgid="8442633436636425221">"Само GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Повикување"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Мрежа"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Режим на подобрени 4G LTE"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Напредно повикување"</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>
@@ -243,19 +238,18 @@
     <string name="roaming" msgid="7894878421600247140">"Роаминг"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Поврзи се со интернет услуги во роаминг"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Поврзи се со интернет услуги во роаминг"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"Интернет-роамингот е исклучен. Допрете за да се вклучи."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Мобилната интернет-врска се прекина"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Изгубивте поврзување податоци зашто на вашата домашна мрежа исклучивте роаминг на податоци."</string>
     <string name="roaming_warning" msgid="1603164667540144353">"Може да направите големи трошоци."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"За цени, проверете кај вашиот интернет-оператор."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Дозволи интернет-роаминг?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Потрошен сообраќај на апликациите"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Потрошен сообраќај"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> потрошен мобилен интернет во периодот <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Напредни"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Оператор"</string>
     <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"оператор, esim, sim, euicc, префрли оператори, додај оператор"</string>
     <string name="carrier_settings_euicc_summary" msgid="5115001942761995457">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> - <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
     <string name="mobile_data_settings_title" msgid="4661165467914727157">"Мобилен интернет"</string>
-    <string name="mobile_data_settings_summary" msgid="5087255915840576895">"Пристап на интернет преку мобилната мрежа"</string>
+    <string name="mobile_data_settings_summary" msgid="5087255915840576895">"Пристапете до податоците преку мобилна мрежа"</string>
     <string name="data_usage_disable_mobile" msgid="3577275288809667615">"Да се исклучи мобилниот интернет?"</string>
     <string name="sim_selection_required_pref" msgid="7049424902961844236">"Треба да се избере"</string>
     <string name="sim_change_data_title" msgid="5332425991853799280">"Да се промени SIM за интернет?"</string>
@@ -509,24 +503,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Не може да се задржат повици."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Поврзете се на безжична мрежа за да повикате."</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"Овозможете повикување преку Wi-Fi за воспоставување повик."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Информации за итни случаи"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Сопственик"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Допрете повторно за приказ на информации"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Повик за итни случаи"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Само итни повици"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Број за итни случаи"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Броеви за итни случаи"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Допрете еднаш за да го повикате <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Вклучување радио..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Нема услуга. Се обидува повторно…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Не може да се постави авионски режим во текот на итен повик."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Итните повици не се достапни"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Полиција"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Брза помош"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Оган"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Користи тастатурата за бирање"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Почекај"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Заврши"</string>
@@ -547,9 +529,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Не успеа да увезе контакт"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Слушни помагала"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Вклучи компатибилност на слушни помагала"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Повик со „Текст во реално време“ (RTT)"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Дозволете пораки во текот на гласовен повик"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"Функцијата RTT им помага на повикувачи коишто се глуви, слабо слушаат, имаат говорна мана или пак, им е потребно многу повеќе од глас.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Дознајте повеќе&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - Повиците со RTT се зачувуваат како препис на порака\n       &lt;br&gt; - Функцијата RTT не е достапна за видеоповици"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Вклучете или исклучете RTT"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY исклучени"</item>
     <item msgid="3971695875449640648">"TTY целосни"</item>
@@ -604,7 +585,7 @@
     <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="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>
@@ -612,8 +593,6 @@
     <string name="selectContact" msgid="781975788478987237">"избери контакт"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Гласовното повикување не е поддржано"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"бирај"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"прикажи копчиња за бирање"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Копчиња за бирање за итни случаи"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Визуелна говорна пошта"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Поставете PIN"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Променете PIN"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index d69623a..3b47c7f 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"ക്രമീകരണങ്ങൾ പഴയപടിയാക്കുന്നു…"</string>
     <string name="response_error" msgid="6674110501330139405">"നെറ്റ്‌വർക്കിൽ നിന്നുള്ള അപ്രതീക്ഷിത പ്രതികരണം."</string>
     <string name="exception_error" msgid="7027667130619518211">"നെറ്റ്‌വർക്ക് അല്ലെങ്കിൽ സിം കാർഡ് പിശക്."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS അഭ്യർത്ഥന, സാധാരണ കോളിലേക്ക് മാറ്റി"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS അഭ്യർത്ഥന, USSD അഭ്യർത്ഥനയിലേക്ക് മാറ്റി"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"പുതിയ SS അഭ്യർത്ഥനയിലേക്ക് മാറ്റി"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS അഭ്യർത്ഥന, വീഡിയോ കോളിലേക്ക് മാറ്റി"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS അഭ്യർത്ഥന, DIAL അഭ്യർത്ഥനയായി പരിഷ്‌ക്കരിച്ചു."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS അഭ്യർത്ഥന, USSD അഭ്യർത്ഥനയായി പരിഷ്‌ക്കരിച്ചു."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS അഭ്യർത്ഥന, പുതിയ SS അഭ്യർത്ഥനയായി പരിഷ്‌ക്കരിച്ചു."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS അഭ്യർത്ഥന, വീഡിയോ DIAL അഭ്യർത്ഥനയായി പരിഷ്‌ക്കരിച്ചു."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"നിങ്ങളുടെ ഫോൺ അപ്ലിക്കേഷന്റെ സ്ഥിര ഡയലിംഗ് നമ്പറുകളുടെ ക്രമീകരണം ഓൺ ചെയ്‌തു. തൽഫലമായി, കോളുമായി ബന്ധപ്പെട്ട ചില സവിശേഷതകൾ പ്രവർത്തിക്കുന്നില്ല."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"ഈ ക്രമീകരണങ്ങൾ കാണുന്നതിന് മുമ്പ് റേഡിയോ ഓൺ ചെയ്യുക."</string>
     <string name="close_dialog" msgid="2365884406356986917">"ശരി"</string>
@@ -163,7 +163,7 @@
     <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="network_query_error" msgid="8466081377231178298">"നെറ്റ്‌വർക്കുകൾ കണ്ടെത്താനായില്ല. വീണ്ടും ശ്രമിക്കുക."</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>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"നെറ്റ്‌വർക്ക് ഓപ്പറേറ്റുചെയ്യൽ മോഡ് മാറ്റുക"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"തിരഞ്ഞെടുത്ത നെറ്റ്‌വർക്ക് തരം"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(നിരോധിക്കപ്പെട്ടത്)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"നെറ്റ്‍വര്‍ക്ക് തിരഞ്ഞെടുക്കുക"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"വിച്ഛേദിച്ചു"</string>
-    <string name="network_connected" msgid="1288589103624338857">"കണക്‌റ്റ് ചെയ്‌തു"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"കണക്‌റ്റ് ചെയ്യുന്നു..."</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"കണക്റ്റ് ചെയ്യാനായില്ല"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA തിരഞ്ഞെടുത്തത്"</item>
     <item msgid="8442633436636425221">"GSM മാത്രം"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"കോൾചെയ്യുന്നു"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"നെറ്റ്‌വർക്ക്"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"മെച്ചപ്പെടുത്തിയ 4G LTE മോഡ്"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"വിപുലമായ കോളിംഗ്"</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>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"റോമിംഗ്"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"റോമിംഗിലാകുമ്പോൾ ഡാറ്റ സേവനങ്ങളുമായി കണ‌ക്റ്റുചെയ്യുക"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"റോമിംഗിലാകുമ്പോൾ ഡാറ്റ സേവനങ്ങളുമായി കണ‌ക്റ്റുചെയ്യുക"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"ഡാറ്റ റോമിംഗ് ഓഫാണ്. ഓണാക്കാൻ ടാപ്പ് ചെയ്യുക."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"മൊബൈൽ ഡാറ്റ കണക്ഷൻ നഷ്‌ടപ്പെട്ടു"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"നിങ്ങൾ ഡാറ്റ റോമിംഗ് ഓഫുചെയ്‌തതിനൊപ്പം നിങ്ങളുടെ ഹോം നെ‌റ്റ്‌വർക്കും വിട്ടതിനാൽ നിങ്ങൾക്ക് ഡാറ്റ കണക്റ്റിവിറ്റി നഷ്‌ടപ്പെട്ടു."</string>
     <string name="roaming_warning" msgid="1603164667540144353">"നിങ്ങളിൽ നിന്ന് നിർദ്ദിഷ്‌ട നിരക്കുകൾ ഈടാക്കിയേക്കാം."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"നിരക്കിനായി നിങ്ങളുടെ നെറ്റ്‌വർക്ക് ദാതാവിനെ ബന്ധപ്പെടുക."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"ഡാറ്റ റോമിംഗ് അനുവദിക്കണോ?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"ആപ്പ് ഡാറ്റ ഉപയോഗം"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"ഡാറ്റ ഉപയോഗം"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_2">%2$s</xliff:g> തീയതികൾക്കിടയിൽ <xliff:g id="ID_1">%1$s</xliff:g> മൊബൈൽ ഡാറ്റ ഉപയോഗിച്ചു"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"വിപുലമായത്"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"കാരിയര്‍"</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"കോളുകൾ ഹോൾഡുചെയ്യാൻ കഴിയില്ല."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"ഒരു കോൾ വിളിക്കാൻ വയർലെസ്സ് നെറ്റ്‌വർക്കിലേക്ക് കണക്റ്റുചെയ്യുക."</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"കോൾ ചെയ്യാൻ Wi-Fi കോളിംഗ് പ്രവർത്തനക്ഷമമാക്കുക."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"അടിയന്തര വിവരം"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"ഉടമ"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"വിവരങ്ങൾ കാണാൻ വീണ്ടും ടാപ്പ് ചെയ്യുക"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"അടിയന്തര കോൾ"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"അടിയന്തര കോളുകൾ മാത്രം"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"അടിയന്തര നമ്പർ"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"അടിയന്തര നമ്പറുകൾ"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"<xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>-ലേക്ക് വിളിക്കാൻ വീണ്ടും ടാപ്പ് ചെയ്യുക"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"റേഡിയോ ഓൺ ചെയ്യുന്നു…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"സേവനമൊന്നുമില്ല. വീണ്ടും ശ്രമിക്കുന്നു…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"അടിയന്തര കോളിലായിരിക്കുമ്പോൾ, ഫ്ലൈറ്റ് മോഡ് ഓണാക്കാനാകില്ല."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"എമർജൻസി കോളിംഗ് ലഭ്യമല്ല"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"പോലീസ്"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"ആംബുലൻസ്"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"തീ"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"ഡയൽ ചെയ്യാൻ കീബോർഡ് ഉപയോഗിക്കുക"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"ഹോള്‍ഡുചെയ്യുക"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"അവസാനിപ്പിക്കുക"</string>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"കോൺടാക്റ്റ് ഇമ്പോർട്ടുചെയ്യുന്നത് പരാജയപ്പെട്ടു"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"ശ്രവണ സഹായികൾ"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"ശ്രവണസഹായി അനുയോജ്യത ഓൺ ചെയ്യുക"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"തത്സമയ ടെക്‌സ്‌റ്റ്(RTT) കോൾ"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"വോയ്‌സ് കോളിൽ സന്ദേശമയയ്‌ക്കൽ അനുവദിക്കുക"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"ബധിരർ, കേൾവി ശക്തി കുറഞ്ഞവർ, സംഭാഷണ വൈകല്യമുള്ളവർ അല്ലെങ്കിൽ ശബ്‌ദത്തിന് പുറമേ മറ്റ് സഹായവും ആവശ്യമുള്ള, വിളിക്കുന്ന ആളുകളെ RTT സഹായിക്കുന്നു.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;കൂടുതലറിയുക&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - RTT കോളുകൾ സന്ദേശ ട്രാൻസ്‌ക്രിപ്റ്റായി സംരക്ഷിക്കുന്നു\n       &lt;br&gt; - വീഡിയോ കോളുകൾക്കായി RTT ലഭ്യമല്ല"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"RTT ഓൺ അല്ലെങ്കിൽ ഓഫ് ചെയ്യുക"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY ഓഫാണ്"</item>
     <item msgid="3971695875449640648">"TTY പൂർണ്ണം"</item>
@@ -606,8 +587,6 @@
     <string name="selectContact" msgid="781975788478987237">"കോൺടാക്റ്റ് തിരഞ്ഞെടുക്കുക"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"വോയ്‌സ് കോൾ ചെയ്യുന്നതിനെ പിന്തുണയ്‌ക്കുന്നില്ല"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"ഡയൽ ചെയ്യുക"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"ഡയൽപാഡ് കാണിക്കുക"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"അടിയന്തര ഡയൽപാഡ്"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"വിഷ്വൽ വോയ്‌സ്‌മെയിൽ"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"പിൻ സജ്ജമാക്കുക"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"പിൻ മാറ്റുക"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 17c4ba5..823352f 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -30,7 +30,7 @@
     <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="manageConferenceLabel" msgid="4691922394301969053">"Утсан хурлыг удирдах"</string>
     <string name="ok" msgid="3811371167865772377">"OK"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Чанга яригч"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Утасны чихэвч"</string>
@@ -91,10 +91,10 @@
     <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" 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>
@@ -108,7 +108,7 @@
     <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="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>
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Тохиргоог буцааж байна…"</string>
     <string name="response_error" msgid="6674110501330139405">"Сүлжээний гэнэтийн хариу."</string>
     <string name="exception_error" msgid="7027667130619518211">"Сүлжээ буюу SIM картны алдаа."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS хүсэлтийг ердийн дуудлага болгож өөрчилсөн"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS хүсэлтийг USSD хүсэлт болгон өөрчилсөн"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Шинэ SS хүсэлт рүү өөрчилсөн"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS хүсэлтийг видео дуудлага болгож өөрчилсөн"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS хүсэлтийг DIAL хүсэлт болгон өөрчилсөн."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS хүсэлтийг USSD хүсэлт болгон өөрчилсөн."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS хүсэлтийг шинэ SS хүсэлт болгон өөрчилсөн."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS хүсэлтийг Видео DIAL хүсэлт болгон өөрчилсөн."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"Таны Phone апп-н FDN тохиргоо асаалттай байна. Тус шалтгаанаар дуудлагатай холбоотой зарим функц ажиллахгүй."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Эдгээр тохиргоог харахын өмнө радиог асаана уу."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
@@ -163,7 +163,7 @@
     <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="network_query_error" msgid="8466081377231178298">"Сүлжээ олдсонгүй. Дахин оролдоно уу."</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>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Сүлжээний ажиллах төлвийг өөрчлөх"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Сүлжээний үндсэн төрөл"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(хориотой)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Сүлжээ сонгоно уу"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Салсан"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Холбогдсон"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Холбогдож байна..."</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Холбогдож чадсангүй"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA эхэнд нь"</item>
     <item msgid="8442633436636425221">"Зөвхөн GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Залгаж байна"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Сүлжээ"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Сайжруулсан 4G LTE горим"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Сайжруулсан дуудлага"</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>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"Роуминг"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Роумингтэй үед дата үйлчилгээнд холбогдох"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Роумингтэй үед дата үйлчилгээнд холбогдох"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"Дата роуминг унтарсан байна. Асаах бол товшино уу."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Мобайл дата холболт салсан"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Та төрөлх сүлжээнээс дата роумингыг унтраагаад гарсан тул дата холболтоо алдлаа."</string>
     <string name="roaming_warning" msgid="1603164667540144353">"Таны төлбөр өндөр гарах магадлалтайг анхааруулж байна."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Үнийг нь өөрийн сүлжээний нийлүүлэгчээс шалгана уу."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Дата роуминг үйлчилгээг идэвхжүүлэх үү?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Аппын дата ашиглалт"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Дата ашиглалт"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> мобайл дата ашигласан <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Нарийвчилсан"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Оператор компани"</string>
@@ -386,20 +380,20 @@
     <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">"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="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" 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>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Дуудлагыг хадгалах боломжгүй байна."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Дуудлага хийхийн тулд утасгүй интернетэд холбогдоно уу."</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"Дуудлага хийхийн тулд Wi-Fi дуудлагыг идэвхжүүлнэ үү."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Яаралтай тусламжийн мэдээлэл"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Эзэмшигч"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Мэдээллийг үзэхийн тулд дахин товшино уу"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Ослын дуудлага"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Зөвхөн яаралтай дуудлага"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Яаралтай тусламжийн дугаар"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Яаралтай тусламжийн дугаарууд"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"<xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>-д дуудлага хийхийн тулд товшино уу"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Радиог асааж байна…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Ажиллагаагүй байна. Дахин оролдоно уу..."</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Яаралтай дуудлагын дундуур нислэгийн горимд шилжих боломжгүй."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Яаралтай тусламжийн дуудлага хийх боломжгүй"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Цагдаа"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Түргэн тусламж"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Гал"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Залгахдаа гар ашиглах"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Саатуулах"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Дуусгах"</string>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Харилцагчийн жагсаалтыг импортолж чадсангүй"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Сонсголын төхөөрөмж"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Сонсголын төхөөрөмж тааруулагчийг асаана уу"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Шууд мессежлэх (RTT) дуудлага"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Дуудлагын дотор зурвас бичихийг зөвшөөрөх"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"RTT нь дүлий, хатуу чихтэй, хэл ярианы хөгжлийн бэрхшээлтэй, эсвэл хэн нэгний тусламжтай ярьдаг дуудлага хийгчдэд тусладаг.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Дэлгэрэнгүй үзэх&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - RTT дуудлага нь зурвасын сийрүүлэг хэлбэрээр хадгалагдана\n       &lt;br&gt; - RTT нь видео дуудлага хийхэд боломжгүй"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"RTT-г асаах эсвэл унтраах"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY Унтраасан"</item>
     <item msgid="3971695875449640648">"TTY Дүүрэн"</item>
@@ -606,8 +587,6 @@
     <string name="selectContact" msgid="781975788478987237">"харилцагч сонгох"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Дуугаар залгахыг дэмждэггүй"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"залгах"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"дугаар цуглуулах самбарыг харуулах"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Яаралтай тусламжийн дугаар цуглуулах самбар"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Уншиж болохуйц дуут шуудан"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"PIN тохируулах"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"PIN өөрчлөх"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 989b393..dbc88c8 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -29,8 +29,8 @@
     <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="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>
@@ -43,10 +43,10 @@
     <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_msg" msgid="1300729501030053828">"सिम कार्डवर कोणताही व्हॉइसमेल नंबर संचयित केला नाही."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"नंबर जोडा"</string>
     <string name="voice_number_setting_primary_user_only" msgid="6596604364907022416">"केवळ प्राथमिक वापरकर्ता व्हॉइसमेल सेटिंग्ज बदलू शकतो."</string>
-    <string name="puk_unlocked" msgid="2284912838477558454">"तुमचे सिम कार्ड अवरोधित करणे रद्द केले गेले आहे. तुमचा फोन अनलॉक होत आहे…"</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>
@@ -94,10 +94,10 @@
     <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="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="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>
@@ -107,17 +107,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"नंबर व्‍यस्‍त असताना"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"<xliff:g id="PHONENUMBER">{0}</xliff:g> वर अग्रेषित करत आहे"</string>
     <string name="sum_cfb_disabled" msgid="4913145177320506827">"बंद"</string>
-    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"तुमचा फोन व्‍यस्‍त असताना तुमचा ऑपरेटर कॉल अग्रेषण करणे अक्षम करण्‍यास समर्थन करीत नाही."</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="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="2684474391807469832">"बंद"</string>
-    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"तुमचा फोन पोहचण्‍यायोग्‍य नसताना तुमचा वाहक कॉल अग्रेषण करणे अक्षम करण्‍यास समर्थन करीत नाही."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"आपला फोन पोहचण्‍यायोग्‍य नसताना आपला वाहक कॉल अग्रेषण करणे अक्षम करण्‍यास समर्थन करीत नाही."</string>
     <string name="updating_title" msgid="6146755386174019046">"कॉल सेटिंग्ज"</string>
     <string name="call_settings_admin_user_only" msgid="4526094783818216374">"कॉल सेटिंग्ज केवळ प्रशासक वापरकर्त्याद्वारे बदलल्‍या जाऊ शकतात."</string>
     <string name="call_settings_with_label" msgid="3401177261468593519">"सेटिंग्ज (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"सेटिंग्‍ज परत करत आहे…"</string>
     <string name="response_error" msgid="6674110501330139405">"नेटवर्क वरून अनपेक्षित प्रतिसाद."</string>
     <string name="exception_error" msgid="7027667130619518211">"नेटवर्क किंवा सिम कार्ड एरर."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS विनंती नियमित कॉलवर बदलली"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS विनंती USSD विनंतीवर बदलली"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"नवीन SS विनंतीवर बदलली"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS विनंती व्हिडिओ कॉलवर बदलली"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS विनंती डायल विनंतीवर सुधारित केली."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS विनंती USSD विनंतीवर सुधारित केली."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS विनंती नवीन SS विनंतीवर सुधारित केली."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS विनंतीमध्ये बदल करून ती व्हिडिओ डायल विनंतीमध्ये बदलली आहे."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"आपल्‍या फोन अ‍ॅप्‍सचे निश्चित डायलिंग नंबर सेटिंग चालू केले. परिणामी, काही कॉल संबंधित वैशिष्‍ट्ये कार्य करीत नाहीत."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"या सेटिंग्‍ज पाहण्‍यापूर्वी रेडिओ चालू करा."</string>
     <string name="close_dialog" msgid="2365884406356986917">"ठीक"</string>
@@ -145,10 +145,10 @@
     <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="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="voicemail_default" msgid="2001233554889016880">"आपला वाहक"</string>
     <string name="vm_change_pin_old_pin" msgid="7295220109886682573">"जुना पिन"</string>
     <string name="vm_change_pin_new_pin" msgid="5412922262839438097">"नवीन पिन"</string>
     <string name="vm_change_pin_progress_message" msgid="3977357361934350336">"कृपया प्रतीक्षा करा."</string>
@@ -158,14 +158,14 @@
     <string name="vm_change_pin_error_mismatch" msgid="2754685537970757317">"जुना पिन जुळत नाही."</string>
     <string name="vm_change_pin_error_invalid" msgid="3972205462701668653">"नवीन पिन मध्ये अवैध वर्ण आहेत."</string>
     <string name="vm_change_pin_error_system_error" msgid="6610603326230000207">"पिन बदलण्यात अक्षम"</string>
-    <string name="vvm_unsupported_message_format" msgid="11795090778411977">"असमर्थित मेसेज प्रकार, ऐकण्यासाठी <xliff:g id="NUMBER">%s</xliff:g> वर कॉल करा."</string>
+    <string name="vvm_unsupported_message_format" msgid="11795090778411977">"असमर्थित संदेश प्रकार, ऐकण्यासाठी <xliff:g id="NUMBER">%s</xliff:g> वर कॉल करा."</string>
     <string name="network_settings_title" msgid="514120489499925574">"मोबाइल नेटवर्क"</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="network_query_error" msgid="8466081377231178298">"नेटवर्क मिळू शकले नाहीत. पुन्‍हा प्रयत्‍न करा."</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="not_allowed" msgid="5613353860205691579">"आपले सिम कार्ड या नेटवर्कच्‍या कनेक्‍शनला अनुमती देत नाही."</string>
     <string name="connect_later" msgid="2308119155752343975">"आत्ता या नेटवर्कशी कनेक्‍ट करू शकत नाही. नंतर पुन्‍हा प्रयत्‍न करा."</string>
     <string name="registration_done" msgid="495135664535876612">"नेटवर्कवर नोंदणी केली."</string>
     <string name="already_auto" msgid="6067116884321285507">"आपोआप निवडीमध्‍ये आधीपासून आहे."</string>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"नेटवर्क कार्य करण्‍याचा मोड बदला"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"प्राधान्‍यकृत नेटवर्क प्रकार"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(मनाई केलेले)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"नेटवर्क निवडा"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"डिस्कनेक्ट केले"</string>
-    <string name="network_connected" msgid="1288589103624338857">"कनेक्ट केले"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"कनेक्ट होत आहे..."</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"कनेक्ट करता आले नाही"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA प्राधान्‍यकृत"</item>
     <item msgid="8442633436636425221">"केवळ GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"कॉलिंग"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"नेटवर्क"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"वर्धित 4G LTE मोड"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"प्रगत कॉलिंग"</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>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"रोमिंग"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"रोमिंग असताना डेटा सेवांना कनेक्ट करा"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"रोमिंग असताना डेटा सेवांना कनेक्ट करा"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"डेटा रोमिंग बंद आहे. सुरू करण्‍यासाठी टॅप करा."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"मोबाइल डेटा कनेक्‍शन गेले"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"आपण डेटा रोमिंग बंद करून आपले होम नेटवर्क सोडल्यामुळे आपण डेटा कनेक्टिव्हिटी गमावली आहे."</string>
     <string name="roaming_warning" msgid="1603164667540144353">"आपल्‍याला लक्षणीय रोमिंग शुल्‍क लागू शकते."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"किंमतींबद्दल तुमच्या नेटवर्क प्रदात्याला विचारा."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"डेटा रोमिंगला अनुमती द्यायची?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"अ‍ॅप डेटा वापर"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"डेटा वापर"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_2">%2$s</xliff:g> दरम्यान <xliff:g id="ID_1">%1$s</xliff:g> मोबाइल डेटा वापरला गेला"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"प्रगत"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"वाहक"</string>
@@ -359,9 +353,9 @@
     <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="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>
@@ -424,23 +418,23 @@
     <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_contact_deleted" msgid="7154162327112259569">"निश्चित डायलिंग नंबर हटविला."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"आपण चुकीचा पिन टाईप केल्‍याने FDN अपडेट केले नव्‍हते."</string>
     <string name="fdn_invalid_number" msgid="2062898833049589309">"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">"सिक कार्डमधून वाचत आहे..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"आपल्‍या सिम कार्डवर कोणतेही संपर्क नाहीत."</string>
-    <string name="simContacts_title" msgid="1861472842524839921">"इंपोर्ट करण्यासाठी संपर्क निवडा"</string>
-    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"सिम कार्डमधील संपर्क इंपोर्ट करण्‍यासाठी विमान मोड बंद करा."</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="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>
@@ -471,7 +465,7 @@
     <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_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>
@@ -492,7 +486,7 @@
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"मोबाइल नेटवर्क उपलब्‍ध नाही. कॉल करण्‍यासाठी वायरलेस नेटवर्कशी कनेक्‍ट करा."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"कॉल करण्यासाठी, एक वैध नंबर एंटर करा."</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"कॉल अयशस्वी झाला."</string>
-    <string name="incall_error_cannot_add_call" msgid="8878159278947023326">"या वेळी कॉल जोडू शकत नाही. तुम्ही मेसेज पाठवून संपर्क करण्याचा प्रयत्न करू शकता."</string>
+    <string name="incall_error_cannot_add_call" msgid="8878159278947023326">"या वेळी कॉल जोडू शकत नाही. तुम्ही संदेश पाठवून संपर्क करण्याचा प्रयत्न करू शकता."</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>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"कॉल सुरु ठेवू शकत नाही."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"कॉल करण्‍यासाठी वायरलेस नेटवर्कशी कनेक्‍ट करा."</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"कॉल करण्यासाठी वाय-फाय कॉलिंग सक्षम करा."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"अतिमहत्त्वाची माहिती"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"मालक"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"माहिती पाहण्यासाठी पुन्हा टॅप करा"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"आणीबाणीचा कॉल"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"फक्त आणीबाणी कॉल"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"आणीबाणी नंबर"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"आणीबाणी नंबर"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"<xliff:g id="EMERGENCY_NUMBER">%s</xliff:g> ला कॉल करण्यासाठी पुन्हा टॅप करा"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"रेडिओ चालू करत आहे..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"सेवा नाही. पुन्हा प्रयत्न करत आहे…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"आणीबाणी कॉलदरम्यान विमान मोडमध्ये प्रवेश करू शकत नाही."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"आणीबाणी कॉलिंग उपलब्‍ध नाही"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"पोलीस"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"रुग्णवाहिका"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"आग"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"डायल करण्‍यासाठी कीबोर्डचा वापर करा"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"होल्ड करा"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"शेवट"</string>
@@ -533,17 +515,16 @@
     <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="singleContactImportedMsg" msgid="6868483416182599206">"इंपोर्ट केलेला संपर्क"</string>
-    <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"संपर्क इंपोर्ट करण्यात अयशस्वी"</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="singleContactImportedMsg" msgid="6868483416182599206">"आयात केलेला संपर्क"</string>
+    <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"संपर्क आयात करण्यात अयशस्वी"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"श्रवणयंत्रे"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"श्रवणयंत्र सुसंगतता चालू करा"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"रीअल-टाइम टेक्‍स्‍ट (RTT) कॉल"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"व्‍हॉइस कॉल करताना मेसेजिंग करू शकतो"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"RTT अशा कॉल करणार्‍यांना साहाय्य करते, ज्‍यांना बहिरेपणा आहे, ज्‍यांना कमी ऐकू येते किंवा बोलताना अडखळतात किंवा ज्‍यांना फक्‍त आवाज पुरेसा नसतो.&lt;br&gt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;अधिक जाणून घ्‍या&lt;a&gt;\n       &lt;br/&gt; - RTT cकॉल मेसेज प्रतिलेख म्‍हणून सेव्‍ह केले आहेत\n       &lt;br/&gt; - RTT व्हिडिओ कॉलसाठी उपलब्‍ध नाही"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"RTT सुरू किंवा बंद करा"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY बंद"</item>
     <item msgid="3971695875449640648">"TTY पूर्ण"</item>
@@ -556,24 +537,24 @@
     <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="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_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">"तुम्ही सक्रिय करणे वगळल्‍यास, तुम्ही कॉल करू शकत नाही किंवा मोबाइल डेटा नेटवर्कशी कनेक्‍ट करू शकत नाही (तुम्ही वाय-फाय नेटवर्कशी कनेक्‍ट करू शकत असला तरीही). तुम्ही तुमचा फोन सक्रिय करेपर्यंत, तुम्ही तो प्रत्‍येक वेळी चालू करताना आपल्‍याला तो सक्रिय करण्‍यास सांगितले जाईल."</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_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_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>
@@ -584,12 +565,12 @@
     <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"डेटा कनेक्शन अक्षम केले"</string>
     <string name="phone_in_ecm_notification_complete_time" msgid="7730376844178948351">"<xliff:g id="COMPLETETIME">%s</xliff:g> पर्यंत कोणतेही डेटा कनेक्‍शन नाही"</string>
     <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>
+      <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>
+      <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>
@@ -606,8 +587,6 @@
     <string name="selectContact" msgid="781975788478987237">"संपर्क निवडा"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"व्‍हॉइस कॉलिंंग समर्थित नाही"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"डायल करा"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"डायलपॅड दाखवा"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"आणीबाणी डायलपॅड"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"दृश्‍यमान व्हॉइसमेल"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"पिन सेट करा"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"पिन बदला"</string>
@@ -621,11 +600,11 @@
     <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="5932176406432044638">"कडून वाय-फाय कॉल"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="5932176406432044638">"कडून Wi-Fi कॉल"</string>
     <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"वाय-फाय कॉल"</string>
     <string name="emergency_action_launch_hint" msgid="4906759256275562674">"उघडण्यासाठी पुन्हा टॅप करा"</string>
-    <string name="message_decode_error" msgid="3456481534066924855">"मेसेज डीकोड करताना एक एरर आली."</string>
-    <string name="callFailed_cdma_activation" msgid="2307989779233262164">"सिम कार्डने तुमची सेवा सक्रिय केली आहे आणि आपल्या फोनच्या रोमिंग क्षमता अपडेट केल्या."</string>
+    <string name="message_decode_error" msgid="3456481534066924855">"संदेश डीकोड करताना एक एरर आली."</string>
+    <string name="callFailed_cdma_activation" msgid="2307989779233262164">"सिम कार्डने आपली सेवा सक्रिय केली आहे आणि आपल्या फोनच्या रोमिंग क्षमता अपडेट केल्या."</string>
     <string name="callFailed_cdma_call_limit" msgid="1556916577171457086">"बरेच सक्रिय कॉल आहेत. कृपया नवीन एक कॉल करण्यापूर्वी विद्यमान कॉल समाप्त करा किंवा विलीन करा."</string>
     <string name="callFailed_imei_not_accepted" msgid="132192626901238542">"कनेक्ट करण्यात अक्षम, कृपया एक वैध सिम कार्ड घाला."</string>
     <string name="callFailed_wifi_lost" msgid="5968076625137297184">"वाय-फाय कनेक्शन गमावले. कॉल समाप्त झाला."</string>
@@ -636,7 +615,7 @@
     <string name="change_pin_cancel_label" msgid="353535488390948596">"रद्द करा"</string>
     <string name="change_pin_ok_label" msgid="6204308560844889926">"ठीक आहे"</string>
     <string name="change_pin_enter_old_pin_header" msgid="419179847657548887">"आपल्या जुन्या पिनची पुष्टी करा"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="8579171678763615453">"सुरु ठेवण्‍यासाठी तुमचा व्हॉइसमेल पिन प्रविष्‍ट करा."</string>
+    <string name="change_pin_enter_old_pin_hint" msgid="8579171678763615453">"सुरु ठेवण्‍यासाठी आपला व्हॉइसमेल पिन प्रविष्‍ट करा."</string>
     <string name="change_pin_enter_new_pin_header" msgid="2611191814590251532">"नवीन पिन सेट करा"</string>
     <string name="change_pin_enter_new_pin_hint" msgid="2322940054329689309">"पिन <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> अंकी असणे आवश्‍यक आहे."</string>
     <string name="change_pin_confirm_pin_header" msgid="8113764019347322170">"आपल्या पिनची पुष्टी करा"</string>
@@ -652,9 +631,9 @@
     <string name="mobile_data_activate_prepaid_summary" msgid="5705389791791637666">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> द्वारे मोबाइल डेटा जोडा"</string>
     <string name="mobile_data_activate_roaming_plan" msgid="5998161536947086264">"कोणतीही रोमिंग योजना नाही"</string>
     <string name="mobile_data_activate_roaming_plan_summary" msgid="511202908883425459">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> द्वारे रोमिंग योजना जोडा"</string>
-    <string name="mobile_data_activate_footer" msgid="5979019929980140594">"तुम्ही आपल्या <xliff:g id="PROVIDER_NAME">%s</xliff:g> वाहकाद्वारे मोबाइल डेटा किंवा रोमिंग योजना जोडू शकता."</string>
+    <string name="mobile_data_activate_footer" msgid="5979019929980140594">"आपण आपल्या <xliff:g id="PROVIDER_NAME">%s</xliff:g> वाहकाद्वारे मोबाइल डेटा किंवा रोमिंग योजना जोडू शकता."</string>
     <string name="mobile_data_activate_diag_title" msgid="9044252207707864493">"डेटा जोडायचा?"</string>
-    <string name="mobile_data_activate_diag_message" msgid="8216154678758451453">"तुम्हाला <xliff:g id="PROVIDER_NAME">%s</xliff:g> द्वारे डेटा जोडण्याची आवश्यकता असू शकते"</string>
+    <string name="mobile_data_activate_diag_message" msgid="8216154678758451453">"आपल्याला <xliff:g id="PROVIDER_NAME">%s</xliff:g> द्वारे डेटा जोडण्याची आवश्यकता असू शकते"</string>
     <string name="mobile_data_activate_button" msgid="3682400969184405446">"डेटा जोडा"</string>
     <string name="mobile_data_activate_cancel_button" msgid="1708022171547398765">"रद्द करा"</string>
     <string name="clh_card_title_call_ended_txt" msgid="4072101334811753823">"कॉल संपला"</string>
@@ -700,14 +679,14 @@
     <string name="clh_callFailed_user_not_member_of_CUG_txt" msgid="8462852903153938988">"वापरकर्ता CUG चा सदस्य नाही"</string>
     <string name="clh_callFailed_incompatible_destination_txt" msgid="2580750652910253219">"विसंगत गंतव्यस्थान"</string>
     <string name="clh_callFailed_invalid_transit_network_selection_txt" msgid="6589916900457111005">"चुकीची परिवहन नेटवर्क निवड"</string>
-    <string name="clh_callFailed_semantically_incorrect_message_txt" msgid="2329284157442218683">"शब्दार्थदृष्ट्या चुकीचा मेसेज"</string>
+    <string name="clh_callFailed_semantically_incorrect_message_txt" msgid="2329284157442218683">"शब्दार्थदृष्ट्या चुकीचा संदेश"</string>
     <string name="clh_callFailed_invalid_mandatory_information_txt" msgid="9081556111928912676">"चुकीची अनिवार्य माहिती"</string>
-    <string name="clh_callFailed_message_type_non_existent_or_not_implemented_txt" msgid="2641350895896546715">"मेसेज प्रकार अस्तित्वात नाही किंवा अमलात आणलेला नाही"</string>
-    <string name="clh_callFailed_message_type_not_compatible_with_protocol_state_txt" msgid="6598180735494982466">"मेसेज प्रकार प्रोटोकॉल स्थितीशी सुसंगत नाही"</string>
+    <string name="clh_callFailed_message_type_non_existent_or_not_implemented_txt" msgid="2641350895896546715">"संदेश प्रकार अस्तित्वात नाही किंवा अमलात आणलेला नाही"</string>
+    <string name="clh_callFailed_message_type_not_compatible_with_protocol_state_txt" msgid="6598180735494982466">"संदेश प्रकार प्रोटोकॉल स्थितीशी सुसंगत नाही"</string>
     <string name="clh_callFailed_information_element_non_existent_or_not_implemented_txt" msgid="4725610801664706983">"माहिती घटक अस्तित्वात नाही किंवा अमलात आणलेला नाही"</string>
     <string name="clh_callFailed_conditional_IE_error_txt" msgid="9140031076499566143">"सशर्त IE एरर"</string>
-    <string name="clh_callFailed_message_not_compatible_with_protocol_state_txt" msgid="6586005128633024271">"मेसेज प्रोटोकॉल स्थितीशी सुसंगत नाही"</string>
-    <string name="clh_callFailed_recovery_on_timer_expiry_txt" msgid="3680765722923600294">"टायमर एक्स्पायरीवर पुनर्प्राप्ती"</string>
+    <string name="clh_callFailed_message_not_compatible_with_protocol_state_txt" msgid="6586005128633024271">"संदेश प्रोटोकॉल स्थितीशी सुसंगत नाही"</string>
+    <string name="clh_callFailed_recovery_on_timer_expiry_txt" msgid="3680765722923600294">"टाइमर एक्स्पायरीवर पुनर्प्राप्ती"</string>
     <string name="clh_callFailed_protocol_Error_unspecified_txt" msgid="8294907817156524790">"प्रोटोकॉल एरर, अनिर्दिष्ट"</string>
     <string name="clh_callFailed_interworking_unspecified_txt" msgid="8838850798491763729">"अंतर्गत कार्य, अनिर्दिष्ट"</string>
     <string name="labelCallBarring" msgid="3452870940716226978">"कॉल बारिंग"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index e9d01e2..5ff053a 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Mengembalikan tetapan kepada sebelumnya..."</string>
     <string name="response_error" msgid="6674110501330139405">"Respons tidak dijangka daripada rangkaian."</string>
     <string name="exception_error" msgid="7027667130619518211">"Ralat Rangkaian atau kad SIM."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"Permintaan SS ditukar kepada panggilan biasa"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"Permintaan SS ditukar kepada permintaan USSD"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Bertukar kepada permintaan SS baharu"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"Permintaan SS ditukar kepada panggilan video"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"Permintaan SS diubah suai kepada permintaan DAIL."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"Permintaan SS diubah suai kepada permintaan USSD."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"Permintaan SS diubah suai kepada permintaan SS yang baharu."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"Permintaan SS diubah suai kepada permintaan DAIL Video."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"Tetapan Nombor Pendailan Tetap apl Telefon anda dihidupkan. Hasilnya, beberapa ciri berkaitan panggilan tidak berfungsi."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Hidupkan radio sebelum melihat tetapan ini."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
@@ -163,7 +163,7 @@
     <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>
-    <string name="network_query_error" msgid="8466081377231178298">"Tidak menemui rangkaian. Cuba lagi."</string>
+    <string name="network_query_error" msgid="6828516148953325006">"Ralat ketika mencari rangkaian."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Mendaftar di <xliff:g id="NETWORK">%s</xliff:g>..."</string>
     <string name="not_allowed" msgid="5613353860205691579">"Kad SIM anda tidak membenarkan sambungan ke rangkaian ini."</string>
     <string name="connect_later" msgid="2308119155752343975">"Tidak dapat menyambung kepada rangkaian ini sekarang. Cuba lagi nanti."</string>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Tukar mod pengendalian rangkaian"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Jenis rangkaian pilihan"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(dilarang)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Pilih rangkaian"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Diputuskan sambungan"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Disambungkan"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Menyambung…"</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Tidak dapat menyambung"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA diutamakan"</item>
     <item msgid="8442633436636425221">"GSM sahaja"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Memanggil"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Rangkaian"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Mod 4G LTE Dipertingkat"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Panggilan Ke Hadapan"</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="2382798156640007971">"Benarkan penggunaan data"</string>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"Perayauan"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Sambung ke perkhidmatan data semasa perayauan"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Sambung ke perkhidmatan data semasa perayauan"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"Perayauan data dimatikan. Ketik untuk menghidupkan."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Sambungan data mudah alih terputus"</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="1603164667540144353">"Anda mungkin dikenakan caj yang tinggi."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Semak dengan penyedia rangkaian untuk mendapatkan harga."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Benarkan perayauan data?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Penggunaan data apl"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Penggunaan data"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> data mudah alih digunakan <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Terperinci"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Pembawa"</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Tidak dapat menunda panggilan."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Sambungkan ke rangkaian wayarles untuk membuat panggilan."</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"Dayakan panggilan Wi-Fi untuk membuat panggilan."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Maklumat kecemasan"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Pemilik"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Ketik lagi untuk melihat maklumat"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Panggilan kecemasan"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Panggilan kecemasan sahaja"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Nombor kecemasan"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Nombor kecemasan"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Ketik lagi untuk memanggil <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Menghidupkan radio..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Tiada perkhidmatan. Mencuba lagi..."</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Tidak dapat memasuki mod pesawat semasa panggilan kecemasan."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Panggilan kecemasan tidak tersedia"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Polis"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Ambulans"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Bomba"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</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>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Gagal mengimport kenalan"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Alat pendengaran"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Hidupkan keserasian alat pendengaran"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Panggilan teks masa nyata (RTT)"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Benarkan pemesejan dalam panggilan suara"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"Pemanggil dibantu RTT yang pekak, kurang pendengaran, mengalami kesukaran bertutur atau memerlukan ciri selain suara.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Ketahui lebih lanjut&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - Panggilan RTT disimpan sebagai transkrip mesej\n       &lt;br&gt; - RTT tidak tersedia untuk panggilan video"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Hidupkan atau matikan RTT"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY Dimatikan"</item>
     <item msgid="3971695875449640648">"TTY Penuh"</item>
@@ -606,8 +587,6 @@
     <string name="selectContact" msgid="781975788478987237">"pilih kenalan"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Panggilan suara tidak disokong"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"dail"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"tunjukkan pad pendail"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Pad Pendail Kecemasan"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Mel Suara Visual"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Tetapkan PIN"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Tukar PIN"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index b559e82..ce70cfd 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -21,7 +21,7 @@
     <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="unknown" msgid="6878797917991465859">"အကြောင်းအရာ မသိရှိ"</string>
     <string name="private_num" msgid="6713286113000232309">"လျို့ဝှက် နံပါတ်"</string>
     <string name="payphone" msgid="4793877574636445118">"ငွေပေးရသည့်ဖုန်း"</string>
     <string name="onHold" msgid="9035493194749959955">"ခဏ ကိုင်ထားစဉ်"</string>
@@ -42,8 +42,8 @@
     <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">"wildစာလုံးကို အစားထိုးရန်မှာ"</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="voice_number_setting_primary_user_only" msgid="6596604364907022416">"အသံမေးလ်ဆက်တင်များကို အဓိကအသုံးပြုသူသာ ပြင်ဆင်နိုင်ပါသည်။"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"သင့် ဆင်းမ်ကဒ်အား ပိတ်ဆို့မှုကို ဖယ်ရှားပြီးပါပြီ။ သင့်ဖုန်းဟာ သော့ဖွင့်နေပါသည်…"</string>
@@ -74,8 +74,8 @@
     <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"ဖုန်းခေါ်ဆိုနိုင်သည့် အကောင့်များအား ရွေးရန်"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi  ခေါ်ဆိုမှု"</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" 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="voicemail_notifications_preference_title" msgid="4019728578955102213">"အကြောင်းကြားချက်များ"</string>
     <string name="cell_broadcast_settings" msgid="8740238216690502563">"အရေးပေါ် ထုတ်လွှင့်မှုများ"</string>
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"ဆက်တင်များကို ပြန်ပြောင်းနေစဉ်…"</string>
     <string name="response_error" msgid="6674110501330139405">"ကွန်ယက်မှ မထင်မှတ်သောတုံ့ပြန်ချက်"</string>
     <string name="exception_error" msgid="7027667130619518211">"ကွန်ရက် သို့မဟုတ် ဆင်းမ်ကဒ်အမှား"</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS တောင်းဆိုမှုကို ပုံမှန်ဖုန်းခေါ်ဆိုမှုသို့ ပြောင်းထားပါသည်"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS တောင်းဆိုမှုကို USSD တောင်းဆိုမှုသို့ ပြောင်းထားပါသည်"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"SS တောင်းဆိုမှုအသစ်သို့ ပြောင်းထားပါသည်"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS တောင်းဆိုမှုကို ဗီဒီယိုခေါ်ဆိုမှုသို့ ပြောင်းထားပါသည်"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS တောင်းဆိုချက်ကို နံပါတ်လှည့်ရန် တောင်းဆိုချက် အဖြစ် ပြောင်းပေးခဲ့။"</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS တောင်းဆိုချက်ကို USSD တောင်းဆိုချက် အဖြစ် ပြောင်းပေးခဲ့။"</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS တောင်းဆိုချက်ကို SS တောင်းဆိုချက် အသစ် အဖြစ် ပြောင်းပေးခဲ့။"</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS တောင်းဆိုမှုကို ဗီဒီယိုခေါ်ရန် တောင်းဆိုမှုအဖြစ် ပြင်ဆင်ထားပါသည်။"</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>
@@ -143,11 +143,11 @@
     <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_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="sum_voicemail_choose_provider" msgid="59911196126278922">"အသံစာပို့စနစ် ဝန်ဆောင်မှု ရွေးပါ"</string>
     <string name="voicemail_default" msgid="2001233554889016880">"သင့် မိုဘိုင်းဝန်ဆောင်မှုပေးသူ"</string>
     <string name="vm_change_pin_old_pin" msgid="7295220109886682573">"ပင်နံပါတ်အဟောင်း"</string>
     <string name="vm_change_pin_new_pin" msgid="5412922262839438097">"ပင်နံပါတ်အသစ်"</string>
@@ -163,7 +163,7 @@
     <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="network_query_error" msgid="8466081377231178298">"ကွန်ရက် ရှာမတွေ့ပါ။ ထပ်လုပ်ကြည့်ပါ။"</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>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"ကွန်ရက် လုပ်ဆောင်မှုစနစ်အား ပြောင်းပါ"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"ပိုနှစ်သက်သော ကွန်ရက်အမျိုးအစား"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(တားမြစ်ထားသည်)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"ကွန်ရက် ရွေးရန်"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"ချိတ်ဆက်မှုပြတ်နေပါသည်"</string>
-    <string name="network_connected" msgid="1288589103624338857">"ချိတ်ဆက်ထားပါသည်"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"ချိတ်ဆက်နေသည်..."</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"ချိတ်ဆက်၍ မရပါ"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA သုံးလိုပါသည်"</item>
     <item msgid="8442633436636425221">"GSM သာ"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"ခေါ်ဆိုခြင်း"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"ကွန်ရက်"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"မြှင့်တင်ထား 4G LTE မုဒ်"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"အဆင့်မြင့်ဖုန်းခေါ်ဆိုခြင်း"</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>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"ပြင်ပကွန်ရက်နှင့် ချိတ်ဆက်ခြင်း"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"ကွန်ရက်ပြင်ပဒေတာကို သုံးနေစဉ် ဒေတာဝန်ဆောင်မှုများကို ချိတ်ဆက်ပါ"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"ကွန်ရက်ပြင်ပဒေတာကို သုံးနေစဉ် ဒေတာဝန်ဆောင်မှုများကို ချိတ်ဆက်ပါ"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"ကွန်ရက်ပြင်ပဒေတာသုံးခြင်းကို ပိတ်ထားပါသည်။ ဖွင့်ရန် တို့ပါ။"</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"မိုဘိုင်းဒေတာ ချိတ်ဆက်မှု မရှိတော့ပါ"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"ဒေတာဆက်သွယ်မှုပြတ်တောက်သွားပါသည် အဘယ်ကြောင့်ဆိုသော် သင့်အိမ်၏ကွန်ယက်မှထွက်ကာ ဒေတာရုန်းမင်းကွန်ယက်ကိုလဲပိတ်ထားသောကြောင့်ဖြစ်သည်"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"သိသာသည့် ငွေနူန်းထားသင့်အား ကျသင့်နိုင်ပါသည်။"</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"ဈေးနှုန်းသိရှိရန် သင်၏ ကွန်ရက်ဝန်ဆောင်မှုပေးသူကို မေးပါ။"</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"ကွန်ရက်ပြင်ပဒေတာအသုံးပြုခြင်း ခွင့်​ပြုမည်လား?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"အက်ပ်ဒေတာ သုံးစွဲမှု"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"ဒေတာအသုံးပြုမှု"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_2">%2$s</xliff:g> အထိ မိုဘိုင်းဒေတာ <xliff:g id="ID_1">%1$s</xliff:g> ကို အသုံးပြုထားပါသည်"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"အဆင့်မြင့်"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"ဝန်ဆောင်မှုပေးသူ"</string>
@@ -393,14 +387,14 @@
     <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="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="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="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>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"ခေါ်ဆိုမှုများကို ကိုင်ထား၍မရပါ။"</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"ဖုန်းခေါ်ရန် ကြိုးမဲကွန်ယက်တစ်ခုသို့ ချိတ်ဆက်ပါ။"</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"ဖုန်းဆက်ရန် Wi-Fi ခေါ်ဆိုခြင်းကို ဖွင့်ပါ။"</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"အရေးပေါ် အချက်အလက်"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"ပိုင်ရှင်"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"အချက်အလက်ကြည့်ရန် ထပ်နှိပ်ပါ"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"အရေးပေါ်ခေါ်ဆိုမှု"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"အရေးပေါ်ဖုန်းခေါ်ရန်သာ"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"အရေးပေါ် နံပါတ်"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"အရေးပေါ် နံပါတ်များ"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"<xliff:g id="EMERGENCY_NUMBER">%s</xliff:g> ကို ဖုန်းခေါ်ရန် ထပ်တို့ပါ"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"ရေဒီယို ဖွင့်နေစဉ်…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"ဝန်ဆောင်မှု မရှိပါ။ ထပ်မံကြိုးစားပါ…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"အရေးပေါ်ဖုန်းခေါ်ဆိုနေစဉ် လေယာဉ်ပျံသန်းနေစဉ် သုံးသောစနစ်သို့ မဝင်ရောက်နိုင်ပါ"</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"အရေးပေါ် ခေါ်ဆို၍ မရပါ"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"ရဲ"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"လူနာတင်ယာဉ်"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"မီး"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s၊ %2$s"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"ကီးဘုတ်သုံး၍ခလုတ်နှိပ်ပါ"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"ကိုင်ထားသည်"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"ပြီးပါပြီ"</string>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"အဆက်အသွယ်ကို တင်သွင်း မရခဲ့"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"နားကြပ်"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"အကြားအာရုံကိရိယာသုံးနိုင်ရန် ဖွင့်ပါ"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"အချိန်နှင့်တစ်ပြေးညီ စာသား(RTT) ခေါ်ဆိုမှု"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"ဖုန်းပြောနေစဉ် မက်ဆေ့ဂျ်ပို့ခွင့်ပြုပါ"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"RTT သည် နားမကြားသူ၊ နားလေးသူ၊ စကားချို့ယွင်းသူ (သို့) အသံတစ်မျိုးတည်းထက် ပိုမို၍ လိုအပ်သူများကို ကူညီပေးပါသည်။&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;ပိုမိုလေ့လာရန်&lt;/a&gt;\n &lt;br&gt;&lt;br&gt; - RTT ခေါ်ဆိုမှုများကို မက်ဆေ့ဂျ်စာသားမှတ်တမ်းအဖြစ် သိမ်းဆည်းပါသည်\n &lt;br&gt; - RTT ကို ဗီဒီယိုခေါ်ဆိုမှုများအတွက် အသုံးမပြုနိုင်ပါ"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"RTT ဖွင့်ပါ (သို့) ပိတ်ပါ"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY ပိတ်ထားသည်"</item>
     <item msgid="3971695875449640648">"TTY အပြည့်"</item>
@@ -597,8 +578,8 @@
     <string name="alert_dialog_no" msgid="1476091437797628703">"No"</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="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>
@@ -606,8 +587,6 @@
     <string name="selectContact" msgid="781975788478987237">"လိပ်စာရွေးပါ"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"အသံခေါ်ဆိုမှု ထောက်ံပံ့ခြင်းမရှိပါ"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"ဖုန်းခေါ်ခြင်း"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"နံပါတ်အကွက် ပြရန်"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"အရေးပေါ် နံပါတ်ကွက်"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"အမြင် အသံမေးလ်"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"ပင်နံပါတ်သတ်မှတ်ရန်"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"ပင်နံပါတ်ပြောင်းပါ"</string>
@@ -619,7 +598,7 @@
     <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="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="5932176406432044638">"အောက်ပါမှ Wi-Fi ခေါ်ခြင်း"</string>
     <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"ဝိုင်ဖိုင်ခေါ်ဆိုမှု"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index f223304..e952341 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Tilbakestiller innstillinger ..."</string>
     <string name="response_error" msgid="6674110501330139405">"Uventet svar fra nettverket."</string>
     <string name="exception_error" msgid="7027667130619518211">"Nettverks- eller SIM-kortfeil."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS-forespørsel endret til vanlig anrop"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS-forespørsel endret til USSD-forespørsel"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Endret til ny SS-forespørsel"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS-forespørsel endret til videoanrop"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS-forespørselen er endret til en DIAL-forespørsel."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS-forespørselen er endret til en USSD-forespørsel."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS-forespørselen er endret til en ny SS-forespørsel."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS-forespørselen er endret til en Video DIAL-forespørsel."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"Telefonappens innstilling for Faste numre er aktivert. Derfor fungerer ikke enkelte av ringefunksjonene."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Slå på radioen før du ser på disse innstillingene."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
@@ -163,7 +163,7 @@
     <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>
-    <string name="network_query_error" msgid="8466081377231178298">"Fant ingen nettverk. Prøv på nytt."</string>
+    <string name="network_query_error" msgid="6828516148953325006">"Det oppsto en feil under søking etter nettverk."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Kobler til <xliff:g id="NETWORK">%s</xliff:g>…"</string>
     <string name="not_allowed" msgid="5613353860205691579">"SIM-kortet tillater ingen tilkobling til dette nettverket."</string>
     <string name="connect_later" msgid="2308119155752343975">"Kan ikke koble til dette nettverket akkurat nå. Prøv på nytt senere."</string>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Bytt nettverksmodus"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Foretrukket nettverkstype"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(forbudt)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Velg nettverk"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Frakoblet"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Tilkoblet"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Kobler til …"</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Kunne ikke koble til"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA er foretrukket"</item>
     <item msgid="8442633436636425221">"Bare GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Anrop"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Nettverk"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Forbedret 4G LTE-modus"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Avansert ringemodus"</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="2382798156640007971">"Tillat databruk"</string>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"Roaming"</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="6843814381576397939">"Data-roaming er slått av. Trykk for å slå på."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Mobildatatilkoblingen er tapt"</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="1603164667540144353">"Det kan medføre betydelige kostnader."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Sjekk med nettverksleverandøren din for priser."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Vil du tillate roaming?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Appens databruk"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Databruk"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> mobildata er brukt i perioden <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Avansert"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Operatør"</string>
@@ -509,24 +503,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Kan ikke sette samtaler på vent."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Koble til et trådløst nettverk for å ringe."</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"Slå på telefonanrop via Wi-Fi for å ringe."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Opplysninger for nødstilfeller"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Eier"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Trykk på nytt for å se informasjon"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Nødanrop"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Bare nødanrop"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Nødnummer"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Nødnumre"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Trykk igjen for å ringe <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Slår på radio…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Ingen tjeneste. Prøver på nytt …"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Du kan ikke slå på flymodus under nødsamtaler."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Nødanrop er ikke tilgjengelig"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Politi"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Ambulanse"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Brann"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</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>
@@ -547,9 +529,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Kunne ikke importere kontakten"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Høreapparater"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Slå på kompatibilitet med høreapparater"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Sanntidstekst-anrop (STT)"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Tillat meldingsutveksling i talesamtaler"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"STT er til hjelp for brukere som er døve, tunghørte, har talefunksjonshemning eller trenger mer enn bare tale.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Finn ut mer&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; – STT-anrop lagres som meldingstranskripsjoner\n       &lt;br&gt; – STT er ikke tilgjengelig for videoanrop"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Slå RTT på eller av"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY av"</item>
     <item msgid="3971695875449640648">"TTY full"</item>
@@ -612,8 +593,6 @@
     <string name="selectContact" msgid="781975788478987237">"velg kontakt"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Taleanrop støttes ikke"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"ring"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"vis talltastatur"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Tastatur for nødanrop"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Visuell talepostkasse"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Angi PIN-kode"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Bytt PIN-kode"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 9b15cff..0ca784b 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -31,7 +31,7 @@
     <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>
@@ -127,16 +127,16 @@
     <string name="reverting_settings" msgid="4752151682666912828">"सेटिङहरू उल्टाउँदै..."</string>
     <string name="response_error" msgid="6674110501330139405">"नेटवर्कबाट अप्रत्याशित प्रतिक्रिया।"</string>
     <string name="exception_error" msgid="7027667130619518211">"नेटवर्क वा SIM कार्ड त्रुटि।"</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS अनुरोध नियमित कलमा परिवर्तन गरियो"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS अनुरोध USSD अनुरोधमा परिवर्तन गरियो"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"नयाँ SS अनुरोधमा परिवर्तन गरियो"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS अनुरोध भिडियो कलमा परिवर्तन गरियो"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS अनुरोध DIAL अनुरोधमा परिमार्जन गरियो।"</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS अनुरोध USSD अनुरोधमा परिमार्जन गरियो।"</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS अनुरोध नयाँ SS अनुरोधमा परिमार्जन गरियो।"</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS अनुरोधलाई भिडियो  DIAL अनुरोधमा परिमार्जन गरियो।"</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="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 name="change_num" msgid="239476305819844391">"अपडेट गर्नुहोस्"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"नेटवर्क पूर्वनिर्धारित"</item>
     <item msgid="7876195870037833661">"सङ्ख्या लुकाउनुहोस्"</item>
@@ -163,7 +163,7 @@
     <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="network_query_error" msgid="8466081377231178298">"नेटवर्कहरू फेला पार्न सकिएन। फेरि प्रयास गर्नुहोस्।"</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>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"नेटवर्क संचालन मोड परिवर्तन गर्नुहोस्"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"रुचाइएको सञ्जाल प्रकार"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(निषेध गरिएको)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"नेटवर्क छनौट गर्नुहोस्‌"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"जडान विच्छेद गरियो"</string>
-    <string name="network_connected" msgid="1288589103624338857">"जडान गरियो"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"जडान गरिँदै छ..."</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"जडान गर्न सकिएन"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA रुचाइयो"</item>
     <item msgid="8442633436636425221">"GSM मात्र"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"कल गर्दै"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"नेटवर्क"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Enhanced 4G LTE Mode"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"उन्नत कल गरिँदै"</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>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"रोमिङ"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"रोमिङको समयमा डेटा सेवामा जडान गर्नुहोस्"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"रोमिङको समयमा डेटा सेवा जडान गर्नुहोस्"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"डेटा रोमिङ सक्रिय गरियो। सक्रिय गर्न ट्याप गर्नुहोस्।"</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"मोबाइल डेटाको जडान टुट्यो"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"तपाईँले डेटा गुमाउनु भएको छ किनभने तपाईँले डेटासहितको घर नेटवर्क रोमिङ बन्द गरेर छोड्नुभएको छ।"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"तपाईंलाई अत्यन्त धेरै शुल्क लाग्न सक्छ।"</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"मूल्यसम्बन्धी जानकारीको लागि आफ्नो नेटवर्क प्रदायकलाई सोध्नुहोस्।"</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"डेटा रोमिङको अनुमति दिने हो?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"अनुप्रयोगले गरेको डेटाको प्रयोग"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"डेटाको प्रयोग"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_2">%2$s</xliff:g> सम्म <xliff:g id="ID_1">%1$s</xliff:g> मोबाइल डेटा प्रयोग भयो"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"उन्नत"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"सेवा प्रदायक"</string>
@@ -274,7 +268,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="5217706521499010816">"तपाईंको केरियरको मोबाइल नेटवर्क डेटाको प्रयोग नीतिको बारेमा अधिक जानकारी"</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>
@@ -457,12 +451,12 @@
     <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="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="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_requested" msgid="5831015200030161434">"पासवर्ड गलत छ। सिम अब ब्लक गरिएको छ। 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>
@@ -490,7 +484,7 @@
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"नेटवर्कमा दर्ता भएको छैन।"</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"मोबाइल नेटवर्क उपलब्ध छैन।"</string>
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"मोबाइल नेटवर्क उपलब्ध छैन। कल गर्न तारविनाको नेटवर्कमा जडान गर्नुहोस्।"</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"एक कल गर्नको लागि, एक वैध नम्बर प्रविष्टि गर्नुहोस्।"</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"एक कल गर्नको लागि, एक वैध नम्बर प्रविष्ट गर्नुहोस्।"</string>
     <string name="incall_error_call_failed" msgid="5891978320269774095">"कल विफल भयो।"</string>
     <string name="incall_error_cannot_add_call" msgid="8878159278947023326">"यतिबेला कल गर्न सकिएन। तपाईंले कुनै सन्देश पठाएर सम्पर्क गर्ने प्रयास गर्न सक्नुहुन्छ।"</string>
     <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"सेवा समर्थित छैन"</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"कल सञ्चालन गर्न सकिँदैन।"</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"एक कल गर्न एक ताररहितको सञ्जालमा जडान गर्नुहोस्।"</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"कल गर्नका लागि Wi-Fi कलिङ सक्षम गर्नुहोस्।"</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"आपतकालीन जानकारी"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"मालिक"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"जानकारी हेर्न पुनः ट्याप गर्नुहोस्"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"आपतकालीन कल"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"आपतकालीन कलहरू मात्र"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"आपतकालीन नम्बर"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"आपतकालीन नम्बरहरू"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"<xliff:g id="EMERGENCY_NUMBER">%s</xliff:g> मा कल गर्न फेरि ट्याप गर्नुहोस्"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"रेडियो खोल्दै..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"कुनै सेवा छैन। फेरि प्रयास गर्दै ..."</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"आपतकालीन कलको समयमा हवाइजहाज मोडमा प्रविष्ट गर्न सक्दैन।"</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"आपतकालीन कल सेवा उपलब्ध छैन"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"प्रहरी"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"एम्बुलेन्स सेवा"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"दमकल सेवा"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"डायल गर्न किबोर्ड प्रयोग गर्नुहोस्"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"होल्ड गर्नुहोस्"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"अन्त्य​ गर्नुहोस्"</string>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"सम्पर्क आयात गर्न असफल"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"श्रवणका लागि सहयोगी यन्त्रहरू"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"श्रवण सहायता अनुकूलता खोल्नुहोस्"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"द्रुत पाठ सन्देश (RTT) कल"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"भ्वाइस कलभित्रै सन्देश प्रवाह गर्ने अनुमति दिनुहोस्"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"RTT ले बहिरा, सुन्नमा कठिन हुने, बोल्न नसक्ने र आवाज मात्र नभई कल गर्दा थप कुराहरू चाहिने  मान्छेहरूलाई सहायता गर्छ!&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;थप जान्नुहोस्&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - RTT कलहरूलाई सन्देशसम्बन्धी ट्रान्सक्रिप्टका रूपमा सुरक्षित गरिन्छ\n      &lt;br&gt; - RTT भिडियो कलहरूमा उपलब्ध छैन"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"RTT लाई सिक्रय गर्नुहोस् वा निष्क्रिय पार्नुहोस्"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY बन्द"</item>
     <item msgid="3971695875449640648">"TTY भरी"</item>
@@ -606,8 +587,6 @@
     <string name="selectContact" msgid="781975788478987237">"सम्पर्क चयन गर्नुहोस्"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"भ्वाइस कल गर्ने समर्थित छैन"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"डायल"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"डायलप्याड देखाउनुहोस्"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"आपतकालीन डायलप्याड"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"भिजुअल भ्वाइस मेल"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"PIN सेट गर्नुहोस्"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"PIN परिवर्तन गर्नुहोस्"</string>
@@ -634,9 +613,9 @@
     <string name="change_pin_title" msgid="7790232089699034029">"भ्वाइस मेलको PIN परिवर्तन गर्नुहोस्"</string>
     <string name="change_pin_continue_label" msgid="2135088662420163447">"जारी राख्नुहोस्"</string>
     <string name="change_pin_cancel_label" msgid="353535488390948596">"रद्द गर्नुहोस्"</string>
-    <string name="change_pin_ok_label" msgid="6204308560844889926">"ठिक छ"</string>
+    <string name="change_pin_ok_label" msgid="6204308560844889926">"ठीक छ"</string>
     <string name="change_pin_enter_old_pin_header" msgid="419179847657548887">"आफ्नो पुरानो PIN को पुष्टि गर्नुहोस्"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="8579171678763615453">"जारी राख्नका लागि आफ्नो भ्वाइस मेलको PIN प्रविष्टि गर्नुहोस्।"</string>
+    <string name="change_pin_enter_old_pin_hint" msgid="8579171678763615453">"जारी राख्नका लागि आफ्नो भ्वाइस मेलको PIN प्रविष्ट गर्नुहोस्।"</string>
     <string name="change_pin_enter_new_pin_header" msgid="2611191814590251532">"एउटा नयाँ PIN सेट गर्नुहोस्"</string>
     <string name="change_pin_enter_new_pin_hint" msgid="2322940054329689309">"PIN <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> अङ्कको हुनु पर्छ।"</string>
     <string name="change_pin_confirm_pin_header" msgid="8113764019347322170">"तपाईँको PIN को पुष्टि गर्नुहोस्"</string>
@@ -735,12 +714,12 @@
     <string name="call_barring_change_pwd_description" msgid="5505087790260233953">"कल ब्यारिङको पासवर्ड परिवर्तन गर्नुहोस्"</string>
     <string name="call_barring_change_pwd_description_disabled" msgid="7630770327645349957">"कल ब्यारिङको पासवर्ड परिवर्तन गर्न सकिएन।"</string>
     <string name="call_barring_pwd_not_match" msgid="6716711689350314525">"पासवर्डहरू मेल खाँदैनन्"</string>
-    <string name="call_barring_right_pwd_number" msgid="2902966502520410446">"कुनै ४ अङ्कको पासवर्ड प्रविष्टि गर्नुहोस्"</string>
+    <string name="call_barring_right_pwd_number" msgid="2902966502520410446">"कुनै ४ अङ्कको पासवर्ड प्रविष्ट गर्नुहोस्"</string>
     <string name="call_barring_change_pwd_success" msgid="3278310763742760321">"पासवर्ड परिवर्तन गरियो"</string>
     <string name="call_barring_old_pwd" msgid="6080515987320238522">"पुरानो पासवर्ड"</string>
     <string name="call_barring_new_pwd" msgid="7048532299150269547">"नयाँ पासवर्ड"</string>
     <string name="call_barring_confirm_pwd" msgid="1947167278466285411">"पासवर्ड निश्चित गर्नुहोस्"</string>
-    <string name="messageCallBarring" msgid="2412123220272136055">"पासवर्ड प्रविष्टि गर्नुहोस्"</string>
+    <string name="messageCallBarring" msgid="2412123220272136055">"पासवर्ड प्रविष्ट गर्नुहोस्"</string>
     <string name="call_barring_settings" msgid="80766145008623645">"कल ब्यारिङसम्बन्धी सेटिङहरू"</string>
     <string name="call_barring_deactivate_all_no_password" msgid="920902774366557311">"कल ब्यारिङसम्बन्धी सबै सेटिङहरू निष्क्रिय पार्ने हो?"</string>
     <string name="supp_service_notification_call_deflected" msgid="9195460512875330926">"कल अर्को नम्बरमा स्थानान्तरण गरियो।"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 7c802b7..cd9d97c 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -60,9 +60,9 @@
     <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="phone_accounts" msgid="6376603393888116364">"Gespreksaccounts"</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-gesprekken uitvoeren 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_default_account_label" msgid="4183772241814460014">"Geen netwerk beschikbaar"</string>
     <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Instellingen"</string>
@@ -79,7 +79,7 @@
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
     <string name="voicemail_notifications_preference_title" msgid="4019728578955102213">"Meldingen"</string>
     <string name="cell_broadcast_settings" msgid="8740238216690502563">"Nooduitzendingen"</string>
-    <string name="call_settings" msgid="6112441768261754562">"Gespreksinstellingen"</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>
@@ -88,19 +88,19 @@
     <string name="labelNwService" msgid="4699970172021870983">"Instellingen voor netwerkservice"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"Beller-ID"</string>
     <string name="sum_loading_settings" msgid="1826692909391168620">"Instellingen laden…"</string>
-    <string name="sum_hide_caller_id" msgid="1071407020290873782">"Nummer verborgen bij uitgaande gesprekken"</string>
-    <string name="sum_show_caller_id" msgid="6768534125447290401">"Nummer weergegeven bij uitgaande gesprekken"</string>
-    <string name="sum_default_caller_id" msgid="1954518825510901365">"Gebruik de standaard operatorinstellingen om mijn nummer bij uitgaande gesprekken weer te geven"</string>
+    <string name="sum_hide_caller_id" msgid="1071407020290873782">"Nummer verborgen bij uitgaande oproepen"</string>
+    <string name="sum_show_caller_id" msgid="6768534125447290401">"Nummer weergegeven bij uitgaande oproepen"</string>
+    <string name="sum_default_caller_id" msgid="1954518825510901365">"Gebruik de standaard operatorinstellingen om mijn nummer bij uitgaande oproepen weer te geven"</string>
     <string name="labelCW" msgid="6120513814915920200">"Wisselgesprek"</string>
-    <string name="sum_cw_enabled" msgid="8083061901633671397">"Inkomende gesprekken melden als ik aan het bellen ben"</string>
-    <string name="sum_cw_disabled" msgid="3648693907300104575">"Inkomende gesprekken melden als ik aan het bellen ben"</string>
-    <string name="call_forwarding_settings" msgid="3378927671091537173">"Doorschakelinstellingen gesprekken"</string>
-    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Doorschakelinstellingen voor gesprekken (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="labelCF" msgid="2574386948026924737">"Gesprek doorschakelen"</string>
+    <string name="sum_cw_enabled" msgid="8083061901633671397">"Inkomende oproepen melden als ik aan het bellen ben"</string>
+    <string name="sum_cw_disabled" msgid="3648693907300104575">"Inkomende oproepen melden als ik aan het bellen ben"</string>
+    <string name="call_forwarding_settings" msgid="3378927671091537173">"Doorschakelinstellingen oproepen"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Doorschakelinstellingen voor oproepen (<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 gesprekken doorschakelen"</string>
-    <string name="sum_cfu_enabled" msgid="2450052502198827927">"Alle gesprekken doorschakelen naar <xliff:g id="PHONENUMBER">{0}</xliff:g>"</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="8384177689501334080">"Uit"</string>
     <string name="labelCFB" msgid="6139853033106283172">"Indien bezet"</string>
@@ -118,7 +118,7 @@
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Doorschakelen naar <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="2684474391807469832">"Uit"</string>
     <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Je provider biedt geen ondersteuning voor het uitschakelen van oproepdoorschakelingen wanneer je telefoon niet bereikbaar is."</string>
-    <string name="updating_title" msgid="6146755386174019046">"Gespreksinstellingen"</string>
+    <string name="updating_title" msgid="6146755386174019046">"Oproepinstellingen"</string>
     <string name="call_settings_admin_user_only" msgid="4526094783818216374">"Oproepinstellingen kunnen alleen worden gewijzigd door de beheerder."</string>
     <string name="call_settings_with_label" msgid="3401177261468593519">"Instellingen (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Fout met oproepinstellingen"</string>
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Instellingen terugzetten..."</string>
     <string name="response_error" msgid="6674110501330139405">"Onverwachte reactie van netwerk."</string>
     <string name="exception_error" msgid="7027667130619518211">"Netwerk- of simkaartfout."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS-verzoek gewijzigd in normale oproep"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS-verzoek gewijzigd in USSD-verzoek"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Gewijzigd in nieuw SS-verzoek"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS-verzoek gewijzigd in videogesprek"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS-verzoek is gewijzigd in DIAL-verzoek."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS-verzoek is gewijzigd in USSD-verzoek."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS-verzoek is gewijzigd in nieuw SS-verzoek."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS-verzoek is gewijzigd in Video DIAL-verzoek."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"De instelling \'Vaste nummers\' in je app Telefoon is ingeschakeld. Hierdoor werken sommige oproepgerelateerde functies niet."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Schakel de radio in voordat je deze instellingen bekijkt."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
@@ -163,7 +163,7 @@
     <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>
-    <string name="network_query_error" msgid="8466081377231178298">"Kan geen netwerken vinden. Probeer het opnieuw."</string>
+    <string name="network_query_error" msgid="6828516148953325006">"Fout tijdens zoeken naar netwerken."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Registreren op <xliff:g id="NETWORK">%s</xliff:g>…"</string>
     <string name="not_allowed" msgid="5613353860205691579">"Je simkaart staat geen verbinding met dit netwerk toe."</string>
     <string name="connect_later" msgid="2308119155752343975">"Kan nu geen verbinding maken met dit netwerk. Probeer het later opnieuw."</string>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"De netwerkgebruiksmodus wijzigen"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Voorkeursnetwerktype"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(niet toegestaan)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Netwerk kiezen"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Verbinding verbroken"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Verbonden"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Verbinding maken..."</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Kan geen verbinding maken"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"Voorkeur voor GSM/WCDMA"</item>
     <item msgid="8442633436636425221">"Alleen GSM"</item>
@@ -235,20 +230,19 @@
     <string name="call_category" msgid="5863978196309462052">"Bellen"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Netwerk"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Geoptimaliseerde 4G LTE-modus"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Geavanceerd bellen"</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="2382798156640007971">"Gegevensgebruik toestaan"</string>
     <string name="dialog_alert_title" msgid="6751344986194435476">"Let op"</string>
     <string name="roaming" msgid="7894878421600247140">"Roaming"</string>
-    <string name="roaming_enable" msgid="7331106985174381987">"Verbinding maken met dataservices tijdens roaming"</string>
-    <string name="roaming_disable" msgid="1843417228755568110">"Verbinding maken met dataservices tijdens roaming"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"Dataroaming is uitgeschakeld. Tik om in te schakelen."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Mobiele internetverbinding is verbroken"</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 je je thuisnetwerk hebt verlaten terwijl dataroaming was uitgeschakeld."</string>
     <string name="roaming_warning" msgid="1603164667540144353">"Er kunnen hoge roamingkosten in rekening worden gebracht."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Neem contact op met je netwerkprovider over de prijzen."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Dataroaming toestaan?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Datagebruik van app"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Datagebruik"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> mobiele data gebruikt van <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Geavanceerd"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Provider"</string>
@@ -472,11 +466,11 @@
     <string name="card_title_dialing" msgid="5769417478498348054">"Kiezen"</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">"Inkomend gesprek"</string>
-    <string name="card_title_call_ended" msgid="5544730338889702298">"Gesprek beëindigd"</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">"Actief gesprek"</string>
+    <string name="card_title_in_call" msgid="6346543933068225205">"Actieve oproep"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nieuwe voicemail"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Nieuwe voicemail (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> bellen"</string>
@@ -491,43 +485,31 @@
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"Mobiel netwerk niet beschikbaar."</string>
     <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"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 je wilt bellen, moet je een geldig nummer invoeren."</string>
-    <string name="incall_error_call_failed" msgid="5891978320269774095">"Gesprek mislukt."</string>
-    <string name="incall_error_cannot_add_call" msgid="8878159278947023326">"Gesprek kan op dit moment niet worden toegevoegd. Je kunt contact opnemen door een bericht te sturen."</string>
+    <string name="incall_error_call_failed" msgid="5891978320269774095">"Oproep mislukt."</string>
+    <string name="incall_error_cannot_add_call" msgid="8878159278947023326">"Oproep kan op dit moment niet worden toegevoegd. Je kunt contact opnemen door een bericht te sturen."</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 gesprekken."</string>
-    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Kan gesprek niet scheiden."</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="8998568661508655638">"Kan gesprek niet weigeren."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Kan gesprek(ken) niet vrijgeven."</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_supp_service_hold" msgid="7967020511232222078">"Kan gesprekken niet in de wacht zetten."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Maak verbinding met een draadloos netwerk om te bellen."</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"Schakel bellen via wifi in om te bellen."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Informatie bij nood"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Eigenaar"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Tik nogmaals om informatie weer te geven"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Noodoproep"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Alleen noodoproepen"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Alarmnummer"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Alarmnummers"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Tik nogmaals om <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g> te bellen"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Radio aanzetten..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Geen bereik. Opnieuw proberen…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Kan vliegtuigmodus niet activeren tijdens een noodoproep."</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">"Bellen niet mogelijk. Bel een alarmnummer."</string>
-    <string name="dial_emergency_calling_not_available" msgid="5675557523782491826">"Noodoproepen niet beschikbaar"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Politie"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Ambulance"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Vuur"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</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>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Toetsenblok"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"Dempen"</string>
-    <string name="onscreenAddCallText" msgid="5140385634712287403">"Gesprek toevoegen"</string>
-    <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Gesprekken samenvoegen"</string>
+    <string name="onscreenAddCallText" msgid="5140385634712287403">"Oproep toevoegen"</string>
+    <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Oproepen samenvoegen"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Wisselen"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Gesprekken beheren"</string>
     <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Conferentie beheren"</string>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Kan contact niet importeren"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Gehoorapparaten"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Compatibiliteit voor gehoorapparaat inschakelen"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Realtime tekstoproep (RTT)"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Berichten in een audiogesprek toestaan"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"RTT helpt bellers die doof of slechthorend zijn, een spraakbeperking hebben of meer dan alleen een stem nodig hebben.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Meer informatie&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - RTT-gesprekken worden opgeslagen als berichttranscript.\n       &lt;br&gt; - RTT is niet beschikbaar voor videogesprekken"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"RTT in- of uitschakelen"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY uit"</item>
     <item msgid="3971695875449640648">"TTY vol"</item>
@@ -559,7 +540,7 @@
     <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">"Je telefoon activeren"</string>
-    <string name="ota_touch_activate" msgid="6553212803262586244">"Je moet een speciaal gesprek voeren om je telefoonservice te activeren. \n\nNadat je op \'Activeren\' hebt gedrukt, luister je naar de instructies om je telefoon te activeren."</string>
+    <string name="ota_touch_activate" msgid="6553212803262586244">"Je moet een speciale oproep uitvoeren om je telefoonservice te activeren. \n\nNadat je op \'Activeren\' hebt gedrukt, luister je naar de instructies om je telefoon te activeren."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Activeren..."</string>
     <string name="ota_hfa_activation_dialog_message" msgid="8092479227918463415">"De telefoon activeert je mobiele gegevensservice.\n\nDit kan tot vijf minuten duren."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Activering overslaan?"</string>
@@ -604,10 +585,8 @@
     <string name="contactPhoto" msgid="4713193418046639466">"contactfoto"</string>
     <string name="goPrivate" msgid="865837794424530980">"privé"</string>
     <string name="selectContact" msgid="781975788478987237">"contact selecteren"</string>
-    <string name="not_voice_capable" msgid="2739898841461577811">"Audiogesprekken worden niet ondersteund"</string>
+    <string name="not_voice_capable" msgid="2739898841461577811">"Spraakoproepen worden niet ondersteund"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"bellen"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"toetsenblok weergeven"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Noodtoetsenblok"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Visuele voicemail"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Pincode instellen"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Pincode wijzigen"</string>
@@ -621,14 +600,14 @@
     <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="5932176406432044638">"Wifi-gesprek van"</string>
-    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wifi-gesprek"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="5932176406432044638">"Wifi-oproep van"</string>
+    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wifi-oproep"</string>
     <string name="emergency_action_launch_hint" msgid="4906759256275562674">"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>
     <string name="callFailed_cdma_activation" msgid="2307989779233262164">"Een simkaart heeft je service geactiveerd en heeft de roaming-mogelijkheden van je telefoon geüpdatet."</string>
-    <string name="callFailed_cdma_call_limit" msgid="1556916577171457086">"Er zijn te veel actieve gesprekken. Beëindig bestaande gesprekken of voeg ze samen voordat je een nieuw gesprek start."</string>
+    <string name="callFailed_cdma_call_limit" msgid="1556916577171457086">"Er zijn te veel actieve oproepen. Beëindig bestaande oproepen of voeg ze samen voordat je een nieuwe oproep start."</string>
     <string name="callFailed_imei_not_accepted" msgid="132192626901238542">"Kan geen verbinding maken. Plaats een geldige simkaart."</string>
-    <string name="callFailed_wifi_lost" msgid="5968076625137297184">"Wifi-verbinding verbroken. Gesprek beëindigd."</string>
+    <string name="callFailed_wifi_lost" msgid="5968076625137297184">"Wifi-verbinding verbroken. Oproep beëindigd."</string>
     <string name="dialFailed_low_battery" msgid="8760548177088774268">"Je videogesprek kan niet worden gestart omdat de batterij bijna leeg is."</string>
     <string name="callFailed_low_battery" msgid="4913582435905872616">"Videogesprek beëindigd omdat batterij bijna leeg is."</string>
     <string name="change_pin_title" msgid="7790232089699034029">"Voicemailpincode wijzigen"</string>
@@ -657,7 +636,7 @@
     <string name="mobile_data_activate_diag_message" msgid="8216154678758451453">"Je moet mogelijk data toevoegen via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="mobile_data_activate_button" msgid="3682400969184405446">"DATA TOEVOEGEN"</string>
     <string name="mobile_data_activate_cancel_button" msgid="1708022171547398765">"ANNULEREN"</string>
-    <string name="clh_card_title_call_ended_txt" msgid="4072101334811753823">"Gesprek beëindigd"</string>
+    <string name="clh_card_title_call_ended_txt" msgid="4072101334811753823">"Oproep beëindigd"</string>
     <string name="clh_callFailed_powerOff_txt" msgid="3773036949107147708">"Radio uit"</string>
     <string name="clh_callFailed_simError_txt" msgid="757650590524277969">"Geen simkaart of simkaartfout"</string>
     <string name="clh_incall_error_out_of_service_txt" msgid="3974373603657193827">"Mobiel netwerk niet beschikbaar"</string>
@@ -669,7 +648,7 @@
     <string name="clh_callFailed_user_busy_txt" msgid="2736095995784746915">"Gebruiker bezet"</string>
     <string name="clh_callFailed_no_user_responding_txt" msgid="1421543095873040084">"Geen gebruiker die reageert"</string>
     <string name="clh_callFailed_user_alerting_txt" msgid="6606245970376797447">"Gebruiker wordt gewaarschuwd, geen reactie"</string>
-    <string name="clh_callFailed_call_rejected_txt" msgid="8001665478195793223">"Gesprek afgewezen"</string>
+    <string name="clh_callFailed_call_rejected_txt" msgid="8001665478195793223">"Oproep afgewezen"</string>
     <string name="clh_callFailed_number_changed_txt" msgid="5127909898925154242">"Nummer gewijzigd"</string>
     <string name="clh_callFailed_pre_emption_txt" msgid="6864702416751338567">"Tijdelijke onderbreking"</string>
     <string name="clh_callFailed_non_selected_user_clearing_txt" msgid="8725898326616836656">"Niet-geselecteerde gebruikersvrijgave"</string>
@@ -687,7 +666,7 @@
     <string name="clh_callFailed_resources_unavailable_unspecified_txt" msgid="4460267429142724322">"Bronnen niet beschikbaar, niet gespecificeerd"</string>
     <string name="clh_callFailed_quality_of_service_unavailable_txt" msgid="7315823047206338755">"Kwaliteit van service niet beschikbaar"</string>
     <string name="clh_callFailed_requested_facility_not_subscribed_txt" msgid="1688438372518949530">"Gevraagde faciliteit niet geabonneerd"</string>
-    <string name="clh_callFailed_incoming_calls_barred_within_the_CUG_txt" msgid="3922231620226043342">"Inkomende gesprekken geblokkeerd binnen de CUG"</string>
+    <string name="clh_callFailed_incoming_calls_barred_within_the_CUG_txt" msgid="3922231620226043342">"Inkomende oproepen geblokkeerd binnen de CUG"</string>
     <string name="clh_callFailed_bearer_capability_not_authorized_txt" msgid="6515594235334537340">"Mogelijkheden van drager niet geautoriseerd"</string>
     <string name="clh_callFailed_bearer_capability_not_presently_available_txt" msgid="8013567156449692135">"Mogelijkheden van drager momenteel niet beschikbaar"</string>
     <string name="clh_callFailed_service_or_option_not_available_unspecified_txt" msgid="8663374141880847414">"Service of optie niet beschikbaar, niet gespecificeerd"</string>
@@ -710,30 +689,30 @@
     <string name="clh_callFailed_recovery_on_timer_expiry_txt" msgid="3680765722923600294">"Herstel na afloop van timer"</string>
     <string name="clh_callFailed_protocol_Error_unspecified_txt" msgid="8294907817156524790">"Protocolfout, niet gespecificeerd"</string>
     <string name="clh_callFailed_interworking_unspecified_txt" msgid="8838850798491763729">"Interworking, niet gespecificeerd"</string>
-    <string name="labelCallBarring" msgid="3452870940716226978">"Gesprekken blokkeren"</string>
+    <string name="labelCallBarring" msgid="3452870940716226978">"Oproepen blokkeren"</string>
     <string name="sum_call_barring_enabled" msgid="6804489690436703488">"Aan"</string>
     <string name="sum_call_barring_disabled" msgid="5900772179198857783">"Uit"</string>
-    <string name="call_barring_baoc" msgid="1199843944333106035">"Alle uitgaande gesprekken"</string>
-    <string name="call_barring_baoc_enabled" msgid="8112118391869380361">"Blokkering van alle uitgaande gesprekken opheffen?"</string>
-    <string name="call_barring_baoc_disabled" msgid="7806697133004697974">"Alle uitgaande gesprekken blokkeren?"</string>
-    <string name="call_barring_baoic" msgid="3162154267825211826">"Uitgaande internationale gesprekken"</string>
-    <string name="call_barring_baoic_enabled" msgid="2634377543147258105">"Blokkering van uitgaande internationale gesprekken opheffen?"</string>
-    <string name="call_barring_baoic_disabled" msgid="5817895648306183464">"Uitgaande internationale gesprekken blokkeren?"</string>
-    <string name="call_barring_baoicr" msgid="8951699885885742076">"Uitgaande internationale gesprekken tijdens roaming"</string>
+    <string name="call_barring_baoc" msgid="1199843944333106035">"Alle uitgaande oproepen"</string>
+    <string name="call_barring_baoc_enabled" msgid="8112118391869380361">"Blokkering van alle uitgaande oproepen opheffen?"</string>
+    <string name="call_barring_baoc_disabled" msgid="7806697133004697974">"Alle uitgaande oproepen blokkeren?"</string>
+    <string name="call_barring_baoic" msgid="3162154267825211826">"Uitgaande internationale oproepen"</string>
+    <string name="call_barring_baoic_enabled" msgid="2634377543147258105">"Blokkering van uitgaande internationale oproepen opheffen?"</string>
+    <string name="call_barring_baoic_disabled" msgid="5817895648306183464">"Uitgaande internationale oproepen blokkeren?"</string>
+    <string name="call_barring_baoicr" msgid="8951699885885742076">"Uitgaande internationale oproepen tijdens roaming"</string>
     <string name="call_barring_baoicr_enabled" msgid="2519630715322138317">"opheffen?"</string>
-    <string name="call_barring_baoicr_disabled" msgid="5831267468931377699">"Uitgaande internationale gesprekken blokkeren tijdens roaming?"</string>
-    <string name="call_barring_baic" msgid="5272726081458339912">"Alle inkomende gesprekken"</string>
-    <string name="call_barring_baic_enabled" msgid="2457134916223203380">"Blokkering van alle inkomende gesprekken opheffen?"</string>
-    <string name="call_barring_baic_disabled" msgid="6945604947500275636">"Alle inkomende gesprekken blokkeren?"</string>
-    <string name="call_barring_baicr" msgid="5728784220691481693">"Inkomende internationale gesprekken tijdens roaming"</string>
-    <string name="call_barring_baicr_enabled" msgid="6533336994391716127">"Blokkering van inkomende internationale gesprekken tijdens roaming opheffen?"</string>
-    <string name="call_barring_baicr_disabled" msgid="6746329853943256566">"Inkomende internationale gesprekken blokkeren tijdens roaming?"</string>
+    <string name="call_barring_baoicr_disabled" msgid="5831267468931377699">"Uitgaande internationale oproepen blokkeren tijdens roaming?"</string>
+    <string name="call_barring_baic" msgid="5272726081458339912">"Alle inkomende oproepen"</string>
+    <string name="call_barring_baic_enabled" msgid="2457134916223203380">"Blokkering van alle inkomende oproepen opheffen?"</string>
+    <string name="call_barring_baic_disabled" msgid="6945604947500275636">"Alle inkomende oproepen blokkeren?"</string>
+    <string name="call_barring_baicr" msgid="5728784220691481693">"Inkomende internationale oproepen tijdens roaming"</string>
+    <string name="call_barring_baicr_enabled" msgid="6533336994391716127">"Blokkering van inkomende internationale oproepen tijdens roaming opheffen?"</string>
+    <string name="call_barring_baicr_disabled" msgid="6746329853943256566">"Inkomende internationale oproepen blokkeren tijdens roaming?"</string>
     <string name="call_barring_deactivate_all" msgid="5269788384941003415">"Alles deactiveren"</string>
-    <string name="call_barring_deactivate_all_description" msgid="4972365443287257704">"Alle blokkeerinstellingen voor gesprekken deactiveren"</string>
-    <string name="call_barring_deactivate_success" msgid="8014685598632000936">"Blokkering van gesprekken gedeactiveerd"</string>
+    <string name="call_barring_deactivate_all_description" msgid="4972365443287257704">"Alle blokkeerinstellingen voor oproepen deactiveren"</string>
+    <string name="call_barring_deactivate_success" msgid="8014685598632000936">"Blokkering van oproepen gedeactiveerd"</string>
     <string name="call_barring_change_pwd" msgid="6887420609726284232">"Wachtwoord wijzigen"</string>
-    <string name="call_barring_change_pwd_description" msgid="5505087790260233953">"Wachtwoord voor blokkering van gesprekken wijzigen"</string>
-    <string name="call_barring_change_pwd_description_disabled" msgid="7630770327645349957">"Wachtwoord voor blokkering van gesprekken kan niet worden gewijzigd."</string>
+    <string name="call_barring_change_pwd_description" msgid="5505087790260233953">"Wachtwoord voor blokkering van oproepen wijzigen"</string>
+    <string name="call_barring_change_pwd_description_disabled" msgid="7630770327645349957">"Wachtwoord voor blokkering van oproepen kan niet worden gewijzigd."</string>
     <string name="call_barring_pwd_not_match" msgid="6716711689350314525">"De wachtwoorden komen niet overeen"</string>
     <string name="call_barring_right_pwd_number" msgid="2902966502520410446">"Geef een wachtwoord van vier cijfers op"</string>
     <string name="call_barring_change_pwd_success" msgid="3278310763742760321">"Wachtwoord gewijzigd"</string>
@@ -741,23 +720,23 @@
     <string name="call_barring_new_pwd" msgid="7048532299150269547">"Nieuw wachtwoord"</string>
     <string name="call_barring_confirm_pwd" msgid="1947167278466285411">"Wachtwoord bevestigen"</string>
     <string name="messageCallBarring" msgid="2412123220272136055">"Wachtwoord invoeren"</string>
-    <string name="call_barring_settings" msgid="80766145008623645">"Blokkeerinstellingen voor gesprekken"</string>
-    <string name="call_barring_deactivate_all_no_password" msgid="920902774366557311">"Alle blokkeerinstellingen voor gesprekken deactiveren?"</string>
-    <string name="supp_service_notification_call_deflected" msgid="9195460512875330926">"Gesprek doorgeschakeld naar ander nummer."</string>
-    <string name="supp_service_notification_call_forwarded" msgid="7818548630812124053">"Gesprek doorgeschakeld."</string>
+    <string name="call_barring_settings" msgid="80766145008623645">"Blokkeerinstellingen voor oproepen"</string>
+    <string name="call_barring_deactivate_all_no_password" msgid="920902774366557311">"Alle blokkeerinstellingen voor oproepen deactiveren?"</string>
+    <string name="supp_service_notification_call_deflected" msgid="9195460512875330926">"Oproep doorgeschakeld naar ander nummer."</string>
+    <string name="supp_service_notification_call_forwarded" msgid="7818548630812124053">"Oproep doorgeschakeld."</string>
     <string name="supp_service_notification_call_waiting" msgid="789154111899572489">"Wisselgesprek."</string>
     <string name="supp_service_clir_suppression_rejected" msgid="1581851661582189045">"Nummerblokkering is geweigerd."</string>
-    <string name="supp_service_closed_user_group_call" msgid="5761735840904590950">"Gesprek van gesloten gebruikersgroep."</string>
-    <string name="supp_service_incoming_calls_barred" msgid="3248813207307882723">"Inkomende gesprekken geblokkeerd."</string>
-    <string name="supp_service_outgoing_calls_barred" msgid="1962644621292054081">"Uitgaande gesprekken geblokkeerd."</string>
+    <string name="supp_service_closed_user_group_call" msgid="5761735840904590950">"Oproep van gesloten gebruikersgroep."</string>
+    <string name="supp_service_incoming_calls_barred" msgid="3248813207307882723">"Inkomende oproepen geblokkeerd."</string>
+    <string name="supp_service_outgoing_calls_barred" msgid="1962644621292054081">"Uitgaande oproepen geblokkeerd."</string>
     <string name="supp_service_call_forwarding_active" msgid="1253134771682248735">"Oproepdoorschakeling actief."</string>
-    <string name="supp_service_additional_call_forwarded" msgid="5228624725214727315">"Bijkomend gesprek doorgeschakeld."</string>
+    <string name="supp_service_additional_call_forwarded" msgid="5228624725214727315">"Aanvullende oproep doorgeschakeld."</string>
     <string name="supp_service_additional_ect_connected" msgid="6396964292513707102">"Expliciet doorverbinden voltooid."</string>
-    <string name="supp_service_additional_ect_connecting" msgid="5443373059716058480">"Gesprek expliciet doorverbinden…"</string>
-    <string name="supp_service_call_on_hold" msgid="1478976782361795422">"Gesprek in de wacht."</string>
-    <string name="supp_service_call_resumed" msgid="1656475289958070674">"Gesprek hervat."</string>
-    <string name="supp_service_deflected_call" msgid="138970419873492166">"Gesprek is doorgeschakeld naar jou."</string>
-    <string name="supp_service_forwarded_call" msgid="4509980341645679803">"Doorgeschakeld gesprek."</string>
+    <string name="supp_service_additional_ect_connecting" msgid="5443373059716058480">"Oproep expliciet doorverbinden…"</string>
+    <string name="supp_service_call_on_hold" msgid="1478976782361795422">"Oproep in de wacht."</string>
+    <string name="supp_service_call_resumed" msgid="1656475289958070674">"Oproep hervat."</string>
+    <string name="supp_service_deflected_call" msgid="138970419873492166">"Oproep is doorgeschakeld naar jou."</string>
+    <string name="supp_service_forwarded_call" msgid="4509980341645679803">"Doorgeschakelde oproep."</string>
     <string name="supp_service_conference_call" msgid="4448616364004466832">"Deelnemen aan telefonische vergadering…"</string>
-    <string name="supp_service_held_call_released" msgid="2030677825038709779">"In de wacht gezette gesprek is vrijgegeven."</string>
+    <string name="supp_service_held_call_released" msgid="2030677825038709779">"In de wacht gezette oproep is vrijgegeven."</string>
 </resources>
diff --git a/res/values-or/arrays.xml b/res/values-or/arrays.xml
deleted file mode 100644
index 2f73b66..0000000
--- a/res/values-or/arrays.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-     Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources 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-or/config.xml b/res/values-or/config.xml
deleted file mode 100644
index 509a3c8..0000000
--- a/res/values-or/config.xml
+++ /dev/null
@@ -1,28 +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.
- -->
-
-<!--  NOTE: Many variables that used to be in this file have been migrated to
-     CarrierConfigManager.java. Please consider whether new variables belong
-     there before adding to this file. Variables here should be more closely
-     related to devices than to networks.  -->
-
-<!--  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="system_visual_voicemail_client" msgid="1787338073957698459"></string>
-</resources>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
deleted file mode 100644
index 623539d..0000000
--- a/res/values-or/strings.xml
+++ /dev/null
@@ -1,763 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="tablet" msgid="8576272342240415145">"ମୋବାଇଲ୍‌ ଡାଟା"</string>
-    <string name="phoneAppLabel" product="default" msgid="6790717591729922998">"ଫୋନ୍ ସେବା"</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">"ୱାଇଲଡ୍ ଅକ୍ଷରକୁ ଏହା ସହିତ ବଦଳାନ୍ତୁ"</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="voice_number_setting_primary_user_only" msgid="6596604364907022416">"କେବଳ ପ୍ରାଥମିକ ୟୁଜରଙ୍କ ଦ୍ଵାରା ଭଏସମେଲ୍ ସେଟିଙ୍ଗକୁ ସଂଶୋଧିତ କରାଯାଇପାରିବ।"</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="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_default_account_label" msgid="4183772241814460014">"କୈଣସି ନେଟ୍‌ୱର୍କ ଉପଲବ୍ଧ ନାହିଁ"</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="phone_accounts_all_calling_accounts" msgid="207619531589278471">"ସମସ୍ତ କଲିଙ୍ଗ ଆକାଉଣ୍ଟ"</string>
-    <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"କଲ୍ କରିପାରୁଥିବା ଆକାଉଣ୍ଟକୁ ଚୟନ କରନ୍ତୁ"</string>
-    <string name="wifi_calling" msgid="739018212480165598">"ୱାଇ-ଫାଇ କଲିଙ୍ଗ"</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="voicemail_notifications_preference_title" msgid="4019728578955102213">"ବିଜ୍ଞପ୍ତି"</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="2684474391807469832">"ଅଫ୍ ଅଛି"</string>
-    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"ଆପଣଙ୍କର ଫୋନ୍ ଅପହଞ୍ଚ ଦୂରତାରେ ଥିବାବେଳେ ଆପଣଙ୍କର କେରିଅର୍ କଲ୍ ଫର୍‌ୱାର୍ଡିଙ୍ଗକୁ ଅକ୍ଷମ କରିବାରେ ସପୋର୍ଟ କରିବେ ନାହିଁ।"</string>
-    <string name="updating_title" msgid="6146755386174019046">"କଲ୍‌ ସେଟିଙ୍ଗ"</string>
-    <string name="call_settings_admin_user_only" msgid="4526094783818216374">"କଲ୍ ସେଟିଙ୍ଗକୁ କେବଳ ଆଡମିନ୍ ୟୁଜର୍‌ ବଦଳାଇପାରିବେ।"</string>
-    <string name="call_settings_with_label" msgid="3401177261468593519">"ସେଟିଙ୍ଗ (<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="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS ଅନୁରୋଧକୁ ସ୍ଵାଭାବିକ କଲ୍‌ରେ ପରିବର୍ତ୍ତନ କରାଗଲା"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS ଅନୁରୋଧ, USSD ଅନୁରୋଧକୁ ପରିବର୍ତ୍ତନ ହେଲା"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"ନୂଆ SS ଅନୁରୋଧରେ ପରିବର୍ତ୍ତନ ହେଲା"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS ଅନୁରୋଧକୁ ଭିଡିଓ କଲ୍‌ରେ ପରିବର୍ତ୍ତନ କରାଗଲା"</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="vm_change_pin_old_pin" msgid="7295220109886682573">"ପୁରୁଣା PIN"</string>
-    <string name="vm_change_pin_new_pin" msgid="5412922262839438097">"ନୂଆ PIN"</string>
-    <string name="vm_change_pin_progress_message" msgid="3977357361934350336">"ଦୟାକରି ଅପେକ୍ଷା କରନ୍ତୁ…"</string>
-    <string name="vm_change_pin_error_too_short" msgid="5974971097302710497">"ନୂଆ PIN ଅତିଛୋଟ ଅଟେ।"</string>
-    <string name="vm_change_pin_error_too_long" msgid="8476870806115051865">"ନୂଆ PIN ଅତିଲମ୍ବା ଅଟେ।"</string>
-    <string name="vm_change_pin_error_too_weak" msgid="7883744811891784882">"ନୂଆ PIN ଅତି ଦୂର୍ବଳ ଅଟେ। ଗୋଟିଏ ସୁରକ୍ଷିତ ପାସ୍‌ୱର୍ଡରେ ନିରନ୍ତର କ୍ରମରେ କିମ୍ବା ଦୋହରାଯାଇଥିବା ସଂଖ୍ୟା କଦାପି ରହିବ ନାହିଁ।"</string>
-    <string name="vm_change_pin_error_mismatch" msgid="2754685537970757317">"ପୁରୁଣା PIN ଆଦୌ ମେଳ ହେଉନାହିଁ।"</string>
-    <string name="vm_change_pin_error_invalid" msgid="3972205462701668653">"ନୂଆ PINରେ ଅବୈଧ ଅକ୍ଷର ଅଛି।"</string>
-    <string name="vm_change_pin_error_system_error" msgid="6610603326230000207">"PINକୁ ବଦଳାଇବାରେ ଅକ୍ଷମ"</string>
-    <string name="vvm_unsupported_message_format" msgid="11795090778411977">"ସପୋର୍ଟ ନଥିବା ମେସେଜ୍‌ର ପ୍ରକାର, ଶୁଣିବା ପାଇଁ <xliff:g id="NUMBER">%s</xliff:g>କୁ କଲ୍ କରନ୍ତୁ।"</string>
-    <string name="network_settings_title" msgid="514120489499925574">"ମୋବାଇଲ୍‌ ନେଟ୍‌ୱର୍କ"</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="network_query_error" msgid="8466081377231178298">"ନେଟ୍‌ୱର୍କ ମିଳୁନାହିଁ। ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ"</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="already_auto" msgid="6067116884321285507">"ପୂର୍ବରୁ ସ୍ଵାଚାଳିତ ଚୟନରେ ଅଛି।"</string>
-    <string name="select_automatically" msgid="1046727200631770962">"ସ୍ଵଚାଳିତ ଭାବେ ନେଟ୍‌ୱର୍କ ଚୟନ କରନ୍ତୁ"</string>
-    <string name="network_select_title" msgid="7733107364757544558">"ନେଟ୍‌ୱର୍କ"</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="forbidden_network" msgid="4384929668343563440">"(ଅନୁମତିପ୍ରାପ୍ତ ନୁହେଁ)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"ନେଟ୍‌ୱର୍କ ଚୟନ କରନ୍ତୁ"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"ଡିସ୍‌କନେକ୍ଟ କରାଗଲା"</string>
-    <string name="network_connected" msgid="1288589103624338857">"କନେନ୍ଟ ହୋ‌ଇଛି"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"କନେନ୍ଟ ହେଉଛି..."</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"କନେକ୍ଟ କରିହେଲା ନାହିଁ"</string>
-  <string-array name="preferred_network_mode_choices">
-    <item msgid="3628460389382468528">"ନିଜ ପସନ୍ଦର GSM/WCDMA"</item>
-    <item msgid="8442633436636425221">"କେବଳ GSM"</item>
-    <item msgid="2032314385791760810">"କେବଳ WCDMA"</item>
-    <item msgid="6334554401059422303">"GSM/WCDMA ଅଟୋ"</item>
-    <item msgid="1462198368200398663">"CDMA/EvDo ଅଟୋ"</item>
-    <item msgid="3611460019185359968">"CDMA ବିନା EvDo"</item>
-    <item msgid="545430093607698090">"କେବଳ EvDo"</item>
-    <item msgid="4286774020869405140">"CDMA/EvDo/GSM/WCDMA"</item>
-    <item msgid="4006002265696868538">"CDMA + LTE/EvDo"</item>
-    <item msgid="8973936140318359205">"GSM/WCDMA/LTE"</item>
-    <item msgid="3471059554252610472">"ଗ୍ଲୋବାଲ୍"</item>
-    <item msgid="2882615514545171802">"LTE"</item>
-    <item msgid="8076204422288290116">"LTE / WCDMA"</item>
-    <item msgid="3982984144824159726">"କେବଳ TDSCDMA"</item>
-    <item msgid="3686191974505922271">"TDSCDMA/WCDMA"</item>
-    <item msgid="7135671700201836475">"LTE/TDSCDMA"</item>
-    <item msgid="3736619459066330755">"TDSCDMA/GSM"</item>
-    <item msgid="4778666570887216861">"LTE/TDSCDMA/GSM"</item>
-    <item msgid="2952322596201849456">"TDSCDMA/GSM/WCDMA"</item>
-    <item msgid="115984258536697617">"LTE/TDSCDMA/WCDMA"</item>
-    <item msgid="7957991936217192636">"LTE/TDSCDMA/GSM/WCDMA"</item>
-    <item msgid="2828588917858484655">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
-    <item msgid="4989979948139945854">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
-  </string-array>
-    <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 name="preferred_network_mode_tdscdma_summary" msgid="8021016193718678775">"ପସନ୍ଦଦାର୍ ନେଟ୍‌ୱର୍କ ମୋଡ୍: TDSCDMA"</string>
-    <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="2405154895437348623">"ପସନ୍ଦଦାର୍ ନେଟ୍‌ୱର୍କ ମୋଡ୍: TDSCDMA / WCDMA"</string>
-    <string name="preferred_network_mode_lte_tdscdma_summary" msgid="2104702896644235637">"ପସନ୍ଦଦାର୍ ନେଟ୍‌ୱର୍କ ମୋଡ୍: LTE / TDSCDMA"</string>
-    <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="4893784445338396204">"ପସନ୍ଦଦାର୍ ନେଟ୍‌ୱର୍କ ମୋଡ୍: TDSCDMA / GSM"</string>
-    <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1815169717046729757">"ପସନ୍ଦଦାର୍ ନେଟ୍‌ୱର୍କ ମୋଡ୍: LTE/GSM/TDSCDMA"</string>
-    <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="2195358773359424099">"ପସନ୍ଦଦାର୍ ନେଟ୍‌ୱର୍କ ମୋଡ୍: TDSCDMA/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="1181424059695667803">"ପସନ୍ଦଦାର୍ ନେଟ୍‌ୱର୍କ ମୋଡ୍: LTE/TDSCDMA/WCDMA"</string>
-    <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="2526539326505354382">"ପସନ୍ଦଦାର୍ ନେଟ୍‌ୱର୍କ ମୋଡ୍: LTE/TDSCDMA/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8195248059196614939">"ପସନ୍ଦଦାର୍ ନେଟ୍‌ୱର୍କ ମୋଡ୍: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5596733053095592791">"ପସନ୍ଦଦାର୍ ନେଟ୍‌ୱର୍କ ମୋଡ୍: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="call_category" msgid="5863978196309462052">"କଲ୍ କରାଯାଉଛି"</string>
-    <string name="network_operator_category" msgid="4830701959205735636">"ନେଟ୍‌ୱର୍କ"</string>
-    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"ଉନ୍ନତ 4G LTE ମୋଡ୍‍"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
-    <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="dialog_alert_title" msgid="6751344986194435476">"ଧ୍ୟାନଦିଅନ୍ତୁ"</string>
-    <string name="roaming" msgid="7894878421600247140">"ରୋମିଙ୍ଗ"</string>
-    <string name="roaming_enable" msgid="7331106985174381987">"ରୋମିଙ୍ଗ ବେଳେ ଡାଟା ସେବାଗୁଡିକୁ କନେକ୍ଟ କରନ୍ତୁ"</string>
-    <string name="roaming_disable" msgid="1843417228755568110">"ରୋମିଙ୍ଗ ବେଳେ ଡାଟା ସେବାଗୁଡିକୁ କନେକ୍ଟ କରନ୍ତୁ"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"ଡାଟା ରୋମିଙ୍ଗ ବନ୍ଦ କରାଯାଇଛି। ଚାଲୁ କରିବା ପାଇଁ ଟାପ୍ କରନ୍ତୁ।"</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"ମୋବାଇଲ୍ ଡାଟା କନେକ୍ସନ୍ ଉପଲବ୍ଧ ନାହିଁ"</string>
-    <string name="roaming_warning" msgid="1603164667540144353">"ଆପଣଙ୍କୁ ଅଧିକ ଦେୟ ଲାଗୁ ହୋଇପାରେ।"</string>
-    <string name="roaming_check_price_warning" msgid="7497570906830902550">"ମୂଲ୍ୟ ଜାଣିବା ପାଇଁ ନିଜର ନେଟ୍‌ୱର୍କ ପ୍ରଦାତାଙ୍କ ସହ ସମ୍ପର୍କ କରନ୍ତୁ।"</string>
-    <string name="roaming_alert_title" msgid="3654815360303826008">"ଡାଟା ରୋମିଙ୍ଗର ଅନୁମତି ଦେବେ?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"ଆପ୍‌ ଦ୍ୱାରା ଡାଟା ବ୍ୟବହାର"</string>
-    <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_2">%2$s</xliff:g>ରେ <xliff:g id="ID_1">%1$s</xliff:g> ମୋବାଇଲ୍ ଡାଟା ବ୍ୟବହାର କରାଯାଇଛି"</string>
-    <string name="advanced_options_title" msgid="8074895510265488035">"ଆଧୁନିକ"</string>
-    <string name="carrier_settings_euicc" msgid="6714062862127226405">"ନେଟୱର୍କ କ୍ୟାରିଅର"</string>
-    <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"ମୋବାଇଲ୍ ଓ ଇଣ୍ଟରନେଟ୍ ସେବା ପ୍ରଦାନକାରୀ କମ୍ପାନୀ, ଇସିମ୍, ସିମ୍, euicc, ମୋବାଇଲ୍ ଓ ଇଣ୍ଟରନେଟ୍ ସେବା ପ୍ରଦାନକାରୀ କମ୍ପାନୀକୁ ସ୍ଵିଚ୍ କରନ୍ତୁ, ମୋବାଇଲ୍ ଓ ଇଣ୍ଟରନେଟ୍ ସେବା ପ୍ରଦାନକାରୀ କମ୍ପାନୀକୁ ଯୋଡ଼ନ୍ତୁ"</string>
-    <string name="carrier_settings_euicc_summary" msgid="5115001942761995457">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> — <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
-    <string name="mobile_data_settings_title" msgid="4661165467914727157">"ମୋବାଇଲ୍‌ ଡାଟା"</string>
-    <string name="mobile_data_settings_summary" msgid="5087255915840576895">"ମୋବାଇଲ୍ ନେଟ୍‌ୱର୍କକୁ ବ୍ୟବହାରକରି ଡାଟା ଆକ୍ସେସ୍ କରନ୍ତୁ"</string>
-    <string name="data_usage_disable_mobile" msgid="3577275288809667615">"ମୋବାଇଲ୍‌ ଡାଟା ବନ୍ଦ କରିବେ?"</string>
-    <string name="sim_selection_required_pref" msgid="7049424902961844236">"ମନୋନୟନ ଆବଶ୍ୟକ"</string>
-    <string name="sim_change_data_title" msgid="5332425991853799280">"ଡାଟା ସିମ୍‌ ବଦଳାଇବେ?"</string>
-    <string name="sim_change_data_message" msgid="2163963581444907496">"ମୋବାଇଲ୍‌ ଡାଟା ପାଇଁ <xliff:g id="OLD_SIM">%2$s</xliff:g> ବଦଳରେ <xliff:g id="NEW_SIM">%1$s</xliff:g> ବ୍ୟବହାର କରିବେ?"</string>
-    <string name="wifi_calling_settings_title" msgid="7741961465416430470">"ୱାଇ-ଫାଇ କଲିଙ୍ଗ"</string>
-    <string name="video_calling_settings_title" msgid="539714564273795574">"କେରିଅର୍ ଭିଡିଓ କଲିଙ୍ଗ"</string>
-    <string name="gsm_umts_options" msgid="6538311689850981686">"GSM/UMTS ବିକଳ୍ପ"</string>
-    <string name="cdma_options" msgid="4016822858172249884">"CDMA ବିକଳ୍ପ"</string>
-    <string name="throttle_data_usage" msgid="3715677828160555808">"ଡାଟାର ବ୍ୟବହାର"</string>
-    <string name="throttle_current_usage" msgid="8762280193043815361">"ବର୍ତ୍ତମାନ ସମୟରେ ବ୍ୟବହାର ହୋ‌ଇଥିବା ଡାଟା"</string>
-    <string name="throttle_time_frame" msgid="1915198770363734685">"ଡାଟା ବ୍ୟବହାର ହୋ‌ଇଥିବା ଅବଧି"</string>
-    <string name="throttle_rate" msgid="4710388992676803508">"ଡାଟା ରେଟ୍ ପଲିସୀ"</string>
-    <string name="throttle_help" msgid="243651091785169900">"ଅଧିକ ଜାଣନ୍ତୁ"</string>
-    <string name="throttle_status_subtext" msgid="1657318943142085170">"<xliff:g id="USED_2">%3$s</xliff:g>ର <xliff:g id="USED_0">%1$s</xliff:g> (<xliff:g id="USED_1">%2$d</xliff:g>٪) ସର୍ବାଧିକ ସମୟ \n ପରବର୍ତ୍ତୀ ଅବଧି <xliff:g id="USED_3">%4$d</xliff:g> ଦିନରେ (<xliff:g id="USED_4">%5$s</xliff:g>) ଆରମ୍ଭ ହେବ"</string>
-    <string name="throttle_data_usage_subtext" msgid="6029276011123694701">"<xliff:g id="USED_2">%3$s</xliff:g>ର <xliff:g id="USED_0">%1$s</xliff:g> (<xliff:g id="USED_1">%2$d</xliff:g>٪) ସର୍ବାଧିକ ସମୟ"</string>
-    <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"<xliff:g id="USED_0">%1$s</xliff:g>ସର୍ବାଧିକ ସୀମା ପାର୍ କରିଯାଇଛି\n ଡାଟାର ବେଗ <xliff:g id="USED_1">%2$d</xliff:g> Kb/sକୁ ହ୍ରାସ ପାଇଯାଇଛି"</string>
-    <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"ଚକ୍ରର <xliff:g id="USED_0">%1$d</xliff:g>٪ ବିତିଯାଇଛି\n ପରବର୍ତ୍ତୀ ଅବଧି <xliff:g id="USED_1">%2$d</xliff:g> ଦିନରେ (<xliff:g id="USED_2">%3$s</xliff:g>) ଆରମ୍ଭ ହେବ"</string>
-    <string name="throttle_rate_subtext" msgid="2149102656120726855">"ଯଦି ଡାଟା ବ୍ୟବହାରର ସୀମା ପାର୍ କରିଯିବ ତେବେ ଡାଟା ରେଟ୍ <xliff:g id="USED">%1$d</xliff:g> Kb/sକୁ ହ୍ରାସ ପାଇବ"</string>
-    <string name="throttle_help_subtext" msgid="5217706521499010816">"ଆପଣଙ୍କ କେରିଅର୍‌ର ମୋବାଇଲ୍ ନେଟ୍‌ୱର୍କ ଡାଟା ବ୍ୟବହାର ନୀତି ବିଷୟରେ ଅଧିକ ସୂଚନା"</string>
-    <string name="cell_broadcast_sms" msgid="5584192824053625842">"ସେଲ୍ ପ୍ରସାରଣ 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">"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="menu_dial" msgid="3223106222819685808">"ଯୋଗାଯୋଗକୁ ଡାଏଲ୍ କରନ୍ତୁ"</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="2062898833049589309">"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">"ସିମ୍‌ ପିନ୍‌ ବଦାଳନ୍ତୁ"</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">"ଆପଣ ଟାଇପ୍ କରିଥିବା PINs ମେଳ ହେଉନାହିଁ। ପୁଣି ଥରେ ଚେଷ୍ଟା କରନ୍ତୁ।"</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 ଲକ୍ ହୋ‌ଇଗଲା। PUK2 ପାଇଁ ଅନୁରୋଧ କରାଯାଇଛି।"</string>
-    <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
-    <string name="oldPin2Label" msgid="8559146795026261502">"ପୁରୁଣା PIN2"</string>
-    <string name="newPin2Label" msgid="4573956902204349054">"ନୂଆ PIN2"</string>
-    <string name="confirmPin2Label" msgid="8100319484454787708">"ନୂଆ PIN2 ନିଶ୍ଚିତ କରନ୍ତୁ"</string>
-    <string name="badPuk2" msgid="7910064009531541708">"PUK2 ଭୁଲ୍ ଅଛି। ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
-    <string name="badPin2" msgid="6646896629970023109">"ପୁରିଣା PIN2 ଭୁଲ୍ ଅଛି। ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
-    <string name="mismatchPin2" msgid="4177967478551851117">"PINଗୁଡିକ ମେଳ ହେଉନାହିଁ। ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
-    <string name="invalidPin2" msgid="1757045131429105595">"ଗୋଟିଏ PIN2 ପ୍ରବେଶ କରନ୍ତୁ ଯାହା 4 ରୁ 8 ସଂଖ୍ୟାବିଶିଷ୍ଟ ଅଟେ।"</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="pin2_error_exception" msgid="1088689322248996699">"ନେଟ୍‌ୱର୍କ କିମ୍ବା SIM କାର୍ଡ ତ୍ରୁଟି"</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_voicemail_title" msgid="8933468752045550523">"ନୂଆ ଭଏସମେଲ୍"</string>
-    <string name="notification_voicemail_title_count" msgid="4366360747660929916">"ନୂଆ ଭଏସମେଲ୍ (<xliff:g id="COUNT">%d</xliff:g>)"</string>
-    <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>କୁ ଡାଏଲ୍ କରନ୍ତୁ"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"ଭଏସ୍ ମେଲ୍ ନମ୍ବର୍ ଅଜଣା"</string>
-    <string name="notification_network_selection_title" msgid="4224455487793492772">"କୌଣସି ସେବା ନାହିଁ"</string>
-    <string name="notification_network_selection_text" msgid="2607085729661923269">"ଚୟନିତ ନେଟ୍‌ୱର୍କ (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) ଉପଲବ୍ଧ ନାହିଁ"</string>
-    <string name="incall_error_power_off" product="watch" msgid="2007450435656211658">"କଲ୍ କରିବା ପାଇଁ ମୋବାଇଲ୍ ନେଟ୍‌ୱର୍କକୁ ଚାଲୁ କରନ୍ତୁ, ଏୟାରପ୍ଲେନ୍ ମୋଡ୍‌କୁ ବନ୍ଦ କରନ୍ତୁ କିମ୍ବା ବ୍ୟାଟେରୀ ସେଭର୍‌କୁ ବନ୍ଦ କରନ୍ତୁ।"</string>
-    <string name="incall_error_power_off" product="default" msgid="2947938060513306698">"ଗୋଟିଏ କଲ୍ କରିବା ପାଇଁ ଏୟାରପ୍ଲେନ୍ ମୋଡ୍‌କୁ ବନ୍ଦ କରନ୍ତୁ।"</string>
-    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"ଗୋଟିଏ କଲ୍ କରିବା ପାଇଁ ଏୟାରପ୍ଲେନ୍ ମୋଡ୍‌କୁ ବନ୍ଦ କରନ୍ତୁ କିମ୍ବା ଏକ ତାରବିହୀନ ନେଟ୍‌ୱର୍କ ସହ କନେକ୍ଟ କରନ୍ତୁ।"</string>
-    <string name="incall_error_ecm_emergency_only" msgid="738708660612388692">"ଗୋଟିଏ ସାଧାରଣ କଲ୍ କରିବା ପାଇଁ ଜରୁରିକାଳୀନ କଲବ୍ୟାକ୍ ମୋଡ୍‌ରୁ ବାହାରି ଆସନ୍ତୁ।"</string>
-    <string name="incall_error_emergency_only" msgid="4678640422710818317">"ନେଟ୍‌ୱର୍କରେ ପଞ୍ଜୀକୃତ କରାଯାଇନାହିଁ।"</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"ମୋବାଇଲ୍ ନେଟ୍‌ୱର୍କ ଉପଲବ୍ଧ ନାହିଁ।"</string>
-    <string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"ମୋବାଇଲ୍ ନେଟ୍‌ୱର୍କ ଉପଲବ୍ଧ ନାହିଁ। କଲ୍ କରିବା ପାଇଁ ଗୋଟିଏ ତାରବିହୀନ ନେଟ୍‌ୱର୍କରେ କନେକ୍ଟ କରନ୍ତୁ"</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"ଗୋଟିଏ କଲ୍ କରିବା ପାଇଁ ଏକ ବୈଧ ନମ୍ବର୍ ପ୍ରବେଶ କରନ୍ତୁ।"</string>
-    <string name="incall_error_call_failed" msgid="5891978320269774095">"କଲ୍ ହେଲା ନାହିଁ।"</string>
-    <string name="incall_error_cannot_add_call" msgid="8878159278947023326">"ଏବେ କଲ୍‌କୁ ଯୋଡ଼ାଯାଇପାରିବ ନାହିଁ। ଆପଣ ମେସେଜ୍ ପଠାଇ ସମ୍ପର୍କ କରିବା ପାଇଁ ଚେଷ୍ଟା କରିପାରନ୍ତି।"</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_supp_service_hold" msgid="7967020511232222078">"କଲ୍‍କୁ ହୋଲ୍ଡ କରାଯାଇପାରିବ ନାହିଁ।"</string>
-    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"ଗୋଟିଏ କଲ୍ କରିବା ପାଇଁ ଏକ ତାରବିହୀନ ନେଟ୍‌ୱର୍କ ସହ କନେକ୍ଟ କରନ୍ତୁ।"</string>
-    <string name="incall_error_promote_wfc" msgid="106510757624022064">"ଗୋଟିଏ କଲ୍ କରିବା ପାଇଁ ୱାଇ-ଫାଇ କଲିଙ୍ଗକୁ ସକ୍ଷମ କରନ୍ତୁ।"</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"ଆପତ୍ତକାଳୀନ ସୂଚନା"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"ମାଲିକ"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"ସୂଚନା ଦେଖିବାକୁ ପୁଣିଥରେ ଟାପ୍‍ କରନ୍ତୁ"</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"ଜରୁରୀକାଳିନ କଲ୍‌"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"କେବଳ ଜରୁରୀକାଳୀନ କଲ୍‌"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"ଜରୁରୀକାଳୀନ ନମ୍ବର୍‌"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"ଜରୁରୀକାଳୀନ ନମ୍ବର୍‌"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"<xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>ରେ କଲ୍‌ କରନ୍ତୁ"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"ରେଡିଓକୁ ଚାଲୁ କରାଯାଉଛି…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"କୌଣସି ସେବା ନାହିଁ। ପୁଣି ଚେଷ୍ଟାକରାଯାଉଛି…"</string>
-    <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"ଗୋଟିଏ ଜରୁରିକାଳୀନ କଲ୍ କରିବାବେଳେ ଏୟାରପ୍ଲେନ୍ ମୋଡ୍‌କୁ ପ୍ରବେଶ କରାଯାଇପାରିବ ନାହିଁ।"</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"ଜରୁରିକାଳୀନ କଲ୍ କରିବା ଉପଲବ୍ଧ ନାହିଁ"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"ପୋଲିସ୍‍"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"ଆମ୍ବୁଲେନ୍ସ"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"ନିଆଁ"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</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="singleContactImportedMsg" msgid="6868483416182599206">"ଇମ୍ପୋର୍ଟ କରାଯାଇଥିବା ଯୋଗାଯୋଗ"</string>
-    <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"ଯୋଗଯୋଗକୁ ଇମ୍ପୋର୍ଟ କରିବାରେ ବିଫଳ ହେଲା"</string>
-    <string name="hac_mode_title" msgid="8740268574688743289">"ଶ୍ରବଣ ଯନ୍ତ୍ର"</string>
-    <string name="hac_mode_summary" msgid="6833851160514929341">"ଶ୍ରବଣ ଯନ୍ତ୍ର କମ୍ପ୍ୟାଟିବିଲିଟୀକୁ ଚାଲୁ କରନ୍ତୁ"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"ରିଅଲ୍-ଟାଇମ୍ ଟେକ୍ସଟ୍ (RTT) କଲ୍"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"ଭଏସ୍ କଲ୍ କରିବା ମଧ୍ୟରେ ମେସେଜ୍ କରିବାକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"RTT ସେହି କଲର୍‌ମାନଙ୍କୁ ସହାୟତା କରିଥାଏ, ଯେଉଁମାନେ ବଧିର, କ୍ଷୀଣ ଶ୍ରବଣଶକ୍ତି, ମୂକ କିମ୍ବା ଭଏସ୍ ଅପେକ୍ଷା ଅଧିକ କିଛି ଆବଶ୍ୟକ କରନ୍ତି। &lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;ଅଧିକ ଜାଣନ୍ତୁ&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - ମେସେଜ୍ ଟ୍ରାନସ୍କ୍ରିପ୍ଟ ଭାବେ RTT କଲ୍ ସେଭ୍ ହୋ‌ଇଛି\n       &lt;br&gt; - ଭିଡିଓ କଲ୍ ପାଇଁ RTT ଉପଲବ୍ଧ ନାହିଁ"</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">"ଯଦି ଆପଣ ସକ୍ରିୟ କରିବା କାର୍ଯ୍ୟକୁ ଛାଡ଼ିଯା’ନ୍ତି ତେବେ ଆପଣ କଲ୍ କରିପାରିବେ ନାହିଁ କିମ୍ବା ମୋବାଇଲ୍ ନେଟ୍‌ୱର୍କ (ଯଦିଓ ଆପଣ ୱାଇ-ଫାଇ ନେଟ୍‌ୱର୍କ ସହିତ ଯୋଡ଼ିହୋ‌ଇପାରିବେ) ସହିତ ଯୋଡ଼ିହୋ‌ଇପାରିବେ ନାହିଁ। ଆପଣ ନିଜର ଫୋନ୍‌କୁ ସକ୍ରିୟ ନକରିବା ପର୍ଯ୍ୟନ୍ତ ପ୍ରତ୍ୟେକଥର ଏହାକୁ ଚାଲୁ କରିବା ସମୟରେ ସକ୍ରିୟ କରିବା ପାଇଁ କୁହାଯିବ।"</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>
-    <string name="phone_in_ecm_notification_complete_time" msgid="7730376844178948351">"<xliff:g id="COMPLETETIME">%s</xliff:g> ପର୍ଯ୍ୟନ୍ତ କୌଣସି ଡାଟା କନେକ୍ସନ୍ ନାହିଁ"</string>
-    <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;ସେଟ୍ ହୋ‌ଇନାହିଁ&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="description_dialpad_button" msgid="5220006811894230590">"ଡାୟଲ୍‍ପ୍ୟାଡ୍‍ ଦେଖାନ୍ତୁ"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"ଜରୁରୀକାଳୀନ ଡାୟଲ୍‍ପ୍ୟାଡ୍‍"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"ଭିଜୁଆଲ୍ ଭଏସମେଲ୍"</string>
-    <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"PIN ସେଟ୍ କରନ୍ତୁ"</string>
-    <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"PIN ବଦଳାନ୍ତୁ"</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="5932176406432044638">"ଠାରୁ ୱାଇ-ଫାଇ କଲ୍ କରନ୍ତୁ"</string>
-    <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"ୱାଇ-ଫାଇ କଲ୍"</string>
-    <string name="emergency_action_launch_hint" msgid="4906759256275562674">"ଖୋଲିବା ପାଇଁ ପୁଣି ଟାପ୍‍ କରନ୍ତୁ"</string>
-    <string name="message_decode_error" msgid="3456481534066924855">"ମେସେଜ୍‌କୁ ଡିକୋଡ୍ କରିବା ବେଳେ ଗୋଟିଏ ତ୍ରୁଟି ଦେଖାଦେଲା।"</string>
-    <string name="callFailed_cdma_activation" msgid="2307989779233262164">"ଗୋଟିଏ SIM କାର୍ଡ ଆପଣଙ୍କର ସେବାକୁ କାର୍ଯ୍ୟକ୍ଷମ କରିଛି ଏବଂ ଆପଣଙ୍କ ଫୋନ୍‌ର ରୋମିଙ୍ଗ କ୍ଷମତାକୁ ଅପଡେଟ୍ କରିଛି।"</string>
-    <string name="callFailed_cdma_call_limit" msgid="1556916577171457086">"ଏଠାରେ ଅନେକ ସକ୍ରିୟ କଲ୍ ଅଛି। ଗୋଟିଏ ନୂଆ କଲ୍‌କୁ ସ୍ଥାପନ କରିବା ପୂର୍ବରୁ ଦୟାକରି ବିଦ୍ୟମାନ ଥିବା କଲ୍‌କୁ ସମାପ୍ତ କିମ୍ବା ମର୍ଜ କରନ୍ତୁ।"</string>
-    <string name="callFailed_imei_not_accepted" msgid="132192626901238542">"କନେକ୍ଟ କରିହେଲା ନାହିଁ, ଦୟାକରି ଗୋଟିଏ ବୈଧ SIM କାର୍ଡ ଇନସର୍ଟ କରନ୍ତୁ।"</string>
-    <string name="callFailed_wifi_lost" msgid="5968076625137297184">"ୱାଇ-ଫାଇ କନେକ୍ସନ୍ ହଜିଗଲା। କଲ୍ ସମାପ୍ତ ହୋ‌ଇଗଲା।"</string>
-    <string name="dialFailed_low_battery" msgid="8760548177088774268">"ବ୍ୟାଟେରୀ କମ୍ ଥିବା ହେତୁ ଆପଣ ଭିଡିଓ କଲ୍ କରିପାରିବେ ନାହିଁ।"</string>
-    <string name="callFailed_low_battery" msgid="4913582435905872616">"ଅଳ୍ପ ବ୍ୟାଟେରୀ ଥିବା ହେତୁ ଭିଡିଓ କଲ୍ ସମାପ୍ତ ହୋ‌ଇଗଲା।"</string>
-    <string name="change_pin_title" msgid="7790232089699034029">"ଭଏସମେଲ୍ PINକୁ ବଦଳାନ୍ତୁ"</string>
-    <string name="change_pin_continue_label" msgid="2135088662420163447">"ଜାରି ରଖନ୍ତୁ"</string>
-    <string name="change_pin_cancel_label" msgid="353535488390948596">"କ୍ୟାନ୍ସଲ୍‍ କରନ୍ତୁ"</string>
-    <string name="change_pin_ok_label" msgid="6204308560844889926">"ଠିକ୍ ଅଛି"</string>
-    <string name="change_pin_enter_old_pin_header" msgid="419179847657548887">"ଆପଣଙ୍କର ପୁରୁଣା PINକୁ ନିଶ୍ଚିତ କରନ୍ତୁ"</string>
-    <string name="change_pin_enter_old_pin_hint" msgid="8579171678763615453">"ଜାରି ରଖିବା ପାଇଁ ଆପଣଙ୍କର ଭଏସମେଲ୍ PINକୁ ପ୍ରବେଶ କରନ୍ତୁ।"</string>
-    <string name="change_pin_enter_new_pin_header" msgid="2611191814590251532">"ଗୋଟିଏ ନୂଆ PIN ସେଟ୍ କରନ୍ତୁ"</string>
-    <string name="change_pin_enter_new_pin_hint" msgid="2322940054329689309">"PIN ନିଶ୍ଚିତରୂପେ <xliff:g id="MIN">%1$d</xliff:g>-<xliff:g id="MAX">%2$d</xliff:g> ଅଙ୍କବିଶିଷ୍ଟ ହେବା ଉଚିତ୍।"</string>
-    <string name="change_pin_confirm_pin_header" msgid="8113764019347322170">"ଆପଣଙ୍କ PIN ନିଶ୍ଚିତ କରନ୍ତୁ"</string>
-    <string name="change_pin_confirm_pins_dont_match" msgid="4795052654904027909">"PIN ମେଳ ହେଉ ନାହିଁ"</string>
-    <string name="change_pin_succeeded" msgid="2022852286442211151">"ଭଏସମେଲ୍ PIN ଅପଡେଟ୍ ହୋ‌ଇଛି"</string>
-    <string name="change_pin_system_error" msgid="8308462387154257840">"PIN ସେଟ୍ କରିବାରେ ଅସମର୍ଥ"</string>
-    <string name="mobile_data_status_roaming_turned_off_subtext" msgid="935636805765823307">"ଡାଟା ରୋମିଙ୍ଗ ବନ୍ଦ ଅଛି"</string>
-    <string name="mobile_data_status_roaming_turned_on_subtext" msgid="1335176927083781041">"ଡାଟା ରୋମିଙ୍ଗ ଚାଲୁ ଅଛି"</string>
-    <string name="mobile_data_status_roaming_without_plan_subtext" msgid="3568412513831673037">"ବର୍ତ୍ତମାନ ରୋମିଙ୍ଗରେ ଅଛି, ଡାଟା ପ୍କାନ୍ ଆବଶ୍ୟକ"</string>
-    <string name="mobile_data_status_roaming_with_plan_subtext" msgid="8721998948811064377">"ବର୍ତ୍ତମାନ ରୋମିଙ୍ଗରେ ଅଛି, ଡାଟା ପ୍କାନ୍ ସକ୍ରିୟ ଅଛି"</string>
-    <string name="mobile_data_status_no_plan_subtext" msgid="4887747337017565725">"ଲିଛି ମୋବାଇଲ୍ ଡାଟା ବଳକା ନାହିଁ"</string>
-    <string name="mobile_data_activate_prepaid" msgid="7447025165850512683">"ଲିଛି ମୋବାଇଲ୍ ଡାଟା ବଳକା ନାହିଁ"</string>
-    <string name="mobile_data_activate_prepaid_summary" msgid="5705389791791637666">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> ମାଧ୍ୟମରେ ମୋବାଇଲ୍ ଡାଟାକୁ ଯୋଡ଼ନ୍ତୁ"</string>
-    <string name="mobile_data_activate_roaming_plan" msgid="5998161536947086264">"କୈଣସି ରୋମିଙ୍ଗ ପ୍ଲାନ୍ ନାହିଁ"</string>
-    <string name="mobile_data_activate_roaming_plan_summary" msgid="511202908883425459">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> ମାଧ୍ୟମରେ ରୋମିଙ୍ଗ ପ୍ଲାନ୍‌କୁ ଯୋଡ଼ନ୍ତୁ"</string>
-    <string name="mobile_data_activate_footer" msgid="5979019929980140594">"ଆପଣଙ୍କ କେରିଅର୍‌ <xliff:g id="PROVIDER_NAME">%s</xliff:g> ମାଧ୍ୟମରେ ଆପଣ ମୋବାଇଲ୍ ଡାଟା କିମ୍ବା ରୋମିଙ୍ଗ ପ୍ଲାନ୍‌କୁ ଯୋଡ଼ିପାରିବେ।"</string>
-    <string name="mobile_data_activate_diag_title" msgid="9044252207707864493">"ଡାଟାକୁ ଯୋଡ଼ିବେ?"</string>
-    <string name="mobile_data_activate_diag_message" msgid="8216154678758451453">"ଆପଣଙ୍କୁ <xliff:g id="PROVIDER_NAME">%s</xliff:g> ମାଧ୍ୟମରେ ଡାଟା ଯୋଡ଼ିବାକୁ ପଡ଼ିପାରେ"</string>
-    <string name="mobile_data_activate_button" msgid="3682400969184405446">"ଡାଟା ଯୋଡ଼ନ୍ତୁ"</string>
-    <string name="mobile_data_activate_cancel_button" msgid="1708022171547398765">"କ୍ୟାନ୍ସଲ୍‍ କରନ୍ତୁ"</string>
-    <string name="clh_card_title_call_ended_txt" msgid="4072101334811753823">"କଲ୍ ସମାପ୍ତ ହୋ‌ଇଛି"</string>
-    <string name="clh_callFailed_powerOff_txt" msgid="3773036949107147708">"ରେଡିଓ ବନ୍ଦ କରନ୍ତୁ"</string>
-    <string name="clh_callFailed_simError_txt" msgid="757650590524277969">"କୌଣସି SIM କାର୍ଡ ନାହିଁ କିମ୍ବା SIM କାର୍ଡରେ ତ୍ରୁଟି ଅଛି"</string>
-    <string name="clh_incall_error_out_of_service_txt" msgid="3974373603657193827">"ମୋବାଇଲ୍ ନେଟ୍‌ୱର୍କ ଉପଲବ୍ଧ ଅଛି"</string>
-    <string name="clh_callFailed_unassigned_number_txt" msgid="7635996793232604064">"ଆସାଇନ୍ କରାଯାଇନଥିବା (ପ୍ରଦାନ କରାଯାଇନଥିବା) ନମ୍ବର୍"</string>
-    <string name="clh_callFailed_no_route_to_destination_txt" msgid="8561586745288855167">"ଗନ୍ତବ୍ୟ ସ୍ଥାନକୁ କୌଣସି ମାର୍ଗ ନାହିଁ"</string>
-    <string name="clh_callFailed_channel_unacceptable_txt" msgid="8048626924246611459">"ଚ୍ୟାନେଲ୍ ସ୍ଵୀକାର୍ଯ୍ୟ ନୁହେଁ"</string>
-    <string name="clh_callFailed_operator_determined_barring_txt" msgid="6889705714244076823">"ଅପରେଟର୍‌ଙ୍କ ଦ୍ଵାରା ନିର୍ଦ୍ଧାରିତ ପ୍ରତିବନ୍ଧ"</string>
-    <string name="clh_callFailed_normal_call_clearing_txt" msgid="2810975267106345820">"ସାଧାରଣ କଲ୍ ଖାଲିକରନ୍ତୁ"</string>
-    <string name="clh_callFailed_user_busy_txt" msgid="2736095995784746915">"ୟୁଜର୍ ବ୍ୟସ୍ତ ଅଛନ୍ତି"</string>
-    <string name="clh_callFailed_no_user_responding_txt" msgid="1421543095873040084">"କୌଣସି ୟୁଜର୍ ଉତ୍ତର ଦେଉନାହାନ୍ତି"</string>
-    <string name="clh_callFailed_user_alerting_txt" msgid="6606245970376797447">"ୟୁଜର୍ ଆଲର୍ଟ କରୁଛନ୍ତି, କୌଣସି ଉତ୍ତର ନାହିଁ"</string>
-    <string name="clh_callFailed_call_rejected_txt" msgid="8001665478195793223">"କଲ୍‌କୁ ପ୍ରତ୍ୟାଖ୍ୟାନ କରାଗଲା"</string>
-    <string name="clh_callFailed_number_changed_txt" msgid="5127909898925154242">"ନମ୍ବର୍ ବଦଳିଯାଇଛି"</string>
-    <string name="clh_callFailed_pre_emption_txt" msgid="6864702416751338567">"ପୂର୍ବାନୁମାନ"</string>
-    <string name="clh_callFailed_non_selected_user_clearing_txt" msgid="8725898326616836656">"ଅଚୟନିତ ୟୁଜର୍‌ଙ୍କୁ ଖାଲି କରନ୍ତୁ"</string>
-    <string name="clh_callFailed_destination_out_of_order_txt" msgid="6626355413556362437">"ଗନ୍ତବ୍ୟ ଖରାପ ଅଛି"</string>
-    <string name="clh_callFailed_invalid_number_format_txt" msgid="6987646655639655370">"ଅବୌଧ ନମ୍ବର୍ ଫର୍ମାଟ୍ (ଅସମ୍ପୂର୍ଣ୍ଣ ନମ୍ବର୍)"</string>
-    <string name="clh_callFailed_facility_rejected_txt" msgid="4539787567476563415">"ସୁବିଧାକୁ ପ୍ରତ୍ୟାଖ୍ୟାନ କରାଗଲା"</string>
-    <string name="clh_callFailed_response_to_STATUS_ENQUIRY_txt" msgid="178503536263624366">"ଷ୍ଟାଟସ୍ ଏନକ୍ଵାରୀର ଉତ୍ତର"</string>
-    <string name="clh_callFailed_normal_unspecified_txt" msgid="2777574148560245427">"ସାଧାରଣ, ଅନିର୍ଦ୍ଦିଷ୍ଟ"</string>
-    <string name="clh_callFailed_no_circuit_available_txt" msgid="2894749820848784700">"କୌଣସି ସର୍କିଟ୍ କିମ୍ବା ଚ୍ୟାନେଲ୍ ଉପଲବ୍ଧ ନାହିଁ"</string>
-    <string name="clh_callFailed_network_out_of_order_txt" msgid="807472585030492179">"ନେଟ୍‌ୱର୍କ ଖରାପ ଅଛି"</string>
-    <string name="clh_callFailed_temporary_failure_txt" msgid="1985847623937655151">"ଅସ୍ଥାୟୀରୂପେ ବିଫଳ ହୋ‌ଇଛି"</string>
-    <string name="clh_callFailed_switching_equipment_congestion_txt" msgid="465517139462928431">"ସ୍ଵିଚିଙ୍ଗ ଉପକରଣ ଭର୍ତ୍ତି ହୋ‌ଇଯାଇଛି"</string>
-    <string name="clh_callFailed_access_information_discarded_txt" msgid="132851305339579892">"ଆକ୍ସେସ୍ ସୂଚନାକୁ କାଢ଼ିଦିଆଗଲା"</string>
-    <string name="clh_callFailed_requested_circuit_txt" msgid="2316345471851443847">"ଅନୁରୋଧ କରାଯାଇଥିବା ସର୍କିଟ୍/ଚ୍ୟାନେଲ୍ ଉପଲବ୍ଧ ନାହିଁ"</string>
-    <string name="clh_callFailed_resources_unavailable_unspecified_txt" msgid="4460267429142724322">"ରିସୋର୍ସ ଉପଲବ୍ଧ ନାହିଁ, ଅନିର୍ଦ୍ଦିଷ୍ଟ"</string>
-    <string name="clh_callFailed_quality_of_service_unavailable_txt" msgid="7315823047206338755">"ସେବାର କ୍ଵାଲିଟୀ ଉପଲବ୍ଧ ନାହିଁ"</string>
-    <string name="clh_callFailed_requested_facility_not_subscribed_txt" msgid="1688438372518949530">"ଅନୁରୋଧ କରାଯାଇଥିବା ସୁବିଧା ସବସ୍କ୍ରାଇବ୍ କରାଯାଇନାହିଁ"</string>
-    <string name="clh_callFailed_incoming_calls_barred_within_the_CUG_txt" msgid="3922231620226043342">"CUG ମଧ୍ୟରେ ଇନକମିଙ୍ଗ କଲ୍‌କୁ ରୋକାଗଲା"</string>
-    <string name="clh_callFailed_bearer_capability_not_authorized_txt" msgid="6515594235334537340">"ଧାରକଙ୍କର କ୍ଷମତାକୁ ଅଧିକୃତ କରାଯାଇନାହିଁ"</string>
-    <string name="clh_callFailed_bearer_capability_not_presently_available_txt" msgid="8013567156449692135">"ଧାରକଙ୍କର କ୍ଷମତା ବର୍ତ୍ତମାନ ଉପଲବ୍ଧ ନାହିଁ"</string>
-    <string name="clh_callFailed_service_or_option_not_available_unspecified_txt" msgid="8663374141880847414">"ସେବା କିମ୍ବା ବିକଳ୍ପ ଉପଲବ୍ଧ ନାହିଁ, ଅନିର୍ଦ୍ଦିଷ୍ଟ"</string>
-    <string name="clh_callFailed_bearer_service_not_implemented_txt" msgid="2772484977847973583">"ଧାରକଙ୍କର ସେବାକୁ ପ୍ରୟୋଗ କରାଯାଇନାହିଁ"</string>
-    <string name="clh_callFailed_ACM_equal_to_or_greater_than_ACMmax_txt" msgid="2192709279981159761">"ACM, ACMmax ସହିତ ସମାନ କିମ୍ବା ଠାରୁ ବଡ଼ ହେବ"</string>
-    <string name="clh_callFailed_requested_facility_not_implemented_txt" msgid="406404292085779118">"ଅନୁରୋଧ କରାଯାଇଥିବା ସୁବିଧା ପ୍ରୟୋଗ କରାଯାଇନାହିଁ"</string>
-    <string name="clh_callFailed_only_restricted_digital_information_bearer_capability_is_available_txt" msgid="4817899794531157207">"କେବଳ ପ୍ରତିରୋଧିତ ଡିଜିଟାଲ୍ ସୂଚନା ଧାରକ କ୍ଷମତା ଉପଲବ୍ଧ ଅଛି"</string>
-    <string name="clh_callFailed_service_or_option_not_implemented_unspecified_txt" msgid="2968655784896862505">"ସେବା କିମ୍ବା ବିକଳ୍ପ ପ୍ରୟୋଗ କରାଯାଇନାହିଁ, ଅନିର୍ଦ୍ଦିଷ୍ଟ"</string>
-    <string name="clh_callFailed_invalid_transaction_identifier_value_txt" msgid="3843478518660918642">"କାରବାର ବିହ୍ନଟକର୍ତ୍ତାଙ୍କର ମୂଲ୍ୟ ଅବୈଧ ଅଟେ"</string>
-    <string name="clh_callFailed_user_not_member_of_CUG_txt" msgid="8462852903153938988">"ୟୁଜର୍ CUGର ସଭ୍ୟ ନୁହନ୍ତି"</string>
-    <string name="clh_callFailed_incompatible_destination_txt" msgid="2580750652910253219">"କମ୍ପ୍ୟାଟିବଲ୍‌ନଥିବା ଗନ୍ତବ୍ୟ"</string>
-    <string name="clh_callFailed_invalid_transit_network_selection_txt" msgid="6589916900457111005">"ଚୟନିତ ଅବୈଧ ଟ୍ରାନଜିଟ୍ ନେଟ୍‌ୱର୍କ"</string>
-    <string name="clh_callFailed_semantically_incorrect_message_txt" msgid="2329284157442218683">"ମେସେଜ୍‌ର ଅର୍ଥ ଭୁଲ୍ ଅଟେ"</string>
-    <string name="clh_callFailed_invalid_mandatory_information_txt" msgid="9081556111928912676">"ଅବୈଧ ବାଧ୍ୟତାମୂଳକ ସୂଚନା"</string>
-    <string name="clh_callFailed_message_type_non_existent_or_not_implemented_txt" msgid="2641350895896546715">"ମେସେଜ୍‌ର ପ୍ରକାର ଉପଲବ୍ଧ ନାହିଁ କିମ୍ବା ପ୍ରୟୋଗ କରାଯାଇନାହିଁ"</string>
-    <string name="clh_callFailed_message_type_not_compatible_with_protocol_state_txt" msgid="6598180735494982466">"ପ୍ରୋଟୋକଲ୍‌ର ଅବସ୍ଥା ସହିତ ମେସେଜ୍‌ର ପ୍ରକାର କମ୍ପ୍ୟାଟିବଲ୍ ନୁହେଁ"</string>
-    <string name="clh_callFailed_information_element_non_existent_or_not_implemented_txt" msgid="4725610801664706983">"ସୂଚନା ନାହିଁ କିମ୍ବା ଲାଗୁକରାଯାଇନାହିଁ"</string>
-    <string name="clh_callFailed_conditional_IE_error_txt" msgid="9140031076499566143">"ସର୍ତ୍ତ ସହିତ IE ତ୍ରୁଟି"</string>
-    <string name="clh_callFailed_message_not_compatible_with_protocol_state_txt" msgid="6586005128633024271">"ପ୍ରୋଟୋକଲ୍‌ର ଅବସ୍ଥା ସହିତ ମେସେଜ୍ କମ୍ପ୍ୟାଟିବଲ୍ ନୁହେଁ"</string>
-    <string name="clh_callFailed_recovery_on_timer_expiry_txt" msgid="3680765722923600294">"ଟାଇମର୍‌ର ସମାପ୍ତିରେ ପୁନଃପ୍ରାପ୍ତ କରନ୍ତୁ"</string>
-    <string name="clh_callFailed_protocol_Error_unspecified_txt" msgid="8294907817156524790">"ପ୍ରୋଟୋକଲ୍ ତ୍ରୁଟି, ଅନିର୍ଦ୍ଦିଷ୍ଟ"</string>
-    <string name="clh_callFailed_interworking_unspecified_txt" msgid="8838850798491763729">"ଇଣ୍ଟରୱର୍କିଙ୍ଗ, ନିର୍ଦ୍ଦିଷ୍ଟ କରାଯାଇନଥିବା"</string>
-    <string name="labelCallBarring" msgid="3452870940716226978">"କଲ୍‌ ରୋକନ୍ତୁ"</string>
-    <string name="sum_call_barring_enabled" msgid="6804489690436703488">"ଅନ୍ ଅଛି"</string>
-    <string name="sum_call_barring_disabled" msgid="5900772179198857783">"ଅଫ୍ ଅଛି"</string>
-    <string name="call_barring_baoc" msgid="1199843944333106035">"ସମସ୍ତ ଆଉଟ୍‌ଗୋ‌ଇଙ୍ଗ"</string>
-    <string name="call_barring_baoc_enabled" msgid="8112118391869380361">"ସମସ୍ତ ଆଉଟ୍‌ଗୋ‌ଇଙ୍ଗର ଅବରୋଧକୁ ଅକ୍ଷମ କରିବେ?"</string>
-    <string name="call_barring_baoc_disabled" msgid="7806697133004697974">"ସମସ୍ତ ଆଉଟ୍‌ଗୋ‌ଇଙ୍ଗକୁ ଅବରୋଧ କରିବେ?"</string>
-    <string name="call_barring_baoic" msgid="3162154267825211826">"ଆଉଟ୍‌ଗୋ‌ଇଙ୍ଗ ଅନ୍ତରାଷ୍ଟ୍ରୀୟ"</string>
-    <string name="call_barring_baoic_enabled" msgid="2634377543147258105">"ଆଉଟ୍‌ଗୋ‌ଇଙ୍ଗ ଅନ୍ତରାଷ୍ଟ୍ରୀୟ କଲ୍‌ର ଅବରୋଧକୁ ଅକ୍ଷମ କରିବେ?"</string>
-    <string name="call_barring_baoic_disabled" msgid="5817895648306183464">"ଆଉଟ୍‌ଗୋ‌ଇଙ୍ଗ ଅନ୍ତରାଷ୍ଟ୍ରୀୟ କଲ୍‌କୁ ଅବରୋଧ କରିବେ?"</string>
-    <string name="call_barring_baoicr" msgid="8951699885885742076">"ଆଉଟ୍‌ଗୋ‌ଇଙ୍ଗ ଅନ୍ତରାଷ୍ଟ୍ରୀୟ ରୋମିଙ୍ଗ"</string>
-    <string name="call_barring_baoicr_enabled" msgid="2519630715322138317">"ଆଉଟ୍‌ଗୋ‌ଇଙ୍ଗ ଅନ୍ତରାଷ୍ଟ୍ରୀୟ ରୋମିଙ୍ଗର ଅବରୋଧକୁ ଅକ୍ଷମ କରିବେ?"</string>
-    <string name="call_barring_baoicr_disabled" msgid="5831267468931377699">"ଆଉଟ୍‌ଗୋ‌ଇଙ୍ଗ ଅନ୍ତରାଷ୍ଟ୍ରୀୟ ରୋମିଙ୍ଗକୁ ଅବରୋଧ କରିବେ?"</string>
-    <string name="call_barring_baic" msgid="5272726081458339912">"ସମସ୍ତ ଇନ୍‌କମିଙ୍ଗ"</string>
-    <string name="call_barring_baic_enabled" msgid="2457134916223203380">"ସମସ୍ତ ଇନ୍‌କମିଙ୍ଗ କଲ୍‌ର ଅବରୋଧକୁ ଅକ୍ଷମ କରିବେ?"</string>
-    <string name="call_barring_baic_disabled" msgid="6945604947500275636">"ସମସ୍ତ ଇନ୍‌କମିଙ୍ଗ କଲ୍‌କୁ ଅବରୋଧ କରିବେ?"</string>
-    <string name="call_barring_baicr" msgid="5728784220691481693">"ଇନ୍‌କମିଙ୍ଗ ଅନ୍ତରାଷ୍ଟ୍ରୀୟ ରୋମିଙ୍ଗ"</string>
-    <string name="call_barring_baicr_enabled" msgid="6533336994391716127">"ସମସ୍ତ ଇନ୍‌କମିଙ୍ଗ ଅନ୍ତରାଷ୍ଟ୍ରୀୟ ରୋମିଙ୍ଗର ଅବରୋଧକୁ ଅକ୍ଷମ କରିବେ?"</string>
-    <string name="call_barring_baicr_disabled" msgid="6746329853943256566">"ଇନ୍‌କମିଙ୍ଗ ଅନ୍ତରାଷ୍ଟ୍ରୀୟ ରୋମିଙ୍ଗକୁ ଅବରୋଧ କରିବେ?"</string>
-    <string name="call_barring_deactivate_all" msgid="5269788384941003415">"ସମସ୍ତକୁ ନିଷ୍କ୍ରିୟ କରନ୍ତୁ"</string>
-    <string name="call_barring_deactivate_all_description" msgid="4972365443287257704">"ସମସ୍ତ କଲ୍ ରୋକିବା ସେଟିଙ୍ଗକୁ ନିଷ୍କ୍ରିୟ କରନ୍ତୁ"</string>
-    <string name="call_barring_deactivate_success" msgid="8014685598632000936">"ସମସ୍ତ କଲ୍ ରୋକିବା ନିଷ୍କ୍ରିୟ ହୋ‌ଇଯାଇଛି"</string>
-    <string name="call_barring_change_pwd" msgid="6887420609726284232">"ପାସ୍‌ୱର୍ଡ ବଦଳାନ୍ତୁ"</string>
-    <string name="call_barring_change_pwd_description" msgid="5505087790260233953">"କଲ୍ ରୋକିବା ପାସ୍‌ୱର୍ଡକୁ ବଦଳାନ୍ତୁ"</string>
-    <string name="call_barring_change_pwd_description_disabled" msgid="7630770327645349957">"କଲ୍ ରୋକିବା ପାସ୍‌ୱର୍ଡକୁ ବଦଳାଯାଇପାରିବ ନାହିଁ।"</string>
-    <string name="call_barring_pwd_not_match" msgid="6716711689350314525">"ପାସ୍‌ୱର୍ଡ ମେଳ ହେଉ ନାହିଁ"</string>
-    <string name="call_barring_right_pwd_number" msgid="2902966502520410446">"4 ଅଙ୍କ ବିଶିଷ୍ଟ ଗୋଟିଏ ପାସ୍‌ୱର୍ଡ ପ୍ରବେଶ କରନ୍ତୁ"</string>
-    <string name="call_barring_change_pwd_success" msgid="3278310763742760321">"ପାସ୍‌ୱର୍ଡ ବଦଳାଯାଇଛି"</string>
-    <string name="call_barring_old_pwd" msgid="6080515987320238522">"ପୁରୁଣା ପାସ୍‌ୱର୍ଡ"</string>
-    <string name="call_barring_new_pwd" msgid="7048532299150269547">"ନୂଆ ପାସ୍‌ୱର୍ଡ"</string>
-    <string name="call_barring_confirm_pwd" msgid="1947167278466285411">"ପାସ୍‌ୱର୍ଡ ସୁନିଶ୍ଚିତ କରନ୍ତୁ"</string>
-    <string name="messageCallBarring" msgid="2412123220272136055">"ପାସ୍‌ୱର୍ଡ ପ୍ରବେଶ କରନ୍ତୁ"</string>
-    <string name="call_barring_settings" msgid="80766145008623645">"କଲ୍ ରୋକିବା ସେଟିଙ୍ଗ"</string>
-    <string name="call_barring_deactivate_all_no_password" msgid="920902774366557311">"ସମସ୍ତ କଲ୍ ରୋକିବା ସେଟିଙ୍ଗକୁ ନିଷ୍କ୍ରିୟ କରିବେ?"</string>
-    <string name="supp_service_notification_call_deflected" msgid="9195460512875330926">"କଲ୍ ଅନ୍ୟ ପାଖକୁ ଯିବା ବଦଳରେ ନିଜ ପାଖକୁ ଆସିଯାଇଛି।"</string>
-    <string name="supp_service_notification_call_forwarded" msgid="7818548630812124053">"କଲ୍‌କୁ ଫରୱାର୍ଡ କରାଯାଇଛି।"</string>
-    <string name="supp_service_notification_call_waiting" msgid="789154111899572489">"କଲ୍ ଅପେକ୍ଷାରେ ଅଛି।"</string>
-    <string name="supp_service_clir_suppression_rejected" msgid="1581851661582189045">"ନମ୍ବର୍ ଅବରୋଧକୁ ପ୍ରତ୍ୟାଖ୍ୟାନ କରାଗଲା।"</string>
-    <string name="supp_service_closed_user_group_call" msgid="5761735840904590950">"ନିକଟତମ ୟୁଜର୍ ଗ୍ରୁପ୍ ଦ୍ଵାରା କଲ୍‌ରେ ସୀମିତ।"</string>
-    <string name="supp_service_incoming_calls_barred" msgid="3248813207307882723">"ଇନକମିଙ୍ଗ କଲ୍‌କୁ ରୋକାଯାଇଛି।"</string>
-    <string name="supp_service_outgoing_calls_barred" msgid="1962644621292054081">"ଆଉଟ୍‌ଗୋ‌ଇଙ୍ଗ କଲ୍‌କୁ ରୋକାଯାଇଛି।"</string>
-    <string name="supp_service_call_forwarding_active" msgid="1253134771682248735">"କଲ୍ ଫରୱାର୍ଡିଙ୍ଗ ସକ୍ରିୟ ଅଛି।"</string>
-    <string name="supp_service_additional_call_forwarded" msgid="5228624725214727315">"ଅତିରିକ୍ତ କଲ୍‌କୁ ଫରୱାର୍ଡ କରାଗଲା।"</string>
-    <string name="supp_service_additional_ect_connected" msgid="6396964292513707102">"ସ୍ପଷ୍ଟ କଲ୍ ଟ୍ରାନ୍ସଫର୍ ସମ୍ପୂର୍ଣ୍ଣ ହେଲା।"</string>
-    <string name="supp_service_additional_ect_connecting" msgid="5443373059716058480">"ସ୍ପଷ୍ଟ କଲ୍ ଟ୍ରାନ୍ସଫର୍ ଜାରି ଅଛି।"</string>
-    <string name="supp_service_call_on_hold" msgid="1478976782361795422">"କଲ୍ ହୋଲ୍ଡରେ ଅଛି।"</string>
-    <string name="supp_service_call_resumed" msgid="1656475289958070674">"କଲ୍ ପୁଣି ଆରମ୍ଭ ହେଲା।"</string>
-    <string name="supp_service_deflected_call" msgid="138970419873492166">"କଲ୍‌କୁ ଅନ୍ୟକୁ ପଠାଯାଇଥିବା ବେଳେ ତାହା ନିଜପାଖକୁ ଆସିଯାଇଥିଲା।"</string>
-    <string name="supp_service_forwarded_call" msgid="4509980341645679803">"ଫରୱାର୍ଡ କରାଯାଇଥିବା କଲ୍।"</string>
-    <string name="supp_service_conference_call" msgid="4448616364004466832">"କନଫରେନ୍ସ କଲ୍‌ରେ ଯୋଗ ଦେବା।"</string>
-    <string name="supp_service_held_call_released" msgid="2030677825038709779">"ହୋଲ୍ଡ କରାଯାଇଥିବା କଲ୍‌ରୁ ହୋଲ୍ଡ ହଟାଇଦିଆଗଲା।"</string>
-</resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index f646e82..879eac1 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -19,7 +19,7 @@
     <string name="phoneAppLabel" product="tablet" msgid="8576272342240415145">"ਮੋਬਾਈਲ ਡਾਟਾ"</string>
     <string name="phoneAppLabel" product="default" msgid="6790717591729922998">"ਫ਼ੋਨ ਸੇਵਾਵਾਂ"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"ਐਮਰਜੈਂਸੀ ਡਾਇਲਰ"</string>
-    <string name="phoneIconLabel" msgid="2331230813161304895">"ਫ਼ੋਨ"</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>
@@ -30,7 +30,7 @@
     <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="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>
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"ਸੈਟਿੰਗਾਂ ਵਾਪਸ ਲਿਆ ਰਿਹਾ ਹੈ…"</string>
     <string name="response_error" msgid="6674110501330139405">"ਨੈਟਵਰਕ ਤੋਂ ਅਕਲਪਿਤ ਜਵਾਬ"</string>
     <string name="exception_error" msgid="7027667130619518211">"ਨੈੱਟਵਰਕ ਜਾਂ SIM ਕਾਰਡ ਵਿੱਚ ਗੜਬੜ।"</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS ਬੇਨਤੀ ਨੂੰ ਨਿਯਮਿਤ ਕਾਲ ਵਿੱਚ ਬਦਲਿਆ ਗਿਆ"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS ਬੇਨਤੀ ਨੂੰ USSD ਬੇਨਤੀ ਵਿੱਚ ਬਦਲਿਆ ਗਿਆ"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"ਨਵੀਂ SS ਬੇਨਤੀ ਵਿੱਚ ਬਦਲਿਆ ਗਿਆ"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS ਬੇਨਤੀ ਨੂੰ ਵੀਡੀਓ ਕਾਲ ਵਿੱਚ ਬਦਲਿਆ ਗਿਆ"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS ਬੇਨਤੀ DIAL ਬੇਨਤੀ ਵਿੱਚ ਸੰਸ਼ੋਧਿਤ ਕੀਤੀ ਗਈ।"</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS ਬੇਨਤੀ USSD ਬੇਨਤੀ ਵਿੱਚ ਸੰਸ਼ੋਧਿਤ ਕੀਤੀ ਗਈ।"</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS ਬੇਨਤੀ ਨਵੀਂ SS ਵਿੱਚ ਸੰਸ਼ੋਧਿਤ ਕੀਤੀ ਗਈ।"</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS ਬੇਨਤੀ ਨੂੰ ਸੋਧ ਕੇ ਵੀਡੀਓ ਡਾਇਲ ਬੇਨਤੀ ਵਿੱਚ ਬਦਲਿਆ ਗਿਆ।"</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"ਤੁਹਾਡੇ ਫੋਨ ਐਪ ਦੀ ਫਿਕਸਡ ਡਾਇਲਿੰਗ ਨੰਬਰ ਸੈਟਿੰਗ ਚਾਲੂ ਕੀਤੀ ਗਈ ਹੈ। ਸਿੱਟੇ ਵਜੋਂ, ਕੁਝ ਕਾਲ-ਸੰਬੰਧਿਤ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਕੰਮ ਨਹੀਂ ਕਰ ਰਹੀਆਂ ਹਨ।"</string>
     <string name="radio_off_error" msgid="2304459933248513376">"ਇਹਨਾਂ ਸੈਟਿੰਗਾਂ ਨੂੰ ਦੇਖਣ ਤੋਂ ਪਹਿਲਾਂ ਰੇਡੀਓ ਚਾਲੂ ਕਰੋ।"</string>
     <string name="close_dialog" msgid="2365884406356986917">"ਠੀਕ"</string>
@@ -163,7 +163,7 @@
     <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="network_query_error" msgid="8466081377231178298">"ਨੈੱਟਵਰਕ ਨਹੀਂ ਮਿਲ ਸਕੇ। ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</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>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"ਨੈਟਵਰਕ ਓਪਰੇਟਿੰਗ ਮੋਡ ਬਦਲੋ"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਪ੍ਰਕਾਰ"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(ਵਰਜਿਤ)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"ਨੈੱਟਵਰਕ ਚੁਣੋ"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"ਡਿਸਕਨੈਕਟ ਹੋਇਆ"</string>
-    <string name="network_connected" msgid="1288589103624338857">"ਕਨੈਕਟ ਹੋਇਆ"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"ਕਨੈਕਟ ਹੋ ਰਿਹਾ ਹੈ..."</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"ਕਨੈਕਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA ਤਰਜੀਹੀ"</item>
     <item msgid="8442633436636425221">"ਸਿਰਫ਼ GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"ਕਾਲਿੰਗ"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"ਨੈੱਟਵਰਕ"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"ਵਿਸਤ੍ਰਿਤ 4G LTE ਮੋਡ"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"ਉੱਨਤ ਕਾਲਿੰਗ"</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>
@@ -243,13 +238,12 @@
     <string name="roaming" msgid="7894878421600247140">"ਰੋਮਿੰਗ"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"ਰੋਮਿੰਗ ਵੇਲੇ ਡਾਟਾ ਸੇਵਾਵਾਂ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"ਰੋਮਿੰਗ ਵੇਲੇ ਡਾਟਾ ਸੇਵਾਵਾਂ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"ਡਾਟਾ ਰੋਮਿੰਗ ਬੰਦ ਹੈ। ਚਾਲੂ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ।"</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"ਮੋਬਾਈਲ ਡਾਟਾ ਕਨੈਕਸ਼ਨ ਟੁੱਟਿਆ"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"ਤੁਹਾਡੀ ਡਾਟਾ ਕਨੈਕਟੀਵਿਟੀ ਨਸ਼ਟ ਹੋ ਗਈ ਹੈ ਕਿਉਂਕਿ ਤੁਸੀਂ ਆਪਣਾ ਡਾਟਾ ਰੋਮਿੰਗ ਬੰਦ ਨਾਲ ਹੋਮ ਨੈਟਵਰਕ ਛੱਡ ਦਿੱਤਾ ਸੀ।"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"ਤੁਹਾਨੂੰ ਵਾਧੂ ਖਰਚਾ ਦੇਣਾ ਪੈ ਸਕਦਾ ਹੈ"</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"ਕੀਮਤਾਂ ਜਾਣਨ ਲਈ ਆਪਣੇ ਨੈੱਟਵਰਕ ਪ੍ਰਦਾਨਕ ਨੂੰ ਸੰਪਰਕ ਕਰੋ।"</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"ਕੀ ਡਾਟਾ ਰੋਮਿੰਗ ਦੀ ਆਗਿਆ ਦੇਣੀ ਹੈ?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"ਐਪ ਡਾਟਾ ਵਰਤੋਂ"</string>
-    <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_2">%2$s</xliff:g> ਤੱਕ <xliff:g id="ID_1">%1$s</xliff:g> ਮੋਬਾਈਲ ਡਾਟਾ ਵਰਤਿਆ ਗਿਆ"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"ਡਾਟਾ ਵਰਤੋਂ"</string>
+    <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_2">%2$s</xliff:g> ਤੱਕ <xliff:g id="ID_1">%1$s</xliff:g> ਮੋਬਾਈਲ  ਡਾਟਾ  ਵਰਤਿਆ ਗਿਆ"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"ਉੱਨਤ"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"ਕੈਰੀਅਰ"</string>
     <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"ਕੈਰੀਅਰ, ਈ-ਸਿਮ, ਸਿਮ, euicc, ਕੈਰੀਅਰ ਬਦਲੋ, ਕੈਰੀਅਰ ਸ਼ਾਮਲ ਕਰੋ"</string>
@@ -362,7 +356,7 @@
     <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_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>
@@ -473,7 +467,7 @@
     <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_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>
@@ -503,32 +497,20 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"ਕਾਲਾਂ ਹੋਲਡ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾ ਸਕਦੀਆਂ ਹਨ।"</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"ਇੱਕ ਕਾਲ ਕਰਨ ਲਈ ਇੱਕ ਵਾਇਰਲੈਸ ਨੈਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਕਰੋ।"</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"ਇੱਕ ਕਾਲ ਕਰਨ ਲਈ Wi-Fi ਕਾਲਿੰਗ ਯੋਗ ਬਣਾਓ।"</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"ਸੰਕਟਕਾਲੀਨ ਜਾਣਕਾਰੀ"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"ਮਾਲਕ"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"ਜਾਣਕਾਰੀ ਦੇਖਣ ਲਈ ਦੁਬਾਰਾ ਟੈਪ ਕਰੋ"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"ਐਮਰਜੈਂਸੀ ਕਾਲ"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"ਸਿਰਫ਼ ਐਮਰਜੈਂਸੀ ਕਾਲਾਂ"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"ਸੰਕਟਕਾਲੀਨ ਨੰਬਰ"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"ਸੰਕਟਕਾਲੀਨ ਨੰਬਰ"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"<xliff:g id="EMERGENCY_NUMBER">%s</xliff:g> \'ਤੇ ਕਾਲ ਕਰਨ ਲਈ ਦੁਬਾਰਾ ਟੈਪ ਕਰੋ"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"ਰੇਡੀਓ ਚਾਲੂ ਕਰ ਰਿਹਾ ਹੈ…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"ਕੋਈ ਸੇਵਾ ਨਹੀਂ। ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰ ਰਿਹਾ ਹੈ…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"ਕਿਸੇ ਐਮਰਜੈਂਸੀ ਕਾਲ ਦੌਰਾਨ ਜਹਾਜ਼ ਮੋਡ ਵਿੱਚ ਦਾਖਲ ਨਹੀਂ ਹੋਇਆ ਜਾ ਸਕਦਾ।"</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"ਸੰਕਟਕਾਲੀਨ ਕਾਲ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"ਪੁਲਿਸ"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"ਐਂਬੂਲੈਂਸ"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"ਅੱਗ"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"ਡਾਇਲ ਕਰਨ ਲਈ ਕੀ-ਬੋਰਡ ਵਰਤੋ"</string>
-    <string name="onscreenHoldText" msgid="2285258239691145872">"ਰੋਕ ਕੇ ਰੱਖੋ"</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="onscreenAddCallText" msgid="5140385634712287403">"ਕਾਲ ਜੋੜੋ"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"ਕਾਲਾਂ ਸ਼ਾਮਲ ਕਰੋ"</string>
-    <string name="onscreenSwapCallsText" msgid="1602990689244030047">"ਦੂਜੀ ਕਾਲ ਲਓ"</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>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"ਸੰਪਰਕ ਆਯਾਤ ਕਰਨ ਵਿੱਚ ਅਸਫਲ"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"ਸੁਣਨ ਲਈ ਸਹਾਇਕ ਸਾਧਨ"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"ਸੁਣਨ ਲਈ ਸਹਾਇਕ ਸਾਧਨ ਅਨੁਕੂਲਤਾ ਚਾਲੂ ਕਰੋ"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"ਨਾਲ-ਦੀ-ਨਾਲ ਦਿਸਦੀ ਲਿਖਤ (RTT) ਵਾਲੀ ਕਾਲ"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"ਕਿਸੇ ਵੌਇਸ ਕਾਲ ਦੌਰਾਨ ਸੁਨੇਹਾ ਭੇਜਣ ਦਿਓ"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"RTT ਅਜਿਹੇ ਕਾਲ ਕਰਨ ਵਾਲੇ ਲੋਕਾਂ ਦੀ ਸਹਾਇਤਾ ਕਰਦਾ ਹੈ ਜੋ ਬੋਲੇ, ਘੱਟ ਸੁਣਨ ਵਾਲੇ, ਬੋਲਣ ਵਿੱਚ ਅਸਮਰਥ ਜਾਂ ਜਿਨ੍ਹਾਂ ਲਈ ਸਿਰਫ਼ ਅਵਾਜ਼ ਕਾਫ਼ੀ ਨਹੀਂ ਹੁੰਦੀ।&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;ਹੋਰ ਜਾਣੋ&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - RTT ਕਾਲਾਂ ਨੂੰ ਇੱਕ ਪ੍ਰਤਿਲਿਪੀ ਸੁਨੇਹੇ ਵਜੋਂ ਰੱਖਿਅਤ ਕੀਤਾ ਜਾਂਦਾ ਹੈ\n       &lt;br&gt; - RTT ਵੀਡੀਓ ਕਾਲਾਂ ਲਈ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"RTT ਚਾਲੂ ਜਾਂ ਬੰਦ ਕਰੋ"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY ਬੰਦ"</item>
     <item msgid="3971695875449640648">"TTY ਪੂਰਾ"</item>
@@ -606,8 +587,6 @@
     <string name="selectContact" msgid="781975788478987237">"ਸੰਪਰਕ ਚੁਣੋ"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"ਵੌਇਸ ਕਾਲਿੰਗ ਸਮਰਥਿਤ ਨਹੀਂ"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"ਡਾਇਲ ਕਰੋ"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"ਡਾਇਲਪੈਡ ਦਿਖਾਓ"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"ਸੰਕਟਕਾਲੀਨ ਡਾਇਲਪੈਡ"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"ਵਿਜੁਅਲ ਵੌਇਸਮੇਲ"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"PIN ਸੈੱਟ ਕਰੋ"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"PIN ਬਦਲੋ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index bdec572..a48aa92 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -30,7 +30,7 @@
     <string name="mmiCancelled" msgid="2771923949751842276">"Kod MMI został anulowany"</string>
     <string name="cancel" msgid="5044513931633602634">"Anuluj"</string>
     <string name="enter_input" msgid="1810529547726803893">"Komunikat USSD musi mieć od <xliff:g id="MIN_LEN">%d</xliff:g> do <xliff:g id="MAX_LEN">%d</xliff:g> znaków. Spróbuj ponownie."</string>
-    <string name="manageConferenceLabel" msgid="4691922394301969053">"Zarządzaj poł. konferencyjnym"</string>
+    <string name="manageConferenceLabel" msgid="4691922394301969053">"Zarządzaj połączeniem konferencyjnym"</string>
     <string name="ok" msgid="3811371167865772377">"OK"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Głośnik"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Słuchawka telefonu"</string>
@@ -94,7 +94,7 @@
     <string name="labelCW" msgid="6120513814915920200">"Połączenia oczekujące"</string>
     <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">"Przekierowanie połączeń"</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>
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Cofanie ustawień…"</string>
     <string name="response_error" msgid="6674110501330139405">"Nieoczekiwana odpowiedź z sieci."</string>
     <string name="exception_error" msgid="7027667130619518211">"Błąd sieci lub karty SIM."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"Żądanie SS zmienione na zwykłe połączenie"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"Żądanie SS zmienione na żądanie USSD"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Zmieniono na nowe żądanie SS"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"Żądanie SS zmienione na rozmowę wideo"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"Żądanie SS zostało zmienione na żądanie DIAL."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"Żądanie SS zostało zmienione na żądanie USSD."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"Żądanie SS zostało zmienione na nowe żądanie SS."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"Żądanie SS zostało zmienione na żądanie Video DIAL."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"W aplikacji Telefon włączone jest ustawienie Numery ustalone. W rezultacie niektóre funkcje związane z połączeniami nie działają."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Przed wyświetleniem tych ustawień włącz radio."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
@@ -163,7 +163,7 @@
     <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>
-    <string name="network_query_error" msgid="8466081377231178298">"Nie udało się znaleźć sieci. Spróbuj ponownie."</string>
+    <string name="network_query_error" msgid="6828516148953325006">"Podczas wyszukiwania sieci wystąpił błąd."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Rejestrowanie w <xliff:g id="NETWORK">%s</xliff:g>..."</string>
     <string name="not_allowed" msgid="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>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Zmień tryb działania sieci"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Preferowany typ sieci"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(dostęp zabroniony)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Wybierz sieć"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Rozłączono"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Połączono"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Łączę..."</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Nie udało się połączyć"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"Preferowany GSM/WCDMA"</item>
     <item msgid="8442633436636425221">"Tylko GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Połączenia"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Sieć"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Tryb rozszerzonego 4G LTE"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Zaawansowane połączenia"</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łączone przesyłanie danych"</string>
     <string name="data_enable_summary" msgid="2382798156640007971">"Zezwalaj na użycie danych"</string>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"Roaming"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Połącz z usługami transmisji danych podczas roamingu"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Połącz z usługami transmisji danych podczas roamingu"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"Roaming danych jest wyłączony. Kliknij, aby go włączyć."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Utracono połączenie mobilnej transmisji danych"</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="1603164667540144353">"Mogą się z tym wiązać wysokie opłaty."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Aby poznać ceny, skontaktuj się z operatorem komórkowym."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Zezwolić na roaming danych?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Użycie danych przez aplikację"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Użycie danych"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"Wykorzystano <xliff:g id="ID_1">%1$s</xliff:g> mobilnej transmisji danych w okresie <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Zaawansowane"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Operator"</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Nie można zawieszać 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="incall_error_promote_wfc" msgid="106510757624022064">"Włącz Połączenia przez Wi-Fi, aby nawiązać połączenie."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Informacje alarmowe"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Właściciel"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Kliknij ponownie, aby wyświetlić informacje"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Połączenie alarmowe"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Tylko połączenia alarmowe"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Numer alarmowy"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Numery alarmowe"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Kliknij jeszcze raz, aby zadzwonić pod <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Trwa włączanie sieci bezprzewodowych..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Brak sieci. Próbuję ponownie…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Nie możesz włączyć trybu samolotowego podczas połączenia alarmowego."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Połączenia alarmowe niedostępne"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Policja"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Karetka pogotowia"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Straż pożarna"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</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>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Nie udało się zaimportować kontaktu"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Aparaty słuchowe"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Włącz funkcje zgodności z aparatem słuchowym"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Połączenie RTT (wysyłanie SMS-ów w czasie rzeczywistym)"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Zezwalaj na wymianę SMS-ów podczas rozmowy głosowej"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"RTT pomaga osobom niesłyszącym, niedosłyszącym, mającym problemy z mówieniem oraz potrzebującym czegoś więcej oprócz głosu.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Więcej informacji&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; – Połączenia RTT są zapisywane jako transkrypcje\n       &lt;br&gt; – Funkcja RTT jest niedostępna w przypadku rozmów wideo"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"Czat RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Włącz lub wyłącz czat RTT"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY wyłączony"</item>
     <item msgid="3971695875449640648">"TTY pełny"</item>
@@ -610,8 +591,6 @@
     <string name="selectContact" msgid="781975788478987237">"wybierz kontakt"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Połączenia głosowe nie są obsługiwane"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"wybierz numer"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"pokaż klawiaturę"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Klawiatura alarmowa"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Wizualna poczta głosowa"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Ustaw kod PIN"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Zmień PIN"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 56881f0..19cc51c 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"A reverter as definições…"</string>
     <string name="response_error" msgid="6674110501330139405">"Resposta inesperada da rede."</string>
     <string name="exception_error" msgid="7027667130619518211">"Erro do cartão SIM ou da rede."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"O pedido SS foi alterado para uma chamada normal"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"Pedido SS alterado para um novo pedido USSD"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Foi alterado para um novo pedido SS"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"O pedido SS foi alterado para uma videochamada"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"Pedido SS modificado para um pedido DIAL."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"Pedido SS modificado para um pedido USSD."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"Pedido SS modificado para um novo pedido SS."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"Pedido SS modificado para um pedido Video DIAL."</string>
     <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>
@@ -163,7 +163,7 @@
     <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>
-    <string name="network_query_error" msgid="8466081377231178298">"Não foi possível localizar nenhuma rede. Tente novamente."</string>
+    <string name="network_query_error" msgid="6828516148953325006">"Erro ao procurar redes."</string>
     <string name="register_on_network" msgid="9055203954040805084">"A registar em <xliff:g id="NETWORK">%s</xliff:g>..."</string>
     <string name="not_allowed" msgid="5613353860205691579">"O cartão SIM não permite uma ligação a esta rede."</string>
     <string name="connect_later" msgid="2308119155752343975">"De momento, não é possível estabelecer ligação com esta rede. Tente novamente mais tarde."</string>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Alterar o modo de funcionamento em rede"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Tipo de rede preferencial"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(proibida)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Escolher rede"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Desligado"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Ligado"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"A ligar…"</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Não foi possível estabelecer ligação"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA preferido"</item>
     <item msgid="8442633436636425221">"Apenas GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Chamadas"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Rede"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Modo 4G LTE avançado"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Chamadas avançadas"</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="2382798156640007971">"Permitir a utilização de dados"</string>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"Roaming"</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="6843814381576397939">"O roaming de dados está desativado. Toque para ativar."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"A ligação de dados móveis foi perdida"</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="1603164667540144353">"Podem ser cobrados custos significativos."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Consulte o seu fornecedor de serviços de rede para obter preços."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Pretende permitir roaming de dados?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Utilização de dados da aplicação"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Utilização de dados"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> de dados móveis utilizados entre <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Avançadas"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Operador"</string>
@@ -471,7 +465,7 @@
     <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="8253487008234167266">"A marcar novamente"</string>
-    <string name="card_title_conf_call" msgid="1162980346189744501">"Conferência"</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>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Não é possível colocar as chamadas em espera."</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="incall_error_promote_wfc" msgid="106510757624022064">"Ativar as chamadas através de Wi-Fi para fazer uma chamada."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Informações de emergência"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Proprietário"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Toque novamente para ver informações"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Chamada de emergência"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Apenas chamadas de emergência"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Número de emergência"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Números de emergência"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Toque novamente para ligar <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"A ligar o rádio..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Sem serviço. A tentar novamente…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Não é possível entrar em modo de voo durante uma chamada de emergência."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Chamadas de emergência não disponíveis"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Polícia"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Ambulância"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Fogo"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</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>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Falha ao importar o contacto"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Aparelhos auxiliares de audição"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Ativar compatibilidade com aparelho auxiliar de audição"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Chamada com Mensagens de texto em tempo real (RTT)"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Permitir envio de mensagens numa chamada de voz"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"A RTT assiste os autores de chamadas surdos, com deficiências auditivas, dificuldades da fala ou que precisem de mais do que apenas a voz.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Saiba mais&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - As chamadas RTT são guardadas como transcrição de mensagem\n       &lt;br&gt; - A RTT não está disponível para videochamadas"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Ativar ou desativar RTT"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY desativado"</item>
     <item msgid="3971695875449640648">"TTY total"</item>
@@ -606,8 +587,6 @@
     <string name="selectContact" msgid="781975788478987237">"seleccionar contacto"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Chamadas de voz não suportadas"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"marcar"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"mostrar o teclado"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Teclado de emergência"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Correio de voz visual"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Definir PIN"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Alterar PIN"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 39745b1..b4282d2 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -43,10 +43,10 @@
     <string name="pause_prompt_no" msgid="6686238803236884877">"Não"</string>
     <string name="wild_prompt_str" msgid="5543521676355533577">"Substituir caractere curinga por"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Número correio de voz ausente"</string>
-    <string name="no_vm_number_msg" msgid="1300729501030053828">"Não há um número correio de voz armazenado no chip."</string>
+    <string name="no_vm_number_msg" msgid="1300729501030053828">"Não há um número correio de voz armazenado no cartão SIM."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"Adicionar número"</string>
     <string name="voice_number_setting_primary_user_only" msgid="6596604364907022416">"As configurações do correio de voz só podem ser modificadas pelo usuário principal."</string>
-    <string name="puk_unlocked" msgid="2284912838477558454">"O seu chip foi desbloqueado. O seu telefone está desbloqueando…"</string>
+    <string name="puk_unlocked" msgid="2284912838477558454">"O seu cartão SIM foi desbloqueado. O seu telefone está desbloqueando…"</string>
     <string name="label_ndp" msgid="780479633159517250">"PIN de desbloqueio da rede SIM"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Desbloquear"</string>
     <string name="sim_ndp_dismiss_text" msgid="1604823375752456947">"Dispensar"</string>
@@ -126,12 +126,12 @@
     <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 chip."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"Solicitação SS alterada para chamada normal"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"Solicitação SS alterada para solicitação USSD"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Alterada para uma nova solicitação SS"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"Solicitação SS alterada para videochamada"</string>
-    <string name="fdn_check_failure" msgid="18200614306525434">"A configuração \"Números de discagem fixa\" do seu app Telefone está ativada. Por isso, alguns recursos relacionados a chamadas não funcionam."</string>
+    <string name="exception_error" msgid="7027667130619518211">"Erro de rede ou do cartão SIM."</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"Solicitação SS modificada para solicitação DIAL."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"Solicitação SS modificada para solicitação USSD."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"Solicitação SS modificada para nova solicitação SS."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"Solicitação SS modificada para solicitação DIAL de vídeo."</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="7248657275000173526">"Ativar"</string>
@@ -163,9 +163,9 @@
     <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>
-    <string name="network_query_error" msgid="8466081377231178298">"Não foi possível encontrar as redes. Tente novamente."</string>
+    <string name="network_query_error" msgid="6828516148953325006">"Erro ao pesquisar redes."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Registrando na <xliff:g id="NETWORK">%s</xliff:g>…"</string>
-    <string name="not_allowed" msgid="5613353860205691579">"Seu chip não permite uma conexão com esta rede."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"Seu cartão SIM não permite uma conexão com esta rede."</string>
     <string name="connect_later" msgid="2308119155752343975">"Não é possível se conectar a esta rede agora. Tente novamente mais tarde."</string>
     <string name="registration_done" msgid="495135664535876612">"Registrado na rede."</string>
     <string name="already_auto" msgid="6067116884321285507">"Já está na seleção automática."</string>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Alterar o modo de operação de rede"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Tipo de rede preferencial"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(proibido)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Escolher rede"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"A rede está desconectada"</string>
-    <string name="network_connected" msgid="1288589103624338857">"A rede está conectada"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Conectando"</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Não foi possível conectar"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA preferencial"</item>
     <item msgid="8442633436636425221">"Somente GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Chamadas"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Rede"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Modo 4G LTE avançado"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Chamada avançada"</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="2382798156640007971">"Permitir o uso de dados"</string>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"Roaming"</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="6843814381576397939">"O roaming de dados está desativado. Toque para ativá-lo."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"A conexão de dados móveis foi perdida"</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="1603164667540144353">"Pode haver cobranças significativas."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Consulte os preços com seu provedor de rede."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Permitir roaming de dados?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Uso de dados do app"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Uso de dados"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> de dados móveis usados em <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Avançadas"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Operadora"</string>
@@ -386,24 +380,24 @@
     <string name="cdma_activate_device" msgid="3793805892364814518">"Ativar aparelho"</string>
     <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">"Números de discagem fixa"</string>
-    <string name="fdn_with_label" msgid="187084204115493366">"Números de discagem fixa (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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 discagem fixa estão ativados"</string>
-    <string name="fdn_disabled" msgid="4700049736675368279">"Os números de discagem fixa estão desativados"</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>
     <string name="enable_fdn" msgid="3740191529180493851">"Ativar FDN"</string>
     <string name="disable_fdn" msgid="7944020890722540616">"Desativar FDN"</string>
     <string name="change_pin2" msgid="2153563695382176676">"Alterar PIN2"</string>
     <string name="enable_fdn_ok" msgid="7215588870329688132">"Desativar FDN"</string>
     <string name="disable_fdn_ok" msgid="5727046928930740173">"Ativar FDN"</string>
-    <string name="sum_fdn" msgid="1959399454900272878">"Gerenciar números de discagem fixa"</string>
+    <string name="sum_fdn" msgid="1959399454900272878">"Gerenciar números de chamadas fixas"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Alterar PIN para acesso FDN"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Gerenciar lista de números telefônicos"</string>
     <string name="voice_privacy" msgid="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_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>
@@ -429,21 +423,21 @@
     <string name="fdn_invalid_number" msgid="2062898833049589309">"O FDN não foi atualizado porque o número excede 20 dígitos."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"O FDN não foi atualizado. O PIN2 estava incorreto, ou o número de telefone foi rejeitado."</string>
     <string name="fdn_failed" msgid="540018079008319747">"Falha na operação de FDN."</string>
-    <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Lendo a partir do chip…"</string>
-    <string name="simContacts_empty" msgid="5270660846489561932">"Não há contatos no seu chip."</string>
+    <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Lendo a partir do cartão SIM…"</string>
+    <string name="simContacts_empty" msgid="5270660846489561932">"Não há contatos no seu cartão SIM."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Selecione os contatos a serem importados"</string>
-    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Desative o modo avião para importar contatos do chip."</string>
-    <string name="enable_pin" msgid="5422767284133234860">"Ativar/desativar PIN do chip"</string>
-    <string name="change_pin" msgid="9174186126330785343">"Alterar PIN do chip"</string>
-    <string name="enter_pin_text" msgid="8532615714751931951">"PIN do chip:"</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>
     <string name="oldPinLabel" msgid="5287773661246368314">"PIN antigo"</string>
     <string name="newPinLabel" msgid="207488227285336897">"Novo PIN"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"Confirmar novo PIN"</string>
     <string name="badPin" msgid="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="3419351358300716472">"Apagar PIN do chip"</string>
-    <string name="enable_sim_pin" msgid="4845145659651484248">"Definir PIN do chip"</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>
@@ -462,11 +456,11 @@
     <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. Chip bloqueado. Insira o PUK2."</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="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="pin2_error_exception" msgid="1088689322248996699">"Erro de rede ou do chip"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Erro de rede ou do cartão SIM"</string>
     <string name="doneButton" msgid="2859593360997984240">"Concluído"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Número correio de voz"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Discando"</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Não é possível colocar chamadas em espera."</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="incall_error_promote_wfc" msgid="106510757624022064">"Ative as chamadas por Wi-Fi para fazer uma chamada."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Informações de emergência"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Proprietário"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Toque novamente para ver as informações"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Chamada de emergência"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Só chamadas de emergência"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Número de emergência"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Números de emergência"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Toque novamente para ligar para <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Ativando o rádio…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Sem serviço. Tentando novamente..."</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Não é possível usar o modo avião durante uma chamada de emergência."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Chamada de emergência indisponível"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Polícia"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Ambulância"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Incêndio"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</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>
@@ -535,20 +517,19 @@
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Videocham."</string>
     <string name="importSimEntry" msgid="6614358325359736031">"Importar"</string>
     <string name="importAllSimEntries" msgid="1503181169636198673">"Importar tudo"</string>
-    <string name="importingSimContacts" msgid="7374056215462575769">"Importando contatos do chip"</string>
+    <string name="importingSimContacts" msgid="7374056215462575769">"Importando contatos do SIM"</string>
     <string name="importToFDNfromContacts" msgid="2130620207013368580">"Importar dos contatos"</string>
     <string name="singleContactImportedMsg" msgid="6868483416182599206">"Contato importado"</string>
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Falha ao importar contato"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Aparelhos auditivos"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Ativar compatibilidade com aparelhos auditivos"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Chamada com mensagem de texto em tempo real (RTT)"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Permitir o envio de mensagens de texto em uma chamada de voz"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"A RTT ajuda os autores das chamadas com deficiências como surdez, dificuldade de audição ou fala ou que precisam de outros recursos além de voz.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Saiba mais&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; — As chamadas RTT são salvas como transcrições de mensagem\n       &lt;br&gt; — A RTT não está disponível para videochamadas"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Ativar ou desativar RTT"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY desativado"</item>
     <item msgid="3971695875449640648">"TTY completo"</item>
-    <item msgid="1937509904407445684">"TTD HCO"</item>
-    <item msgid="5644925873488772224">"TTD VCO"</item>
+    <item msgid="1937509904407445684">"TTY HCO"</item>
+    <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
     <string name="dtmf_tones_title" msgid="5163153771291340803">"Tons DTMF"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"Definir duração dos tons DTMF"</string>
@@ -606,28 +587,26 @@
     <string name="selectContact" msgid="781975788478987237">"selecionar contato"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Chamada de voz não compatível"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"discar"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"Mostrar teclado"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Teclado de emergência"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Correio de voz visual"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Definir PIN"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Alterar PIN"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Toque e vibração"</string>
-    <string name="pstn_connection_service_label" msgid="1743245930577325900">"Chips integrados"</string>
+    <string name="pstn_connection_service_label" msgid="1743245930577325900">"Cartões SIM integrados"</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 videochamada, 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">"Chip, slot: <xliff:g id="SLOT_ID">%s</xliff:g>"</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="5932176406432044638">"Chamada via Wi-Fi de"</string>
     <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Chamada por Wi-Fi"</string>
     <string name="emergency_action_launch_hint" msgid="4906759256275562674">"Toque novamente para abrir"</string>
     <string name="message_decode_error" msgid="3456481534066924855">"Ocorreu um erro ao decodificar a mensagem."</string>
-    <string name="callFailed_cdma_activation" msgid="2307989779233262164">"Um chip ativou seu serviço e atualizou os recursos de roaming do smartphone."</string>
+    <string name="callFailed_cdma_activation" msgid="2307989779233262164">"Um cartão SIM ativou seu serviço e atualizou os recursos de roaming do smartphone."</string>
     <string name="callFailed_cdma_call_limit" msgid="1556916577171457086">"Há muitas chamadas ativas. Finalize ou mescle as chamadas existentes antes de fazer uma nova."</string>
-    <string name="callFailed_imei_not_accepted" msgid="132192626901238542">"Não é possível conectar-se, insira um chip válido."</string>
+    <string name="callFailed_imei_not_accepted" msgid="132192626901238542">"Não é possível conectar-se, insira um cartão SIM válido."</string>
     <string name="callFailed_wifi_lost" msgid="5968076625137297184">"Conexão Wi-Fi perdida. Chamada encerrada."</string>
     <string name="dialFailed_low_battery" msgid="8760548177088774268">"Não é possível fazer sua videochamada devido à bateria baixa."</string>
     <string name="callFailed_low_battery" msgid="4913582435905872616">"A videochamada foi encerrada devido à bateria baixa."</string>
@@ -659,7 +638,7 @@
     <string name="mobile_data_activate_cancel_button" msgid="1708022171547398765">"CANCELAR"</string>
     <string name="clh_card_title_call_ended_txt" msgid="4072101334811753823">"Chamada encerrada"</string>
     <string name="clh_callFailed_powerOff_txt" msgid="3773036949107147708">"O rádio está desativado"</string>
-    <string name="clh_callFailed_simError_txt" msgid="757650590524277969">"Nenhum chip ou erro do chip"</string>
+    <string name="clh_callFailed_simError_txt" msgid="757650590524277969">"Nenhum cartão SIM ou erro do cartão SIM"</string>
     <string name="clh_incall_error_out_of_service_txt" msgid="3974373603657193827">"A rede móvel não está disponível"</string>
     <string name="clh_callFailed_unassigned_number_txt" msgid="7635996793232604064">"Número não atribuído (sem alocação)"</string>
     <string name="clh_callFailed_no_route_to_destination_txt" msgid="8561586745288855167">"Não há rota para o destino"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index b6908b0..06aaed7 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -20,7 +20,7 @@
     <string name="phoneAppLabel" product="default" msgid="6790717591729922998">"Telefon – Servicii"</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="fdnListLabel" msgid="8630418672279521003">"Listă NAR"</string>
     <string name="unknown" msgid="6878797917991465859">"Necunoscut"</string>
     <string name="private_num" msgid="6713286113000232309">"Număr privat"</string>
     <string name="payphone" msgid="4793877574636445118">"Telefon public"</string>
@@ -90,7 +90,7 @@
     <string name="sum_loading_settings" msgid="1826692909391168620">"Se încarcă setările…"</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Număr ascuns în apelurile de ieșire"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Numărul afișat în apelurile de ieșire"</string>
-    <string name="sum_default_caller_id" msgid="1954518825510901365">"Utilizați setările prestabilite ale operatorului pentru a vă afișa numărul în apelurile efectuate"</string>
+    <string name="sum_default_caller_id" msgid="1954518825510901365">"Utilizați setările prestabilite ale operatorului, pentru a vă afișa numărul în apelurile de ieșire"</string>
     <string name="labelCW" msgid="6120513814915920200">"Apel în așteptare"</string>
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Anunță-mă dacă primesc un apel în timpul unei convorbiri"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Anunță-mă dacă primesc un apel în timpul unei convorbiri"</string>
@@ -127,10 +127,10 @@
     <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="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"Solicitarea SS a fost schimbată cu un apel obișnuit"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"Solicitarea SS a fost schimbată cu o solicitare USSD"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Schimbat cu o solicitare SS nouă"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"Solicitarea SS a fost schimbată cu un apel video"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"Solicitarea SS a fost transformată în solicitare DIAL."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"Solicitarea SS a fost transformată în solicitare USSD."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"Solicitarea SS a fost transformată în solicitare SS nouă."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"Solicitarea SS a fost modificată într-o solicitare DIAL video."</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>
@@ -163,7 +163,7 @@
     <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>
-    <string name="network_query_error" msgid="8466081377231178298">"Nu s-au găsit rețele. Încercați din nou."</string>
+    <string name="network_query_error" msgid="6828516148953325006">"Eroare la căutarea rețelelor."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Se înregistrează pe <xliff:g id="NETWORK">%s</xliff:g>..."</string>
     <string name="not_allowed" msgid="5613353860205691579">"Cardul dvs. SIM nu permite conexiunea la această rețea."</string>
     <string name="connect_later" msgid="2308119155752343975">"Nu se poate efectua conectarea la această rețea chiar acum. Încercați din nou mai târziu."</string>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Schimbați modul de operare a rețelei"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Tipul de rețea preferat"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(interzis)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Alegeți o rețea"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Deconectat"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Conectat"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Se conectează…"</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Nu s-a putut conecta"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA preferată"</item>
     <item msgid="8442633436636425221">"Numai GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Se apelează"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Rețea"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Mod 4G LTE îmbunătățit"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Apelare avansată"</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="2382798156640007971">"Permiteți utilizarea datelor"</string>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"Roaming"</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="6843814381576397939">"Roamingul de date este dezactivat. Atingeți pentru a-l activa."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"S-a pierdut conexiunea de date mobile"</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="1603164667540144353">"Se pot acumula costuri mari."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Consultați furnizorul de rețea în privința prețurilor."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Permiteți roamingul de date?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Date utilizate de aplicație"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Utilizarea datelor"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> de date mobile utilizate în intervalul <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Avansate"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Operator"</string>
@@ -388,16 +382,16 @@
     <string name="carrier_settings_title" msgid="9028166176523012300">"Setări operator"</string>
     <string name="fdn" msgid="7878832555095183202">"Numere apeluri restricționate"</string>
     <string name="fdn_with_label" msgid="187084204115493366">"Numere pentru apeluri restricționate (<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">"Listă FDN (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="manage_fdn_list" msgid="8777755791892122369">"Listă NAR"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"Listă NAR (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Activați NAR"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Numerele cu apelări restricționate sunt activate"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Numerele pentru apeluri restricționate sunt dezactivate"</string>
-    <string name="enable_fdn" msgid="3740191529180493851">"Activați FDN"</string>
+    <string name="enable_fdn" msgid="3740191529180493851">"Activați NAR"</string>
     <string name="disable_fdn" msgid="7944020890722540616">"Dezactivați NAR"</string>
     <string name="change_pin2" msgid="2153563695382176676">"Schimbați codul PIN2"</string>
     <string name="enable_fdn_ok" msgid="7215588870329688132">"Dezactivați NAR"</string>
-    <string name="disable_fdn_ok" msgid="5727046928930740173">"Activați FDN"</string>
+    <string name="disable_fdn_ok" msgid="5727046928930740173">"Activați NAR"</string>
     <string name="sum_fdn" msgid="1959399454900272878">"Gestionați numerele cu apelări restricționate"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Schimbați codul PIN pentru acces la NAR"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Gestionați lista numerelor de telefon"</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Apelurile nu pot fi puse în așteptare."</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="incall_error_promote_wfc" msgid="106510757624022064">"Activați apelarea prin Wi-Fi pentru a iniția un apel."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Informații în caz de urgență"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Proprietar"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Atingeți din nou pentru a vedea informațiile"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Apel de urgență"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Numai apeluri de urgență"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Număr de urgență"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Numere de urgență"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Atingeți din nou pentru a apela <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Se activează semnalul radio..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Fără semnal. Se încearcă din nou..."</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Nu se poate intra în modul avion în timpul unui apel de urgență."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Apelurile de urgență nu sunt disponibile."</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Poliție"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Ambulanță"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Pompieri"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</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>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Persoana de contact nu a fost importată"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Aparate auditive"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Activați compatibilitatea cu aparatele auditive"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Apel de tipul Text în timp real (TTR)"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Permiteți schimbul de mesaje în timpul unui apel vocal"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"TTR oferă asistență apelanților fără auz, cu deficiențe de auz, care au dizabilități de vorbire sau care au nevoie de mai mult decât de voce.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Aflați mai multe&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - Apelurile RTT sunt salvate ca transcrierea unui mesaj\n       &lt;br&gt; - Serviciul TTR nu este disponibil pentru apelurile video."</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Activați sau dezactivați RTT"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY dezactivat"</item>
     <item msgid="3971695875449640648">"TTY integral"</item>
@@ -608,8 +589,6 @@
     <string name="selectContact" msgid="781975788478987237">"selectarea unei persoane din agendă"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Apelarea vocală nu este acceptată"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"apelare"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"afișați tastatura numerică"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Tastatură pentru apeluri de urgență"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Mesagerie vocală vizuală"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Setați codul PIN"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Schimbați codul PIN"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index d1bef4b..55e7d8b 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -102,21 +102,21 @@
     <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="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="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="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="2684474391807469832">"Отключено"</string>
+    <string name="sum_cfnrc_disabled" msgid="2684474391807469832">"Выкл."</string>
     <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Ваш оператор не позволяет отключать переадресацию вызовов, если телефон находится вне зоны доступа."</string>
     <string name="updating_title" msgid="6146755386174019046">"Настройки вызовов"</string>
     <string name="call_settings_admin_user_only" msgid="4526094783818216374">"Настройки вызовов может изменить только основной пользователь"</string>
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Возврат к предыдущим настройкам…"</string>
     <string name="response_error" msgid="6674110501330139405">"Неожиданный отклик сети."</string>
     <string name="exception_error" msgid="7027667130619518211">"Ошибка сети или SIM-карты."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS-запрос преобразован в обычный вызов"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS-запрос преобразован в USSD-запрос"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Преобразовано в SS-запрос"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS-запрос преобразован в видеовызов"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS-запрос преобразован в DIAL-запрос."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS-запрос преобразован в USSD-запрос."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS-запрос преобразован в новый SS-запрос."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS-запрос преобразован в DIAL-запрос (видео)."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"Разрешенные номера в приложении \"Телефон\" включены. В результате некоторые функции вызовов недоступны."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Чтобы увидеть настройки, включите приемопередатчик."</string>
     <string name="close_dialog" msgid="2365884406356986917">"ОК"</string>
@@ -163,7 +163,7 @@
     <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="network_query_error" msgid="8466081377231178298">"Не удалось найти сети. Повторите попытку."</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>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Изменить режим работы сети"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Тип сети"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(доступ запрещен)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Выбрать сеть"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Подключения нет"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Подключено"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Подключение…"</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Не удалось подключиться к сети"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA (предпочтительный режим)"</item>
     <item msgid="8442633436636425221">"Только GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Вызовы"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Сеть"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Режим 4G LTE"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Расширенный вызов"</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>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"Роуминг"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Подключаться к службам передачи данных в роуминге"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Подключаться к службам передачи данных в роуминге"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"Интернет-роуминг выключен. Нажмите, чтобы его включить."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Отсутствует подключение к мобильной сети"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Мобильный Интернет в роуминге отключен. Вы можете включить интернет-роуминг в настройках."</string>
     <string name="roaming_warning" msgid="1603164667540144353">"Возможны значительные расходы."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Информацию о тарифах вы можете получить у интернет-провайдера."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Разрешить интернет-роуминг?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Трафик приложения"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Передача данных"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"Объем мобильного трафика за период <xliff:g id="ID_2">%2$s</xliff:g>: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Дополнительные настройки"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Оператор"</string>
@@ -505,24 +499,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Удержание невозможно."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Чтобы позвонить, подключитесь к Wi-Fi."</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"Чтобы позвонить, включите звонки через Wi-Fi."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Данные для экстренных случаев"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Владелец"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Чтобы посмотреть информацию, нажмите ещё раз"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Экстренный вызов"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Только экстренные вызовы"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Экстренная служба"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Экстренные службы"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Нажмите ещё раз, чтобы позвонить по номеру <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Включение радио…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Нет сигнала. Повторная попытка…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Во время экстренного вызова перейти в режим полета нельзя"</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Экстренные вызовы недоступны"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Полиция"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Скорая помощь"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Пожарная служба"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Используйте клавиатуру для набора номера"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Удерживать"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Завершить"</string>
@@ -543,9 +525,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Не удалось импортировать контакт"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Слуховые аппараты"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Включить поддержку слухового аппарата"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Вызов RTT"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Разрешить обмен сообщениями во время голосового вызова"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"Функция RTT предназначена для пользователей с нарушениями слуха и речи.&lt;br&gt;&lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Подробнее…&lt;/a&gt;\n&lt;br&gt;&lt;br&gt;– Вызовы RTT сохраняются как транскрипции.\n&lt;br&gt;– Функция RTT недоступна при видеовызове."</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"Текст в режиме реального времени"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Включение и выключение текста в режиме реального времени"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"Телетайп выключен"</item>
     <item msgid="3971695875449640648">"Полнофункциональный телетайп"</item>
@@ -612,8 +593,6 @@
     <string name="selectContact" msgid="781975788478987237">"выбрать контакт"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Голосовые вызовы не поддерживаются"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"набор номера"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"показать кнопки"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Экстренные вызовы"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Визуальная голосовая почта"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Установка PIN-кода"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Изменение PIN-кода"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 60d3109..9d55d34 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"සැකසුම් ප්‍රතිවර්තනය කරමින්…"</string>
     <string name="response_error" msgid="6674110501330139405">"ජාලයෙන් බලාපොරොත්තු නොවූ ප්‍රතිචාරයක්."</string>
     <string name="exception_error" msgid="7027667130619518211">"ජාලයේ හෝ SIM කාඩ්පතෙහි දෝෂයක්."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS ඉල්ලීම සාමාන්‍ය ඇමතුමට වෙනස් කරන ලදී"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS ඉල්ලීම USSD ඉල්ලීමට වෙනස් කරන ලදී"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"නව SS ඉල්ලීමට වෙනස් කරන ලදී"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS ඉල්ලීම වීඩියෝ ඇමතුමට වෙනස් කරන ලදී"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS ඉල්ලීම DIAL ඉල්ලීම වෙත විකරණය කරන ලදී."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS ඉල්ලීම USSD ඉල්ලීම වෙත විකරණය කරන ලදී."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS ඉල්ලීම නව SS ඉල්ලීම වෙත විකරණය කරන ලදී."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SSD ඉල්ලීම Video DIAL ඉල්ලීම ලෙස වෙනස් කර ඇත."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"ඔබගේ දුරකතනයේ යෙදුමෙහි ස්ථිර ඇමතුම් අංක සක්‍රීයයි. ප්‍රතිඑලයක් ලෙස, සමහර ඇමතුම් හා සම්බන්ධ විශේෂාංග ක්‍රියා නොකරයි."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"මෙම සැකසුම් බැලීමට පෙර රේඩියෝව ක්‍රියා කරන්න."</string>
     <string name="close_dialog" msgid="2365884406356986917">"හරි"</string>
@@ -163,7 +163,7 @@
     <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="network_query_error" msgid="8466081377231178298">"ජාල සොයා ගත නොහැකි විය. නැවත උත්සාහ කරන්න."</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>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"ජාල මෙහෙයුම් ආකාරය වෙනස් කරන්න"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"ප්‍රියකරන ජාල වර්ගය"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(තහනම්)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"ජාලය තෝරන්න"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"විසන්ධි විය"</string>
-    <string name="network_connected" msgid="1288589103624338857">"සම්බන්ධිතයි"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"සම්බන්ධ වෙමින්…"</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"සම්බන්ධ වීමට නොහැකි විය"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA කැමතියි"</item>
     <item msgid="8442633436636425221">"GSM පමණි"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"අමතමින්"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"ජාලය"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"දියුණු කරන ලද 4G LTE මෝඩය"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"උසස් ඇමතුම්"</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>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"රෝමිං"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"රෝමින් අතරතුර දත්ත සේවා වෙත සම්බන්ධ වන්න"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"රෝමින් අතරතුර දත්ත සේවා වෙත සම්බන්ධ වන්න"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"දත්ත රෝමිං ක්‍රියාවිරහිත කර ඇත. ක්‍රියාත්මක කිරීමට තට්ටු කරන්න."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"ජංගම දත්ත සම්බන්ධතාව නැතිවීම"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"ඔබගේ නිවාස ජාලය ඔබ හැර ගිය විට දත්ත රෝමින් අක්‍රිය වන බැවින් දත්ත සම්බන්ධතාවය ඔබට නැති වෙයි"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"ඔබ සැලකිය යුතු ගාස්තු ඇති විය හැකිය."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"මිල ගණන් සඳහා ඔබගේ ජාල සැපයුම්කරු සමඟ පරීක්ෂා කරන්න."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"දත්ත රෝමින් සඳහා අවසර දෙන්න ද?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"යෙදුම් දත්ත භාවිතය"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"දත්ත භාවිතය"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_2">%2$s</xliff:g> <xliff:g id="ID_1">%1$s</xliff:g>ක ජංගම දත්ත භාවිත කරන ලදී"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"උසස්"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"වාහකය"</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"ඇමතුම් රඳවා තැබීමට නොහැකිය."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"ඇමතුමක් ගැනීමට රැහැන් රහිත ජාලයක් වෙත සම්බන්ධ වෙන්න."</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"ඇමතුමක් කිරීමට Wi-Fi ඇමතීම සබල කරන්න."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"හදිසි අවස්ථා තොරතුරු"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"හිමිකරු"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"තොරතුරු බැලීම සඳහා නැවත තට්ටු කරන්න"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"හදිසි ඇමතුම"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"හදිසි ඇමතුම් පමණි"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"හදිසි ඇමතුම් අංකය"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"හදිසි අවස්ථා අංක"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"<xliff:g id="EMERGENCY_NUMBER">%s</xliff:g> අැමතීමට නැවත තට්ටු කරන්න"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"රේඩියෝව ආරම්භ කරමින්…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"සේවා නැත. නැවත උත්සාහ කරන්න…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"හදිසි අවස්ථා ඇමතුමක් අතරතුර ගුවන් යානා ප්‍රකාරය ඇතුළු කළ නොහැකිය."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"හදිසි අවස්ථා ඇමතුම ලබා ගත නොහැකිය"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"පොලීසිය"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"ගිලන් රථය"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"ගින්න"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"ඇමතීමට කිරීමට යතුරු පුවරුව භාවිතා කරන්න"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"රඳවා සිටින්න"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"අවසානයි"</string>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"සම්බන්ධතාවය ආයාත කිරීමට නොහැකි විය"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"ඇසීමේ සහාය"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"ඇසීමේ සහාය සඳහා ගැලපීම සක්‍රිය කරන්න"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"තථ්‍ය-කාල පෙළ (RTT) ඇමතුම"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"හඬ ඇමතුමක් තුළ පණිවිඩ යැවීමට ඉඩ දෙන්න"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"බිහිරි, ශ්‍රවණ දුර්වලතා, කථන ආබාධයක් හෝ හඬට වඩා වැඩි දෙයක් අවශ්‍ය අමතන්නන්ට RTT සහාය දක්වයි.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;තව දැන ගන්න&lt;/a&gt;\n &lt;br&gt;&lt;br&gt; - RTT ඇමතුම් පණිවිඩ පිටපතත් ලෙස සුරැකේ \n &lt;br&gt; - වීඩියෝ ඇමතුම් සඳහා RTT ලබා ගත නොහැකිය"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"RTT ක්‍රියාත්මක හෝ ක්‍රියාවිරහිත කරන්න"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY අක්‍රියයි"</item>
     <item msgid="3971695875449640648">"TTY පුර්ණයි"</item>
@@ -606,8 +587,6 @@
     <string name="selectContact" msgid="781975788478987237">"සම්බන්ධතාවය තෝරාගන්න"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"හඬ ඇමතීම සඳහා සහාය නොදක්වයි"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"අමතන්න"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"ඇමතුම් පෑඩය පෙන්වන්න"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"හදිසි ඇමතුම් පෑඩය"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"දෘශ්‍ය හඬ තැපෑල"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"PIN අංකය සකසන්න"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"PIN අංකය වෙනස් කරන්න"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index baebc00..ae06676 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Prebieha vrátenie predchádzajúcich nastavení…"</string>
     <string name="response_error" msgid="6674110501330139405">"Neočakávaná odpoveď siete."</string>
     <string name="exception_error" msgid="7027667130619518211">"Došlo k chybe siete alebo SIM karty."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"Žiadosť SS bola zmenená na bežný hovor"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"Žiadosť SS bola zmenená žiadosť USSD"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Zmenené na novú žiadosť SS"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"Žiadosť SS bola zmenená na videohovor"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"Žiadosť SS bola upravená na žiadosť DIAL."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"Žiadosť SS bola upravená na žiadosť USSD."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"Žiadosť SS bola upravená na novú žiadosť SS."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"Žiadosť SS bola upravená na žiadosť Video DIAL."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"V aplikácii Telefón je zapnutý režim povolených čísel. 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>
@@ -163,7 +163,7 @@
     <string name="label_available" msgid="1181658289009300430">"Dostupné siete"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Hľadá sa…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Nebola nájdená žiadna sieť."</string>
-    <string name="network_query_error" msgid="8466081377231178298">"Nepodarilo sa nájsť siete. Skúste to znova."</string>
+    <string name="network_query_error" msgid="6828516148953325006">"Pri vyhľadávaní sietí došlo k chybe."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Prebieha registrácia v sieti <xliff:g id="NETWORK">%s</xliff:g>..."</string>
     <string name="not_allowed" msgid="5613353860205691579">"Vaša SIM karta nepovoľuje pripojenie k tejto sieti."</string>
     <string name="connect_later" msgid="2308119155752343975">"V tejto chvíli sa nedá pripojiť k sieti. Skúste to znova neskôr."</string>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Zmeniť prevádzkový režim siete"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Preferovaný typ siete"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(zakázané)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Vybrať sieť"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Odpojené"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Pripojené"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Pripája sa..."</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Nepodarilo sa pripojiť"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA – preferované"</item>
     <item msgid="8442633436636425221">"Iba GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Volanie"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Sieť"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Zlepšený režim 4G LTE"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Rozšírené volanie"</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>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"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="6843814381576397939">"Dátový roaming je vypnutý. Klepnutím ho zapnete."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Mobilné dátové pripojenie bolo stratené"</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_check_price_warning" msgid="7497570906830902550">"Informácie o cenách získate od svojho poskytovateľa siete."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Povoliť dátový roaming?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Spotreba dát aplikácií"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Spotreba dát"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"Spotreba mobilných dát za obdobie <xliff:g id="ID_2">%2$s</xliff:g> je <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Rozšírené"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Operátor"</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Hovory nie je možné podržať."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Ak chcete volať, pripojte sa k bezdrôtovej sieti"</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"Na uskutočnenie hovoru povoľte volanie cez Wi‑Fi."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Tiesňové informácie"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Vlastník"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Informácie si zobrazíte opätovným klepnutím"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Tiesňové volanie"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Len tiesňové volania"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Číslo tiesňovej linky"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Čísla tiesňovej linky"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Opätovným klepnutím zavoláte <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Prebieha zapínanie rádia..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Žiadna služba. Prebieha opätovný pokus…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Počas tiesňového volania sa nedá zapnúť režim v lietadle."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Tiesňové volania nie sú k dispozícii"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Polícia"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Záchranka"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Hasiči"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</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>
@@ -539,11 +521,10 @@
     <string name="importToFDNfromContacts" msgid="2130620207013368580">"Import z kontaktov"</string>
     <string name="singleContactImportedMsg" msgid="6868483416182599206">"Kontakt bol importovaný"</string>
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Kontakt sa nepodarilo importovať"</string>
-    <string name="hac_mode_title" msgid="8740268574688743289">"Načúvadlá"</string>
-    <string name="hac_mode_summary" msgid="6833851160514929341">"Zapnúť kompatibilitu s načúvadlom"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Posielanie okamžitého textu (RTT) počas hovorov"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Povoliť posielanie správ počas hlasového hovoru"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"Okamžitý text pomáha volajúcim, ktorí nepočujú, majú problémy so sluchom, rečovú poruchu alebo potrebujú viac ako samotný hlas.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Ďalšie informácie&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; – Okamžitý text poslaný počas hovoru sa uloží ako prepis správ\n       &lt;br&gt; – Okamžitý text nie je k dispozícii počas videohovorov"</string>
+    <string name="hac_mode_title" msgid="8740268574688743289">"Načúvacie pomôcky"</string>
+    <string name="hac_mode_summary" msgid="6833851160514929341">"Zapnúť režim kompatibility s načúvacou pomôckou"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Zapnúť alebo vypnúť RTT"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"Textový telefón vypnutý"</item>
     <item msgid="3971695875449640648">"Úplný textový telefón"</item>
@@ -610,8 +591,6 @@
     <string name="selectContact" msgid="781975788478987237">"vybrať kontakt"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Hlasové volanie nie je podporované"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"vytáčanie"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"zobraziť číselnú klávesnicu"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Číselná klávesnica na tiesňové volanie"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Vizuálna hlasová schránka"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Nastavenie kódu PIN"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Zmena kódu PIN"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 030f8ac..41f59d0 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Povrnitev nastavitev ..."</string>
     <string name="response_error" msgid="6674110501330139405">"Nepričakovan odgovor iz omrežja."</string>
     <string name="exception_error" msgid="7027667130619518211">"Napaka omrežja ali kartice SIM."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"Zahteva SS je spremenjena v navaden klic"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"Zahteva SS je spremenjena v zahtevo USSD"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Spremenjeno v novo zahtevo SS"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"Zahteva SS je spremenjena v videoklic"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"Zahteva SS je spremenjena v zahtevo DIAL."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"Zahteva SS je spremenjena v zahtevo USSD."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"Zahteva SS je spremenjena v novo zahtevo SS."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"Zahteva SS je spremenjena v zahtevo Video DIAL."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"Nastavitev predpisanih številk aplikacije telefona je vklopljena. Zato nekatere funkcije, povezane s klici, ne delujejo."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Pred ogledom teh nastavitev vklopite radijski oddajnik."</string>
     <string name="close_dialog" msgid="2365884406356986917">"V redu"</string>
@@ -163,7 +163,7 @@
     <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>
-    <string name="network_query_error" msgid="8466081377231178298">"Omrežij ni bilo mogoče najti. Poskusite znova."</string>
+    <string name="network_query_error" msgid="6828516148953325006">"Napaka pri iskanju omrežij."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Registriranje v <xliff:g id="NETWORK">%s</xliff:g> ..."</string>
     <string name="not_allowed" msgid="5613353860205691579">"Kartica SIM ne dovoljuje povezave s tem omrežjem."</string>
     <string name="connect_later" msgid="2308119155752343975">"S tem omrežjem trenutno ni mogoče vzpostaviti povezave. Poskusite znova pozneje."</string>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Sprememba načina delovanja omrežja"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Prednostna vrsta omrežja"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(prepovedano)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Izberi omrežje"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Povezava je prekinjena"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Povezano"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Povezovanje …"</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Povezave ni bilo mogoče vzpostaviti"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"Prednostno GSM/WCDMA"</item>
     <item msgid="8442633436636425221">"Samo GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Klicanje"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Omrežje"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Izboljšan način 4G LTE"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Napredno klicanje"</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="2382798156640007971">"Dovoli prenos podatkov"</string>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"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="6843814381576397939">"Podatkovno gostovanje je izklopljeno. Dotaknite se, da ga vklopite."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Mobilna podatkovna povezava je prekinjena"</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="1603164667540144353">"Stroški utegnejo biti veliki."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Preverite cene pri operaterju omrežja."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Želite dovoliti podatkovno gostovanje?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Prenos podatkov aplikacije"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Prenesena količina podatkov"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"V obdobju <xliff:g id="ID_2">%2$s</xliff:g> je bilo v mobilnem omrežju prenesenih <xliff:g id="ID_1">%1$s</xliff:g> podatkov"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Dodatno"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Operater"</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Klicev ni mogoče zadržati."</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="incall_error_promote_wfc" msgid="106510757624022064">"Če želite opraviti klic, omogočite klicanja prek Wi-Fi-ja."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Informacije za nujne primere"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Lastnik"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Znova se dotaknite, da si ogledate podatke"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Klic v sili"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Le klici v sili"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Številka za klic v sili"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Številke za klic v sili"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Znova se dotaknite, da pokličete <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Vklop radia …"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Ni signala. Vnovičen poskus …"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Načina za letalo ni mogoče vklopiti med klicem v sili."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Klicanje v sili ni na voljo"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Policija"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Nujna medicinska pomoč"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Gasilci"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</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>
@@ -540,10 +522,9 @@
     <string name="singleContactImportedMsg" msgid="6868483416182599206">"Uvožen je bil stik"</string>
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Uvoz stika ni uspel"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Slušni pripomočki"</string>
-    <string name="hac_mode_summary" msgid="6833851160514929341">"Vključi združljivost s slušnimi pripomočki"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Klic s sprotnim besedilom (RTT)"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Dovoli izmenjavo sporočil v glasovnem klicu"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"Funkcija RTT pomaga klicateljem, ki so gluhi, naglušni, imajo govorno motnjo ali potrebujejo več kot samo glas.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Več o tem&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; – Klici RTT se shranijo kot prepis sporočila\n       &lt;br&gt; – RTT ni na voljo pri videoklicih"</string>
+    <string name="hac_mode_summary" msgid="6833851160514929341">"Vključi združljivost s slušnim pripomočkom"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Vklop ali izklop sporočil RTT"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"Način TTY izklopljen"</item>
     <item msgid="3971695875449640648">"TTY poln"</item>
@@ -610,8 +591,6 @@
     <string name="selectContact" msgid="781975788478987237">"izbira stika"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Glasovno klicanje ni podprto"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"klicanje"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"prikaži številčnico"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Tipkovnica za klic v sili"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Vizualno sporočilo v odzivniku"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Nastavitev kode PIN"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Sprememba kode PIN"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 79fcba6..fa024c2 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Po rikthen cilësimet…"</string>
     <string name="response_error" msgid="6674110501330139405">"Përgjigje e papritur nga rrjeti."</string>
     <string name="exception_error" msgid="7027667130619518211">"Gabim në rrjet ose në kartën SIM."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"Kërkesa SS u ndryshua në telefonatë të zakonshme"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"Kërkesa SS u ndryshua në kërkesë USSD"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"U ndryshua në kërkesë të re SS"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"Kërkesa SS u ndryshua në telefonatë me video"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"Kërkesa SS është modifikuar në kërkesën DIAL."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"Kërkesa SS është modifikuar në kërkesën USSD."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"Kërkesa SS është modifikuar në kërkesën e re SS."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"Kërkesa SS është modifikuar në kërkesën Video DIAL."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"Cilësimi për numrat me telefonim të përzgjedhur të aplikacionit të telefonit tënd u aktivizua. Si rezultat, disa funksione që kanë të bëjnë me telefonimin nuk funksionojnë."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Aktivizo radion para se të shohësh këto cilësime."</string>
     <string name="close_dialog" msgid="2365884406356986917">"Në rregull"</string>
@@ -163,7 +163,7 @@
     <string name="label_available" msgid="1181658289009300430">"Rrjete të arritshme"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Po kërkon..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Nuk u gjetën rrjete."</string>
-    <string name="network_query_error" msgid="8466081377231178298">"Rrjetet nuk mund të gjendeshin. Provo përsëri."</string>
+    <string name="network_query_error" msgid="6828516148953325006">"Gabim gjatë kërkimit për rrjete."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Po regjistron në <xliff:g id="NETWORK">%s</xliff:g>…"</string>
     <string name="not_allowed" msgid="5613353860205691579">"Karta SIM nuk lejon lidhje me këtë rrjet."</string>
     <string name="connect_later" msgid="2308119155752343975">"Nuk mund të lidhet me këtë rrjet tani. Provo sërish më vonë."</string>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Ndrysho modalitetin e operimit të rrjetit"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Lloji i preferuar i rrjetit"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(ndalohet)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Zgjidh rrjetin"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Shkëputur"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Lidhur"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Po lidhet..."</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Nuk mund të lidhej"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA i preferuar"</item>
     <item msgid="8442633436636425221">"Vetëm GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Po telefonon"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Rrjeti"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Modaliteti i përparuar 4G LTE"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Telefonatë e avancuar"</string>
     <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Përdor shërbimet LTE për të përmirësuar komunikimet zanore dhe të tjera (rekomandohet)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Të dhënat janë të aktivizuara"</string>
     <string name="data_enable_summary" msgid="2382798156640007971">"Lejo përdorimin e të dhënave"</string>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"Roaming"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Lidhu me shërbimet e të dhënave kur je në roaming"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Lidhu me shërbimin e të dhënave kur je në roaming"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"Roaming për të dhënat është çaktivizuar. Trokit për ta aktivizuar."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Lidhja e të dhënave celulare ka humbur"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"E humbët lidhjen e të dhënave sepse sapo latë rrjetin e vendit tuaj dhe tani jeni me të dhëna roaming-u, të cilat ende nuk janë aktivizuar."</string>
     <string name="roaming_warning" msgid="1603164667540144353">"Mund të shkaktohen tarifa të larta."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Kontakto me ofruesin e rrjetit për çmimin."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Të lejohet përdorimi i të dhënave kur je në roaming?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Përdorimi i të dhënave të aplikacioneve"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Përdorimi i të dhënave"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> të dhëna celulare të përdorura mes datave <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Të përparuara"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Operatori celular"</string>
@@ -392,7 +386,7 @@
     <string name="fdn_list_with_label" msgid="7437232552210469217">"Lista e FDN-së (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Aktivizimi i FDN-së"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Numrat me telefonim të përzgjedhur u aktivizuan"</string>
-    <string name="fdn_disabled" msgid="4700049736675368279">"Numrat me telefonim të përzgjedhur janë të çaktivizuar"</string>
+    <string name="fdn_disabled" msgid="4700049736675368279">"Numrat me telefonim të përzgjedhur u çaktivizuan"</string>
     <string name="enable_fdn" msgid="3740191529180493851">"Aktivizo FDN-në"</string>
     <string name="disable_fdn" msgid="7944020890722540616">"Çaktivizo FDN-në"</string>
     <string name="change_pin2" msgid="2153563695382176676">"Ndrysho PIN2-shin"</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Telefonatat nuk mund të mbahen në pritje."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Lidhu me një rrjet me valë për të bërë një telefonatë."</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"Aktivizo telefonatat nëpërmjet rrjetit Wi-Fi për të bërë një telefonatë."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Informacioni i urgjencës"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Zotëruesi"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Trokit përsëri për të shikuar informacionet"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Telefonata e urgjencës"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Vetëm telefonata urgjente"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Numri i urgjencës"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Numrat e urgjencës"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Trokit përsëri për të telefonuar <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Po aktivizon radion…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Nuk ka shërbim. Po provon sërish…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Nuk mund të hysh në modalitetin e aeroplanit gjatë telefonatave të urgjencës."</string>
     <string name="dial_emergency_error" msgid="1509085166367420355">"Nuk mund të telefonohet. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nuk është numër urgjence."</string>
     <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Nuk mund të telefonohet. Formo një numër urgjence."</string>
-    <string name="dial_emergency_calling_not_available" msgid="5675557523782491826">"Telefonatat e urgjencës nuk ofrohen"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Policia"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Ambulancë"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Zjarr"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Përdor tastierën për të formuar numrin"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Në pritje"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Përfundo"</string>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Dështoi në importimin e kontaktit"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Aparatet e dëgjimit"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Aktivizo përputhshmërinë e aparateve të dëgjimit"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Telefonata me tekst në kohë reale (RTT)"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Lejo mesazhet brenda një telefonate zanore"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"Funksioni RTT ndihmon telefonuesit që janë të shurdhër, kanë vështirësi me dëgjimin, kanë një aftësi të kufizuar të të folurit ose që kanë nevojë për më shumë se thjesht zërin.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Mëso më shumë&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - Telefonatat RTT ruhen si një transkript mesazhi\n       &lt;br&gt; - Funksioni RTT nuk ofrohet për telefonatat me video"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Aktivizo ose çaktivizo RTT"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY i çaktivizuar"</item>
     <item msgid="3971695875449640648">"TTY i plotë"</item>
@@ -606,8 +587,6 @@
     <string name="selectContact" msgid="781975788478987237">"përzgjidh kontaktin"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Telefonata zanore nuk mbështetet"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"formo numrin"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"shfaq bllokun e formimit të numrit"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Blloku i formimit të numrit të urgjencës"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Posta zanore vizuale"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Konfiguro kodin PIN"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Ndrysho kodin PIN"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index efaa21f..f645018 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -58,7 +58,7 @@
     <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="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>
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Враћање подешавања…"</string>
     <string name="response_error" msgid="6674110501330139405">"Неочекивани одговор мреже."</string>
     <string name="exception_error" msgid="7027667130619518211">"Грешка на мрежи или SIM картици."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS захтев је промењен у обичан позив"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS захтев је промењен у USSD захтев"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Промењено је у нови SS захтев"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS захтев је промењен у видео позив"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS захтев је промењен у DIAL захтев."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS захтев је промењен у USSD захтев."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS захтев је промењен у нови SS захтев."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS захтев је промењен у Video DIAL захтев."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"Подешавање Бројева за фиксно бирање апликације Телефон је укључено. Због тога неке функције у вези са позивима не функционишу."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Укључите радио пре прегледања ових подешавања."</string>
     <string name="close_dialog" msgid="2365884406356986917">"Потврди"</string>
@@ -163,7 +163,7 @@
     <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="network_query_error" msgid="8466081377231178298">"Не можемо да пронађемо мреже. Пробајте поново."</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>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Промена режима рада мреже"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Жељени тип мреже"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(забрањено)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Изаберите мрежу"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Веза је прекинута"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Повезани сте"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Повезује се..."</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Повезивање није успело"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA има предност"</item>
     <item msgid="8442633436636425221">"Само GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Позивање"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Мрежа"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Побољшани 4G LTE режим"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Напредно позивање"</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>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"Роминг"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Повезивање са услугом за податке током роминга"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Повезивање са услугом за податке током роминга"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"Пренос података у ромингу је искључен. Додирните да бисте га укључили."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Изгубили сте везу за пренос мобилних података"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Веза за пренос података је прекинута зато што сте напустили кућну мрежу са искљученим преносом података у ромингу."</string>
     <string name="roaming_warning" msgid="1603164667540144353">"Могу да настану значајни трошкови."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Цене проверите код мобилног оператера."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Дозвољавате пренос података у ромингу?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Потрошња података апликације"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Употреба података"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"Потрошили сте <xliff:g id="ID_1">%1$s</xliff:g> мобилних података у периоду <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Напредно"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Мобилни оператер"</string>
@@ -399,7 +393,7 @@
     <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_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>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Није могуће стављати позиве на чекање."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Повежите се на бежичну мрежу да бисте упутили позив."</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"Омогућите позивање преко Wi-Fi-ја да бисте упутили позив."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Информације за хитне случајеве"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Власник"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Додирните поново да бисте видели информације"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Хитан позив"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Само хитни позиви"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Број хитне службе"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Бројеви телефона хитних служби"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Додирните поново да бисте позвали <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Укључивање радија…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Нема мреже. Поновни покушај…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Улазак у режим рада у авиону није могућ током хитног позива."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Упућивање хитних позива није доступно"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Полиција"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Хитна помоћ"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Ватрогасци"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Користите тастатуру за позивање"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Чекање"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Заврши"</string>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Увоз контакта није успео"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Слушни апарат"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Укључи компатибилност са слушним апаратом"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Позив са текстом у реалном времену (RTT)"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Дозволите размену порука у аудио позиву"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"Текст у реалном времену (RTT) помаже позиваоцима који су глуви, слабо чују, имају тешкоће у говору или којима је потребно нешто више од гласа.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Сазнајте више&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; – RTT позиви се чувају као транскрипт поруке\n       &lt;br&gt; – RTT није доступан за видео позиве"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Укључите или искључите RTT"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY је искључен"</item>
     <item msgid="3971695875449640648">"TTY је пун"</item>
@@ -608,8 +589,6 @@
     <string name="selectContact" msgid="781975788478987237">"изаберите контакт"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Аудио позиви нису подржани"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"бирање"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"прикажите нумеричку тастатуру"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Нумеричка тастатура за хитне позиве"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Визуелна говорна пошта"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Подесите PIN"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Промените PIN"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 5204543..b287a18 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -94,8 +94,8 @@
     <string name="labelCW" msgid="6120513814915920200">"Samtal väntar"</string>
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Meddela mig om inkommande samtal under pågående samtal"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Meddela mig om inkommande samtal under pågående samtal"</string>
-    <string name="call_forwarding_settings" msgid="3378927671091537173">"Inställningar för vidarebefordran"</string>
-    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Inställningar för vidarebefordran (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="call_forwarding_settings" msgid="3378927671091537173">"Inställningar vidarebefordning"</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">"Vidarekoppla samtal"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Vidarebefordra alltid"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Använd alltid detta nummer"</string>
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Återställer inställningarna…"</string>
     <string name="response_error" msgid="6674110501330139405">"Oväntat svar från nätverket."</string>
     <string name="exception_error" msgid="7027667130619518211">"Nätverks- eller SIM-kortsfel."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS-begäran har ändrats till standardsamtal"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS-begäran har ändrats till en USSD-begäran"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Har ändrats till en ny SS-begäran"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS-begäran har ändrats till videosamtal"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS-begäran har ändrats till en DIAL-begäran."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS-begäran har ändrats till en USSD-begäran."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS-begäran har ändrats till en ny SS-begäran."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS-begäran ändrad till Video DIAL-begäran."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"Inställningen Fasta nummer i mobilappen är aktiverad. Därför fungerar inte vissa samtalsfunktioner."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Sätt på radion innan du visar inställningarna."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
@@ -163,7 +163,7 @@
     <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>
-    <string name="network_query_error" msgid="8466081377231178298">"Det gick inte att hitta nätverk. Försök igen."</string>
+    <string name="network_query_error" msgid="6828516148953325006">"Ett fel uppstod när vi sökte efter nätverk."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Registrerar på <xliff:g id="NETWORK">%s</xliff:g>…"</string>
     <string name="not_allowed" msgid="5613353860205691579">"Ditt SIM-kort tillåter inte anslutning till detta nätverk."</string>
     <string name="connect_later" msgid="2308119155752343975">"Det går inte att ansluta till det här nätverket just nu. Försök igen senare."</string>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Ändra nätverksläge"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Önskad nätverkstyp"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(förbjudet)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Välj nätverk"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Frånkopplad"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Ansluten"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Ansluter …"</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Det gick inte att ansluta"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"Föredrar GSM/WCDMA"</item>
     <item msgid="8442633436636425221">"Endast GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Ringer upp"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Nätverk"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Förbättrat 4G LTE-läge"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Avancerade samtal"</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="2382798156640007971">"Tillåt dataanvändning"</string>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"Roaming"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Anslut till datatjänster vid roaming"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Anslut till datatjänster vid roaming"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"Dataroaming är avstängd. Tryck för att aktivera."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Mobildataanslutningen avbruten"</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="1603164667540144353">"Detta kan leda till höga kostnader."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Kontakta din nätoperatör för priser."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Vill du tillåta dataroaming?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Appens dataanvändning"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Dataanvändning"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> mobildata använt mellan <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Avancerat"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Operatör"</string>
@@ -509,24 +503,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Det går inte att hålla kvar 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="incall_error_promote_wfc" msgid="106510757624022064">"Aktivera Wi-Fi-samtal för att ringa."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Krisinformation"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Ägare"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Tryck igen för att visa information"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Nödsamtal"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Endast nödsamtal"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Larmnummer"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Larmnummer"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Tryck igen om du vill ringa <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Sätter på radion…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Ingen tjänst. Försök igen …"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Det går inte att aktivera flygplansläge under nödsamtal."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Nödsamtal ej tillgängligt"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Polis"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Ambulans"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Brand"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</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>
@@ -547,9 +529,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Det gick inte att importera kontakter"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Hörapparater"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Aktivera kompatibilitet med hörapparat"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"RTT-samtal (realtidstext)"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Tillåt meddelanden i röstsamtal"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"RTT hjälper döva, hörselskadade och personer med talsvårigheter eller som behöver mer än endast röst.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Läs mer&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - RTT-samtal sparas som en meddelandetranskription\n       &lt;br&gt; - RTT är inte tillgängligt för videosamtal"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Slå på eller av RTT"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY av"</item>
     <item msgid="3971695875449640648">"TTY är full"</item>
@@ -612,8 +593,6 @@
     <string name="selectContact" msgid="781975788478987237">"välj kontakt"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Röstsamtal stöds inte"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"ring upp"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"visa knappsats"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Knappsats för nödsituationer"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Visuell röstbrevlåda"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Ställ in pinkod"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Byt pinkod"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index c084216..c271596 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -58,7 +58,7 @@
     <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="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 milango ya mtandao"</string>
+    <string name="apn_settings" msgid="9043423184895642077">"Majina ya milango ya Mtandao"</string>
     <string name="settings_label" msgid="3876743539816984008">"Mipangilio ya mtandao"</string>
     <string name="phone_accounts" msgid="6376603393888116364">"Akaunti za simu"</string>
     <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Piga simu kutumia"</string>
@@ -72,7 +72,7 @@
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Sanidi mipangilio ya akaunti"</string>
     <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Akaunti zote za simu"</string>
     <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Chagua akaunti ambazo zinaweza kupiga simu"</string>
-    <string name="wifi_calling" msgid="739018212480165598">"Kupiga simu kupitia Wi-Fi"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Upigaji simu kwa Wi-Fi"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Huduma ya muunganisho iliyojengewa ndani"</string>
     <string name="voicemail" msgid="8693759337917898954">"Ujumbe wa sauti"</string>
     <string name="voicemail_settings_with_label" msgid="152724978380748296">"Ujumbe wa sauti (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
@@ -90,7 +90,7 @@
     <string name="sum_loading_settings" msgid="1826692909391168620">"Mipangilio inapakia..."</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Nambari imefichwa kwa simu unayopiga"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Namba inaonekana kwa simu zinazopigwa"</string>
-    <string name="sum_default_caller_id" msgid="1954518825510901365">"Tumia mipangilio ya kiendesha chaguomsingi kuonyesha namba kwa simu zinazopigwa"</string>
+    <string name="sum_default_caller_id" msgid="1954518825510901365">"Tumia mipangilio ya kiendesha chaguo-msingi kuonyesha namba kwa simu zinazopigwa"</string>
     <string name="labelCW" msgid="6120513814915920200">"Simu inayosubiri kupokewa"</string>
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Wakati ninapokea simu, niarifu kuhusu simu zingine zinazoingia"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Wakati ninapokea simu, niarifu kuhusu simu zingine zinazoingia"</string>
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Inageuza mipangilio..."</string>
     <string name="response_error" msgid="6674110501330139405">"Jibu lisilotarajiwa kutoka kwa mtandao."</string>
     <string name="exception_error" msgid="7027667130619518211">"Hitilafu ya mtandao au SIM kadi."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"Imebadilisha ombi la SS kuwa simu ya kawaida"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"Imebadilisha ombi la SS kuwa ombi la USSD"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Imebadilishwa kuwa ombi jipya la SS"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"Imebadilisha ombi la SS kuwa simu ya video"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"Ombi la SS limebadilishwa kuwa ombi la DIAL."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"Ombi la SS limebadilishwa kuwa ombi la USSD."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"Ombi la SS limebadilishwa kuwa ombi jipya la SS."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"Ombi la SS limebadilishwa kuwa la Video DIAL."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"Mipangilio ya programu ya simu yako ya nambari za simu zilizobainishwa pekee imewashwa. Kutokana na hayo, baadhi ya vipengele vya kupiga 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>
@@ -138,7 +138,7 @@
     <string name="disable" msgid="4678348128118573672">"Zima"</string>
     <string name="change_num" msgid="239476305819844391">"Sasisha"</string>
   <string-array name="clir_display_values">
-    <item msgid="5560134294467334594">"Chaguomsingi la mtandao"</item>
+    <item msgid="5560134294467334594">"Chaguo-msingi la mtandao"</item>
     <item msgid="7876195870037833661">"Ficha nambari"</item>
     <item msgid="1108394741608734023">"Onyesha nambari"</item>
   </string-array>
@@ -163,7 +163,7 @@
     <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>
-    <string name="network_query_error" msgid="8466081377231178298">"Imeshindwa kupata mitandao. Jaribu tena."</string>
+    <string name="network_query_error" msgid="6828516148953325006">"Hitilafu wakati wa utafutaji wa mitandao."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Inasajili kwa <xliff:g id="NETWORK">%s</xliff:g>….."</string>
     <string name="not_allowed" msgid="5613353860205691579">"SIM kadi yako hairuhusu muunganisho wa mtandao huu."</string>
     <string name="connect_later" msgid="2308119155752343975">"Haiwezi kuunganisha na mtandao huu hivi sasa. Jaribu tena baadaye."</string>
@@ -176,11 +176,6 @@
     <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 unaoupendelea"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(hairuhusiwi)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Chagua mtandao"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Hujaunganishwa"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Imeunganishwa"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Inaunganisha..."</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Imeshindwa kuunganisha"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA inapendelewa"</item>
     <item msgid="8442633436636425221">"GSM pekee"</item>
@@ -235,20 +230,19 @@
     <string name="call_category" msgid="5863978196309462052">"Kupiga simu"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Mtandao"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Hali Iliyoimarishwa ya 4G LTE"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Upigaji Simu Ulioimarishwa"</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="2382798156640007971">"Ruhusu matumizi ya data"</string>
     <string name="dialog_alert_title" msgid="6751344986194435476">"Ilani"</string>
-    <string name="roaming" msgid="7894878421600247140">"Mitandao ya ng\'ambo"</string>
+    <string name="roaming" msgid="7894878421600247140">"Matumizi ya mitandao mingine"</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="6843814381576397939">"Kipengele cha kuwasha matumizi ya intaneti ukiwa nje ya mtandao wako wa kawaida kimezimwa. Gusa ili ukiwashe."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Imepoteza muunganisho wa data kwa simu ya mkononi"</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="1603164667540144353">"Huenda ukatozwa gharama kubwa."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Wasiliana na mtoaji wako wa huduma za mtandao kwa maelezo kuhusu bei."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Ungependa kutumia intaneti ukiwa kwenye mitandao mingine?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Matumizi ya data ya programu"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Matumizi ya data"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> za data ya mtandao wa simu zimetumika kuanzia <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Mipangilio ya Kina"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Mtoa huduma"</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Haiwezi kushikilia simu."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Unganisha kwenye mtandao pasiwaya ili upige simu."</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"Washa kipengele cha kupiga simu kupitia Wi-Fi ili upige simu."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Maelezo ya dharura"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Mmiliki"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Gusa tena ili uangalie maelezo"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Simu ya dharura"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Simu za dharura pekee"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Nambari ya dharura"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Nambari za dharura"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Gusa tena ili upige <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Inawasha redio..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Hakuna huduma. Inajaribu tena..."</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Huwezi kuingia katika hali ya ndegeni huku simu ya dharura inaendelea."</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 nambari ya dharura."</string>
-    <string name="dial_emergency_calling_not_available" msgid="5675557523782491826">"Upigaji simu ya dharura haupatikani"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Polisi"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Gari la wagonjwa"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Moto"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Tumia kibodi kubonyeza"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Shikilia"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Mwisho"</string>
@@ -540,10 +522,9 @@
     <string name="singleContactImportedMsg" msgid="6868483416182599206">"Imeingiza anwani"</string>
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Imeshindwa kuingiza anwani"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Vifaa vya kusaidia kusikia"</string>
-    <string name="hac_mode_summary" msgid="6833851160514929341">"Washa utumiaji wa kifaa cha kusaidia kusikia"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Kutuma SMS katika Muda Halisi (RTT) wakati wa kupiga simu"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Ruhusu uandikaji wa ujumbe wakati unapiga simu"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"RTT huwasaidia wapigaji simu ambao ni viziwi, wasioweza kusikia vyema, wenye matatizo ya kuzungumza au wanaohitaji kufanya zaidi ya kuzungumza.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Pata maelezo zaidi&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - Simu za RTT huhifadhiwa kama manukuu ya ujumbe\n       &lt;br&gt; - RTT haipatikani kwa simu za video"</string>
+    <string name="hac_mode_summary" msgid="6833851160514929341">"Washa utangamano wa kifaa cha kusaidia kusikia"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Washa au uzime kipengele cha RTT"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"Zima TTY"</item>
     <item msgid="3971695875449640648">"TTY Kamili"</item>
@@ -606,8 +587,6 @@
     <string name="selectContact" msgid="781975788478987237">"chagua anwani"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Upigaji simu za sauti hauhimiliwi"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"piga simu"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"onyesha vitufe vya kupiga simu"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Vitufe vya kupiga simu ya Dharura"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Ujumbe wa Sauti Unaoonekana"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Weka PIN"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Badilisha PIN"</string>
diff --git a/res/values-sw345dp/dimens.xml b/res/values-sw345dp/dimens.xml
new file mode 100644
index 0000000..84db80b
--- /dev/null
+++ b/res/values-sw345dp/dimens.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT 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>
+    <dimen name="emergency_info_button_height">88dp</dimen>
+    <dimen name="emergency_info_button_margin_vertical">48dp</dimen>
+    <dimen name="emergency_shortcut_button_height">88dp</dimen>
+    <dimen name="emergency_number_title_text_size">12sp</dimen>
+    <dimen name="emergency_location_text_size">12sp</dimen>
+</resources>
\ No newline at end of file
diff --git a/res/values-sw360dp/dimens.xml b/res/values-sw360dp/dimens.xml
new file mode 100644
index 0000000..c578065
--- /dev/null
+++ b/res/values-sw360dp/dimens.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT 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>
+    <dimen name="emergency_info_button_height">96dp</dimen>
+    <dimen name="emergency_info_button_margin_vertical">56dp</dimen>
+    <dimen name="emergency_shortcut_button_height">96dp</dimen>
+    <dimen name="emergency_number_title_text_size">14sp</dimen>
+    <dimen name="emergency_location_text_size">14sp</dimen>
+</resources>
\ No newline at end of file
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index a635e09..68f6a4c 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="tablet" msgid="8576272342240415145">"மொபைல் டேட்டா"</string>
+    <string name="phoneAppLabel" product="tablet" msgid="8576272342240415145">"மொபைல் தரவு"</string>
     <string name="phoneAppLabel" product="default" msgid="6790717591729922998">"ஃபோன் சேவைகள்"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"அவசரகால டயலர்"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"மொபைல்"</string>
@@ -96,27 +96,27 @@
     <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="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="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="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="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="2684474391807469832">"ஆஃப்"</string>
+    <string name="sum_cfnrc_disabled" msgid="2684474391807469832">"முடக்கப்பட்டுள்ளது"</string>
     <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"மொபைல் தொடர்புகொள்ள முடியாத இடத்தில் இருக்கும்போது, அழைப்பு பகிர்தலை முடக்குவதை ஆபரேட்டர் ஆதரிக்கவில்லை."</string>
     <string name="updating_title" msgid="6146755386174019046">"அழைப்பு அமைப்பு"</string>
     <string name="call_settings_admin_user_only" msgid="4526094783818216374">"நிர்வாகிப் பயனர் மட்டுமே அழைப்பிற்கான அமைப்புகளை மாற்ற முடியும்."</string>
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"அமைப்புகளை மாற்றியமைக்கிறது…"</string>
     <string name="response_error" msgid="6674110501330139405">"நெட்வொர்க்கிலிருந்து எதிர்பார்த்திராத பதில்."</string>
     <string name="exception_error" msgid="7027667130619518211">"நெட்வொர்க் அல்லது சிம் கார்டு பிழை."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS கோரிக்கை, வழக்கமான அழைப்பிற்கு மாற்றப்பட்டது"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS கோரிக்கை, USSD கோரிக்கைக்கு மாற்றப்பட்டது"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"புதிய SS கோரிக்கைக்கு மாற்றப்பட்டது"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS கோரிக்கை, வீடியோ அழைப்பிற்கு மாற்றப்பட்டது"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS கோரிக்கையானது DIAL கோரிக்கைக்கு மாற்றப்பட்டது."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS கோரிக்கையானது USSD கோரிக்கைக்கு மாற்றப்பட்டது."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS கோரிக்கையானது புதிய SS கோரிக்கைக்கு மாற்றப்பட்டது."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS கோரிக்கையானது வீடியோ DIAL கோரிக்கைக்கு மாற்றப்பட்டது."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"மொபைல் பயன்பாட்டின் நிலையான அழைப்பு எண்களுக்கான அமைப்பு இயக்கப்பட்டது. இதன் விளைவாக, அழைப்பு தொடர்பான சில அம்சங்கள் செயல்படவில்லை."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"அமைப்புகளைப் பார்ப்பதற்கு முன், ரேடியோவை இயக்கவும்."</string>
     <string name="close_dialog" msgid="2365884406356986917">"சரி"</string>
@@ -163,7 +163,7 @@
     <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="network_query_error" msgid="8466081377231178298">"நெட்வொர்க்குகளைக் கண்டறிய முடியவில்லை. மீண்டும் முயலவும்."</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>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"நெட்வொர்க் செயல்பாட்டிற்கான பயன்முறையை மாற்று"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"தேர்ந்தெடுத்த நெட்வொர்க் வகை"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(தடுக்கப்பட்டது)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"நெட்வொர்க்கைத் தேர்வுசெய்"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"தொடர்பு துண்டிக்கப்பட்டது"</string>
-    <string name="network_connected" msgid="1288589103624338857">"இணைக்கப்பட்டது"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"இணைக்கிறது..."</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"இணைக்க முடியவில்லை"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMAக்கு முன்னுரிமை"</item>
     <item msgid="8442633436636425221">"GSM மட்டும்"</item>
@@ -235,36 +230,35 @@
     <string name="call_category" msgid="5863978196309462052">"அழைப்பு"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"நெட்வொர்க்"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"மேம்பட்ட 4G LTE பயன்முறை"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"மேம்பட்ட அழைப்பு"</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="data_enable_summary" msgid="2382798156640007971">"தரவுப் பயன்பாட்டை அனுமதி"</string>
     <string name="dialog_alert_title" msgid="6751344986194435476">"கவனம் தேவை"</string>
     <string name="roaming" msgid="7894878421600247140">"ரோமிங்"</string>
-    <string name="roaming_enable" msgid="7331106985174381987">"ரோமிங்கின் போது டேட்டா சேவைகளுடன் இணை"</string>
-    <string name="roaming_disable" msgid="1843417228755568110">"ரோமிங்கின் போது டேட்டா சேவைகளுடன் இணை"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"டேட்டா ரோமிங் முடக்கத்தில் உள்ளது. இயக்க, தட்டவும்."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"மொபைல் டேட்டா இணைப்பு இல்லை"</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_check_price_warning" msgid="7497570906830902550">"உங்கள் நெட்வொர்க் வழங்குநர் விதிக்கும் கட்டணத்தைப் பார்க்கவும்."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"தரவு ரோமிங்கை அனுமதிக்கவா?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"பயன்பாட்டின் டேட்டா உபயோகம்"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"டேட்டா பயன்பாடு"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_2">%2$s</xliff:g>: <xliff:g id="ID_1">%1$s</xliff:g> மொபைல் டேட்டா பயன்படுத்தப்பட்டது"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"மேம்பட்டவை"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"தொலைத்தொடர்பு நிறுவனம்"</string>
     <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"தொலைத்தொடர்பு நிறுவனம், eSIM, சிம், euicc, தொலைத்தொடர்பு நிறுவனங்களை மாற்று, தொலைத்தொடர்பு நிறுவனத்தைச் சேர்"</string>
     <string name="carrier_settings_euicc_summary" msgid="5115001942761995457">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> — <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
-    <string name="mobile_data_settings_title" msgid="4661165467914727157">"மொபைல் டேட்டா"</string>
-    <string name="mobile_data_settings_summary" msgid="5087255915840576895">"மொபைல் நெட்வொர்க்கைப் பயன்படுத்தி, டேட்டாவை அணுகு"</string>
-    <string name="data_usage_disable_mobile" msgid="3577275288809667615">"மொபைல் டேட்டாவை முடக்கவா?"</string>
+    <string name="mobile_data_settings_title" msgid="4661165467914727157">"மொபைல் தரவு"</string>
+    <string name="mobile_data_settings_summary" msgid="5087255915840576895">"மொபைல் நெட்வொர்க்கைப் பயன்படுத்தி, தரவை அணுகு"</string>
+    <string name="data_usage_disable_mobile" msgid="3577275288809667615">"மொபைல் தரவை முடக்கவா?"</string>
     <string name="sim_selection_required_pref" msgid="7049424902961844236">"தேர்ந்தெடுக்க வேண்டும்"</string>
     <string name="sim_change_data_title" msgid="5332425991853799280">"தரவிற்கான சிம்மை மாற்றவா?"</string>
-    <string name="sim_change_data_message" msgid="2163963581444907496">"<xliff:g id="OLD_SIM">%2$s</xliff:g>க்குப் பதிலாக <xliff:g id="NEW_SIM">%1$s</xliff:g> இன் மொபைல் டேட்டாவைப் பயன்படுத்தவா?"</string>
+    <string name="sim_change_data_message" msgid="2163963581444907496">"<xliff:g id="OLD_SIM">%2$s</xliff:g>க்குப் பதிலாக <xliff:g id="NEW_SIM">%1$s</xliff:g> இன் மொபைல் தரவைப் பயன்படுத்தவா?"</string>
     <string name="wifi_calling_settings_title" msgid="7741961465416430470">"வைஃபை அழைப்பு"</string>
     <string name="video_calling_settings_title" msgid="539714564273795574">"தொலைத்தொடர்பு நிறுவன வீடியோ அழைப்பு"</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>
@@ -384,7 +378,7 @@
     <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="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>
@@ -400,7 +394,7 @@
     <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="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>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"அழைப்புகளை ஹோல்டு செய்ய முடியாது."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"அழைக்க, வயர்லெஸ் நெட்வொர்க்குடன் இணைக்கவும்."</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"அழைக்க, வைஃபை அழைப்பை இயக்கவும்."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"அவசரத் தகவல்"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"உரிமையாளர்"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"தகவலைப் பார்க்க, மீண்டும் தட்டவும்"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"அவசரகால அழைப்பு"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"அவசர அழைப்புகள் மட்டும்"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"அவசர எண்"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"அவசர எண்கள்"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"<xliff:g id="EMERGENCY_NUMBER">%s</xliff:g> என்ற எண்ணை அழைக்க, மீண்டும் தட்டவும்"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"ரேடியோவை இயக்குகிறது…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"சேவை இல்லை. மீண்டும் முயற்சிக்கிறது…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"அவசர அழைப்பின் போது, விமானப் பயன்முறையை இயக்க முடியாது."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"அவசர அழைப்பு வசதி இல்லை"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"காவல்"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"ஆம்புலன்ஸ்"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"தீயணைப்பு"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"டயல் செய்வதற்கு விசைப்பலகையைப் பயன்படுத்துக"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"காத்திரு"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"முடி"</string>
@@ -541,11 +523,10 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"தொடர்பை இறக்க முடியவில்லை"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"கேட்பதற்கான சாதனங்கள்"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"கேட்கும் சாதனத்தின் இணக்கத்தன்மையை இயக்கு"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"நிகழ்நேர உரை (RTT) அழைப்பு"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"குரல் அழைப்பிலேயே செய்தியிடலை அனுமதிக்கும்"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"காது கேளாதோர், கேட்பதற்குச் சிரமப்படுவோர், பேச இயலாதோர் அல்லது குரலைத் தாண்டி மற்ற வழிகளில் தகவல் தேவைப்படுவோருக்கு RTT பயன்முறை உதவுகிறது.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;மேலும் அறிக&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - டிரான்ஸ்கிரிப்ட் செய்யப்பட்ட செய்தியாக RTT அழைப்புகள் சேமிக்கப்படும்\n       &lt;br&gt; - வீடியோ அழைப்புகளுக்கு RTT பயன்முறை இல்லை"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"RTTஐ இயக்கும் அல்லது முடக்கும்"</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>
@@ -561,14 +542,14 @@
     <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_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">"இதைத் தவிர்த்தால், அழைப்புகளை மேற்கொள்ள முடியாது அல்லது மொபைல் டேட்டா நெட்வொர்க்குகளுடன் இணைக்க முடியாது (எனினும் வைஃபை நெட்வொர்க்குகளுடன் இணைக்கலாம்). மொபைலைச் செயல்படுத்தும்வரை, அதை இயக்கும் ஒவ்வொரு முறையும் இதைச் செயல்படுத்துமாறு தெரிவிக்கப்படும்."</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_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>
@@ -606,8 +587,6 @@
     <string name="selectContact" msgid="781975788478987237">"தொடர்பைத் தேர்ந்தெடுக்கவும்"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"குரல் அழைப்பு ஆதரிக்கப்படவில்லை"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"டயல்"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"டயல்பேடைக் காட்டும் பட்டன்"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"அவசரகால டயல்பேட்"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"விஷூவல் குரலஞ்சல்"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"பின்னை அமை"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"பின்னை மாற்றவும்"</string>
@@ -647,12 +626,12 @@
     <string name="mobile_data_status_roaming_turned_on_subtext" msgid="1335176927083781041">"தரவு ரோமிங் இயக்கப்பட்டுள்ளது"</string>
     <string name="mobile_data_status_roaming_without_plan_subtext" msgid="3568412513831673037">"தற்போது ரோமிங்கில், தரவுத் திட்டம் தேவை"</string>
     <string name="mobile_data_status_roaming_with_plan_subtext" msgid="8721998948811064377">"தற்போது ரோமிங்கில், தரவுத் திட்டம் இயக்கத்தில் உள்ளது"</string>
-    <string name="mobile_data_status_no_plan_subtext" msgid="4887747337017565725">"மொபைல் டேட்டா இல்லை"</string>
-    <string name="mobile_data_activate_prepaid" msgid="7447025165850512683">"மொபைல் டேட்டா இல்லை"</string>
-    <string name="mobile_data_activate_prepaid_summary" msgid="5705389791791637666">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> மூலம் மொபைல் டேட்டாவைச் சேர்க்கவும்"</string>
+    <string name="mobile_data_status_no_plan_subtext" msgid="4887747337017565725">"மொபைல் தரவு இல்லை"</string>
+    <string name="mobile_data_activate_prepaid" msgid="7447025165850512683">"மொபைல் தரவு இல்லை"</string>
+    <string name="mobile_data_activate_prepaid_summary" msgid="5705389791791637666">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> மூலம் மொபைல் தரவைச் சேர்க்கவும்"</string>
     <string name="mobile_data_activate_roaming_plan" msgid="5998161536947086264">"ரோமிங் திட்டம் இல்லை"</string>
     <string name="mobile_data_activate_roaming_plan_summary" msgid="511202908883425459">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> மூலம் ரோமிங் திட்டத்தைச் சேர்க்கவும்"</string>
-    <string name="mobile_data_activate_footer" msgid="5979019929980140594">"உங்கள் <xliff:g id="PROVIDER_NAME">%s</xliff:g> மொபைல் நிறுவனம் மூலம் மொபைல் டேட்டா அல்லது ரோமிங் திட்டத்தைச் சேர்க்கலாம்."</string>
+    <string name="mobile_data_activate_footer" msgid="5979019929980140594">"உங்கள் <xliff:g id="PROVIDER_NAME">%s</xliff:g> மொபைல் நிறுவனம் மூலம் மொபைல் தரவு அல்லது ரோமிங் திட்டத்தைச் சேர்க்கலாம்."</string>
     <string name="mobile_data_activate_diag_title" msgid="9044252207707864493">"தரவைச் சேர்க்கவா?"</string>
     <string name="mobile_data_activate_diag_message" msgid="8216154678758451453">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> மூலம் தரவைச் சேர்க்க வேண்டியது இருக்கலாம்"</string>
     <string name="mobile_data_activate_button" msgid="3682400969184405446">"தரவைச் சேர்"</string>
@@ -711,8 +690,8 @@
     <string name="clh_callFailed_protocol_Error_unspecified_txt" msgid="8294907817156524790">"புரோட்டோகால் பிழை, குறிப்பிடப்படவில்லை"</string>
     <string name="clh_callFailed_interworking_unspecified_txt" msgid="8838850798491763729">"இண்டர்வொர்க்கிங், குறிப்பிடப்படவில்லை"</string>
     <string name="labelCallBarring" msgid="3452870940716226978">"அழைப்புத் தடுப்பு"</string>
-    <string name="sum_call_barring_enabled" msgid="6804489690436703488">"ஆன்"</string>
-    <string name="sum_call_barring_disabled" msgid="5900772179198857783">"ஆஃப்"</string>
+    <string name="sum_call_barring_enabled" msgid="6804489690436703488">"இயக்கப்பட்டது"</string>
+    <string name="sum_call_barring_disabled" msgid="5900772179198857783">"முடக்கப்பட்டது"</string>
     <string name="call_barring_baoc" msgid="1199843944333106035">"வெளிச்செல்லும் எல்லா அழைப்புகளும்"</string>
     <string name="call_barring_baoc_enabled" msgid="8112118391869380361">"வெளிச்செல்லும் எல்லா அழைப்புகளையும் தடுப்பதை முடக்கவா?"</string>
     <string name="call_barring_baoc_disabled" msgid="7806697133004697974">"வெளிச்செல்லும் எல்லா அழைப்புகளையும் தடுக்கவா?"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 6ecece6..1e8bc44 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -58,7 +58,7 @@
     <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="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>
@@ -97,7 +97,7 @@
     <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="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>
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"సెట్టింగ్‌లను తిరిగి మారుస్తోంది…"</string>
     <string name="response_error" msgid="6674110501330139405">"నెట్‌వర్క్ నుండి ఊహించని ప్రతిస్పందన."</string>
     <string name="exception_error" msgid="7027667130619518211">"నెట్‌వర్క్ లేదా SIM కార్డు లోపం."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS అభ్యర్థన సాధారణ కాల్‌కు మార్చబడింది"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS అభ్యర్థన USSD అభ్యర్థనకు మార్చబడింది"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"కొత్త SS అభ్యర్థనకు మార్చబడింది"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS అభ్యర్థన వీడియో కాల్‌కి మార్చబడింది"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS అభ్యర్థన డయల్ అభ్యర్థనగా సవరించబడింది."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS అభ్యర్థన USSD అభ్యర్థనగా సవరించబడింది."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS అభ్యర్థన కొత్త SS అభ్యర్థనగా సవరించబడింది."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS అభ్యర్థన వీడియో డయల్ అభ్యర్థనగా సవరించబడింది."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"మీ ఫోన్ అనువర్తనం యొక్క ఫిక్స్‌డ్ డయలింగ్ నంబర్‌ల సెట్టింగ్ ప్రారంభించబడింది. తత్ఫలితంగా, కాల్ సంబంధిత లక్షణాల్లో కొన్ని పని చేయడం లేదు."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"ఈ సెట్టింగ్‌లను వీక్షించడానికి ముందు రేడియోను ప్రారంభించండి."</string>
     <string name="close_dialog" msgid="2365884406356986917">"సరే"</string>
@@ -163,24 +163,19 @@
     <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="network_query_error" msgid="8466081377231178298">"నెట్‌వర్క్‌లను కనుగొనడం సాధ్యపడలేదు. మళ్లీ ప్రయత్నించండి."</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="already_auto" msgid="6067116884321285507">"ఇప్పటికే స్వయంచాలక ఎంపికలో ఉంది."</string>
-    <string name="select_automatically" msgid="1046727200631770962">"నెట్‌వర్క్‌ను ఆటోమేటిక్‌గా ఎంచుకో"</string>
+    <string name="select_automatically" msgid="1046727200631770962">"నెట్‌వర్క్‌ను స్వయంచాలకంగా ఎంచుకోండి"</string>
     <string name="network_select_title" msgid="7733107364757544558">"నెట్‌వర్క్"</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="forbidden_network" msgid="4384929668343563440">"(నిషేధించబడింది)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"నెట్‌వర్క్‌ను ఎంచుకోండి"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"డిస్‌కనెక్ట్ చేయబడింది"</string>
-    <string name="network_connected" msgid="1288589103624338857">"కనెక్ట్ చేయబడింది"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"కనెక్ట్ అవుతోంది..."</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"కనెక్ట్ చేయడం సాధ్యపడలేదు"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMAకు ప్రాధాన్యత"</item>
     <item msgid="8442633436636425221">"GSM మాత్రమే"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"కాలింగ్"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"నెట్‌వర్క్"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"మెరుగుపరిచిన 4G LTE మోడ్"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"అధునాతన కాలింగ్"</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>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"రోమింగ్"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"రోమింగ్‌లో ఉన్నప్పుడు డేటా సేవలకు కనెక్ట్ చేయి"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"రోమింగ్‌లో ఉన్నప్పుడు డేటా సేవలకు కనెక్ట్ చేయి"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"డేటా రోమింగ్ ఆఫ్ చేయబడింది. ఆన్ చేయడానికి నొక్కండి."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"మొబైల్ డేటా కనెక్షన్‌ని కోల్పోయారు"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"మీరు డేటా రోమింగ్ ఆపివేసి, మీ హోమ్ నెట్‌వర్క్ నుండి నిష్క్రమించినందున మీరు డేటా కనెక్టివిటీని కోల్పోయారు."</string>
     <string name="roaming_warning" msgid="1603164667540144353">"మీకు గణనీయ ఛార్జీలు విధించబడవచ్చు."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"ధరల కోసం మీ నెట్‌వర్క్ ప్రదాతను అడగండి."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"డేటా రోమింగ్‌ను అనుమతించాలా?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"యాప్ డేటా వినియోగం"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"డేటా వినియోగం"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_2">%2$s</xliff:g> మధ్య కాలంలో <xliff:g id="ID_1">%1$s</xliff:g> మొబైల్ డేటా ఉపయోగించబడింది"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"అధునాతనం"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"క్యారియర్"</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"కాల్‌లను హోల్డ్ చేయలేరు."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"కాల్ చేయడానికి వైర్‌లెస్ నెట్‌వర్క్‌కు కనెక్ట్ చేయండి."</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"కాల్‌ను చేయడానికి Wi-Fi కాలింగ్‌ను ప్రారంభించండి."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"అత్యవసర సమాచారం"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"యజమాని"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"సమాచారాన్ని చూడడానికి మళ్లీ నొక్కండి"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"అత్యవసర కాల్"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"అత్యవసర కాల్‌లు మాత్రమే"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"అత్యవసర నంబర్"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"అత్యవసర నంబర్‌లు"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"<xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>కు కాల్ చేయడానికి మళ్లీ నొక్కండి"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"రేడియోను ప్రారంభిస్తోంది…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"సేవ లేదు. మళ్లీ ప్రయత్నిస్తోంది…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"అత్యవసర కాల్‌లో ఉన్నప్పుడు ఎయిర్‌ప్లైన్ మోడ్‌లోకి ప్రవేశించలేరు."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"అత్యవసర కాలింగ్ అందుబాటులో లేదు"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"పోలీస్"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"అంబులెన్స్‌"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"అగ్ని"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"డయల్ చేయడానికి కీబోర్డ్‌ను ఉపయోగించండి"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"హోల్డ్ చేయి"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"ముగించు"</string>
@@ -541,11 +523,10 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"పరిచయాన్ని దిగుమతి చేయడంలో విఫలమైంది"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"వినికిడి సహాయక సాధనాలు"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"వినికిడి సహాయక సాధనం అనుకూలతను ప్రారంభించండి"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"నిజ సమయ వచనం (RTT) కాల్"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"వాయిస్ కాల్‌లో సందేశాలు పంపడానికి అనుమతించండి"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"బధిరులు, వినికిడి సమస్యలు ఉన్న వారు, మాట్లాడటంలో సమస్యలు ఉన్న వారు లేదా కేవలం వాయిస్‌తో అర్థం చేసుకోలేని కాలర్‌లకు RTT సహాయపడుతుంది.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;మరింత తెలుసుకోండి&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - RTT కాల్‌లు సందేశ లిపి మార్పు వలె సేవ్ చేయబడతాయి\n       &lt;br&gt; - వీడియో కాల్‌ల కోసం RTT అందుబాటులో లేదు"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"RTT ఆన్ లేదా ఆఫ్ చేయండి"</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>
@@ -606,8 +587,6 @@
     <string name="selectContact" msgid="781975788478987237">"పరిచయాన్ని ఎంచుకోండి"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"వాయిస్ కాలింగ్‌కు మద్దతు లేదు"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"డయల్ చేయి"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"డయల్‌ప్యాడ్‌ను చూపు"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"అత్యవసర డయల్‌ప్యాడ్"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"దృశ్యమాన వాయిస్‌మెయిల్"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"PINని సెట్ చేయండి"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"PINను మార్చు"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 404a349..4068a70 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="tablet" msgid="8576272342240415145">"เน็ตมือถือ"</string>
+    <string name="phoneAppLabel" product="tablet" msgid="8576272342240415145">"ข้อมูลมือถือ"</string>
     <string name="phoneAppLabel" product="default" msgid="6790717591729922998">"บริการโทรศัพท์"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"โปรแกรมโทรออกฉุกเฉิน"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"โทรศัพท์"</string>
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"กำลังย้อนกลับการตั้งค่า…"</string>
     <string name="response_error" msgid="6674110501330139405">"พบการตอบกลับที่ไม่คาดหมายจากเครือข่าย"</string>
     <string name="exception_error" msgid="7027667130619518211">"ข้อผิดพลาดของเครือข่ายหรือซิมการ์ด"</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"คำขอ SS เปลี่ยนเป็นการโทรปกติแล้ว"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"คำขอ SS เปลี่ยนเป็นคำขอ USSD แล้ว"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"เปลี่ยนเป็นคำขอ SS ใหม่แล้ว"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"คำขอ SS เปลี่ยนเป็นวิดีโอคอลแล้ว"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"คำขอ SS ที่แก้ไขเป็นคำขอ DIAL"</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"คำขอ SS ที่แก้ไขเป็นคำขอ USSD"</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"คำขอ SS ที่แก้ไขเป็นคำขอ SS ใหม่"</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"คำขอ SS ที่แก้ไขเป็นคำขอ Video DIAL"</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"เนื่องจากมีการเปิดใช้การตั้งค่าการจำกัดหมายเลขโทรออกของแอปโทรศัพท์ จึงเป็นผลให้ฟีเจอร์ที่เกี่ยวกับการโทรบางอย่างไม่ทำงาน"</string>
     <string name="radio_off_error" msgid="2304459933248513376">"เปิดวิทยุก่อนดูการตั้งค่าเหล่านี้"</string>
     <string name="close_dialog" msgid="2365884406356986917">"ตกลง"</string>
@@ -163,7 +163,7 @@
     <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="network_query_error" msgid="8466081377231178298">"ไม่พบเครือข่าย ลองอีกครั้ง"</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>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"เปลี่ยนโหมดปฏิบัติการของเครือข่าย"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"ประเภทเครือข่ายที่ต้องการ"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(ห้ามใช้)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"เลือกเครือข่าย"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"เลิกเชื่อมต่อแล้ว"</string>
-    <string name="network_connected" msgid="1288589103624338857">"เชื่อมต่อแล้ว"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"กำลังเชื่อมต่อ..."</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"เชื่อมต่อไม่ได้"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"ต้องการ GSM/WCDMA"</item>
     <item msgid="8442633436636425221">"GSM เท่านั้น"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"กำลังโทร"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"เครือข่าย"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"โหมด 4G LTE ที่ปรับปรุงแล้ว"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"การโทรขั้นสูง"</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>
@@ -243,18 +238,17 @@
     <string name="roaming" msgid="7894878421600247140">"โรมมิ่ง"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"เชื่อมต่ออินเทอร์เน็ตมือถือขณะโรมมิ่ง"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"เชื่อมต่ออินเทอร์เน็ตมือถือขณะโรมมิ่ง"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"การโรมมิ่งข้อมูลปิดอยู่ แตะเพื่อเปิด"</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"การเชื่อมต่อเน็ตมือถือถูกตัด"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"การเชื่อมต่อข้อมูลของคุณหายไปเนื่องจากคุณออกจากเครือข่ายที่บ้านโดยปิดการโรมมิ่งข้อมูลไว้"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"คุณอาจต้องเสียค่าใช้จ่ายมาก"</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"โปรดสอบถามผู้ให้บริการเครือข่ายสำหรับข้อมูลเกี่ยวกับราคา"</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"อนุญาตการโรมมิ่งอินเทอร์เน็ตไหม"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"การใช้อินเทอร์เน็ตของแอป"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"ปริมาณการใช้อินเทอร์เน็ต"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"เน็ตมือถือ <xliff:g id="ID_1">%1$s</xliff:g> ที่ใช้ระหว่าง <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"ขั้นสูง"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"ผู้ให้บริการ"</string>
     <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"ผู้ให้บริการ, eSIM, ซิม, eUICC, เปลี่ยนผู้ให้บริการ, เพิ่มผู้ให้บริการ"</string>
     <string name="carrier_settings_euicc_summary" msgid="5115001942761995457">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> — <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
-    <string name="mobile_data_settings_title" msgid="4661165467914727157">"เน็ตมือถือ"</string>
+    <string name="mobile_data_settings_title" msgid="4661165467914727157">"อินเทอร์เน็ตมือถือ"</string>
     <string name="mobile_data_settings_summary" msgid="5087255915840576895">"เข้าถึงข้อมูลโดยใช้เครือข่ายมือถือ"</string>
     <string name="data_usage_disable_mobile" msgid="3577275288809667615">"ปิดเน็ตมือถือไหม"</string>
     <string name="sim_selection_required_pref" msgid="7049424902961844236">"ต้องเลือก"</string>
@@ -268,7 +262,7 @@
     <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_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>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"ไม่สามารถถือสายรอได้"</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"เชื่อมต่อเครือข่ายไร้สายเพื่อโทรออก"</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"เปิดใช้การโทรผ่าน Wi-Fi เพื่อโทรออก"</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"ข้อมูลสำหรับกรณีฉุกเฉิน"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"เจ้าของ"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"แตะอีกครั้งเพื่อดูข้อมูล"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"หมายเลขฉุกเฉิน"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"หมายเลขฉุกเฉินเท่านั้น"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"หมายเลขฉุกเฉิน"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"หมายเลขฉุกเฉิน"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"แตะอีกครั้งเพื่อโทรหา <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"กำลังเปิดวิทยุ…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"ไม่มีบริการ โปรดลองอีกครั้ง…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"ไม่สามารถเข้าสู่โหมดบนเครื่องบินระหว่างการโทรหมายเลขฉุกเฉินได้"</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"หมายเลขฉุกเฉินไม่พร้อมใช้งาน"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"ตำรวจ"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"รถพยาบาล"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"อัคคีภัย"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"ใช้แป้นพิมพ์กดหมายเลขโทรศัพท์"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"พักสาย"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"สิ้นสุด"</string>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"ไม่สามารถนำเข้ารายชื่อติดต่อ"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"เครื่องช่วยฟัง"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"เปิดการช่วยฟัง"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"การโทรระบบข้อความแบบเรียลไทม์ (RTT)"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"อนุญาตให้รับส่งข้อความระหว่างการโทรด้วยเสียง"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"RTT ช่วยเหลือผู้โทรที่หูหนวก ได้ยินไม่ชัด มีความบกพร่องในการพูด หรือต้องการการสื่อสารที่นอกเหนือจากเสียงพูด&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;ดูข้อมูลเพิ่มเติม&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - สาย RTT จะบันทึกในรูปแบบการถอดเสียงเป็นข้อความ\n       &lt;br&gt; - RTT ใช้ไม่ได้สำหรับวิดีโอคอล"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"เปิดหรือปิด RTT"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"ปิด TTY"</item>
     <item msgid="3971695875449640648">"TTY เต็ม"</item>
@@ -606,8 +587,6 @@
     <string name="selectContact" msgid="781975788478987237">"เลือกรายชื่อติดต่อ"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"ไม่สนับสนุนการโทรออกด้วยเสียง"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"หมุนหมายเลข"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"แสดงแป้นหมายเลข"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"แป้นหมายเลขฉุกเฉิน"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"ข้อความเสียงพร้อมภาพ"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"ตั้งค่า PIN"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"เปลี่ยน PIN"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 1ef48cb..db07b36 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Ibinabalik ang mga setting…"</string>
     <string name="response_error" msgid="6674110501330139405">"Hindi inaasahang tugon mula sa network."</string>
     <string name="exception_error" msgid="7027667130619518211">"Error sa Network o SIM card."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"Pinalitan ang SS na kahilingan ng regular na tawag"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"Pinalitan ang SS na kahilingan ng USSD na kahilingan"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Pinalitan ng bagong SS na kahilingan"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"Pinalitan ang SS na kahilingan ng video call"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"Ginawang DIAL request ang SS request."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"Ginawang USSD request ang SS request."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"Ginawang bagong SS request ang SS request."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"Binago ang SS na kahilingan sa Video DIAL na kahilingan."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"Naka-on ang setting ng mga Fixed Dialing Number ng iyong app ng Telepono. Bilang resulta, hindi gumagana ang ilang tampok na nauugnay sa pagtawag."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Mangyaring i-on ang radyo bago tingnan ang mga setting na ito."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
@@ -163,7 +163,7 @@
     <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>
-    <string name="network_query_error" msgid="8466081377231178298">"Hindi makahanap ng mga network. Subukang muli."</string>
+    <string name="network_query_error" msgid="6828516148953325006">"Error habang naghahanap ng mga network."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Nirerehistro sa <xliff:g id="NETWORK">%s</xliff:g>…"</string>
     <string name="not_allowed" msgid="5613353860205691579">"Hindi pinapayagan ng iyong SIM card ang koneksyon sa network na ito."</string>
     <string name="connect_later" msgid="2308119155752343975">"Hindi makakonekta sa network na ito sa ngayon. Subukang muli sa ibang pagkakataon."</string>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Baguhin ang network operating mode"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Gustong uri ng network"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(pinagbabawal)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Pumili ng network"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Nadiskonekta"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Nakakonekta"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Kumokonekta..."</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Hindi makakonekta"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"Mas gusto ang GSM/WCDMA"</item>
     <item msgid="8442633436636425221">"GSM lang"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Tumatawag"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Network"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Enhanced 4G LTE Mode"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Advanced na Pagtawag"</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="2382798156640007971">"Payagan ang paggamit ng data"</string>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"Roaming"</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="6843814381576397939">"Naka-off ang data roaming. I-tap para i-on."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Nawalan ng koneksyon ng mobile data"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Nawalan ka ng pagkonekta sa data dahil iniwan mo ang iyong home network na naka-off ang roaming ng data."</string>
     <string name="roaming_warning" msgid="1603164667540144353">"Maaari kang magkaroon ng malaking bayarin."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Magtanong sa iyong provider ng network para sa presyo."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Payagan ang roaming ng data?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Paggamit ng data ng app"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Paggamit ng data"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> na mobile data ang nagamit noong <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Advanced"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Carrier"</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Hindi makakapag-hold ng mga tawag."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Kumonekta sa isang wireless network upang makatawag."</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"I-enable ang pagtawag sa Wi-Fi upang tumawag."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Impormasyong pang-emergency"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"May-ari"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"I-tap muli para tingnan ang impormasyon"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Emergency na tawag"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Mga pang-emergency na tawag lang"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Numerong pang-emergency"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Mga numerong pang-emergency"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Mag-tap muli para tumawag sa <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Ino-on ang radyo…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Walang serbisyo. Sinusubukang muli…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Hindi maaaring ilagay sa ariplane mode habang nasa isang emergency na tawag."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Hindi available ang emergency na pagtawag"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Pulis"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Ambulansya"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Sunog"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</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>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Hindi na-import ang contact"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Mga hearing aid"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"I-on ang compatibility ng hearing aid"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Real-time na text (RTT) na tawag"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Payagan ang pagmemensahe sa isang voice call"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"Tinutulungan ng RTT ang mga tumatawag na bingi, mahina ang pandinig, may kapansanan sa pagsasalita, o kailangan ng higit pa sa boses lang.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Matuto pa&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - Sine-save ang mga RTT na tawag bilang transcript ng mensahe\n       &lt;br&gt; - Hindi available ang RTT para sa mga video call"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"I-on o i-off ang RTT"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"I-off ang TTY"</item>
     <item msgid="3971695875449640648">"Puno ang TTY"</item>
@@ -606,8 +587,6 @@
     <string name="selectContact" msgid="781975788478987237">"pumili ng contact"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Hindi suportado ang voice calling"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"Mag-dial"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"ipakita ang dialpad"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Pang-emergency na Dialpad"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Visual Voicemail"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Magtakda ng PIN"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Baguhin ang PIN"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index cfe4c93..f14eb3b 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Ayarlar geri alınıyor..."</string>
     <string name="response_error" msgid="6674110501330139405">"Ağdan beklenmeyen yanıt."</string>
     <string name="exception_error" msgid="7027667130619518211">"Ağ veya SIM kart hatası."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS isteği normal çağrı olarak değişti"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS isteği USSD isteği olarak değişti"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Yeni SS isteği olarak değişti"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS isteği görüntülü görüşme olarak değişti"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS isteği DIAL isteği olarak değiştirildi."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS isteği USSD isteği olarak değiştirildi."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS isteği yeni SS isteği olarak değiştirildi."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS isteği, Video DIAL isteği olarak değiştirildi."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"Telefon uygulamanızın Sabit Arama Numaraları ayarı açık. Bu nedenle çağrıyla ilgili bazı özellikler çalışmıyor."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Bu ayarları görüntülemeden önce radyoyu açın."</string>
     <string name="close_dialog" msgid="2365884406356986917">"Tamam"</string>
@@ -163,7 +163,7 @@
     <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>
-    <string name="network_query_error" msgid="8466081377231178298">"Ağlar bulunamadı. Tekrar deneyin."</string>
+    <string name="network_query_error" msgid="6828516148953325006">"Ağlar aranırken hata oluştu."</string>
     <string name="register_on_network" msgid="9055203954040805084">"<xliff:g id="NETWORK">%s</xliff:g> ağına kaydediliyor..."</string>
     <string name="not_allowed" msgid="5613353860205691579">"SIM kartınız bu ağa bağlanmaya izin vermiyor."</string>
     <string name="connect_later" msgid="2308119155752343975">"Şu an bu ağa bağlanılamıyor. Daha sonra tekrar deneyin."</string>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Ağın çalışma modunu değiştir"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Tercih edilen ağ türü"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(yasak)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Ağ seç"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Bağlı değil"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Bağlanıldı"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Bağlanılıyor..."</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Bağlanılamadı"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA tercih edilen"</item>
     <item msgid="8442633436636425221">"Yalnızca GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Çağrı"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Ağ"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Geliştirilmiş 4G LTE Modu"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Gelişmiş Çağrı"</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="2382798156640007971">"Veri kullanımına izin ver"</string>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"Dolaşım"</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="6843814381576397939">"Veri dolaşımı devre dışı bırakıldı. Etkinleştirmek için dokunun."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Mobil veri bağlantısı koptu"</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="1603164667540144353">"Kayda değer ücretler ödeyebilirsiniz."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Fiyat bilgisi için ağ sağlayıcınıza başvurun."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Veri dolaşımına izin verilsin mi?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Uygulama veri kullanımı"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Veri kullanımı"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_2">%2$s</xliff:g> arasında <xliff:g id="ID_1">%1$s</xliff:g> mobil veri kullanıldı"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Gelişmiş"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Operatör"</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Çağrılar beklemeye alınamı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="incall_error_promote_wfc" msgid="106510757624022064">"Telefon etmek için Kablosuz çağrı\'yı etkinleştirin."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Acil durum bilgisi"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Sahip"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Bilgileri görüntülemek için tekrar dokunun"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Acil durum çağrısı"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Yalnızca acil durum aramaları için"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Acil durum numarası"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Acil durum numaraları"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"<xliff:g id="EMERGENCY_NUMBER">%s</xliff:g> numaralı telefonu aramak için tekrar dokunun"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Radyo açılıyor..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Servis yok. Tekrar deneniyor…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Acil durum çağrısı sırasında uçak moduna geçilemez."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Acil durum çağrısı yapılamaz"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Polis"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Ambulans"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"İtfaiye"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</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>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Kişi içe aktarılamadı"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"İşitme cihazları"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"İşitme cihazı uyumluluğunu aç"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Gerçek zamanlı mesaj (RTT) çağrısı"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Sesli aramada mesajlaşmaya izin verilir"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"RTT; tam veya kısmi işitme engelli, konuşma engeli olan veya sesten fazlasına ihtiyaç duyan arayanlara yardımcı olur.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Daha fazla bilgi&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - RTT çağrıları, mesaj çeviri yazısı olarak kaydedilir\n       &lt;br&gt; - RTT, görüntülü görüşmelerde kullanılamaz"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"RTT\'yi etkinleştirin veya devre dışı bırakın"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY Kapalı"</item>
     <item msgid="3971695875449640648">"TTY Tam"</item>
@@ -606,8 +587,6 @@
     <string name="selectContact" msgid="781975788478987237">"kişi seçin"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Sesli arama desteklenmiyor"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"çevir"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"tuş takımını gösterir"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Acil Durum Tuş Takımı"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Görsel Sesli Mesaj"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"PIN\'i ayarlayın"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"PIN\'i değiştirin"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index e8adb1a..7d491e1 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -20,7 +20,7 @@
     <string name="phoneAppLabel" product="default" msgid="6790717591729922998">"Телефонні служби"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Аварійний телефон"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Телефон"</string>
-    <string name="fdnListLabel" msgid="8630418672279521003">"Список фіксованого набору"</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>
@@ -92,8 +92,8 @@
     <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="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>
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Відновл. налашт-нь…"</string>
     <string name="response_error" msgid="6674110501330139405">"Неочікувана відповідь від мережі"</string>
     <string name="exception_error" msgid="7027667130619518211">"Помилка мережі чи SIM-карти."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"Запит SS змінено на звичайний виклик"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"Запит SS змінено на запит USSD"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Змінено на новий запит SS"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"Запит SS змінено на відеовиклик"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"Запит SS перетворено на запит DIAL."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"Запит SS перетворено на запит USSD."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"Запит SS перетворено на новий запит SS."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"Запит SS перетворено на запит Video DIAL."</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>
@@ -163,7 +163,7 @@
     <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="network_query_error" msgid="8466081377231178298">"Не вдалося знайти мережу. Повторіть спробу."</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>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Змінити режим роботи мережі"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Тип мережі"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(заборонено)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Вибрати мережу"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Від’єднано"</string>
-    <string name="network_connected" msgid="1288589103624338857">"З’єднано"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"З’єднання…"</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Не вдалося з’єднатися"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"Рекомендовано GSM/WCDMA"</item>
     <item msgid="8442633436636425221">"Лише GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Виклики"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Мережа"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Розширений режим 4G LTE"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Дзвінки з розширеними можливостями"</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>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"Роумінг"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Підключатися до служб передавання даних у роумінгу"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Підключатися до служб передавання даних у роумінгу"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"Роумінг даних вимкнено. Натисніть, щоб увімкнути."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Від’єднано від мобільного Інтернету"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Доступ до даних утрачено, оскільки ви вийшли з домашньої мережі з вимкненим роумінгом даних."</string>
     <string name="roaming_warning" msgid="1603164667540144353">"Може стягуватися значна плата."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Докладніше про ціни можна дізнатися в оператора мережі."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Дозволити роумінг даних?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Використання трафіку додатками"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Використання трафіку"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> мобільного трафіку використано в період <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Додатково"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Оператор"</string>
@@ -388,18 +382,18 @@
     <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="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">"Увімкнути фіксований набір"</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">"Увімкнути фіксований набір"</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">"Змінити PIN-код для фіксованого набору"</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">"Конфіденційність Voice"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Увімкн. режим розшир. конфіденц."</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Не можна призупиняти виклики."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Щоб зателефонувати, під’єднайтеся до бездротової мережі."</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"Щоб мати змогу телефонувати, увімкніть виклики через Wi-Fi."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Дані для екстрених випадків"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Власник"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Торкніться ще раз, щоб переглянути відомості"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Аварійний виклик"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Лише екстрені виклики"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Екстрений номер"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Екстрені номери"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Торкніться ще раз, щоб зателефонувати на номер <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Увімкнення радіо…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Зв’язку немає. Повторна спроба…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Неможливо перейти в режим польоту під час екстреного виклику."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Екстрені виклики недоступні"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Поліція"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Швидка допомога"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Пожежно-рятувальна служба"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Викор. клав. для набору"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Утрим."</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Закінч."</string>
@@ -540,10 +522,9 @@
     <string name="singleContactImportedMsg" msgid="6868483416182599206">"Імпортований контакт"</string>
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Контакт не імпортовано"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Слухові апарати"</string>
-    <string name="hac_mode_summary" msgid="6833851160514929341">"Увімкнути підтримку слухових апаратів"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Виклик із передаванням тексту в реальному часі"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Дозволити передавання повідомлень під час голосового виклику"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"Функція RTT буде корисною для осіб із вадами слуху чи порушеннями мовлення, а також тих людей, для яких голосового спілкування недостатньо.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Докладніше&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; – RTT-виклики зберігаються як транскрибований текст\n       &lt;br&gt; – Функція RTT не підтримується для відеодзвінків"</string>
+    <string name="hac_mode_summary" msgid="6833851160514929341">"Увімкнути функцію НАС"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Увімкнути або вимкнути RTT"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"Телетайп вимкнено"</item>
     <item msgid="3971695875449640648">"Повнофункціональний телетайп"</item>
@@ -610,8 +591,6 @@
     <string name="selectContact" msgid="781975788478987237">"вибрати контакт"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Голосові дзвінки не підтримуються"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"дзвонити"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"показати цифрову клавіатуру"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Цифрова клавіатура для екстрених викликів"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Візуальна голосова пошта"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Установити PIN-код"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Змінити PIN-код"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 838b4c5..46fb220 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"ترتیبات لوٹا رہا ہے…"</string>
     <string name="response_error" msgid="6674110501330139405">"نیٹ ورک سے غیر متوقع جواب۔"</string>
     <string name="exception_error" msgid="7027667130619518211">"‏نیٹ ورک یا SIM کارڈ کی خرابی۔"</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"‏SS درخواست کو ریگولر کال میں تبدیل کر دیا گیا"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"‏SS درخواست کو USSD درخواست میں تبدیل کر دیا گیا"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"‏نئی SS درخواست میں تبدیل کر دیا گیا"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"‏SS درخواست کو ویڈیو کال میں تبدیل کر دیا گیا"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"‏SS درخواست میں ترمیم کر کے DIAL درخواست بنا دی گئی ہے۔"</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"‏SS درخواست میں ترمیم کر کے USSD درخواست بنا دی گئی ہے۔"</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"‏SS درخواست میں ترمیم کر کے نئی SS درخواست بنا دی گئی ہے۔"</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"‏SS درخواست میں ترمیم کر کے ویڈیو DIAL درخواست بنا دی گئی ہے۔"</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"آپ کے فون کی ایپ کے فکسڈ ڈائلنگ نمبرز کی ترتیب آن ہے۔ نتیجتاًً، کال سے متعلقہ کچھ خصوصیات کام نہیں کر رہی ہیں۔"</string>
     <string name="radio_off_error" msgid="2304459933248513376">"یہ ترتیبات دیکھنے سے پہلے ریڈیو آن کریں۔"</string>
     <string name="close_dialog" msgid="2365884406356986917">"ٹھیک ہے"</string>
@@ -163,7 +163,7 @@
     <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="network_query_error" msgid="8466081377231178298">"نیٹ ورکس نہیں مل سکے۔ دوبارہ کوشش کریں۔"</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>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"نیٹ ورک آپریٹنگ طرز تبدیل کریں"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"ترجیحی نیٹ ورک کی قسم"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(ممنوع)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"نیٹ ورک کا انتخاب کریں"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"غیر منسلک ہے"</string>
-    <string name="network_connected" msgid="1288589103624338857">"منسلک ہو گیا"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"منسلک ہو رہا ہے…"</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"منسلک نہیں کیا جا سکا"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"‏GSM/WCDMA ترجیحی"</item>
     <item msgid="8442633436636425221">"‏صرف GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"کال کی جا رہی ہے"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"نیٹ ورک"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"‏Enhanced 4G LTE وضع"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"اعلی درجے کی کالنگ"</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>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"رومنگ"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"رومنگ کے وقت ڈیٹا سروسز سے مربوط ہوں"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"رومنگ کے وقت ڈیٹا سروسز سے مربوط ہوں"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"ڈیٹا رومنگ آف ہے۔ آن کرنے کے لئے تھپتھپائیں۔"</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"موبائل ڈیٹا کنکشن منقطع ہو گیا"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"آپ ڈیٹا کی حالت رسائی سے محروم ہوگئے کیونکہ آپ نے ڈیٹا رومنگ آف ہونے کے ساتھ اپنا ہوم نیٹ ورک چھوڑ دیا۔"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"آپ پر خاطر خواہ چارجز لگ سکتے ہیں۔"</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"اپنے نیٹ ورک فراہم کنندہ سے قیمت معلوم کریں۔"</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"ڈیٹا رومنگ کی اجازت دیں؟"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"ایپ ڈیٹا کا استعمال"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"ڈیٹا کا استعمال"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> موبائل ڈیٹا <xliff:g id="ID_2">%2$s</xliff:g> میں استعمال ہوا"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"جدید ترین"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"کیریئر"</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"کالز کو ہولڈ نہیں کیا جا سکتا۔"</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"کال کرنے کیلئے کسی وائرلیس نیٹ ورک سے منسلک ہوں۔"</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"‏کال کرنے کیلئے Wi-Fi کالنگ فعال کریں۔"</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"ہنگامی معلومات"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"مالک"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"معلومات دیکھنے کیلئے دوبارہ تھپتھپائیں"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"ہنگامی کال"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"صرف ہنگامی کالز"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"ایمرجنسی نمبر"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"ایمرجنسی نمبرز"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"<xliff:g id="EMERGENCY_NUMBER">%s</xliff:g> کو کال کرنے کے لئے دوبارہ تھپتھپائيں"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"ریڈیو آن کر رہا ہے…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"کوئی سروس نہیں ہے۔ دوبارہ کوشش کی جا رہی ہے…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"ہنگامی کال کے دوران ہوائی جہاز موڈ میں داخل نہیں ہو سکتا۔"</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"ہنگامی کالنگ دستیاب نہیں ہے"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"پولیس"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"ایمبولینس"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"آگ"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"ڈائل کرنے کیلئے کی بورڈ استعمال کریں"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"ہولڈ کریں"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"ختم کریں"</string>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"رابطہ درآمد کرنے میں ناکام"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"سماعتی آلات"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"سماعتی آلہ کی ہم آہنگی آن کریں"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"‏ریئل ٹائم ٹیکسٹ (RTT) کال"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"صوتی کال کے اندر پیغام رسانی کی اجازت دیں"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"‏RTT ایسے کالرز کو اسسٹ کرتا ہے جو بہرے ہیں، اونچا سنتے ہیں، بولنے سے معزور ہیں یا ان کیلئے صرف آواز ہی کافی نہیں ہے۔‎&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;‎مزید جانیں‎&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - RTT کالز پیغام ٹرانسکرپٹ کے بطور محفوظ کی جاتی ہیں\n       ‎&lt;br&gt; - RTT ویڈیو کالز کیلئے دستیاب نہیں ہے"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"‏RTT آن یا آف کریں"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"‏TTY آف"</item>
     <item msgid="3971695875449640648">"‏TTY مکمل"</item>
@@ -606,8 +587,6 @@
     <string name="selectContact" msgid="781975788478987237">"رابطہ منتخب کریں"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"صوتی کالنگ تعاون یافتہ نہیں ہے"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"ڈائل کریں"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"ڈائل پیڈ دکھائیں"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"ایمرجنسی ڈائل پیڈ"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"بصری صوتی میل"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"‏PIN سیٹ کریں"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"‏PIN تبدیل کریں"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index a5cac48..f19040d 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -58,7 +58,7 @@
     <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">"Internetga ulanish nuqtalari (APN)"</string>
+    <string name="apn_settings" msgid="9043423184895642077">"Internetga kirish nuqtalari (APN)"</string>
     <string name="settings_label" msgid="3876743539816984008">"Tarmoq sozlamalari"</string>
     <string name="phone_accounts" msgid="6376603393888116364">"Chaqiruv uchun hisoblar"</string>
     <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Qo‘ng‘iroqlar uchun hisob"</string>
@@ -72,7 +72,7 @@
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Hisob sozlamalarini shakllantirish"</string>
     <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Barcha qo‘ng‘iroq hisoblari"</string>
     <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Qo‘ng‘iroqlarni amalga oshirish mumkin bo‘lgan hisoblarni tanlang"</string>
-    <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi chaqiruv"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi qo‘ng‘iroq"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Ichki o‘rnatilgan ulanish xizmati"</string>
     <string name="voicemail" msgid="8693759337917898954">"Ovozli pochta"</string>
     <string name="voicemail_settings_with_label" msgid="152724978380748296">"Ovozli pochta (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
@@ -80,22 +80,22 @@
     <string name="voicemail_notifications_preference_title" msgid="4019728578955102213">"Bildirishnomalar"</string>
     <string name="cell_broadcast_settings" msgid="8740238216690502563">"Favqulodda tarqatma xabarlar"</string>
     <string name="call_settings" msgid="6112441768261754562">"Chaqiruv sozlamalari"</string>
-    <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Kengaytirilgan sozlamalar"</string>
-    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Kengaytirilgan sozlamalar (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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">"Raqamni aniqlash xizmati"</string>
     <string name="sum_loading_settings" msgid="1826692909391168620">"Sozlamalar yuklanmoqda…"</string>
-    <string name="sum_hide_caller_id" msgid="1071407020290873782">"Chiquvchi chaqiruvlarda raqam berkitilsin"</string>
-    <string name="sum_show_caller_id" msgid="6768534125447290401">"Chiquvchi chaqiruvlarda chiqadigan raqam"</string>
-    <string name="sum_default_caller_id" msgid="1954518825510901365">"Chiquvchi chaqiruvlarda telefon raqamingizni chiqarish uchun operatorning standart sozlamalari ishlatiladi"</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">"Chiquvchi qo‘ng‘iroqlarda telefon raqamimni ko‘rsatish uchun operatorning standart sozlamalaridan foydalanilsin"</string>
     <string name="labelCW" msgid="6120513814915920200">"Chaqiruvni kutish"</string>
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Suhbat vaqtida kiruvchi chaqiruv kelsa, sizga xabar qilinadi"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Suhbat vaqtida kiruvchi chaqiruv kelsa, sizga xabar qilinadi"</string>
-    <string name="call_forwarding_settings" msgid="3378927671091537173">"Chaqiruvni uzatish"</string>
-    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Chaqiruvni uzatish (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="call_forwarding_settings" msgid="3378927671091537173">"Chaqiruvni yo‘naltirish"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Chaqiruvni yo‘naltirish (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Chaqiruvlarni uzatish"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Har doim uzatish"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Qo‘ng‘iroq har doim ushbu raqamga yo‘naltirilsin"</string>
@@ -113,7 +113,7 @@
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"<xliff:g id="PHONENUMBER">{0}</xliff:g> raqamiga yo‘naltiriladi"</string>
     <string name="sum_cfnry_disabled" msgid="3884684060443538097">"O‘chiq"</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">"Agar raqam tarmoqdan tashqarida bo‘lsa"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"Agar raqamga tushib bo‘lmasa"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Ushbu raqamga yo‘naltirilsin"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"<xliff:g id="PHONENUMBER">{0}</xliff:g> raqamiga yo‘naltiriladi"</string>
     <string name="sum_cfnrc_disabled" msgid="2684474391807469832">"O‘chiq"</string>
@@ -127,10 +127,10 @@
     <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="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS so‘rovi oddiy chaqiruvga o‘zgartirildi"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS so‘rovi USSD so‘roviga o‘zgartirildi"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Yangi SS so‘roviga o‘zgartirildi"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS so‘rovi video chaqiruvga o‘zgartirildi"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS so‘rovi DIAL so‘roviga o‘zgartirildi."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS so‘rovi USSD so‘roviga o‘zgartirildi."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS so‘rovi yangi SS so‘roviga o‘zgartirildi."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS so‘rovi Video DIAL so‘roviga o‘zgartirildi."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"Telefon ilovasidagi ruxsat etilgan raqamlar yoqildi. Endim ba’zi qo‘ng‘iroq funksiyalari ishlamay qoladi."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Ushbu sozlamalarni ko‘rishdan oldin radioni yoqing."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
@@ -163,7 +163,7 @@
     <string name="label_available" msgid="1181658289009300430">"Mavjud tarmoqlar"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Qidirilmoqda…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Birorta ham tarmoq topilmadi."</string>
-    <string name="network_query_error" msgid="8466081377231178298">"Hech qanday tarmoqni topilmadi. Qayta urining."</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>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Tarmoq rejimini o‘zgartiring"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Tarmoq turi"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(taqiqlangan)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Tarmoqni tanlash"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Tarmoqqa ulanmagan"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Ulandi"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Ulanmoqda…"</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Tarmoqqa ulanmadi"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA (tavsiya qilinadi)"</item>
     <item msgid="8442633436636425221">"Faqat GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Chaqiruvlar"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Tarmoq"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Kuchaytirilgan 4G LTE rejimi"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Keng imkoniyatli qo‘ng‘iroqlar"</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>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"Rouming"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Rouming vaqtida mobil internetga ulanish"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Rouming vaqtida mobil internetga ulanish"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"Rouming-internet yoqilmagan. Uni yoqish uchun bosing."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Mobil internet uzildi"</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">"Xarajati ancha yuqori bo‘lishi mumkin."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Paketlar narxlari haqidagi ma’lumotni internet provayderingizdan olishingiz mumkin."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Internet-roumingga ruxsat berilsinmi?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Ilova sarflagan trafik"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Trafik sarfi"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_2">%2$s</xliff:g> davomida sarflangan mobil trafik: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Kengaytirilgan sozlamalar"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Aloqa operatori"</string>
@@ -274,7 +268,7 @@
     <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="5217706521499010816">"Aloqa operatoringizning mobil internetdan foydalanish siyosati haqida batafsil"</string>
+    <string name="throttle_help_subtext" msgid="5217706521499010816">"Tarmoq operatoringizning uyali tarmoq ma’lumotidan foydalanish siyosati haqida ko‘proq 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>
@@ -395,12 +389,12 @@
     <string name="fdn_disabled" msgid="4700049736675368279">"Ruxsat etilgan raqamlar cheklovi yoqilmagan"</string>
     <string name="enable_fdn" msgid="3740191529180493851">"Ruxsat etilgan raqamlar cheklovini yoqish"</string>
     <string name="disable_fdn" msgid="7944020890722540616">"FDNni o‘chirib qo‘yish"</string>
-    <string name="change_pin2" msgid="2153563695382176676">"PIN2 kodni almashtirish"</string>
+    <string name="change_pin2" msgid="2153563695382176676">"PIN2 kodni o‘zgartirish"</string>
     <string name="enable_fdn_ok" msgid="7215588870329688132">"FDNni o‘chirib qo‘yish"</string>
     <string name="disable_fdn_ok" msgid="5727046928930740173">"Ruxsat etilgan raqamlar cheklovini yoqish"</string>
     <string name="sum_fdn" msgid="1959399454900272878">"Ruxsat etilgan raqamlarni boshqarish"</string>
-    <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Ruxsat etilgan raqamlarga kirishda ishlatiladigan PIN kodni almashtirish"</string>
-    <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Ruxsat etilgan raqamlarni boshqarish"</string>
+    <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Ruxsat etilgan raqamlar ro‘yxatiga kirishda ishlatiladigan PIN kodni o‘zgartirish"</string>
+    <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Ruxsat etilgan raqamlar 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">"Teletayp rejimi"</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Qo‘ng‘iroqlarni ushlab turib 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="incall_error_promote_wfc" msgid="106510757624022064">"Qo‘ng‘iroq qilish uchun Wi-Fi qo‘ng‘iroqlar funksiyasini yoqing."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Favqulodda vaziyatlar uchun axborot"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Egasi"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Axborotni ochish uchun yana bir marta bosing"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Favqulodda chaqiruv"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Faqat favqulodda chaqiruvlar"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Favqulodda xizmat raqami"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Favqulodda xizmat raqamlari"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"<xliff:g id="EMERGENCY_NUMBER">%s</xliff:g> raqamiga chaqiruv qilish uchun yana bir marta bosing"</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="radio_off_during_emergency_call" msgid="2535800034010306830">"Favqulodda qo‘ng‘iroq paytida parvoz rejimiga o‘tkazib bo‘lmaydi."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Favqulodda xizmat raqamiga chaqiruv qilib bo‘lmaydi"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Politsiya"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Tez tibbiy yordam"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"O‘t o‘chirish xizmati"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</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>
@@ -532,7 +514,7 @@
     <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"</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>
@@ -541,11 +523,10 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Kontaktni import qilib bo‘lmadi"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Eshitish apparatlari"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Eshitish apparatlari bilan ishlash imkoniyatini yoqish"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"RTT chaqiruvi"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Video chaqiruvlar vaqtida xabarlar almashinuviga ruxsat berish"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"RTT kar, eshitish qobiliyati va nutqiy faoliyati buzilgan shaxslarga mo‘ljallangan funksiyadir.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Batafsil&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; – RTT chaqiruvlari transkripsiya sifatida saqlanadi.\n       &lt;br&gt; – RTT funksiyasidan video chaqiruvlar vaqtida foydalanib bo‘lmaydi."</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"Kiritilayotgan matnni real vaqtda ko‘rish funksiyasi"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Kiritilayotgan matnni real vaqtda ko‘rish funksiyasini yoqish yoki o‘chirish"</string>
   <string-array name="tty_mode_entries">
-    <item msgid="512950011423868021">"Teletayp yoqilmagan"</item>
+    <item msgid="512950011423868021">"Teletayp o‘chiq"</item>
     <item msgid="3971695875449640648">"To‘liq funksiyali teletayp"</item>
     <item msgid="1937509904407445684">"Suhbatdoshni eshitish imkoniyati bor teletayp"</item>
     <item msgid="5644925873488772224">"Ovozni uzatish imkoniyati bor teletayp"</item>
@@ -579,8 +560,8 @@
     <string name="ota_try_again" msgid="7685477206465902290">"Yana urinib ko‘ring"</string>
     <string name="ota_next" msgid="3904945374358235910">"Keyingisi"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
-    <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Favqulodda teskari chaqiruv rejimida"</string>
-    <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Favqulodda teskari chaqiruv rejimi"</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>
     <string name="phone_in_ecm_notification_complete_time" msgid="7730376844178948351">"<xliff:g id="COMPLETETIME">%s</xliff:g> gacha internetga ulanib bo‘lmaydi"</string>
     <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
@@ -606,11 +587,9 @@
     <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="description_dialpad_button" msgid="5220006811894230590">"klaviaturani ochish"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Favqulodda chaqiruvlar"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Vizual ovozli pochta"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"PIN kodni o‘rnatish"</string>
-    <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"PIN kodni almashtirish"</string>
+    <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"PIN kodni o‘zgartirish"</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>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 1d67637..6c82fd0 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -90,7 +90,7 @@
     <string name="sum_loading_settings" msgid="1826692909391168620">"Đang tải cài đặt…"</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Số bị ẩn trong cuộc gọi đi"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Số được hiển thị trong cuộc gọi đi"</string>
-    <string name="sum_default_caller_id" msgid="1954518825510901365">"Sử dụng các mục cài đặt mặc định của nhà mạng để hiển thị số của tôi trong các cuộc gọi đi"</string>
+    <string name="sum_default_caller_id" msgid="1954518825510901365">"Sử dụng cài đặt mặc định của nhà cung cấp dịch vụ để hiển thị số của tôi trong cuộc gọi đi"</string>
     <string name="labelCW" msgid="6120513814915920200">"Chờ cuộc gọi"</string>
     <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>
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Đang hoàn nguyên cài đặt…"</string>
     <string name="response_error" msgid="6674110501330139405">"Phản hồi không mong muốn từ mạng."</string>
     <string name="exception_error" msgid="7027667130619518211">"Lỗi mạng hoặc thẻ SIM."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"Yêu cầu SS đã thay đổi thành cuộc gọi thông thường"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"Yêu cầu SS đã thay đổi thành yêu cầu USSD"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Đã thay đổi thành yêu cầu SS mới"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"Yêu cầu SS đã thay đổi thành cuộc gọi video"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"Yêu cầu SS được sửa đổi thành yêu cầu DIAL."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"Yêu cầu SS được sửa đổi thành yêu cầu USSD."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"Yêu cầu SS được sửa đổi thành yêu cầu SS mới."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"Đã sửa đổi yêu cầu SS thành yêu cầu DIAL video."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"Cài đặt Số quay định sẵn trên ứng dụng điện thoại được bật. Do đó, một số tính năng có liên quan đến cuộc gọi không hoạt động."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Hãy bật radio trước khi xem những cài đặt này."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
@@ -148,7 +148,7 @@
     <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="2001233554889016880">"Nhà mạng của bạn"</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"Nhà cung cấp dịch vụ của bạn"</string>
     <string name="vm_change_pin_old_pin" msgid="7295220109886682573">"Mã PIN cũ"</string>
     <string name="vm_change_pin_new_pin" msgid="5412922262839438097">"Mã PIN mới"</string>
     <string name="vm_change_pin_progress_message" msgid="3977357361934350336">"Vui lòng đợi."</string>
@@ -163,7 +163,7 @@
     <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>
-    <string name="network_query_error" msgid="8466081377231178298">"Không tìm thấy mạng. Hãy thử lại."</string>
+    <string name="network_query_error" msgid="6828516148953325006">"Lỗi khi tìm kiếm mạng."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Đang đăng ký trên <xliff:g id="NETWORK">%s</xliff:g>..."</string>
     <string name="not_allowed" msgid="5613353860205691579">"Thẻ SIM của bạn không cho phép kết nối với mạng này."</string>
     <string name="connect_later" msgid="2308119155752343975">"Không thể kết nối với mạng này ngay bây giờ. Hãy thử lại sau."</string>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Thay đổi chế độ hoạt động của mạng"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Loại mạng ưu tiên"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(cấm)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Chọn mạng"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Đã ngắt kết nối"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Đã kết nối"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Đang kết nối..."</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Không thể kết nối"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA được ưu tiên"</item>
     <item msgid="8442633436636425221">"Chỉ GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Đang gọi"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Mạng"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Chế độ 4G LTE tăng cường"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Tính năng gọi nâng cao"</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="2382798156640007971">"Cho phép sử dụng dữ liệu"</string>
@@ -243,13 +238,12 @@
     <string name="roaming" msgid="7894878421600247140">"Chuyển vùng"</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="6843814381576397939">"Tính năng Chuyển vùng dữ liệu bị tắt. Nhấn để bật."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Đã mất kết nối dữ liệu di độ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="1603164667540144353">"Bạn có thể phải chịu các khoản phí đáng kể."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Hãy liên hệ với nhà cung cấp mạng của bạn để biết giá cước."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Cho phép chuyển vùng dữ liệu?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Mức sử dụng dữ liệu của ứng dụng"</string>
-    <string name="data_usage_template" msgid="8526428824844656364">"Đã dùng <xliff:g id="ID_1">%1$s</xliff:g> dữ liệu di động: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Mức sử dụng dữ liệu"</string>
+    <string name="data_usage_template" msgid="8526428824844656364">"Đã sử dụng <xliff:g id="ID_1">%1$s</xliff:g> dữ liệu di động <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Nâng cao"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Nhà cung cấp dịch vụ"</string>
     <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"nhà mạng, esim, sim, euicc, chuyển nhà mạng, thêm nhà mạng"</string>
@@ -362,7 +356,7 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Nhiều danh mục"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Đã bật nhiều danh mục"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Đã vô hiệu hóa nhiều danh mục"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (khuyên dùng)"</string>
+    <string name="network_lte" msgid="7702681952521375754">"LTE (được khuyến nghị)"</string>
     <string name="network_4G" msgid="2723512640529983138">"4G (được khuyến nghị)"</string>
     <string name="network_global" msgid="1323190488685355309">"Toàn cầu"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Chọn hệ thống"</string>
@@ -385,14 +379,14 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Kích hoạt thiết bị"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Thiết lập dịch vụ dữ liệu"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"Cài đặt nhà mạng"</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ố gọi định sẵn"</string>
     <string name="fdn_with_label" msgid="187084204115493366">"Số gọi định sẵn (<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ố gọi định sẵn đã bị tắt"</string>
+    <string name="fdn_disabled" msgid="4700049736675368279">"Số gọi định sẵn bị vô hiệu hóa"</string>
     <string name="enable_fdn" msgid="3740191529180493851">"Bật FDN"</string>
     <string name="disable_fdn" msgid="7944020890722540616">"Vô hiệu hóa FDN"</string>
     <string name="change_pin2" msgid="2153563695382176676">"Thay đổi mã PIN2"</string>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Không thể giữ 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="incall_error_promote_wfc" msgid="106510757624022064">"Bật gọi điện qua Wi-Fi để thực hiện cuộc gọi."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Thông tin khẩn cấp"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Chủ sở hữu"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Nhấn lại để xem thông tin"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Cuộc gọi khẩn cấp"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Chỉ cuộc gọi khẩn cấp"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Số khẩn cấp"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Số khẩn cấp"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Nhấn lại để gọi <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Đang bật radio..."</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="radio_off_during_emergency_call" msgid="2535800034010306830">"Không thể bật chế độ trên máy bay trong khi thực hiện cuộc gọi khẩn cấp."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Không sử dụng được tính năng gọi khẩn cấp"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Cảnh sát"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"Cấp cứu"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Hỏa hoạn"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</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>
@@ -541,12 +523,11 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Không nhập được liên hệ"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Trợ thính"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Bật khả năng tương thích trợ thính"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Cuộc gọi qua Tin nhắn theo thời gian thực (RTT)"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Cho phép nhắn tin trong cuộc gọi thoại"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"Tin nhắn theo thời gian thực (RTT) trợ giúp những người gọi khiếm thính, bị suy giảm thính lực, không có khả năng nói hoặc cần thêm hỗ trợ ngoài giọng nói.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Tìm hiểu thêm&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - Cuộc gọi qua RTT được lưu dưới dạng bản chép lời tin nhắn\n       &lt;br&gt; - Không thực hiện được cuộc gọi video qua RTT"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Bật hoặc tắt RTT"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"Tắt TTY"</item>
-    <item msgid="3971695875449640648">"TTY Đầy đủ"</item>
+    <item msgid="3971695875449640648">"TTY Đầy"</item>
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
@@ -606,8 +587,6 @@
     <string name="selectContact" msgid="781975788478987237">"chọn địa chỉ liên hệ"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Không hỗ trợ tính năng gọi thoại"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"quay số"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"hiển thị bàn phím số"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Bàn phím số khẩn cấp"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Thư thoại kèm theo hình ảnh"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Đặt mã PIN"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Thay đổi mã PIN"</string>
@@ -620,7 +599,7 @@
     <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">"Hỗ trợ tiếp cận"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Trợ năng"</string>
     <string name="status_hint_label_incoming_wifi_call" msgid="5932176406432044638">"Cuộc gọi qua Wi-Fi từ"</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="4906759256275562674">"Nhấn lại để mở"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 00dde1d..85d5f74 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -47,7 +47,7 @@
     <string name="add_vm_number_str" msgid="4676479471644687453">"添加号码"</string>
     <string name="voice_number_setting_primary_user_only" msgid="6596604364907022416">"只有主用户才能修改语音信箱设置。"</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网络解锁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>
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"正在恢复设置..."</string>
     <string name="response_error" msgid="6674110501330139405">"网络响应异常。"</string>
     <string name="exception_error" msgid="7027667130619518211">"网络或SIM卡出错。"</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS 请求已更改为普通通话"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS 请求已更改为 USSD 请求"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"已更改为新的 SS 请求"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS 请求已更改为视频通话"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS 请求已修改为 DIAL 请求。"</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS 请求已修改为 USSD 请求。"</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS 请求已修改为新的 SS 请求。"</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS 请求已修改为视频 DIAL 请求。"</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"拨号应用的固定拨号设置已启用。因此，部分与拨号相关的功能将不能正常使用。"</string>
     <string name="radio_off_error" msgid="2304459933248513376">"请先开启无线装置，然后再查看这些设置。"</string>
     <string name="close_dialog" msgid="2365884406356986917">"确定"</string>
@@ -163,7 +163,7 @@
     <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="network_query_error" msgid="8466081377231178298">"找不到网络，请重试。"</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>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"更改网络运行方式"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"首选网络类型"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"（禁止）"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"选择网络"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"已断开连接"</string>
-    <string name="network_connected" msgid="1288589103624338857">"已连接"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"正在连接…"</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"无法连接"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"首选 GSM/WCDMA"</item>
     <item msgid="8442633436636425221">"仅限 GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"通话"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"网络"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"增强型 4G LTE 模式"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"高级通话"</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>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"漫游"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"漫游时连接到移动数据网络服务"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"漫游时连接到移动数据网络服务"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"数据网络漫游已停用。点按即可启用。"</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"移动网络连接中断"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"移动数据网络连接已断开，因为您已离开本地网络并关闭了移动数据网络漫游功能。"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"这可能会产生高额费用。"</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"请与您的网络服务提供商联系以了解定价。"</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"要允许移动数据网络漫游吗？"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"应用的流量使用情况"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"流量使用情况"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_2">%2$s</xliff:g>期间使用的移动数据流量为：<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"高级"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"运营商"</string>
@@ -362,8 +356,8 @@
     <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_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>
@@ -433,9 +427,9 @@
     <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="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>
@@ -503,24 +497,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"无法保持通话。"</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"需连接至无线网络才能拨打电话。"</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"启用 WLAN 通话功能以拨打电话。"</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"急救信息"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"所有者"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"再次点按即可查看信息"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"紧急呼救"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"只能拨打紧急呼救电话"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"紧急电话号码"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"紧急电话号码"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"再次点按即可呼叫 <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"正在打开天线..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"无服务，正在重试…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"正在进行紧急呼救通话，无法开启飞行模式。"</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"无法使用紧急呼救功能"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"警察局"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"救护车"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"火警"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s、%2$s"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"使用键盘拨号"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"保持"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"挂断"</string>
@@ -541,9 +523,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"无法导入联系人"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"助听器"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"启用助听器兼容模式"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"实时信息 (RTT) 通话"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"允许在语音通话中发送信息"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"RTT 可为以下类型的来电者提供协助：失聪者、听力障碍人士、语言障碍人士或需要语音以外服务的人。&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;了解详情&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - 系统会以信息转录的方式存储 RTT 通话\n       &lt;br&gt; - 视频通话不支持 RTT"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"启用或停用 RTT"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"TTY 关闭"</item>
     <item msgid="3971695875449640648">"TTY 完整"</item>
@@ -606,8 +587,6 @@
     <string name="selectContact" msgid="781975788478987237">"选择联系人"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"不支持语音呼叫"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"拨号"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"显示拨号键盘"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"紧急拨号键盘"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"可视语音邮箱"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"设置 PIN 码"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"更改 PIN 码"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 65b31b1..62e13ce 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"正在還原設定…"</string>
     <string name="response_error" msgid="6674110501330139405">"網絡傳回非預期回應。"</string>
     <string name="exception_error" msgid="7027667130619518211">"網絡或 SIM 卡錯誤。"</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS 要求已變更為一般通話"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS 要求已變更為 USSD 要求"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"已變更為新的 SS 要求"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS 要求已變更為視像通話"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS 要求已修改為 DIAL 要求。"</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS 要求已修改為 USSD 要求。"</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS 要求已修改為新的 SS 要求。"</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS 要求已修改為影片 DIAL 要求。"</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"您的「手機」應用程式已開啟固定撥號設定，因此部分撥號相關功能無法正常運作。"</string>
     <string name="radio_off_error" msgid="2304459933248513376">"查看這些設定前，請先開啟無線電。"</string>
     <string name="close_dialog" msgid="2365884406356986917">"確定"</string>
@@ -163,7 +163,7 @@
     <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="network_query_error" msgid="8466081377231178298">"找不到網絡，請再試一次。"</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>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"更改網絡操作模式"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"偏好的網絡類型"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(禁止)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"選擇網絡"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"已解除連接"</string>
-    <string name="network_connected" msgid="1288589103624338857">"已連接"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"正在連接…"</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"無法連接"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"首選 GSM/WCDMA"</item>
     <item msgid="8442633436636425221">"只限 GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"通話"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"網絡"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"強化 4G LTE 模式"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"進階通話功能"</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>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"漫遊"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"漫遊時連線到數據服務"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"漫遊時連線到數據服務"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"數據漫遊已關閉。輕按以開啟。"</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"流動數據連線中斷"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"您已離開主網絡覆蓋範圍，且已關閉數據漫遊，因此數據連線已中斷。"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"您可能需要支付龐大的費用。"</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"請聯絡您的網絡供應商查詢定價。"</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"要允許數據漫遊嗎？"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"應用程式數據用量"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"數據用量"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_2">%2$s</xliff:g>期間使用了 <xliff:g id="ID_1">%1$s</xliff:g>流動數據"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"進階設定"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"流動網絡供應商"</string>
@@ -509,24 +503,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"無法保留通話。"</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"連接無線網絡，以撥打電話。"</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"啟用 Wi-Fi 通話功能以撥打電話。"</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"緊急資料"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"擁有者"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"再次輕按即可查看資訊"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"緊急電話"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"只可撥打緊急電話"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"緊急電話號碼"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"緊急電話號碼"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"再次輕按即可撥打 <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"正在開啟無線電..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"沒有服務。請再試一次…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"緊急通話時無法進入飛行模式。"</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"無法撥打緊急電話"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"警局"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"救護車"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"火"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s，%2$s"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"使用鍵盤撥號"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"按住"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"結束"</string>
@@ -547,9 +529,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"無法匯入聯絡人"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"助聽器"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"開啟助聽器相容功能"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"即時文字短訊 (RTT) 通話"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"允許在語音通話中傳送訊息"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"RTT 可協助耳聾、有聽力障礙、語言失能或不僅僅需要語音的通話者。&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;瞭解詳情&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - RTT 通話內容會儲存為訊息轉錄內容 \n       &lt;br&gt; - RTT 不適用於視像通話"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"開啟或關閉 RTT"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"關閉 TTY"</item>
     <item msgid="3971695875449640648">"TTY 完整模式"</item>
@@ -612,8 +593,6 @@
     <string name="selectContact" msgid="781975788478987237">"選取聯絡人"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"不支援語音通話"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"撥號"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"顯示撥號鍵盤"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"緊急撥號盤"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Visual Voicemail"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"設定 PIN 碼"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"變更 PIN"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index bdc42f1..4773603 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"正在還原設定…"</string>
     <string name="response_error" msgid="6674110501330139405">"網路傳回非預期回應。"</string>
     <string name="exception_error" msgid="7027667130619518211">"網路或 SIM 卡錯誤。"</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"SS 要求已變更為一般通話"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"SS 要求已變更為 USSD 要求"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"已變更為新的 SS 要求"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"SS 要求已變更為視訊通話"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS 要求已改為 DIAL 要求。"</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS 要求已改為 USSD 要求。"</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS 要求已改為新的 SS 要求。"</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"SS 要求已改為影片 DIAL 要求。"</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"您的「手機」應用程式已開啟「固定撥號」設定，導致部分撥號相關功能無法正常運作。"</string>
     <string name="radio_off_error" msgid="2304459933248513376">"查看這些設定前，請先開啟無線電。"</string>
     <string name="close_dialog" msgid="2365884406356986917">"確定"</string>
@@ -163,7 +163,7 @@
     <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="network_query_error" msgid="8466081377231178298">"找不到網路，請再試一次。"</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>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"變更網路操作模式"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"偏好的網路類型"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(已禁止)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"選擇網路"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"已中斷連線"</string>
-    <string name="network_connected" msgid="1288589103624338857">"已連線"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"連線中…"</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"無法連線"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA 優先"</item>
     <item msgid="8442633436636425221">"僅限 GSM"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"通話"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"網路"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"加強型 4G LTE 模式"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"進階通話功能"</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>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"漫遊"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"漫遊時連線到數據傳輸服務"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"漫遊時連線到數據傳輸服務"</string>
-    <string name="roaming_reenable_message" msgid="6843814381576397939">"漫遊服務已關閉，輕觸即可開啟。"</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"行動數據連線中斷"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"您已離開國內網路涵蓋範圍，且已關閉數據傳輸漫遊服務，因此數據連線已中斷。"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"您可能需要支付可觀的費用。"</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"請向你的網路供應商洽詢定價。"</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"允許漫遊服務？"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"應用程式數據用量"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"數據用量"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_2">%2$s</xliff:g>期間使用了 <xliff:g id="ID_1">%1$s</xliff:g> 的行動數據"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"進階"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"電信業者"</string>
@@ -297,7 +291,7 @@
     <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="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>
@@ -509,24 +503,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"無法保留通話。"</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"連上無線網路即可撥打電話。"</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"請啟用 Wi-Fi 通話功能以撥打電話。"</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"緊急救援資訊"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"擁有者"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"再次輕觸即可查看資訊"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"緊急電話"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"只能撥打緊急電話"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"緊急電話號碼"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"緊急電話號碼"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"再次輕觸即可撥打 <xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"開啟無線通訊中…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"找不到服務訊號，正在重試…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"撥打緊急電話時無法開啟飛航模式。"</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"無法撥打緊急電話"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"警察局"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"救護車"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"火警"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s、%2$s"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"使用鍵盤撥號"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"保留"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"結束"</string>
@@ -547,9 +529,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"無法匯入聯絡人"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"助聽器"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"開啟助聽器相容功能"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"即時文字訊息 (RTT) 通話"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"允許在進行語音通話時傳送訊息"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"即時文字訊息功能可為以下類型的來電者提供協助：聽障人士、聽力受損者、語言障礙者，或需要語音服務以外的使用者。&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;瞭解詳情&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - 系統會以訊息轉錄的方式儲存即時文字訊息通話內容\n       &lt;br&gt; - 視訊通話不支援即時文字訊息功能"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"開啟或關閉 RTT"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"關閉 TTY"</item>
     <item msgid="3971695875449640648">"TTY 完整功能"</item>
@@ -612,8 +593,6 @@
     <string name="selectContact" msgid="781975788478987237">"選取聯絡人"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"不支援語音通話"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"撥號"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"顯示撥號鍵盤"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"緊急撥號鍵盤"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"具有畫面的語音信箱"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"設定語音信箱密碼"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"變更 PIN 碼"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index df959b1..8f01c06 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -127,10 +127,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Iguqula izilungiselelo."</string>
     <string name="response_error" msgid="6674110501330139405">"Impendulo engalindelekile kwinethiwekhi."</string>
     <string name="exception_error" msgid="7027667130619518211">"Iphutha lenethiwekhi noma lekhadi le-SIM."</string>
-    <string name="stk_cc_ss_to_dial_error" msgid="4440038807310535377">"Isicelo se-SS sishintshele kukholi ejwayelekile"</string>
-    <string name="stk_cc_ss_to_ussd_error" msgid="6095812685884176176">"Isicelo se-SS sishintshele kusicelo se-USSD"</string>
-    <string name="stk_cc_ss_to_ss_error" msgid="7920654012697945858">"Ishintshele kusicelo esisha se-SS"</string>
-    <string name="stk_cc_ss_to_dial_video_error" msgid="3873905132181743781">"Isicelo se-SS sishintshele kukholi yevidiyo"</string>
+    <string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"Isicelo se-SS silungiselwe kusicelo SOKUDAYELA."</string>
+    <string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"Isicelo se-SS silungiselwe kusicelo se-USSD."</string>
+    <string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"Isicelo se-SS silungiselwe kusicelo esisha se-SS."</string>
+    <string name="stk_cc_ss_to_dial_video_error" msgid="3091186225006683939">"Isicelo se-SS silungiselwe kusicelo se-DIAL."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"Izilungiselelo zezinombolo zokudayila okukhiyiwe kohlelo lokusebenza lwefoni yakho zikhanyisiwe. Njengomphumela, ezinye izici ezihlobene namakholi azisebenzi."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Sicela uvule umsakazo ngaphambi kokubuka lezi zilungiselelo."</string>
     <string name="close_dialog" msgid="2365884406356986917">"KULUNGILE"</string>
@@ -163,7 +163,7 @@
     <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>
-    <string name="network_query_error" msgid="8466081377231178298">"Ayikwazanga ukuthola amanethiwekhi. Zama futhi."</string>
+    <string name="network_query_error" msgid="6828516148953325006">"Iphutha ngenkathi icinga amanethiwekhi."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Ibhalisa kwi <xliff:g id="NETWORK">%s</xliff:g>"</string>
     <string name="not_allowed" msgid="5613353860205691579">"Ikhadi lakho le-SIM alivumeli uxhumano kulenethiwekhi."</string>
     <string name="connect_later" msgid="2308119155752343975">"Ayikwazi ukuxhuma kunethiwekhi okwamanje. Zama futhi ngemva kwesikhashana."</string>
@@ -176,11 +176,6 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Shintsha imodi esebenzayo yenethiwekhi"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Uhlobo lwenethiwekhi oluncamelayo"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(kunqatshelwe)"</string>
-    <string name="choose_network_title" msgid="4023911977543009350">"Khetha inethiwekhi"</string>
-    <string name="network_disconnected" msgid="2227251609006103194">"Inqamukile"</string>
-    <string name="network_connected" msgid="1288589103624338857">"Ixhunyiwe"</string>
-    <string name="network_connecting" msgid="4927203097283533783">"Iyaxhuma..."</string>
-    <string name="network_could_not_connect" msgid="8254009365807767243">"Ayikwazanga ukuxhumeka"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"Okukhethwayo kwe-GSM / WCDMA"</item>
     <item msgid="8442633436636425221">"I-GSM kuphela"</item>
@@ -235,7 +230,7 @@
     <string name="call_category" msgid="5863978196309462052">"Iyashaya"</string>
     <string name="network_operator_category" msgid="4830701959205735636">"Inethiwekhi"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Imodi ye-4G LTE ethuthukisiwe"</string>
-    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (4447454259719947406) -->
+    <string name="enhanced_4g_lte_mode_title_variant" msgid="4871126028907265406">"Ukushaya okuthuthukile"</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="2382798156640007971">"Vumela ukusetshenziswa kwedatha"</string>
@@ -243,12 +238,11 @@
     <string name="roaming" msgid="7894878421600247140">"Iyazulazula"</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="6843814381576397939">"Ukuzulazula kwedatha kuvaliwe. Thepha ukuze ukuvule."</string>
-    <string name="roaming_notification_title" msgid="4749053220884743110">"Ukuxhumeka kwedatha yeselula kulahlekile"</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="1603164667540144353">"Ingahle uthole izindleko ezincane."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Hlola ngomhlinzeki wakho wenethiwekhi ukuze uthole intengo."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Vumela ukuhamba kwedatha?"</string>
-    <string name="data_usage_title" msgid="4042209259808900283">"Ukusetshenziswa kwedatha yohlelo lokusebenza"</string>
+    <string name="data_usage_title" msgid="8759619109516889802">"Ukusebenzisa idatha"</string>
     <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> kusetshenziswe idatha yeselula engu-<xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="advanced_options_title" msgid="8074895510265488035">"Okuthuthukisiwe"</string>
     <string name="carrier_settings_euicc" msgid="6714062862127226405">"Inkampani yenethiwekhi"</string>
@@ -507,24 +501,12 @@
     <string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Ayikwazi ukubamba amakholi."</string>
     <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Xhumeka kunethiwekhi engenantambo ukuze wenze ikholi."</string>
     <string name="incall_error_promote_wfc" msgid="106510757624022064">"Nika amandla ukushaya kwevoyisimeyili ukuze wenze ikholi."</string>
-    <string name="emergency_information_hint" msgid="399011533038204351">"Ulwazi lwesimo esiphuthumayo"</string>
-    <string name="emergency_information_owner_hint" msgid="688331472291637149">"Umnikazi"</string>
-    <string name="emergency_information_confirm_hint" msgid="4039012670779853030">"Thepha futhi ukuze ubuke ulwazi"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Ikholi ephuthumayo"</string>
-    <string name="emergency_dialpad_title" msgid="6052294225467269233">"Amakholi aphuthumayo kuphela"</string>
-    <string name="single_emergency_number_title" msgid="4959203129714396515">"Inombolo ephuthumayo"</string>
-    <string name="numerous_emergency_numbers_title" msgid="754158099451343898">"Izinombolo zesimo esiphuthumayo"</string>
-    <string name="emergency_call_shortcut_hint" msgid="6506167229097004348">"Thepha futhi ukuze ushayele u-<xliff:g id="EMERGENCY_NUMBER">%s</xliff:g>"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Ivula umsakazo..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Ayikho isevisi. Iyazama futhi…"</string>
     <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Ayikwazi ukungena kumodi yendiza ngesikhathi sekholi yesimo esiphuthumayo."</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="dial_emergency_calling_not_available" msgid="5675557523782491826">"Ukushaya okuphuthumayo akutholakali"</string>
-    <string name="police_type_description" msgid="5324410799919829693">"Amaphoyisa"</string>
-    <string name="ambulance_type_description" msgid="4114815025408089866">"I-Ambulensi"</string>
-    <string name="fire_type_description" msgid="7145996705197064710">"Umlilo"</string>
-    <string name="description_concat_format" msgid="7141070875487870177">"%1$s, %2$s"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Sebenzisa ikhibhodi ukudayela"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Bamba"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Qeda"</string>
@@ -545,9 +527,8 @@
     <string name="failedToImportSingleContactMsg" msgid="415399285420353917">"Yehlulekile ukungenisa oxhumana naye"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Izinsiza zokuzwa"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Vula ikhono lensiza yokuzwa"</string>
-    <string name="rtt_mode_title" msgid="6954652435543570121">"Ikholi yombhalo wesikhathi sangempela (i-RTT)"</string>
-    <string name="rtt_mode_summary" msgid="5146344277246544580">"Vumela ukuthumela imilayezo ngaphakathi kwekholi yezwi"</string>
-    <string name="rtt_mode_more_information" msgid="6080420780730383030">"I-RTT isiza abafonayo abangezwa ezindlebeni, abenzwa kanzima, abanokukhubazeka kwenkulumo, noma udinga ngaphezulu kwezwi kuphela.&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Funda kabanzi&lt;/a&gt;\n       &lt;br&gt;&lt;br&gt; - Amakholi e-RTT alondolozwa njengokubhala ngokuloba ngomlayezo\n       &lt;br&gt; - I-RTT ayitholakali kumakholi evidiyo"</string>
+    <string name="rtt_mode_title" msgid="5868105073514206953">"I-RTT"</string>
+    <string name="rtt_mode_summary" msgid="7346441783429748083">"Vula noma vala i-RTT"</string>
   <string-array name="tty_mode_entries">
     <item msgid="512950011423868021">"I-TTY Ivaliwe"</item>
     <item msgid="3971695875449640648">"I-TTY Igcwele"</item>
@@ -610,8 +591,6 @@
     <string name="selectContact" msgid="781975788478987237">"khetha othintana naye"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Ukushayela ngezwi akusekelwe"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"dayela"</string>
-    <string name="description_dialpad_button" msgid="5220006811894230590">"bonisa iphedi yokudayela"</string>
-    <string name="pane_title_emergency_dialpad" msgid="1148505414688493134">"Iphedi yokudayela ephuthumayo"</string>
     <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Ivoyisimeyili ebonakalayo"</string>
     <string name="voicemail_set_pin_dialog_title" msgid="2797924461029093837">"Setha IPHINI"</string>
     <string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"Shintsha i-PIN"</string>
diff --git a/res/values/config.xml b/res/values/config.xml
index 855fa92..b1c1607 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -137,7 +137,7 @@
     <!-- DEPRECATED: Use CarrierConfigManager#KEY_PREFER_2G_BOOL -->
     <bool name="config_prefer_2g" translatable="false">true</bool>
     <!-- Show enabled lte option for lte device -->
-    <bool name="config_enabled_lte" translatable="false">false</bool>
+    <bool name="config_enabled_lte" translatable="false">true</bool>
     <!-- Show enabled tdscdma option for device -->
     <bool name="config_support_tdscdma" translatable="false">false</bool>
     <!-- Show enabled tdscdma option for device when connect roaming network -->
@@ -235,6 +235,9 @@
     <!-- Flag indicating whether the device supports RTT (real-time text) -->
     <bool name="config_support_rtt">false</bool>
 
+    <!-- The package name for the platform number verification supplier app. -->
+    <string name="platform_number_verification_package" translatable="false"></string>
+
     <!-- Flag indicating whether a system app can use video calling fallback if carrier video
          calling is not available. -->
     <bool name="config_support_video_calling_fallback">true</bool>
@@ -247,4 +250,7 @@
          When this is true, the Telephony stack is able to add additional audio to the outgoing
          audio stream which the remote party will be able to hear. -->
     <bool name="config_support_telephony_audio_device">false</bool>
+
+    <!-- Intent action to launch target emergency app. -->
+    <string name="config_emergency_app_intent" translatable="false"></string>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index b657e64..38241de 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -128,8 +128,8 @@
     <dimen name="emergency_number_title_group_padding_horizontal">16dp</dimen>
 
     <!-- Height and vertical margin for the emergency information button. -->
-    <dimen name="emergency_info_button_height">96dp</dimen>
-    <dimen name="emergency_info_button_margin_vertical">56dp</dimen>
+    <dimen name="emergency_info_button_height">80dp</dimen>
+    <dimen name="emergency_info_button_margin_vertical">40dp</dimen>
     <dimen name="emergency_info_button_fix_margin_vertical">40dp</dimen>
 
     <!-- Margin for the emergency information button text. -->
@@ -155,7 +155,7 @@
     <dimen name="location_image_width">16dp</dimen>
 
     <!-- The height for button of emergency shortcut. -->
-    <dimen name="emergency_shortcut_button_height">96dp</dimen>
+    <dimen name="emergency_shortcut_button_height">80dp</dimen>
 
     <!-- The height and width for the circle image of phone number type.-->
     <dimen name="phone_number_type_circle_image_height">40dp</dimen>
@@ -197,4 +197,9 @@
     <!-- The width for emergency number title container.-->
     <dimen name="emergency_number_title_container_width">210dp</dimen>
 
+    <!-- The text size for emergency number title.-->
+    <dimen name="emergency_number_title_text_size">13sp</dimen>
+
+    <!-- The text size for emergency location.-->
+    <dimen name="emergency_location_text_size">13sp</dimen>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9053520..8fd194a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -51,7 +51,7 @@
     <!-- Label for "cancel" button on the MMI dialog -->
     <string name="cancel">Cancel</string>
     <!-- Toast string displayed to user if the input in MMI dialog is < 1 or > 160 -->
-    <string name="enter_input">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="enter_input">USSD message must be between <xliff:g id="min_len" >%1$d</xliff:g> and <xliff:g id="max_len" >%2$d</xliff:g> characters. Please try again.</string>
 
     <!-- Label for "Manage conference call" panel [CHAR LIMIT=40] -->
     <string name="manageConferenceLabel">Manage conference call</string>
@@ -382,6 +382,8 @@
     <string name="already_auto">Already in automatic selection.</string>
     <!-- Available networks screen, name of switch button for whether to select network automatically -->
     <string name="select_automatically">Automatically select network</string>
+    <!-- Available networks screen, summary when button disallowed due to permanent automatic mode -->
+    <string name="manual_mode_disallowed_summary">Unavailable when connected to %1$s</string>
     <!-- Available networks screen, name of button when user wants to select network manually  -->
     <string name="network_select_title">Network</string>
     <string name="register_automatically">Automatic registration\u2026</string>
@@ -528,6 +530,16 @@
 
     <!-- Mobile network 4G summary [CHAR LIMIT=80] -->
     <string name="enhanced_4g_lte_mode_summary">Use LTE services to improve voice and other communications (recommended)</string>
+    <string name="enhanced_4g_lte_mode_summary_o2">Use 4G services to improve voice and other communications (recommended)</string>
+    <!-- Carrier variant of Enhaced 4G LTE Mode summary.  [CHAR LIMIT=80] -->
+    <string-array name="enhanced_4g_lte_mode_sumary_variant">
+        <!-- 0: Default -->
+        <item>@string/enhanced_4g_lte_mode_summary</item>
+        <!-- 1: Verizon -->
+        <item>@string/enhanced_4g_lte_mode_summary</item>
+        <!-- 2: O2 UK -->
+        <item>@string/enhanced_4g_lte_mode_summary_o2</item>
+    </string-array>
 
     <!-- Mobile network settings screen, data enabling checkbox name -->
     <string name="data_enabled">Data enabled</string>
@@ -1082,8 +1094,8 @@
     <!-- Label for the "No service" notification item, when expanded. -->
     <string name="notification_network_selection_title">No service</string>
     <!-- Label for the expanded "No service" notification item, including the
-         operator name set by user -->
-    <string name="notification_network_selection_text">Selected network (<xliff:g id="operator_name">%s</xliff:g>) unavailable</string>
+         operator name set by user. No space after "network", appended in nonempty value. -->
+    <string name="notification_network_selection_text">Selected network<xliff:g id="operator_name">%s</xliff:g> unavailable</string>
 
     <!-- In-call screen: call failure message displayed in an error dialog. [CHAR_LIMIT=NONE] -->
     <string name="incall_error_power_off" product="watch">Turn on mobile network, turn off airplane mode or turn off battery saver mode to make a call.</string>
@@ -1110,12 +1122,17 @@
     <string name="incall_error_supp_service_unknown">Service not supported</string>
     <!-- In-call screen: message displayed in an error dialog -->
     <string name="incall_error_supp_service_switch">Can\'t switch calls.</string>
+    <!-- In-call screen: message displayed in an error dialog when the user attempts to resume a
+         call, and the system encountered an error which prevented the call from being resumed. -->
+    <string name="incall_error_supp_service_resume">Can\'t resume call.</string>
     <!-- In-call screen: message displayed in an error dialog -->
     <string name="incall_error_supp_service_separate">Can\'t separate call.</string>
     <!-- In-call screen: message displayed in an error dialog -->
     <string name="incall_error_supp_service_transfer">Can\'t transfer.</string>
-    <!-- In-call screen: message displayed in an error dialog -->
-    <string name="incall_error_supp_service_conference">Unable to conference calls.</string>
+    <!-- In-call screen: message displayed in an error dialog.  Shown when the user attempts to
+        merge calls to form a conference call, but there was an error which prevented this from
+        occurring. -->
+    <string name="incall_error_supp_service_conference">Unable to merge calls.</string>
     <!-- In-call screen: message displayed in an error dialog -->
     <string name="incall_error_supp_service_reject">Can\'t reject call.</string>
     <!-- In-call screen: message displayed in an error dialog -->
@@ -1573,111 +1590,111 @@
     <!-- In-call screen: status label displayed briefly after a call ends -->
     <string name="clh_card_title_call_ended_txt">Call ended</string>
     <!-- In-call screen: call failure reason (radio is off) -->
-    <string name="clh_callFailed_powerOff_txt">Radio off</string>
+    <string name="clh_callFailed_powerOff_txt">Airplane mode is on</string>
     <!-- In-call screen: call failure reason (SIM error) -->
-    <string name="clh_callFailed_simError_txt">No SIM card or SIM card error</string>
+    <string name="clh_callFailed_simError_txt">Can\'t access SIM card</string>
     <!-- In-call screen: call failure message displayed in an error dialog -->
     <string name="clh_incall_error_out_of_service_txt">Mobile network not available</string>
 
     <!-- See CallFailCause for details on what causes each message -->
     <!-- In-call screen: call failure reason (Cause Number 1) -->
-    <string name="clh_callFailed_unassigned_number_txt">Unassigned (unallocated) number</string>
+    <string name="clh_callFailed_unassigned_number_txt">Issue with phone number you are trying to dial. Error code 1.</string>
     <!-- In-call screen: call failure reason (Cause Number 3) -->
-    <string name="clh_callFailed_no_route_to_destination_txt">No route to destination</string>
+    <string name="clh_callFailed_no_route_to_destination_txt">Couldn\'t complete call. Error code 3.</string>
     <!-- In-call screen: call failure reason (Cause Number 6) -->
-    <string name="clh_callFailed_channel_unacceptable_txt">Channel unacceptable</string>
+    <string name="clh_callFailed_channel_unacceptable_txt">Couldn\'t complete call. Error code 6.</string>
     <!-- In-call screen: call failure reason (Cause Number 8) -->
-    <string name="clh_callFailed_operator_determined_barring_txt">Operator determined barring</string>
+    <string name="clh_callFailed_operator_determined_barring_txt">Couldn\'t complete call. Error code 8.</string>
     <!-- In-call screen: call failure reason (Cause Number 16) -->
-    <string name="clh_callFailed_normal_call_clearing_txt">Normal call clearing</string>
+    <string name="clh_callFailed_normal_call_clearing_txt">Couldn\'t complete call. Error code 16.</string>
     <!-- In-call screen: call failure reason (Cause Number 17) -->
     <string name="clh_callFailed_user_busy_txt">User busy</string>
     <!-- In-call screen: call failure reason (Cause Number 18) -->
-    <string name="clh_callFailed_no_user_responding_txt">No user responding</string>
+    <string name="clh_callFailed_no_user_responding_txt">User not responding</string>
     <!-- In-call screen: call failure reason (Cause Number 19) -->
-    <string name="clh_callFailed_user_alerting_txt">User alerting, no answer</string>
+    <string name="clh_callFailed_user_alerting_txt">Couldn\'t complete call. Error code 19.</string>
     <!-- In-call screen: call failure reason (Cause Number 21) -->
     <string name="clh_callFailed_call_rejected_txt">Call rejected</string>
     <!-- In-call screen: call failure reason (Cause Number 22) -->
     <string name="clh_callFailed_number_changed_txt">Number changed</string>
     <!-- In-call screen: call failure reason (Cause Number 25) -->
-    <string name="clh_callFailed_pre_emption_txt">Pre-emption</string>
+    <string name="clh_callFailed_pre_emption_txt">Couldn\'t complete call. Error code 25.</string>
     <!-- In-call screen: call failure reason (Cause Number 26) -->
-    <string name="clh_callFailed_non_selected_user_clearing_txt">Non selected user clearing</string>
+    <string name="clh_callFailed_non_selected_user_clearing_txt">Couldn\'t complete call. Error code 26.</string>
     <!-- In-call screen: call failure reason (Cause Number 27) -->
-    <string name="clh_callFailed_destination_out_of_order_txt">Destination out of order</string>
+    <string name="clh_callFailed_destination_out_of_order_txt">Couldn\'t complete call. Error code 27.</string>
     <!-- In-call screen: call failure reason (Cause Number 28) -->
     <string name="clh_callFailed_invalid_number_format_txt">Invalid number format (incomplete number)</string>
     <!-- In-call screen: call failure reason (Cause Number 29) -->
-    <string name="clh_callFailed_facility_rejected_txt">Facility rejected</string>
+    <string name="clh_callFailed_facility_rejected_txt">Couldn\'t complete call. Error code 29.</string>
     <!-- In-call screen: call failure reason (Cause Number 30) -->
-    <string name="clh_callFailed_response_to_STATUS_ENQUIRY_txt">Response to STATUS ENQUIRY</string>
+    <string name="clh_callFailed_response_to_STATUS_ENQUIRY_txt">Couldn\'t complete call. Error code 30.</string>
     <!-- In-call screen: call failure reason (Cause Number 31) -->
-    <string name="clh_callFailed_normal_unspecified_txt">Normal, unspecified</string>
+    <string name="clh_callFailed_normal_unspecified_txt">Couldn\'t complete call. Error code 31.</string>
     <!-- In-call screen: call failure reason (Cause Number 34) -->
-    <string name="clh_callFailed_no_circuit_available_txt">No circuit/channel available</string>
+    <string name="clh_callFailed_no_circuit_available_txt">Couldn\'t complete call. Error code 34.</string>
     <!-- In-call screen: call failure reason (Cause Number 38) -->
-    <string name="clh_callFailed_network_out_of_order_txt">Network out of order</string>
+    <string name="clh_callFailed_network_out_of_order_txt">Couldn\'t complete call. Error code 38.</string>
     <!-- In-call screen: call failure reason (Cause Number 41) -->
-    <string name="clh_callFailed_temporary_failure_txt">Temporary failure</string>
+    <string name="clh_callFailed_temporary_failure_txt">Couldn\'t complete call. Error code 41.</string>
     <!-- In-call screen: call failure reason (Cause Number 42) -->
-    <string name="clh_callFailed_switching_equipment_congestion_txt">Switching equipment congestion</string>
+    <string name="clh_callFailed_switching_equipment_congestion_txt">Couldn\'t complete call. Error code 42.</string>
     <!-- In-call screen: call failure reason (Cause Number 43) -->
-    <string name="clh_callFailed_access_information_discarded_txt">Access information discarded</string>
+    <string name="clh_callFailed_access_information_discarded_txt">Couldn\'t complete call. Error code 43.</string>
     <!-- In-call screen: call failure reason (Cause Number 44) -->
-    <string name="clh_callFailed_requested_circuit_txt">Requested circuit/channel not available</string>
+    <string name="clh_callFailed_requested_circuit_txt">Couldn\'t complete call. Error code 44.</string>
     <!-- In-call screen: call failure reason (Cause Number 47) -->
-    <string name="clh_callFailed_resources_unavailable_unspecified_txt">Resources unavailable, unspecified</string>
+    <string name="clh_callFailed_resources_unavailable_unspecified_txt">Couldn\'t complete call. Error code 47.</string>
     <!-- In-call screen: call failure reason (Cause Number 49) -->
-    <string name="clh_callFailed_quality_of_service_unavailable_txt">Quality of service unavailable</string>
+    <string name="clh_callFailed_quality_of_service_unavailable_txt">Couldn\'t complete call. Error code 49.</string>
     <!-- In-call screen: call failure reason (Cause Number 50) -->
-    <string name="clh_callFailed_requested_facility_not_subscribed_txt">Requested facility not subscribed</string>
+    <string name="clh_callFailed_requested_facility_not_subscribed_txt">Couldn\'t complete call. Error code 50.</string>
     <!-- In-call screen: call failure reason (Cause Number 55) -->
-    <string name="clh_callFailed_incoming_calls_barred_within_the_CUG_txt">Incoming calls barred within the CUG</string>
+    <string name="clh_callFailed_incoming_calls_barred_within_the_CUG_txt">Couldn\'t complete call. Error code 55.</string>
     <!-- In-call screen: call failure reason (Cause Number 57) -->
-    <string name="clh_callFailed_bearer_capability_not_authorized_txt">Bearer capability not authorized</string>
+    <string name="clh_callFailed_bearer_capability_not_authorized_txt">Couldn\'t complete call. Error code 57.</string>
     <!-- In-call screen: call failure reason (Cause Number 58) -->
-    <string name="clh_callFailed_bearer_capability_not_presently_available_txt">Bearer capability not presently available</string>
+    <string name="clh_callFailed_bearer_capability_not_presently_available_txt">Couldn\'t complete call. Error code 58.</string>
     <!-- In-call screen: call failure reason (Cause Number 63) -->
-    <string name="clh_callFailed_service_or_option_not_available_unspecified_txt">Service or option not available, unspecified</string>
+    <string name="clh_callFailed_service_or_option_not_available_unspecified_txt">Couldn\'t complete call. Error code 63.</string>
     <!-- In-call screen: call failure reason (Cause Number 65) -->
-    <string name="clh_callFailed_bearer_service_not_implemented_txt">Bearer service not implemented</string>
+    <string name="clh_callFailed_bearer_service_not_implemented_txt">Couldn\'t complete call. Error code 65.</string>
     <!-- In-call screen: call failure reason (Cause Number 68) -->
-    <string name="clh_callFailed_ACM_equal_to_or_greater_than_ACMmax_txt">ACM equal to or greater than ACMmax</string>
+    <string name="clh_callFailed_ACM_equal_to_or_greater_than_ACMmax_txt">Couldn\'t complete call. Error code 68.</string>
     <!-- In-call screen: call failure reason (Cause Number 69) -->
-    <string name="clh_callFailed_requested_facility_not_implemented_txt">Requested facility not implemented</string>
+    <string name="clh_callFailed_requested_facility_not_implemented_txt">Couldn\'t complete call. Error code 69.</string>
     <!-- In-call screen: call failure reason (Cause Number 70) -->
-    <string name="clh_callFailed_only_restricted_digital_information_bearer_capability_is_available_txt">Only restricted digital information bearer capability is available</string>
+    <string name="clh_callFailed_only_restricted_digital_information_bearer_capability_is_available_txt">Couldn\'t complete call. Error code 70.</string>
     <!-- In-call screen: call failure reason (Cause Number 79) -->
-    <string name="clh_callFailed_service_or_option_not_implemented_unspecified_txt">Service or option not implemented, unspecified</string>
+    <string name="clh_callFailed_service_or_option_not_implemented_unspecified_txt">Couldn\'t complete call. Error code 79.</string>
     <!-- In-call screen: call failure reason (Cause Number 81) -->
-    <string name="clh_callFailed_invalid_transaction_identifier_value_txt">Invalid transaction identifier value</string>
+    <string name="clh_callFailed_invalid_transaction_identifier_value_txt">Couldn\'t complete call. Error code 81.</string>
     <!-- In-call screen: call failure reason (Cause Number 87) -->
-    <string name="clh_callFailed_user_not_member_of_CUG_txt">User not member of CUG</string>
+    <string name="clh_callFailed_user_not_member_of_CUG_txt">Couldn\'t complete call. Error code 87.</string>
     <!-- In-call screen: call failure reason (Cause Number 88) -->
-    <string name="clh_callFailed_incompatible_destination_txt">Incompatible destination</string>
+    <string name="clh_callFailed_incompatible_destination_txt">Couldn\'t complete call. Error code 88.</string>
     <!-- In-call screen: call failure reason (Cause Number 91) -->
-    <string name="clh_callFailed_invalid_transit_network_selection_txt">Invalid transit network selection</string>
+    <string name="clh_callFailed_invalid_transit_network_selection_txt">Couldn\'t complete call. Error code 91.</string>
     <!-- In-call screen: call failure reason (Cause Number 95) -->
-    <string name="clh_callFailed_semantically_incorrect_message_txt">Semantically incorrect message</string>
+    <string name="clh_callFailed_semantically_incorrect_message_txt">Couldn\'t complete call. Error code 95.</string>
     <!-- In-call screen: call failure reason (Cause Number 96) -->
-    <string name="clh_callFailed_invalid_mandatory_information_txt">Invalid mandatory information</string>
+    <string name="clh_callFailed_invalid_mandatory_information_txt">Couldn\'t complete call. Error code 96.</string>
     <!-- In-call screen: call failure reason (Cause Number 97) -->
-    <string name="clh_callFailed_message_type_non_existent_or_not_implemented_txt">Message type non-existent or not implemented</string>
+    <string name="clh_callFailed_message_type_non_existent_or_not_implemented_txt">Couldn\'t complete call. Error code 97.</string>
     <!-- In-call screen: call failure reason (Cause Number 98) -->
-    <string name="clh_callFailed_message_type_not_compatible_with_protocol_state_txt">Message type not compatible with protocol state</string>
+    <string name="clh_callFailed_message_type_not_compatible_with_protocol_state_txt">Couldn\'t complete call. Error code 98.</string>
     <!-- In-call screen: call failure reason (Cause Number 99) -->
-    <string name="clh_callFailed_information_element_non_existent_or_not_implemented_txt">Information element non-existent or not implemented</string>
+    <string name="clh_callFailed_information_element_non_existent_or_not_implemented_txt">Couldn\'t complete call. Error code 99.</string>
     <!-- In-call screen: call failure reason (Cause Number 100) -->
-    <string name="clh_callFailed_conditional_IE_error_txt">Conditional IE error</string>
+    <string name="clh_callFailed_conditional_IE_error_txt">Couldn\'t complete call. Error code 100.</string>
     <!-- In-call screen: call failure reason (Cause Number 101) -->
-    <string name="clh_callFailed_message_not_compatible_with_protocol_state_txt">Message not compatible with protocol state</string>
+    <string name="clh_callFailed_message_not_compatible_with_protocol_state_txt">Couldn\'t complete call. Error code 101.</string>
     <!-- In-call screen: call failure reason (Cause Number 102) -->
-    <string name="clh_callFailed_recovery_on_timer_expiry_txt">Recovery on timer expiry</string>
+    <string name="clh_callFailed_recovery_on_timer_expiry_txt">Couldn\'t complete call. Error code 102.</string>
     <!-- In-call screen: call failure reason (Cause Number 111) -->
-    <string name="clh_callFailed_protocol_Error_unspecified_txt">Protocol error, unspecified</string>
+    <string name="clh_callFailed_protocol_Error_unspecified_txt">Couldn\'t complete call. Error code 111.</string>
     <!-- In-call screen: call failure reason (Cause Number 127) -->
-    <string name="clh_callFailed_interworking_unspecified_txt">Interworking, unspecified</string>
+    <string name="clh_callFailed_interworking_unspecified_txt">Couldn\'t complete call. Error code 127.</string>
     <!-- Call settings screen, setting option name -->
     <string name="labelCallBarring">Call barring</string>
     <!-- Call barring settings screen, setting summary text when a call barring option is activated -->
@@ -1797,4 +1814,21 @@
     <!-- Message displayed to the user to indicate that a held call has been released /
          disconnected. -->
     <string name="supp_service_held_call_released">Held call has been released.</string>
+    <!-- In-call screen: error message shown when the user attempts to place a call, but the device
+         is currently in the process of being provisioned for service.  Provisioning is the process
+         by which a device confirms which services are available to the user by contacting the
+         mobile service provider. -->
+    <string name="callFailed_otasp_provisioning_in_process">Cannot place a call as the device is currently being provisioned.</string>
+    <!-- In-call screen: error message shown when the user has attempted to place a new outgoing
+         call, but there is already a call in dialing state. -->
+    <string name="callFailed_already_dialing">Cannot place a call as another outgoing call is already dialing.</string>
+    <!-- In-call screen: error message shown when the user has attempted to place a new outgoing
+         call while there is already a call in ringing state. -->
+    <string name="callFailed_already_ringing">Cannot place a call as there is an unanswered incoming call.  Answer or reject the incoming call prior to placing a new call.</string>
+    <!-- In-call screen: error message shown when the user attempts to place a call, but calling has
+         been disabled using a debug property. -->
+    <string name="callFailed_calling_disabled">Cannot place a call as calling has been disabled using the ro.telephony.disable-call system property.</string>
+    <!-- In-call screen: error message shown when the user attempts to place a call, but calling has
+         been disabled using a debug property. -->
+    <string name="callFailed_too_many_calls">Cannot place a call a there are already two calls in progress.  Disconnect one of the calls or merge them into a conference prior to placing a new call.</string>
 </resources>
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index ccc97c5..ce193aa 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -15,8 +15,7 @@
 -->
 
 <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">
+                  android:title="@string/accessibility_settings_activity_title">
 
     <com.android.phone.settings.TtyModeListPreference
         android:key="@string/tty_mode_key"
diff --git a/res/xml/call_feature_setting.xml b/res/xml/call_feature_setting.xml
index 5eb28fb..fe0ea43 100644
--- a/res/xml/call_feature_setting.xml
+++ b/res/xml/call_feature_setting.xml
@@ -14,8 +14,7 @@
      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/call_settings">
+                  android:title="@string/call_settings">
 
     <PreferenceScreen
         android:key="phone_account_settings_preference_screen"
diff --git a/res/xml/cdma_call_privacy.xml b/res/xml/cdma_call_privacy.xml
index ca24d20..1aeeefe 100644
--- a/res/xml/cdma_call_privacy.xml
+++ b/res/xml/cdma_call_privacy.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.phone"
-        android:title="@string/additional_cdma_call_settings">
+                  android:title="@string/additional_cdma_call_settings">
 
     <com.android.phone.CdmaVoicePrivacySwitchPreference
         android:key="button_voice_privacy_key"
diff --git a/res/xml/cdma_options.xml b/res/xml/cdma_options.xml
index 6ac5dae..f6ef97a 100644
--- a/res/xml/cdma_options.xml
+++ b/res/xml/cdma_options.xml
@@ -14,8 +14,7 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.phone">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
     <com.android.phone.CdmaSystemSelectListPreference
         android:key="cdma_system_select_key"
diff --git a/res/xml/data_usage_settings.xml b/res/xml/data_usage_settings.xml
index fdadb25..a81e14c 100644
--- a/res/xml/data_usage_settings.xml
+++ b/res/xml/data_usage_settings.xml
@@ -14,8 +14,7 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.phone">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
     <Preference
             android:key="throttle_current_usage"
diff --git a/res/xml/gsm_umts_additional_options.xml b/res/xml/gsm_umts_additional_options.xml
index 33b0769..650754f 100644
--- a/res/xml/gsm_umts_additional_options.xml
+++ b/res/xml/gsm_umts_additional_options.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-     xmlns:phone="http://schemas.android.com/apk/res/com.android.phone"
-     android:title="@string/additional_gsm_call_settings">
+                  android:title="@string/additional_gsm_call_settings">
 
     <com.android.phone.CLIRListPreference
         android:key="button_clir_key"
diff --git a/res/xml/gsm_umts_call_options.xml b/res/xml/gsm_umts_call_options.xml
index 774aec8..d1695e7 100644
--- a/res/xml/gsm_umts_call_options.xml
+++ b/res/xml/gsm_umts_call_options.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-     xmlns:phone="http://schemas.android.com/apk/res/com.android.phone"
-     android:title="@string/labelGSMMore">
+                  android:title="@string/labelGSMMore">
 
     <PreferenceScreen
         android:key="call_forwarding_key"
diff --git a/res/xml/gsm_umts_options.xml b/res/xml/gsm_umts_options.xml
index 3b4bc21..81b2deb 100644
--- a/res/xml/gsm_umts_options.xml
+++ b/res/xml/gsm_umts_options.xml
@@ -14,8 +14,7 @@
      limitations under the License.
 -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.phone">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
     <com.android.phone.NetworkOperators
         android:key="network_operators_category_key"
diff --git a/res/xml/phone_account_settings.xml b/res/xml/phone_account_settings.xml
index 8e0d17a..ae3e9d9 100644
--- a/res/xml/phone_account_settings.xml
+++ b/res/xml/phone_account_settings.xml
@@ -15,8 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:phone="http://schemas.android.com/apk/res/com.android.phone"
-    android:title="@string/phone_accounts">
+                  android:title="@string/phone_accounts">
 
     <PreferenceCategory
         android:key="phone_accounts_accounts_list_category_key"
diff --git a/res/xml/telephony_injection.xml b/res/xml/telephony_injection.xml
new file mode 100644
index 0000000..2af425c
--- /dev/null
+++ b/res/xml/telephony_injection.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License"" />
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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: customized component factory to inject,
+        e.g. "example.package.exampleTelephonyComponentFactory"
+     jar: jar path to customized jar which contains exampleTelephonyComponentFactory to inject, and
+     "/system/framework/" should be the target directory.
+        e.g. "/system/framework/eg-telephony-common.jar"
+-->
+<injection package=""
+           jar="">
+    <components>
+        <!-- Components use injected component factory,
+            e.g. com.android.internal.telephony.ServiceStateTracker
+        -->
+        <!--<component>com.example.componentA</component>-->
+        <!--<component>com.example.componentB</component>-->
+    </components>
+</injection>
diff --git a/sip/res/values-as/strings.xml b/sip/res/values-as/strings.xml
deleted file mode 100644
index 0063799..0000000
--- a/sip/res/values-as/strings.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources 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_username" msgid="8404717434312826082">"&lt;ছেট কৰা হোৱা নাই&gt;"</string>
-    <string name="default_preference_summary_password" msgid="4464464672997027904">"&lt;ছেট কৰা হোৱা নাই&gt;"</string>
-    <string name="default_preference_summary_domain_address" msgid="4871971710197441673">"&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="all_empty_alert" msgid="4087734950375192387">"নতুন SIP একাউণ্টৰ সবিশেষ লিখক।"</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-az/strings.xml b/sip/res/values-az/strings.xml
index 23a6ba8..4e88535 100644
--- a/sip/res/values-az/strings.xml
+++ b/sip/res/values-az/strings.xml
@@ -16,11 +16,11 @@
 
 <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_settings" msgid="3768482698061677257">"SIP parametrləri"</string>
     <string name="sip_accounts" msgid="85559497282185405">"SIP hesabları"</string>
     <string name="sip_accounts_title" msgid="2082527045326874519">"Hesablar"</string>
     <string name="sip_receive_calls" msgid="426678617137462173">"Daxil olan zəngləri qəbul et"</string>
-    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Daha çox batareya işlədəcək"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Daha çox batareya istismar müddətindən istifadə edir"</string>
     <string name="sip_call_options_title" msgid="8421210494703869806">"SIP zəngindən istifadə et"</string>
     <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"SIP zəngindən istifadə et (yalnız Wi-Fi)"</string>
     <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Data şəbəkəsi əlçatımlı olanda bütün şəbəkələr üçün"</string>
diff --git a/sip/res/values-be/strings.xml b/sip/res/values-be/strings.xml
index 2252024..1ba21bb 100644
--- a/sip/res/values-be/strings.xml
+++ b/sip/res/values-be/strings.xml
@@ -21,8 +21,8 @@
     <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_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>
@@ -73,8 +73,8 @@
     <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="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>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Убудаваныя SIP-выклікі"</string>
 </resources>
diff --git a/sip/res/values-bn/strings.xml b/sip/res/values-bn/strings.xml
index cfb5dce..17c698d 100644
--- a/sip/res/values-bn/strings.xml
+++ b/sip/res/values-bn/strings.xml
@@ -19,7 +19,7 @@
     <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" 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>
diff --git a/sip/res/values-bs/strings.xml b/sip/res/values-bs/strings.xml
index b066ddf..84b045e 100644
--- a/sip/res/values-bs/strings.xml
+++ b/sip/res/values-bs/strings.xml
@@ -20,9 +20,9 @@
     <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 se više baterije"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Troši više baterije"</string>
     <string name="sip_call_options_title" msgid="8421210494703869806">"Koristi SIP pozivanje"</string>
-    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Koristi SIP pozivanje (samo WiFi)"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Koristi SIP pozivanje (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>
@@ -41,7 +41,7 @@
     <string name="registration_status_still_trying" msgid="7648151061205513458">"Još uvijek pokušavamo…"</string>
     <string name="registration_status_not_receiving" msgid="7620333886153361090">"Ne prima pozive."</string>
     <string name="registration_status_no_data" msgid="2541999976218192413">"Registracija računa je zaustavljena jer niste povezani na internet."</string>
-    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Registracija računa je zaustavljena jer nema WiFi veze."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Registracija računa je zaustavljena jer nema Wi-Fi veze."</string>
     <string name="registration_status_not_running" msgid="514205414303796800">"Registracija računa neuspješna."</string>
     <string name="registration_status_done" msgid="3264961069247314253">"Primanje poziva."</string>
     <string name="registration_status_failed_try_later" msgid="2199970021756384317">"Registracija računa neuspješna: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); pokušat ćemo kasnije"</string>
@@ -65,7 +65,7 @@
     <string name="default_preference_summary_password" msgid="4464464672997027904">"&lt;Nije postavljeno&gt;"</string>
     <string name="default_preference_summary_domain_address" msgid="4871971710197441673">"&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;Nije obavezno&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;Opcionalno&gt;"</string>
     <string name="advanced_settings_show" msgid="7838761602853998622">"▷ Dodirnite da prikažete sve"</string>
     <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Dodirnite da sakrijete sve"</string>
     <string name="all_empty_alert" msgid="4087734950375192387">"Unesite detalje novog SIP računa."</string>
diff --git a/sip/res/values-ca/strings.xml b/sip/res/values-ca/strings.xml
index 31b72b6..4b8661f 100644
--- a/sip/res/values-ca/strings.xml
+++ b/sip/res/values-ca/strings.xml
@@ -19,9 +19,9 @@
     <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">"Vull rebre trucades entrants"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Rep trucades entrants"</string>
     <string name="sip_receive_calls_summary" msgid="946161517528227523">"Consumeix més bateria"</string>
-    <string name="sip_call_options_title" msgid="8421210494703869806">"Utilitza trucades SIP"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"Fes servir trucades SIP"</string>
     <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Fes servir 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>
diff --git a/sip/res/values-da/strings.xml b/sip/res/values-da/strings.xml
index b6764a9..94fef38 100644
--- a/sip/res/values-da/strings.xml
+++ b/sip/res/values-da/strings.xml
@@ -68,7 +68,7 @@
     <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="all_empty_alert" msgid="4087734950375192387">"Angiv oplysninger om den nye SIP-konto."</string>
+    <string name="all_empty_alert" msgid="4087734950375192387">"Indtast oplysninger om den nye SIP-konto."</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>
diff --git a/sip/res/values-es-rUS/strings.xml b/sip/res/values-es-rUS/strings.xml
index 62d1a09..dc0615f 100644
--- a/sip/res/values-es-rUS/strings.xml
+++ b/sip/res/values-es-rUS/strings.xml
@@ -27,7 +27,7 @@
     <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">"Quitar 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>
diff --git a/sip/res/values-eu/strings.xml b/sip/res/values-eu/strings.xml
index 0fd3ceb..eb8da9f 100644
--- a/sip/res/values-eu/strings.xml
+++ b/sip/res/values-eu/strings.xml
@@ -71,7 +71,7 @@
     <string name="all_empty_alert" msgid="4087734950375192387">"Idatzi SIP kontu berriaren xehetasunak."</string>
     <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> behar 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 Internetera konektatuta zaudela."</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>
diff --git a/sip/res/values-hi/strings.xml b/sip/res/values-hi/strings.xml
index 51c0f90..8341cf9 100644
--- a/sip/res/values-hi/strings.xml
+++ b/sip/res/values-hi/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="sip_settings" msgid="3768482698061677257">"एसआईपी सेटिंग"</string>
+    <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">"एसआईपी कॉलिंग का उपयोग करें"</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">"एसआईपी खाते"</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>
diff --git a/sip/res/values-hu/strings.xml b/sip/res/values-hu/strings.xml
index 0c952c7..520255f 100644
--- a/sip/res/values-hu/strings.xml
+++ b/sip/res/values-hu/strings.xml
@@ -25,7 +25,7 @@
     <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áshoz"</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>
diff --git a/sip/res/values-in/strings.xml b/sip/res/values-in/strings.xml
index 9db817c..1c59a30 100644
--- a/sip/res/values-in/strings.xml
+++ b/sip/res/values-in/strings.xml
@@ -20,7 +20,7 @@
     <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">"Menghabiskan lebih banyak daya baterai"</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>
diff --git a/sip/res/values-iw/strings.xml b/sip/res/values-iw/strings.xml
index 930ede5..edd8d64 100644
--- a/sip/res/values-iw/strings.xml
+++ b/sip/res/values-iw/strings.xml
@@ -19,14 +19,14 @@
     <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" 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="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>
diff --git a/sip/res/values-ky/strings.xml b/sip/res/values-ky/strings.xml
index 27dd760..afde29d 100644
--- a/sip/res/values-ky/strings.xml
+++ b/sip/res/values-ky/strings.xml
@@ -17,18 +17,18 @@
 <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" 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_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="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="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>
diff --git a/sip/res/values-mn/strings.xml b/sip/res/values-mn/strings.xml
index d2a9992..1dc5c64 100644
--- a/sip/res/values-mn/strings.xml
+++ b/sip/res/values-mn/strings.xml
@@ -17,18 +17,18 @@
 <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" 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_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="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>
diff --git a/sip/res/values-mr/strings.xml b/sip/res/values-mr/strings.xml
index e09b33d..b90c155 100644
--- a/sip/res/values-mr/strings.xml
+++ b/sip/res/values-mr/strings.xml
@@ -19,7 +19,7 @@
     <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" 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>
@@ -29,7 +29,7 @@
     <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="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>
@@ -71,8 +71,8 @@
     <string name="all_empty_alert" msgid="4087734950375192387">"नवीन SIP खात्याचा तपशील एंटर करा."</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_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>
diff --git a/sip/res/values-my/strings.xml b/sip/res/values-my/strings.xml
index ee05617..1841c55 100644
--- a/sip/res/values-my/strings.xml
+++ b/sip/res/values-my/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sip_settings" msgid="3768482698061677257">"SIP ဆက်တင်များ"</string>
+    <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>
diff --git a/sip/res/values-nb/strings.xml b/sip/res/values-nb/strings.xml
index 28ade85..0ce35ed 100644
--- a/sip/res/values-nb/strings.xml
+++ b/sip/res/values-nb/strings.xml
@@ -40,7 +40,7 @@
     <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 internettilkobling."</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>
diff --git a/sip/res/values-ne/strings.xml b/sip/res/values-ne/strings.xml
index 179c3a8..a2d5f44 100644
--- a/sip/res/values-ne/strings.xml
+++ b/sip/res/values-ne/strings.xml
@@ -23,7 +23,7 @@
     <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_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>
@@ -34,7 +34,7 @@
     <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="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>
@@ -68,7 +68,7 @@
     <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="all_empty_alert" msgid="4087734950375192387">"नयाँ SIP खाताको विवरणहरू प्रविष्टि गर्नुहोस्।"</string>
+    <string name="all_empty_alert" msgid="4087734950375192387">"नयाँ SIP खाताको विवरणहरू प्रविष्ट गर्नुहोस्।"</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>
diff --git a/sip/res/values-nl/strings.xml b/sip/res/values-nl/strings.xml
index 30542b4..4715559 100644
--- a/sip/res/values-nl/strings.xml
+++ b/sip/res/values-nl/strings.xml
@@ -19,13 +19,13 @@
     <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 gesprekken ontvangen"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Binnenkomende oproepen ontvangen"</string>
     <string name="sip_receive_calls_summary" msgid="946161517528227523">"Gebruikt meer batterijlading"</string>
-    <string name="sip_call_options_title" msgid="8421210494703869806">"SIP-gesprekken gebruiken"</string>
-    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"SIP-gesprekken gebruiken (alleen wifi)"</string>
-    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Voor alle gesprekken indien gegevensnetwerk beschikbaar is"</string>
-    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Alleen voor SIP-gesprekken"</string>
-    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Voor alle gesprekken"</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>
@@ -39,11 +39,11 @@
     <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">"Gesprekken worden niet ontvangen."</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">"Gesprekken worden ontvangen."</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>
@@ -71,10 +71,10 @@
     <string name="all_empty_alert" msgid="4087734950375192387">"Geef details op voor nieuw SIP-account."</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 je een SIP-gesprek wilt plaatsen, controleer je eerst je internetverbinding."</string>
-    <string name="no_wifi_available" msgid="1955023904229673488">"Je moet verbinding hebben met een wifi-netwerk voor SIP-gesprekken (gebruik de instellingen bij \'Draadloos en netwerken\')."</string>
-    <string name="no_voip" msgid="3038021971231952704">"SIP-gesprekken worden niet ondersteund"</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"Als je een SIP-oproep wilt plaatsen, controleer je eerst je internetverbinding."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"Je 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-gesprekken"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Ingebouwde SIP-oproepen"</string>
 </resources>
diff --git a/sip/res/values-or/strings.xml b/sip/res/values-or/strings.xml
deleted file mode 100644
index ac824a8..0000000
--- a/sip/res/values-or/strings.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources 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_username" msgid="8404717434312826082">"&lt;ସେଟ୍ କରାଯାଇନାହିଁ&gt;"</string>
-    <string name="default_preference_summary_password" msgid="4464464672997027904">"&lt;ସେଟ୍ କରାଯାଇନାହିଁ&gt;"</string>
-    <string name="default_preference_summary_domain_address" msgid="4871971710197441673">"&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="all_empty_alert" msgid="4087734950375192387">"ନୂଆ SIP ଆକାଉଣ୍ଟର ବିବରଣୀକୁ ପ୍ରବେଶ କରନ୍ତୁ"</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-pt-rPT/strings.xml b/sip/res/values-pt-rPT/strings.xml
index 171ef20..912941d 100644
--- a/sip/res/values-pt-rPT/strings.xml
+++ b/sip/res/values-pt-rPT/strings.xml
@@ -19,7 +19,7 @@
     <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">"Receber chamadas"</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>
diff --git a/sip/res/values-th/strings.xml b/sip/res/values-th/strings.xml
index c39d50f..1616cec 100644
--- a/sip/res/values-th/strings.xml
+++ b/sip/res/values-th/strings.xml
@@ -20,7 +20,7 @@
     <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_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>
diff --git a/src/com/android/phone/ADNList.java b/src/com/android/phone/ADNList.java
index b1cb16b..18b48fa 100644
--- a/src/com/android/phone/ADNList.java
+++ b/src/com/android/phone/ADNList.java
@@ -22,12 +22,10 @@
 import android.app.ListActivity;
 import android.content.AsyncQueryHandler;
 import android.content.ContentResolver;
-import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
-import android.provider.Settings;
 import android.text.BidiFormatter;
 import android.text.TextDirectionHeuristics;
 import android.util.Log;
diff --git a/src/com/android/phone/CLIRListPreference.java b/src/com/android/phone/CLIRListPreference.java
old mode 100644
new mode 100755
index f5d14b8..5c6132b
--- a/src/com/android/phone/CLIRListPreference.java
+++ b/src/com/android/phone/CLIRListPreference.java
@@ -1,19 +1,20 @@
 package com.android.phone;
 
 import static com.android.phone.TimeConsumingPreferenceActivity.RESPONSE_ERROR;
-import com.android.internal.telephony.CommandException;
-import com.android.internal.telephony.CommandsInterface;
-import com.android.internal.telephony.Phone;
 
 import android.content.Context;
 import android.os.AsyncResult;
 import android.os.Handler;
 import android.os.Message;
-import android.os.Parcelable;
 import android.preference.ListPreference;
+import android.telephony.CarrierConfigManager;
 import android.util.AttributeSet;
 import android.util.Log;
 
+import com.android.internal.telephony.CommandException;
+import com.android.internal.telephony.CommandsInterface;
+import com.android.internal.telephony.Phone;
+
 /**
  * {@link ListPreference} for CLIR (Calling Line Identification Restriction).
  * Right now this is used for "Caller ID" setting.
@@ -26,6 +27,12 @@
     private Phone mPhone;
     private TimeConsumingPreferenceListener mTcpListener;
 
+    private final String[] mEntries = getContext().getResources()
+            .getStringArray(R.array.clir_display_values);
+    private final String[] mValues = getContext().getResources()
+            .getStringArray(R.array.clir_values);
+    private boolean mConfigSupportNetworkDefault;
+
     int clirArray[];
 
     public CLIRListPreference(Context context, AttributeSet attrs) {
@@ -40,7 +47,7 @@
     protected void onDialogClosed(boolean positiveResult) {
         super.onDialogClosed(positiveResult);
 
-        mPhone.setOutgoingCallerIdDisplay(findIndexOfValue(getValue()),
+        mPhone.setOutgoingCallerIdDisplay(convertValueToCLIRMode(getValue()),
                 mHandler.obtainMessage(MyHandler.MESSAGE_SET_CLIR));
         if (mTcpListener != null) {
             mTcpListener.onStarted(this, false);
@@ -51,6 +58,19 @@
             TimeConsumingPreferenceListener listener, boolean skipReading, Phone phone) {
         mPhone = phone;
         mTcpListener = listener;
+        mConfigSupportNetworkDefault = PhoneGlobals.getInstance()
+                .getCarrierConfigForSubId(mPhone.getSubId())
+                .getBoolean(CarrierConfigManager.KEY_SUPPORT_CLIR_NETWORK_DEFAULT_BOOL);
+        // When "Network default" is not supported, create entries with remaining two values.
+        if (!mConfigSupportNetworkDefault) {
+            String[] noNetworkDefaultEntries = {mEntries[CommandsInterface.CLIR_INVOCATION],
+                    mEntries[CommandsInterface.CLIR_SUPPRESSION]};
+            String[] noNetworkDefaultValues = {mValues[CommandsInterface.CLIR_INVOCATION],
+                    mValues[CommandsInterface.CLIR_SUPPRESSION]};
+            setEntries(noNetworkDefaultEntries);
+            setEntryValues(noNetworkDefaultValues);
+        }
+
         if (!skipReading) {
             Log.i(LOG_TAG, "init: requesting CLIR");
             mPhone.getOutgoingCallerIdDisplay(mHandler.obtainMessage(MyHandler.MESSAGE_GET_CLIR,
@@ -92,7 +112,10 @@
                 value = CommandsInterface.CLIR_DEFAULT;
                 break;
         }
-        setValueIndex(value);
+        value = (!mConfigSupportNetworkDefault && value == CommandsInterface.CLIR_DEFAULT)
+                ? CommandsInterface.CLIR_SUPPRESSION : value;
+
+        setValue(mValues[value]);
 
         // set the string summary to reflect the value
         int summary = R.string.sum_default_caller_id;
@@ -110,6 +133,25 @@
         setSummary(summary);
     }
 
+    /**
+     * When "Network default" is hidden, UI list index(0-1) doesn't match CLIR Mode(0-2 for Modem).
+     * In order to send request to Modem, it is necessary to convert value to CLIR Mode.
+     * ("Hide" = CommandsInterface.CLIR_INVOCATION, "Show" = CommandsInterface.CLIR_SUPPRESSION)
+     *
+     * @param String of entry value.
+     * @return "CommandInterface.CLIR_*" for Modem.
+     */
+    private int convertValueToCLIRMode(String value) {
+        if (mValues[CommandsInterface.CLIR_INVOCATION].equals(value)) {
+            return CommandsInterface.CLIR_INVOCATION;
+        } else if (mValues[CommandsInterface.CLIR_SUPPRESSION].equals(value)) {
+            return CommandsInterface.CLIR_SUPPRESSION;
+        } else {
+            return mConfigSupportNetworkDefault ? CommandsInterface.CLIR_DEFAULT :
+                    CommandsInterface.CLIR_SUPPRESSION;
+        }
+    }
+
     private class MyHandler extends Handler {
         static final int MESSAGE_GET_CLIR = 0;
         static final int MESSAGE_SET_CLIR = 1;
diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index 8da980c..c1bbf2d 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -133,7 +133,7 @@
 
         if (preference == mEnableVideoCalling) {
             if (mImsMgr.isEnhanced4gLteModeSettingEnabledByUser()) {
-                PhoneGlobals.getInstance().phoneMgr.enableVideoCalling((boolean) objValue);
+                mImsMgr.setVtSetting((boolean) objValue);
             } else {
                 AlertDialog.Builder builder = new AlertDialog.Builder(this);
                 DialogInterface.OnClickListener networkSettingsClickListener =
@@ -190,19 +190,26 @@
         }
     }
 
+    private void listenPhoneState(boolean listen) {
+        TelephonyManager telephonyManager =
+                (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
+        telephonyManager.listen(mPhoneStateListener, listen
+                ? PhoneStateListener.LISTEN_CALL_STATE : PhoneStateListener.LISTEN_NONE);
+    }
+
     private final PhoneStateListener mPhoneStateListener = new PhoneStateListener() {
         @Override
         public void onCallStateChanged(int state, String incomingNumber) {
             if (DBG) log("PhoneStateListener onCallStateChanged: state is " + state);
+            // Use TelecomManager#getCallStete instead of 'state' parameter because it needs
+            // to check the current state of all phone calls.
+            boolean isCallStateIdle =
+                    mTelecomManager.getCallState() == TelephonyManager.CALL_STATE_IDLE;
             if (mEnableVideoCalling != null) {
-                // Use TelephonyManager#getCallStete instead of 'state' parameter because it needs
-                // to check the current state of all phone calls.
-                TelephonyManager telephonyManager =
-                        (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
-                mEnableVideoCalling.setEnabled(
-                        telephonyManager.getCallState() == TelephonyManager.CALL_STATE_IDLE);
-                mButtonWifiCalling.setEnabled(
-                        telephonyManager.getCallState() == TelephonyManager.CALL_STATE_IDLE);
+                mEnableVideoCalling.setEnabled(isCallStateIdle);
+            }
+            if (mButtonWifiCalling != null) {
+                mButtonWifiCalling.setEnabled(isCallStateIdle);
             }
         }
     };
@@ -210,9 +217,7 @@
     @Override
     protected void onPause() {
         super.onPause();
-        TelephonyManager telephonyManager =
-                (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
-        telephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
+        listenPhoneState(false);
     }
 
     @Override
@@ -220,6 +225,7 @@
         super.onResume();
 
         updateImsManager(mPhone);
+        listenPhoneState(true);
         PreferenceScreen preferenceScreen = getPreferenceScreen();
         if (preferenceScreen != null) {
             preferenceScreen.removeAll();
@@ -227,9 +233,8 @@
 
         addPreferencesFromResource(R.xml.call_feature_setting);
 
-        TelephonyManager telephonyManager =
-                (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
-        telephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);
+        TelephonyManager telephonyManager = getSystemService(TelephonyManager.class)
+                .createForSubscriptionId(mPhone.getSubId());
 
         PreferenceScreen prefSet = getPreferenceScreen();
         mVoicemailSettingsScreen =
@@ -281,7 +286,9 @@
                         addPreferencesFromResource(R.xml.cdma_call_privacy);
                     }
                 } else if (phoneType == PhoneConstants.PHONE_TYPE_GSM) {
-
+                    if (mPhone.getIccCard() == null || !mPhone.getIccCard().getIccFdnAvailable()) {
+                        prefSet.removePreference(fdnButton);
+                    }
                     if (carrierConfig.getBoolean(
                             CarrierConfigManager.KEY_ADDITIONAL_CALL_SETTING_BOOL)) {
                         addPreferencesFromResource(R.xml.gsm_umts_call_options);
@@ -296,24 +303,16 @@
         if (mImsMgr.isVtEnabledByPlatform() && mImsMgr.isVtProvisionedOnDevice()
                 && (carrierConfig.getBoolean(
                         CarrierConfigManager.KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS)
-                || mPhone.mDcTracker.isDataEnabled())) {
+                || mPhone.getDataEnabledSettings().isDataEnabled())) {
             boolean currentValue =
                     mImsMgr.isEnhanced4gLteModeSettingEnabledByUser()
-                    ? PhoneGlobals.getInstance().phoneMgr.isVideoCallingEnabled(
-                            getOpPackageName()) : false;
+                    ? mImsMgr.isVtEnabledByUser() : false;
             mEnableVideoCalling.setChecked(currentValue);
             mEnableVideoCalling.setOnPreferenceChangeListener(this);
         } else {
             prefSet.removePreference(mEnableVideoCalling);
         }
 
-        if (mImsMgr.isVolteEnabledByPlatform()
-                && !carrierConfig.getBoolean(
-                        CarrierConfigManager.KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL)) {
-            TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
-            /* tm.listen(mPhoneStateListener, PhoneStateListener.LISTEN_CALL_STATE); */
-        }
-
         final PhoneAccountHandle simCallManager = mTelecomManager.getSimCallManager();
         if (simCallManager != null) {
             Intent intent = PhoneAccountSettingsFragment.buildPhoneAccountConfigureIntent(
diff --git a/src/com/android/phone/CallForwardEditPreference.java b/src/com/android/phone/CallForwardEditPreference.java
index 8a82e05..bdffb26 100644
--- a/src/com/android/phone/CallForwardEditPreference.java
+++ b/src/com/android/phone/CallForwardEditPreference.java
@@ -1,9 +1,7 @@
 package com.android.phone;
 
-import com.android.internal.telephony.CallForwardInfo;
-import com.android.internal.telephony.CommandException;
-import com.android.internal.telephony.CommandsInterface;
-import com.android.internal.telephony.Phone;
+import static com.android.phone.TimeConsumingPreferenceActivity.EXCEPTION_ERROR;
+import static com.android.phone.TimeConsumingPreferenceActivity.RESPONSE_ERROR;
 
 import android.app.AlertDialog;
 import android.content.Context;
@@ -24,8 +22,10 @@
 import android.util.Log;
 import android.view.View;
 
-import static com.android.phone.TimeConsumingPreferenceActivity.RESPONSE_ERROR;
-import static com.android.phone.TimeConsumingPreferenceActivity.EXCEPTION_ERROR;
+import com.android.internal.telephony.CallForwardInfo;
+import com.android.internal.telephony.CommandException;
+import com.android.internal.telephony.CommandsInterface;
+import com.android.internal.telephony.Phone;
 
 public class CallForwardEditPreference extends EditPhoneNumberPreference {
     private static final String LOG_TAG = "CallForwardEditPreference";
@@ -69,22 +69,16 @@
         this(context, null);
     }
 
-    void init(TimeConsumingPreferenceListener listener, boolean skipReading, Phone phone,
+    void init(TimeConsumingPreferenceListener listener, Phone phone,
             boolean replaceInvalidCFNumber) {
         mPhone = phone;
         mTcpListener = listener;
         mReplaceInvalidCFNumber = replaceInvalidCFNumber;
+    }
 
-        if (!skipReading) {
-            mPhone.getCallForwardingOption(reason,
-                    mHandler.obtainMessage(MyHandler.MESSAGE_GET_CF,
-                            // unused in this case
-                            CommandsInterface.CF_ACTION_DISABLE,
-                            MyHandler.MESSAGE_GET_CF, null));
-            if (mTcpListener != null) {
-                mTcpListener.onStarted(this, true);
-            }
-        }
+    void restoreCallForwardInfo(CallForwardInfo cf) {
+        handleCallForwardResult(cf);
+        updateSummaryText();
     }
 
     @Override
@@ -111,7 +105,15 @@
             int action = (isToggled() || (mButtonClicked == DialogInterface.BUTTON_POSITIVE)) ?
                     CommandsInterface.CF_ACTION_REGISTRATION :
                     CommandsInterface.CF_ACTION_DISABLE;
-            int time = (reason != CommandsInterface.CF_REASON_NO_REPLY) ? 0 : 20;
+            int time = 0;
+            if (reason == CommandsInterface.CF_REASON_NO_REPLY) {
+                PersistableBundle carrierConfig = PhoneGlobals.getInstance()
+                        .getCarrierConfigForSubId(mPhone.getSubId());
+                if (carrierConfig.getBoolean(
+                        CarrierConfigManager.KEY_SUPPORT_NO_REPLY_TIMER_FOR_CFNRY_BOOL, true)) {
+                    time = 20;
+                }
+            }
             final String number = getPhoneNumber();
 
             Log.d(LOG_TAG, "callForwardInfo=" + callForwardInfo);
@@ -148,7 +150,7 @@
         }
     }
 
-    void handleCallForwardResult(CallForwardInfo cf) {
+    private void handleCallForwardResult(CallForwardInfo cf) {
         callForwardInfo = cf;
         Log.d(LOG_TAG, "handleGetCFResponse done, callForwardInfo=" + callForwardInfo);
         // In some cases, the network can send call forwarding URIs for voicemail that violate the
@@ -176,6 +178,23 @@
         setPhoneNumber(displayVoicemailNumber ? voicemailNumber : callForwardInfo.number);
     }
 
+    /**
+     * Starts the Call Forwarding Option query to the network and calls
+     * {@link TimeConsumingPreferenceListener#onStarted}. Will call
+     * {@link TimeConsumingPreferenceListener#onFinished} when finished, or
+     * {@link TimeConsumingPreferenceListener#onError} if an error has occurred.
+     */
+    void startCallForwardOptionsQuery() {
+        mPhone.getCallForwardingOption(reason,
+                mHandler.obtainMessage(MyHandler.MESSAGE_GET_CF,
+                        // unused in this case
+                        CommandsInterface.CF_ACTION_DISABLE,
+                        MyHandler.MESSAGE_GET_CF, null));
+        if (mTcpListener != null) {
+            mTcpListener.onStarted(this, true);
+        }
+    }
+
     private void updateSummaryText() {
         if (isToggled()) {
             final String number = getRawPhoneNumber();
diff --git a/src/com/android/phone/CallGatewayManager.java b/src/com/android/phone/CallGatewayManager.java
index bdac983..1dd75c4 100644
--- a/src/com/android/phone/CallGatewayManager.java
+++ b/src/com/android/phone/CallGatewayManager.java
@@ -16,184 +16,19 @@
 
 package com.android.phone;
 
-import android.content.Intent;
 import android.net.Uri;
-import android.telecom.PhoneAccount;
-import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
-import android.util.Log;
-
-import com.android.internal.telephony.Connection;
-
-import java.util.concurrent.ConcurrentHashMap;
 
 /**
- * This class manages gateway information for outgoing calls. When calls are made, they may contain
- * gateway information for services which route phone calls through their own service/numbers.
- * The data consists of a number to call and the package name of the service. This data is used in
- * two ways:<br/>
- * 1. Call the appropriate routing number<br/>
- * 2. Display information about the routing to the user<br/>
- *
- * <p>When an outgoing call is finally placed in PhoneUtils.placeCall, it uses this class to get the
- * proper number to dial. It also saves an association between the connection object and the gateway
- * data into this class.
+ * TODO: Not much of this class is even used any more.  Need to unwind the RawGatewayInfo class as
+ * it is used in part of the placeCall method used in OTASP.
  */
 public class CallGatewayManager {
-    private static final String LOG_TAG = CallGatewayManager.class.getSimpleName();
-
-    /**
-     * Intent extra to specify the package name of the gateway
-     * provider.  Used to get the name displayed in the in-call screen
-     * during the call setup. The value is a string.
-     */
-    // TODO: This extra is currently set by the gateway application as
-    // a temporary measure. Ultimately, the framework will securely
-    // set it.
-    /* package */ static final String EXTRA_GATEWAY_PROVIDER_PACKAGE =
-            "com.android.phone.extra.GATEWAY_PROVIDER_PACKAGE";
-
-    /**
-     * Intent extra to specify the URI of the provider to place the
-     * call. The value is a string. It holds the gateway address
-     * (phone gateway URL should start with the 'tel:' scheme) that
-     * will actually be contacted to call the number passed in the
-     * intent URL or in the EXTRA_PHONE_NUMBER extra.
-     */
-    // TODO: Should the value be a Uri (Parcelable)? Need to make sure
-    // MMI code '#' don't get confused as URI fragments.
-    /* package */ static final String EXTRA_GATEWAY_URI =
-            "com.android.phone.extra.GATEWAY_URI";
-
     public static final RawGatewayInfo EMPTY_INFO = new RawGatewayInfo(null, null, null);
 
-    private final ConcurrentHashMap<Connection, RawGatewayInfo> mMap =
-        new ConcurrentHashMap<Connection, RawGatewayInfo>(4, 0.9f, 1);
-
-    private static CallGatewayManager sSingleton;
-
-    public static synchronized CallGatewayManager getInstance() {
-        if (sSingleton == null) {
-            sSingleton = new CallGatewayManager();
-        }
-        return sSingleton;
-    }
-
     private CallGatewayManager() {
     }
 
-    /**
-     * Static method returns an object containing the gateway data stored in the extras of the
-     * Intent parameter.  If no such data exists, returns a Null-Object RawGatewayInfo.
-     * @param intent The intent from which to read gateway data.
-     * @return A populated or empty RawGatewayInfo object.
-     */
-    public static RawGatewayInfo getRawGatewayInfo(Intent intent, String number) {
-        if (hasPhoneProviderExtras(intent)) {
-            return new RawGatewayInfo(intent.getStringExtra(EXTRA_GATEWAY_PROVIDER_PACKAGE),
-                    getProviderGatewayUri(intent), number);
-        }
-        return EMPTY_INFO;
-    }
-
-    /**
-     * This function sets the current mapping from connection to gatewayInfo.
-     * @param connection The connection object for the placed outgoing call.
-     * @param gatewayInfo Gateway info gathered using getRawGatewayInfo.
-     */
-    public void setGatewayInfoForConnection(Connection connection, RawGatewayInfo gatewayInfo) {
-        if (!gatewayInfo.isEmpty()) {
-            mMap.put(connection, gatewayInfo);
-        } else {
-            mMap.remove(connection);
-        }
-    }
-
-    /**
-     * Clears the gateway information previously stored via setGatewayInfoForConnection.
-     */
-    public void clearGatewayData(Connection connection) {
-        setGatewayInfoForConnection(connection, EMPTY_INFO);
-    }
-
-    /**
-     * If the parameter matches the connection object we previously saved through
-     * setGatewayInfoForConnection, return the associated raw gateway info data. If not, then
-     * return an empty raw gateway info.
-     */
-    public RawGatewayInfo getGatewayInfo(Connection connection) {
-        final RawGatewayInfo info = mMap.get(connection);
-        if (info != null) {
-            return info;
-        }
-
-        return EMPTY_INFO;
-    }
-
-    /**
-     * Check if all the provider's info is present in the intent.
-     * @param intent Expected to have the provider's extra.
-     * @return true if the intent has all the extras to build the
-     * in-call screen's provider info overlay.
-     */
-    public static boolean hasPhoneProviderExtras(Intent intent) {
-        if (null == intent) {
-            return false;
-        }
-        final String name = intent.getStringExtra(EXTRA_GATEWAY_PROVIDER_PACKAGE);
-        final String gatewayUri = intent.getStringExtra(EXTRA_GATEWAY_URI);
-
-        return !TextUtils.isEmpty(name) && !TextUtils.isEmpty(gatewayUri);
-    }
-
-    /**
-     * Copy all the expected extras set when a 3rd party provider is
-     * used from the source intent to the destination one.  Checks all
-     * the required extras are present, if any is missing, none will
-     * be copied.
-     * @param src Intent which may contain the provider's extras.
-     * @param dst Intent where a copy of the extras will be added if applicable.
-     */
-    public static void checkAndCopyPhoneProviderExtras(Intent src, Intent dst) {
-        if (!hasPhoneProviderExtras(src)) {
-            Log.d(LOG_TAG, "checkAndCopyPhoneProviderExtras: some or all extras are missing.");
-            return;
-        }
-
-        dst.putExtra(EXTRA_GATEWAY_PROVIDER_PACKAGE,
-                     src.getStringExtra(EXTRA_GATEWAY_PROVIDER_PACKAGE));
-        dst.putExtra(EXTRA_GATEWAY_URI,
-                     src.getStringExtra(EXTRA_GATEWAY_URI));
-    }
-
-    /**
-     * Return the gateway uri from the intent.
-     * @param intent With the gateway uri extra.
-     * @return The gateway URI or null if not found.
-     */
-    public static Uri getProviderGatewayUri(Intent intent) {
-        final String uri = intent.getStringExtra(EXTRA_GATEWAY_URI);
-        return TextUtils.isEmpty(uri) ? null : Uri.parse(uri);
-    }
-
-    /**
-     * Return a formatted version of the uri's scheme specific
-     * part. E.g for 'tel:12345678', return '1-234-5678'.
-     * @param uri A 'tel:' URI with the gateway phone number.
-     * @return the provider's address (from the gateway uri) formatted
-     * for user display. null if uri was null or its scheme was not 'tel:'.
-     */
-    public static String formatProviderUri(Uri uri) {
-        if (uri != null) {
-            if (PhoneAccount.SCHEME_TEL.equals(uri.getScheme())) {
-                return PhoneNumberUtils.formatNumber(uri.getSchemeSpecificPart());
-            } else {
-                return uri.toString();
-            }
-        }
-        return null;
-    }
-
     public static class RawGatewayInfo {
         public String packageName;
         public Uri gatewayUri;
@@ -206,10 +41,6 @@
             this.trueNumber = trueNumber;
         }
 
-        public String getFormattedGatewayNumber() {
-            return formatProviderUri(gatewayUri);
-        }
-
         public boolean isEmpty() {
             return TextUtils.isEmpty(packageName) || gatewayUri == null;
         }
diff --git a/src/com/android/phone/CallLogger.java b/src/com/android/phone/CallLogger.java
deleted file mode 100644
index 27dbec4..0000000
--- a/src/com/android/phone/CallLogger.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.phone;
-
-import com.android.internal.telephony.CallerInfo;
-import com.android.internal.telephony.Connection;
-import com.android.internal.telephony.Phone;
-import com.android.internal.telephony.PhoneConstants;
-import com.android.internal.telephony.TelephonyCapabilities;
-import com.android.phone.common.CallLogAsync;
-
-import android.net.Uri;
-import android.os.SystemProperties;
-import android.provider.CallLog.Calls;
-import android.telephony.DisconnectCause;
-import android.telephony.PhoneNumberUtils;
-import android.text.TextUtils;
-import android.util.Log;
-
-/**
- * Helper class for interacting with the call log.
- */
-class CallLogger {
-    private static final String LOG_TAG = CallLogger.class.getSimpleName();
-    private static final boolean DBG = (PhoneGlobals.DBG_LEVEL >= 1) &&
-        (SystemProperties.getInt("ro.debuggable", 0) == 1);
-    private static final boolean VDBG = (PhoneGlobals.DBG_LEVEL >= 2);
-
-    private PhoneGlobals mApplication;
-    private CallLogAsync mCallLog;
-
-    public CallLogger(PhoneGlobals application, CallLogAsync callLogAsync) {
-        mApplication = application;
-        mCallLog = callLogAsync;
-    }
-
-    /**
-     * Logs a call to the call log based on the connection object passed in.
-     *
-     * @param c The connection object for the call being logged.
-     * @param callLogType The type of call log entry.
-     */
-    public void logCall(Connection c, int callLogType) {
-        final String number = c.getAddress();
-        final long date = c.getCreateTime();
-        final long duration = c.getDurationMillis();
-        final Phone phone = c.getCall().getPhone();
-
-        final CallerInfo ci = getCallerInfoFromConnection(c);  // May be null.
-        final String logNumber = getLogNumber(c, ci);
-
-        if (DBG) {
-            log("- onDisconnect(): logNumber set to:" + PhoneUtils.toLogSafePhoneNumber(logNumber) +
-                ", number set to: " + PhoneUtils.toLogSafePhoneNumber(number));
-        }
-
-        // TODO: In getLogNumber we use the presentation from
-        // the connection for the CNAP. Should we use the one
-        // below instead? (comes from caller info)
-
-        // For international calls, 011 needs to be logged as +
-        final int presentation = getPresentation(c, ci);
-
-        final boolean isOtaspNumber = TelephonyCapabilities.supportsOtasp(phone)
-                && phone.isOtaSpNumber(number);
-
-        // Don't log OTASP calls.
-        if (!isOtaspNumber) {
-            logCall(ci, logNumber, presentation, callLogType, date, duration);
-        }
-    }
-
-    /**
-     * Came as logCall(Connection,int) but calculates the call type from the connection object.
-     */
-    public void logCall(Connection c) {
-        final int cause = c.getDisconnectCause();
-
-        // Set the "type" to be displayed in the call log (see constants in CallLog.Calls)
-        final int callLogType;
-
-        if (c.isIncoming()) {
-            callLogType = (cause == DisconnectCause.INCOMING_MISSED ?
-                           Calls.MISSED_TYPE : Calls.INCOMING_TYPE);
-        } else {
-            callLogType = Calls.OUTGOING_TYPE;
-        }
-        if (VDBG) log("- callLogType: " + callLogType + ", UserData: " + c.getUserData());
-
-        logCall(c, callLogType);
-    }
-
-    /**
-     * Logs a call to the call from the parameters passed in.
-     */
-    public void logCall(CallerInfo ci, String number, int presentation, int callType, long start,
-                        long duration) {
-        // no-op
-    }
-
-    /**
-     * Get the caller info.
-     *
-     * @param conn The phone connection.
-     * @return The CallerInfo associated with the connection. Maybe null.
-     */
-    private CallerInfo getCallerInfoFromConnection(Connection conn) {
-        CallerInfo ci = null;
-        Object o = conn.getUserData();
-
-        if ((o == null) || (o instanceof CallerInfo)) {
-            ci = (CallerInfo) o;
-        } else if (o instanceof Uri) {
-            ci = CallerInfo.getCallerInfo(mApplication.getApplicationContext(), (Uri) o);
-        } else {
-            ci = ((PhoneUtils.CallerInfoToken) o).currentInfo;
-        }
-        return ci;
-    }
-
-    /**
-     * Retrieve the phone number from the caller info or the connection.
-     *
-     * For incoming call the number is in the Connection object. For
-     * outgoing call we use the CallerInfo phoneNumber field if
-     * present. All the processing should have been done already (CDMA vs GSM numbers).
-     *
-     * If CallerInfo is missing the phone number, get it from the connection.
-     * Apply the Call Name Presentation (CNAP) transform in the connection on the number.
-     *
-     * @param conn The phone connection.
-     * @param callerInfo The CallerInfo. Maybe null.
-     * @return the phone number.
-     */
-    private String getLogNumber(Connection conn, CallerInfo callerInfo) {
-        String number = null;
-
-        if (conn.isIncoming()) {
-            number = conn.getAddress();
-        } else {
-            // For emergency and voicemail calls,
-            // CallerInfo.phoneNumber does *not* contain a valid phone
-            // number.  Instead it contains an I18N'd string such as
-            // "Emergency Number" or "Voice Mail" so we get the number
-            // from the connection.
-            if (null == callerInfo || TextUtils.isEmpty(callerInfo.phoneNumber) ||
-                callerInfo.isEmergencyNumber() || callerInfo.isVoiceMailNumber()) {
-                if (conn.getCall().getPhone().getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA) {
-                    // In cdma getAddress() is not always equals to getOrigDialString().
-                    number = conn.getOrigDialString();
-                } else {
-                    number = conn.getAddress();
-                }
-            } else {
-                number = callerInfo.phoneNumber;
-            }
-        }
-
-        if (null == number) {
-            return null;
-        } else {
-            int presentation = conn.getNumberPresentation();
-
-            // Do final CNAP modifications.
-            String newNumber = PhoneUtils.modifyForSpecialCnapCases(mApplication, callerInfo,
-                                                          number, presentation);
-
-            if (!PhoneNumberUtils.isUriNumber(number)) {
-                number = PhoneNumberUtils.stripSeparators(number);
-            }
-            if (VDBG) log("getLogNumber: " + number);
-            return number;
-        }
-    }
-
-    /**
-     * Get the presentation from the callerinfo if not null otherwise,
-     * get it from the connection.
-     *
-     * @param conn The phone connection.
-     * @param callerInfo The CallerInfo. Maybe null.
-     * @return The presentation to use in the logs.
-     */
-    private int getPresentation(Connection conn, CallerInfo callerInfo) {
-        int presentation;
-
-        if (null == callerInfo) {
-            presentation = conn.getNumberPresentation();
-        } else {
-            presentation = callerInfo.numberPresentation;
-            if (DBG) log("- getPresentation(): ignoring connection's presentation: " +
-                         conn.getNumberPresentation());
-        }
-        if (DBG) log("- getPresentation: presentation: " + presentation);
-        return presentation;
-    }
-
-    private void log(String msg) {
-        Log.d(LOG_TAG, msg);
-    }
-}
diff --git a/src/com/android/phone/CallNotifier.java b/src/com/android/phone/CallNotifier.java
index 1a7a1d1..bd97b69 100644
--- a/src/com/android/phone/CallNotifier.java
+++ b/src/com/android/phone/CallNotifier.java
@@ -16,14 +16,6 @@
 
 package com.android.phone;
 
-import com.android.internal.telephony.CallManager;
-
-import com.android.internal.telephony.Phone;
-import com.android.internal.telephony.PhoneConstants;
-import com.android.internal.telephony.cdma.CdmaInformationRecords.CdmaDisplayInfoRec;
-import com.android.internal.telephony.cdma.CdmaInformationRecords.CdmaSignalInfoRec;
-import com.android.internal.telephony.cdma.SignalToneUtil;
-
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothHeadset;
 import android.bluetooth.BluetoothProfile;
@@ -35,7 +27,6 @@
 import android.os.Message;
 import android.os.SystemProperties;
 import android.telecom.TelecomManager;
-
 import android.telephony.PhoneStateListener;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
@@ -44,15 +35,20 @@
 import android.util.ArrayMap;
 import android.util.Log;
 
+import com.android.internal.telephony.CallManager;
+import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.PhoneConstants;
+import com.android.internal.telephony.SubscriptionController;
+import com.android.internal.telephony.cdma.CdmaInformationRecords.CdmaDisplayInfoRec;
+import com.android.internal.telephony.cdma.CdmaInformationRecords.CdmaSignalInfoRec;
+import com.android.internal.telephony.cdma.SignalToneUtil;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import com.android.internal.telephony.SubscriptionController;
-
 /**
  * Phone app module that listens for phone state changes and various other
  * events from the telephony layer, and triggers any resulting UI behavior
@@ -257,23 +253,6 @@
     }
 
     /**
-     * Resets the audio mode and speaker state when a call ends.
-     */
-    private void resetAudioStateAfterDisconnect() {
-        if (VDBG) log("resetAudioStateAfterDisconnect()...");
-
-        if (mBluetoothHeadset != null) {
-            mBluetoothHeadset.disconnectAudio();
-        }
-
-        // call turnOnSpeaker() with state=false and store=true even if speaker
-        // is already off to reset user requested speaker state.
-        PhoneUtils.turnOnSpeaker(mApplication, false, true);
-
-        PhoneUtils.setAudioMode(mCM);
-    }
-
-    /**
      * Helper class to play tones through the earpiece (or speaker / BT)
      * during a call, using the ToneGenerator.
      *
@@ -497,23 +476,6 @@
                     mState = TONE_OFF;
                 }
             }
-
-            // Finally, do the same cleanup we otherwise would have done
-            // in onDisconnect().
-            //
-            // (But watch out: do NOT do this if the phone is in use,
-            // since some of our tones get played *during* a call (like
-            // CALL_WAITING) and we definitely *don't*
-            // want to reset the audio mode / speaker / bluetooth after
-            // playing those!
-            // This call is really here for use with tones that get played
-            // *after* a call disconnects, like "busy" or "congestion" or
-            // "call ended", where the phone has already become idle but
-            // we need to defer the resetAudioStateAfterDisconnect() call
-            // till the tone finishes playing.)
-            if (mCM.getState() == PhoneConstants.State.IDLE) {
-                resetAudioStateAfterDisconnect();
-            }
         }
     }
 
@@ -546,9 +508,9 @@
             mergeFailedString = mApplication.getResources().getString(
                     R.string.incall_error_supp_service_conference);
         } else if (r.result == Phone.SuppService.RESUME) {
-            if (DBG) log("onSuppServiceFailed: displaying merge failure message");
+            if (DBG) log("onSuppServiceFailed: displaying resume failure message");
             mergeFailedString = mApplication.getResources().getString(
-                    R.string.incall_error_supp_service_switch);
+                    R.string.incall_error_supp_service_resume);
         } else if (r.result == Phone.SuppService.HOLD) {
             if (DBG) log("onSuppServiceFailed: displaying hold failure message");
             mergeFailedString = mApplication.getResources().getString(
@@ -563,13 +525,16 @@
                     R.string.incall_error_supp_service_separate);
         } else if (r.result == Phone.SuppService.SWITCH) {
             if (DBG) log("onSuppServiceFailed: displaying switch failure message");
-            mApplication.getResources().getString(
+            mergeFailedString = mApplication.getResources().getString(
                     R.string.incall_error_supp_service_switch);
         } else if (r.result == Phone.SuppService.REJECT) {
             if (DBG) log("onSuppServiceFailed: displaying reject failure message");
-            mApplication.getResources().getString(
+            mergeFailedString = mApplication.getResources().getString(
                     R.string.incall_error_supp_service_reject);
-        } else {
+        } else if (r.result == Phone.SuppService.HANGUP) {
+            mergeFailedString = mApplication.getResources().getString(
+                    R.string.incall_error_supp_service_hangup);
+        }  else {
             if (DBG) log("onSuppServiceFailed: unknown failure");
             return;
         }
diff --git a/src/com/android/phone/CallTime.java b/src/com/android/phone/CallTime.java
index 92c7972..a870ea6 100644
--- a/src/com/android/phone/CallTime.java
+++ b/src/com/android/phone/CallTime.java
@@ -20,9 +20,10 @@
 import android.os.Debug;
 import android.os.Handler;
 import android.os.SystemClock;
+import android.util.Log;
+
 import com.android.internal.telephony.Call;
 import com.android.internal.telephony.Connection;
-import android.util.Log;
 
 import java.io.File;
 import java.util.List;
diff --git a/src/com/android/phone/CallWaitingSwitchPreference.java b/src/com/android/phone/CallWaitingSwitchPreference.java
index 3f248ae..41442fe 100644
--- a/src/com/android/phone/CallWaitingSwitchPreference.java
+++ b/src/com/android/phone/CallWaitingSwitchPreference.java
@@ -1,8 +1,5 @@
 package com.android.phone;
 
-import com.android.internal.telephony.CommandException;
-import com.android.internal.telephony.Phone;
-
 import static com.android.phone.TimeConsumingPreferenceActivity.RESPONSE_ERROR;
 
 import android.content.Context;
@@ -13,6 +10,9 @@
 import android.util.AttributeSet;
 import android.util.Log;
 
+import com.android.internal.telephony.CommandException;
+import com.android.internal.telephony.Phone;
+
 public class CallWaitingSwitchPreference extends SwitchPreference {
     private static final String LOG_TAG = "CallWaitingSwitchPreference";
     private final boolean DBG = (PhoneGlobals.DBG_LEVEL >= 2);
diff --git a/src/com/android/phone/CallerInfoCache.java b/src/com/android/phone/CallerInfoCache.java
index 644aa22..2707c7c 100644
--- a/src/com/android/phone/CallerInfoCache.java
+++ b/src/com/android/phone/CallerInfoCache.java
@@ -16,14 +16,10 @@
 
 package com.android.phone;
 
-import android.app.AlarmManager;
-import android.app.PendingIntent;
 import android.content.Context;
-import android.content.Intent;
 import android.database.Cursor;
 import android.os.AsyncTask;
 import android.os.PowerManager;
-import android.os.SystemClock;
 import android.os.SystemProperties;
 import android.provider.ContactsContract.CommonDataKinds.Callable;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index f216b79..1e9e286 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -16,8 +16,6 @@
 
 package com.android.phone;
 
-import static android.Manifest.permission.READ_PHONE_STATE;
-import static android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE;
 import static android.service.carrier.CarrierService.ICarrierServiceWrapper.KEY_CONFIG_BUNDLE;
 import static android.service.carrier.CarrierService.ICarrierServiceWrapper.RESULT_ERROR;
 
@@ -72,7 +70,6 @@
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.lang.Math;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -96,6 +93,8 @@
     private PersistableBundle[] mConfigFromDefaultApp;
     // Carrier configs from privileged carrier config app, indexed by phoneID.
     private PersistableBundle[] mConfigFromCarrierApp;
+    // Carrier configs that are provided via the override test API, indexed by phone ID.
+    private PersistableBundle[] mOverrideConfigs;
     // Service connection for binding to config app.
     private CarrierServiceConnection[] mServiceConnection;
     // Whether we have sent config change bcast for each phone id.
@@ -138,9 +137,6 @@
 
     private static final int BIND_TIMEOUT_MILLIS = 30000;
 
-    // Length limit of gid1 for naming config file.
-    private static final int GID1_LENGTH_LIMIT = 20;
-
     // Tags used for saving and restoring XML documents.
     private static final String TAG_DOCUMENT = "carrier_config";
     private static final String TAG_VERSION = "package_version";
@@ -221,10 +217,8 @@
 
                 case EVENT_DO_FETCH_DEFAULT:
                 {
-                    final String iccid = getIccIdForPhoneId(phoneId);
-                    final String gid1 = getGid1ForPhoneId(phoneId);
                     final PersistableBundle config =
-                            restoreConfigFromXml(mPlatformCarrierConfigPackage, iccid, gid1);
+                            restoreConfigFromXml(mPlatformCarrierConfigPackage, phoneId);
                     if (config != null) {
                         log(
                                 "Loaded config from XML. package="
@@ -263,9 +257,7 @@
                         mContext.unbindService(conn);
                         break;
                     }
-                    final CarrierIdentifier carrierId = getCarrierIdForPhoneId(phoneId);
-                    final String iccid = getIccIdForPhoneId(phoneId);
-                    final String gid1 = getGid1ForPhoneId(phoneId);
+                    final CarrierIdentifier carrierId = getCarrierIdentifierForPhoneId(phoneId);
                     // ResultReceiver callback will execute in this Handler's thread.
                     final ResultReceiver resultReceiver =
                             new ResultReceiver(this) {
@@ -286,8 +278,8 @@
                                     }
                                     PersistableBundle config =
                                             resultData.getParcelable(KEY_CONFIG_BUNDLE);
-                                    saveConfigToXml(mPlatformCarrierConfigPackage,
-                                            iccid, gid1, config);
+                                    saveConfigToXml(
+                                            mPlatformCarrierConfigPackage, phoneId, config);
                                     mConfigFromDefaultApp[phoneId] = config;
                                     sendMessage(
                                             obtainMessage(
@@ -342,10 +334,8 @@
                 case EVENT_DO_FETCH_CARRIER:
                 {
                     final String carrierPackageName = getCarrierPackageForPhoneId(phoneId);
-                    final String iccid = getIccIdForPhoneId(phoneId);
-                    final String gid1 = getGid1ForPhoneId(phoneId);
                     final PersistableBundle config =
-                            restoreConfigFromXml(carrierPackageName, iccid, gid1);
+                            restoreConfigFromXml(carrierPackageName, phoneId);
                     if (config != null) {
                         log(
                                 "Loaded config from XML. package="
@@ -383,9 +373,7 @@
                         mContext.unbindService(conn);
                         break;
                     }
-                    final CarrierIdentifier carrierId = getCarrierIdForPhoneId(phoneId);
-                    final String iccid = getIccIdForPhoneId(phoneId);
-                    final String gid1 = getGid1ForPhoneId(phoneId);
+                    final CarrierIdentifier carrierId = getCarrierIdentifierForPhoneId(phoneId);
                     // ResultReceiver callback will execute in this Handler's thread.
                     final ResultReceiver resultReceiver =
                             new ResultReceiver(this) {
@@ -406,8 +394,8 @@
                                     }
                                     PersistableBundle config =
                                             resultData.getParcelable(KEY_CONFIG_BUNDLE);
-                                    saveConfigToXml(getCarrierPackageForPhoneId(phoneId),
-                                            iccid, gid1, config);
+                                    saveConfigToXml(
+                                            getCarrierPackageForPhoneId(phoneId), phoneId, config);
                                     mConfigFromCarrierApp[phoneId] = config;
                                     sendMessage(
                                             obtainMessage(
@@ -504,6 +492,7 @@
         int numPhones = TelephonyManager.from(context).getPhoneCount();
         mConfigFromDefaultApp = new PersistableBundle[numPhones];
         mConfigFromCarrierApp = new PersistableBundle[numPhones];
+        mOverrideConfigs = new PersistableBundle[numPhones];
         mServiceConnection = new CarrierServiceConnection[numPhones];
         mHasSentConfigChange = new boolean[numPhones];
         // Make this service available through ServiceManager.
@@ -537,12 +526,15 @@
         Intent intent = new Intent(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);
         intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT |
                 Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);
-        // Include subId extra only if SIM records are loaded
+        // Include subId/carrier id extra only if SIM records are loaded
         TelephonyManager telephonyManager = TelephonyManager.from(mContext);
         int simApplicationState = telephonyManager.getSimApplicationState();
         if (addSubIdExtra && (simApplicationState != TelephonyManager.SIM_STATE_UNKNOWN
                 && simApplicationState != TelephonyManager.SIM_STATE_NOT_READY)) {
             SubscriptionManager.putPhoneIdAndSubIdExtra(intent, phoneId);
+            intent.putExtra(TelephonyManager.EXTRA_PRECISE_CARRIER_ID,
+                    getPreciseCarrierIdForPhoneId(phoneId));
+            intent.putExtra(TelephonyManager.EXTRA_CARRIER_ID, getCarrierIdForPhoneId(phoneId));
         }
         intent.putExtra(CarrierConfigManager.EXTRA_SLOT_INDEX, phoneId);
         ActivityManager.broadcastStickyIntent(intent, UserHandle.USER_ALL);
@@ -563,7 +555,7 @@
         }
     }
 
-    private CarrierIdentifier getCarrierIdForPhoneId(int phoneId) {
+    private CarrierIdentifier getCarrierIdentifierForPhoneId(int phoneId) {
         String mcc = "";
         String mnc = "";
         String imsi = "";
@@ -571,6 +563,8 @@
         String gid2 = "";
         String spn = TelephonyManager.from(mContext).getSimOperatorNameForPhone(phoneId);
         String simOperator = TelephonyManager.from(mContext).getSimOperatorNumericForPhone(phoneId);
+        int carrierId = TelephonyManager.UNKNOWN_CARRIER_ID;
+        int preciseCarrierId = TelephonyManager.UNKNOWN_CARRIER_ID;
         // 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);
@@ -581,9 +575,10 @@
             imsi = phone.getSubscriberId();
             gid1 = phone.getGroupIdLevel1();
             gid2 = phone.getGroupIdLevel2();
+            carrierId = phone.getCarrierId();
+            preciseCarrierId = phone.getPreciseCarrierId();
         }
-
-        return new CarrierIdentifier(mcc, mnc, spn, imsi, gid1, gid2);
+        return new CarrierIdentifier(mcc, mnc, spn, imsi, gid1, gid2, carrierId, preciseCarrierId);
     }
 
     /** Returns the package name of a priveleged carrier app, or null if there is none. */
@@ -609,38 +604,62 @@
         return phone.getIccSerialNumber();
     }
 
-    private String getGid1ForPhoneId(int phoneId) {
+    /**
+     * Get the sim precise carrier id {@link TelephonyManager#getSimPreciseCarrierId()}
+     */
+    private int getPreciseCarrierIdForPhoneId(int phoneId) {
         if (!SubscriptionManager.isValidPhoneId(phoneId)) {
-            return null;
+            return TelephonyManager.UNKNOWN_CARRIER_ID;
         }
         Phone phone = PhoneFactory.getPhone(phoneId);
         if (phone == null) {
-            return null;
+            return TelephonyManager.UNKNOWN_CARRIER_ID;
         }
-        String gid1 = phone.getGroupIdLevel1();
-        if (gid1 == null) {
-            return null;
+        return phone.getPreciseCarrierId();
+    }
+
+    /**
+     * Get the sim carrier id {@link TelephonyManager#getSimCarrierId() }
+     */
+    private int getCarrierIdForPhoneId(int phoneId) {
+        if (!SubscriptionManager.isValidPhoneId(phoneId)) {
+            return TelephonyManager.UNKNOWN_CARRIER_ID;
         }
-        return gid1.substring(0, Math.min(gid1.length(), GID1_LENGTH_LIMIT));
+        Phone phone = PhoneFactory.getPhone(phoneId);
+        if (phone == null) {
+            return TelephonyManager.UNKNOWN_CARRIER_ID;
+        }
+        return phone.getCarrierId();
     }
 
     /**
      * Writes a bundle to an XML file.
      *
-     * The bundle will be written to a file named after the package name and ICCID, so that it can
-     * be restored later with {@link @restoreConfigFromXml}. The XML output will include the bundle
-     * and the current version of the specified package.
+     * The bundle will be written to a file named after the package name, ICCID and
+     * precise carrier id {@link TelephonyManager#getSimPreciseCarrierId()}. the same carrier
+     * should have a single copy of XML file named after carrier id. However, it's still possible
+     * that platform doesn't recognize the current sim carrier, we will use iccid + carrierid as
+     * the canonical file name. carrierid can also handle the cases SIM OTA resolves to different
+     * carrier while iccid remains the same.
+     *
+     * The file can be restored later with {@link @restoreConfigFromXml}. The XML output will
+     * include the bundle and the current version of the specified package.
      *
      * In case of errors or invalid input, no file will be written.
      *
      * @param packageName the name of the package from which we fetched this bundle.
-     * @param iccid the ICCID of the subscription for which this bundle was fetched.
-     * @param extras First 20 characters of gid1 of the subscription for which the bundle
-     *               was fetched.
+     * @param phoneId the phone ID.
      * @param config the bundle to be written. Null will be treated as an empty bundle.
      */
-    private void saveConfigToXml(String packageName, String iccid, String extras,
-            PersistableBundle config) {
+    private void saveConfigToXml(String packageName, int phoneId, PersistableBundle config) {
+        if (SubscriptionManager.getSimStateForSlotIndex(phoneId)
+                != TelephonyManager.SIM_STATE_LOADED) {
+            log("Skip save config because SIM records are not loaded.");
+            return;
+        }
+
+        final String iccid = getIccIdForPhoneId(phoneId);
+        final int cid = getPreciseCarrierIdForPhoneId(phoneId);
         if (packageName == null || iccid == null) {
             loge("Cannot save config with null packageName or iccid.");
             return;
@@ -663,8 +682,8 @@
         FileOutputStream outFile = null;
         try {
             outFile = new FileOutputStream(
-                    new File(mContext.getFilesDir(), getFilenameForConfig(packageName,
-                            iccid, extras)));
+                    new File(mContext.getFilesDir(),
+                            getFilenameForConfig(packageName, iccid, cid)));
             FastXmlSerializer out = new FastXmlSerializer();
             out.setOutput(outFile, "utf-8");
             out.startDocument("utf-8", true);
@@ -692,25 +711,30 @@
      * Reads a bundle from an XML file.
      *
      * This restores a bundle that was written with {@link #saveConfigToXml}. This returns the saved
-     * config bundle for the given package and ICCID.
+     * config bundle for the given package and phone ID.
      *
      * In case of errors, or if the saved config is from a different package version than the
      * current version, then null will be returned.
      *
      * @param packageName the name of the package from which we fetched this bundle.
-     * @param iccid the ICCID of the subscription for which this bundle was fetched.
-     * @param extras First 20 characters of gid1 of the subscription for which the bundle
-     *               was fetched.
+     * @param phoneId the phone ID.
      * @return the bundle from the XML file. Returns null if there is no saved config, the saved
      *         version does not match, or reading config fails.
      */
-    private PersistableBundle restoreConfigFromXml(String packageName, String iccid,
-            String extras) {
+    private PersistableBundle restoreConfigFromXml(String packageName, int phoneId) {
         final String version = getPackageVersion(packageName);
         if (version == null) {
             loge("Failed to get package version for: " + packageName);
             return null;
         }
+        if (SubscriptionManager.getSimStateForSlotIndex(phoneId)
+                != TelephonyManager.SIM_STATE_LOADED) {
+            log("Skip restoring config because SIM records are not yet loaded.");
+            return null;
+        }
+
+        final String iccid = getIccIdForPhoneId(phoneId);
+        final int cid = getPreciseCarrierIdForPhoneId(phoneId);
         if (packageName == null || iccid == null) {
             loge("Cannot restore config with null packageName or iccid.");
             return null;
@@ -720,8 +744,8 @@
         FileInputStream inFile = null;
         try {
             inFile = new FileInputStream(
-                    new File(mContext.getFilesDir(), getFilenameForConfig(packageName, iccid,
-                            extras)));
+                    new File(mContext.getFilesDir(),
+                            getFilenameForConfig(packageName, iccid, cid)));
             XmlPullParser parser = XmlPullParserFactory.newInstance().newPullParser();
             parser.setInput(inFile, "utf-8");
 
@@ -785,11 +809,12 @@
 
     /** Builds a canonical file name for a config file. */
     private String getFilenameForConfig(@NonNull String packageName, @NonNull String iccid,
-            String extras) {
-        if (extras != null) {
-            return "carrierconfig-" + packageName + "-" + iccid + "-" + extras + ".xml";
-        }
-        return "carrierconfig-" + packageName + "-" + iccid + ".xml";
+                                        int cid) {
+        // the same carrier should have a single copy of XML file named after carrier id.
+        // However, it's still possible that platform doesn't recognize the current sim carrier,
+        // we will use iccid + carrierid as the canonical file name. carrierid can also handle the
+        // cases SIM OTA resolves to different carrier while iccid remains the same.
+        return "carrierconfig-" + packageName + "-" + iccid + "-" + cid + ".xml";
     }
 
     /** Return the current version code of a package, or null if the name is not found. */
@@ -819,24 +844,11 @@
         mHandler.sendMessage(mHandler.obtainMessage(EVENT_DO_FETCH_DEFAULT, phoneId, -1));
     }
 
-    @Override public
-    @NonNull
-    PersistableBundle getConfigForSubId(int subId) {
-        // TODO(b/73136824): Migrate to TelephonyPermissions#checkCallingOrSelfReadPhoneState.
-        try {
-            mContext.enforceCallingOrSelfPermission(READ_PRIVILEGED_PHONE_STATE, null);
-            // SKIP checking run-time READ_PHONE_STATE since using PRIVILEGED
-        } catch (SecurityException e) {
-            try {
-                mContext.enforceCallingOrSelfPermission(READ_PHONE_STATE, null);
-            } catch (SecurityException securityException) {
-                // If we don't have the runtime permission, but do have carrier privileges, that
-                // suffices for reading phone state.
-                if (!SubscriptionManager.isValidSubscriptionId(subId)) {
-                    throw securityException;
-                }
-                TelephonyPermissions.enforceCallingOrSelfCarrierPrivilege(subId, null);
-            }
+    @Override
+    public @NonNull PersistableBundle getConfigForSubId(int subId, String callingPackage) {
+        if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
+                mContext, subId, callingPackage, "getCarrierConfig")) {
+            return new PersistableBundle();
         }
 
         int phoneId = SubscriptionManager.getPhoneId(subId);
@@ -852,11 +864,39 @@
                 retConfig.putAll(config);
                 retConfig.putBoolean(CarrierConfigManager.KEY_CARRIER_CONFIG_APPLIED_BOOL, true);
             }
+            config = mOverrideConfigs[phoneId];
+            if (config != null) {
+                retConfig.putAll(config);
+                retConfig.putBoolean(CarrierConfigManager.KEY_CARRIER_CONFIG_APPLIED_BOOL, true);
+            }
         }
         return retConfig;
     }
 
     @Override
+    public void overrideConfig(int subscriptionId, PersistableBundle overrides) {
+        mContext.enforceCallingOrSelfPermission(
+                android.Manifest.permission.MODIFY_PHONE_STATE, null);
+        int phoneId = SubscriptionManager.getPhoneId(subscriptionId);
+        if (!SubscriptionManager.isValidPhoneId(phoneId)) {
+            log("Ignore invalid phoneId: " + phoneId + " for subId: " + subscriptionId);
+            return;
+        }
+
+        if (overrides == null) {
+            mOverrideConfigs[phoneId] = new PersistableBundle();
+            return;
+        }
+
+        if (mOverrideConfigs[phoneId] == null) {
+            mOverrideConfigs[phoneId] = overrides;
+        } else {
+            mOverrideConfigs[phoneId].putAll(overrides);
+        }
+        broadcastConfigChangedIntent(phoneId);
+    }
+
+    @Override
     public void notifyConfigChangedForSubId(int subId) {
         int phoneId = SubscriptionManager.getPhoneId(subId);
         if (!SubscriptionManager.isValidPhoneId(phoneId)) {
@@ -930,6 +970,8 @@
             pw.println("");
             // display ConfigFromCarrierApp
             printConfig(mConfigFromCarrierApp[i], pw, "mConfigFromCarrierApp");
+            pw.println("");
+            printConfig(mOverrideConfigs[i], pw, "mOverrideConfigs");
         }
     }
 
diff --git a/src/com/android/phone/CdmaCallOptions.java b/src/com/android/phone/CdmaCallOptions.java
index bbd0069..acfa496 100644
--- a/src/com/android/phone/CdmaCallOptions.java
+++ b/src/com/android/phone/CdmaCallOptions.java
@@ -16,23 +16,17 @@
 
 package com.android.phone;
 
-import com.android.internal.telephony.Phone;
-import com.android.internal.telephony.PhoneConstants;
-
-import android.content.DialogInterface;
-import android.os.AsyncResult;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
 import android.os.PersistableBundle;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
 import android.preference.SwitchPreference;
 import android.telephony.CarrierConfigManager;
-import android.util.Log;
 import android.view.MenuItem;
 
+import com.android.internal.telephony.PhoneConstants;
+
 public class CdmaCallOptions extends PreferenceActivity {
     private static final String LOG_TAG = "CdmaCallOptions";
     private final boolean DBG = (PhoneGlobals.DBG_LEVEL >= 2);
diff --git a/src/com/android/phone/CdmaOptions.java b/src/com/android/phone/CdmaOptions.java
index 7f7d58c..9c713ef 100644
--- a/src/com/android/phone/CdmaOptions.java
+++ b/src/com/android/phone/CdmaOptions.java
@@ -24,12 +24,12 @@
 import android.preference.PreferenceScreen;
 import android.provider.Settings;
 import android.telephony.CarrierConfigManager;
+import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneConstants;
 import com.android.settingslib.RestrictedLockUtils;
 
@@ -39,6 +39,7 @@
 public class CdmaOptions {
     private static final String LOG_TAG = "CdmaOptions";
 
+    private CarrierConfigManager mCarrierConfigManager;
     private CdmaSystemSelectListPreference mButtonCdmaSystemSelect;
     private CdmaSubscriptionListPreference mButtonCdmaSubscription;
     private RestrictedPreference mButtonAPNExpand;
@@ -53,18 +54,13 @@
 
     private PreferenceFragment mPrefFragment;
     private PreferenceScreen mPrefScreen;
-    private Phone mPhone;
+    private int mSubId;
 
-    // Constructor for CdmaOptionsTest, since PreferenceScreen is final and cannot be mocked
-    @VisibleForTesting
-    public CdmaOptions(Phone phone) {
-        mPhone = phone;
-    }
-
-    public CdmaOptions(PreferenceFragment prefFragment, PreferenceScreen prefScreen, Phone phone) {
+    public CdmaOptions(PreferenceFragment prefFragment, PreferenceScreen prefScreen, int subId) {
         mPrefFragment = prefFragment;
         mPrefScreen = prefScreen;
         mPrefFragment.addPreferencesFromResource(R.xml.cdma_options);
+        mCarrierConfigManager = new CarrierConfigManager(prefFragment.getContext());
 
         // Initialize preferences.
         mButtonCdmaSystemSelect = (CdmaSystemSelectListPreference) mPrefScreen
@@ -75,19 +71,17 @@
         mButtonAPNExpand = (RestrictedPreference) mPrefScreen.findPreference(BUTTON_APN_EXPAND_KEY);
         mCategoryAPNExpand = mPrefScreen.findPreference(CATEGORY_APN_EXPAND_KEY);
 
-        update(phone);
+        updateSubscriptionId(subId);
     }
 
-    // Unlike mPrefFragment or mPrefScreen, mPhone may change during lifecycle of CdmaOptions.
-    // For example, a new sim card is inserted. When that happens, we update CdmaOptions with new
-    // phone.
-    protected void update(Phone phone) {
-        mPhone = phone;
+    protected void updateSubscriptionId(int subId) {
+        mSubId = subId;
+        int phoneType = TelephonyManager.from(mPrefFragment.getContext())
+                .createForSubscriptionId(mSubId).getPhoneType();
 
-        PersistableBundle carrierConfig =
-                PhoneGlobals.getInstance().getCarrierConfigForSubId(mPhone.getSubId());
+        PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(mSubId);
         // Some CDMA carriers want the APN settings.
-        boolean addAPNExpand = shouldAddApnExpandPreference(carrierConfig);
+        boolean addAPNExpand = shouldAddApnExpandPreference(phoneType, carrierConfig);
         boolean addCdmaSubscription =
                 deviceSupportsNvAndRuim();
         // Read platform settings for carrier settings
@@ -118,7 +112,7 @@
                             final Intent intent = new Intent(Settings.ACTION_APN_SETTINGS);
                             // This will setup the Home and Search affordance
                             intent.putExtra(":settings:show_fragment_as_subsetting", true);
-                            intent.putExtra("sub_id", mPhone.getSubId());
+                            intent.putExtra("sub_id", mSubId);
                             mPrefFragment.startActivity(intent);
                             return true;
                         }
@@ -149,12 +143,9 @@
      * carrier config
      */
     @VisibleForTesting
-    public boolean shouldAddApnExpandPreference(PersistableBundle config) {
-        if (mPhone.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA
-                && config.getBoolean(CarrierConfigManager.KEY_SHOW_APN_SETTING_CDMA_BOOL)) {
-            return true;
-        }
-        return false;
+    public static boolean shouldAddApnExpandPreference(int phoneType, PersistableBundle config) {
+        return phoneType == PhoneConstants.PHONE_TYPE_CDMA
+                && config.getBoolean(CarrierConfigManager.KEY_SHOW_APN_SETTING_CDMA_BOOL);
     }
 
     private boolean deviceSupportsNvAndRuim() {
diff --git a/src/com/android/phone/CdmaSubscriptionListPreference.java b/src/com/android/phone/CdmaSubscriptionListPreference.java
index 49f4678..cd0c681 100644
--- a/src/com/android/phone/CdmaSubscriptionListPreference.java
+++ b/src/com/android/phone/CdmaSubscriptionListPreference.java
@@ -17,18 +17,15 @@
 package com.android.phone;
 
 import android.content.Context;
-import android.os.AsyncResult;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
 import android.preference.ListPreference;
 import android.provider.Settings;
-import android.provider.Settings.Secure;
+import android.telephony.TelephonyManager;
 import android.util.AttributeSet;
 import android.util.Log;
 
 import com.android.internal.telephony.Phone;
-import com.android.internal.telephony.PhoneFactory;
+import com.android.settingslib.utils.ThreadUtils;
 
 public class CdmaSubscriptionListPreference extends ListPreference {
 
@@ -42,19 +39,17 @@
     //                           1 - NV
     static final int preferredSubscriptionMode = Phone.PREFERRED_CDMA_SUBSCRIPTION;
 
-    private Phone mPhone;
-    private CdmaSubscriptionButtonHandler mHandler;
+    private TelephonyManager mTelephonyManager;
 
     public CdmaSubscriptionListPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
 
-        mPhone = PhoneFactory.getDefaultPhone();
-        mHandler = new CdmaSubscriptionButtonHandler();
+        mTelephonyManager = TelephonyManager.from(context);
         setCurrentCdmaSubscriptionModeValue();
     }
 
     private void setCurrentCdmaSubscriptionModeValue() {
-        int cdmaSubscriptionMode = Settings.Global.getInt(mPhone.getContext().getContentResolver(),
+        int cdmaSubscriptionMode = Settings.Global.getInt(getContext().getContentResolver(),
                 Settings.Global.CDMA_SUBSCRIPTION_MODE, preferredSubscriptionMode);
         setValue(Integer.toString(cdmaSubscriptionMode));
     }
@@ -63,6 +58,15 @@
         this(context, null);
     }
 
+    /**
+     * Sets the subscription id associated with this preference.
+     *
+     * @param subId the subscription id.
+     */
+    public void setSubscriptionId(int subId) {
+        mTelephonyManager = TelephonyManager.from(getContext()).createForSubscriptionId(subId);
+    }
+
     @Override
     protected void showDialog(Bundle state) {
         setCurrentCdmaSubscriptionModeValue();
@@ -93,40 +97,23 @@
                 statusCdmaSubscriptionMode = Phone.PREFERRED_CDMA_SUBSCRIPTION;
         }
 
-        // Set the CDMA subscription mode, when mode has been successfully changed
-        // handleSetCdmaSubscriptionMode will be invoked and the value saved.
-        mPhone.setCdmaSubscription(statusCdmaSubscriptionMode, mHandler
-                .obtainMessage(CdmaSubscriptionButtonHandler.MESSAGE_SET_CDMA_SUBSCRIPTION,
-                        getValue()));
+        // Set the CDMA subscription mode, when mode has been successfully changed, update the
+        // mode to the global setting.
+        ThreadUtils.postOnBackgroundThread(() -> {
+            // The subscription mode selected by user.
+            int cdmaSubscriptionMode = Integer.parseInt(getValue());
 
-    }
+            boolean isSuccessed = mTelephonyManager.setCdmaSubscriptionMode(
+                    statusCdmaSubscriptionMode);
 
-    private class CdmaSubscriptionButtonHandler extends Handler {
-
-        static final int MESSAGE_SET_CDMA_SUBSCRIPTION = 0;
-
-        @Override
-        public void handleMessage(Message msg) {
-            switch (msg.what) {
-                case MESSAGE_SET_CDMA_SUBSCRIPTION:
-                    handleSetCdmaSubscriptionMode(msg);
-                    break;
-            }
-        }
-
-        private void handleSetCdmaSubscriptionMode(Message msg) {
-            mPhone = PhoneFactory.getDefaultPhone();
-            AsyncResult ar = (AsyncResult) msg.obj;
-
-            if (ar.exception == null) {
-                // Get the original string entered by the user
-                int cdmaSubscriptionMode = Integer.parseInt((String) ar.userObj);
-                Settings.Global.putInt(mPhone.getContext().getContentResolver(),
+            // Update the global settings if successed.
+            if (isSuccessed) {
+                Settings.Global.putInt(getContext().getContentResolver(),
                         Settings.Global.CDMA_SUBSCRIPTION_MODE,
-                        cdmaSubscriptionMode );
+                        cdmaSubscriptionMode);
             } else {
                 Log.e(LOG_TAG, "Setting Cdma subscription source failed");
             }
-        }
+        });
     }
 }
diff --git a/src/com/android/phone/CdmaSystemSelectListPreference.java b/src/com/android/phone/CdmaSystemSelectListPreference.java
index ca2bc02..0044a8b 100644
--- a/src/com/android/phone/CdmaSystemSelectListPreference.java
+++ b/src/com/android/phone/CdmaSystemSelectListPreference.java
@@ -17,46 +17,49 @@
 package com.android.phone;
 
 import android.content.Context;
-import android.os.AsyncResult;
 import android.os.Bundle;
-import android.os.SystemProperties;
 import android.os.Handler;
 import android.os.Message;
 import android.preference.ListPreference;
 import android.provider.Settings;
-import android.provider.Settings.Secure;
+import android.telephony.TelephonyManager;
 import android.util.AttributeSet;
 import android.util.Log;
 
-import com.android.internal.telephony.Phone;
-import com.android.internal.telephony.TelephonyProperties;
+import com.android.settingslib.utils.ThreadUtils;
 
 public class CdmaSystemSelectListPreference extends ListPreference {
 
     private static final String LOG_TAG = "CdmaRoamingListPreference";
     private static final boolean DBG = false;
 
-    private Phone mPhone;
+    private TelephonyManager mTelephonyManager;
     private MyHandler mHandler = new MyHandler();
 
     public CdmaSystemSelectListPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
 
-        mPhone = PhoneGlobals.getPhone();
         mHandler = new MyHandler();
-        mPhone.queryCdmaRoamingPreference(
-                mHandler.obtainMessage(MyHandler.MESSAGE_GET_ROAMING_PREFERENCE));
+        mTelephonyManager = TelephonyManager.from(context);
     }
 
     public CdmaSystemSelectListPreference(Context context) {
         this(context, null);
     }
 
+    /**
+     * Sets the subscription id associated with this preference.
+     *
+     * @param subId the subscription id.
+     */
+    public void setSubscriptionId(int subId) {
+        mTelephonyManager = TelephonyManager.from(getContext()).createForSubscriptionId(subId);
+        queryCdmaRoamingMode();
+    }
+
     @Override
     protected void showDialog(Bundle state) {
-        if (mPhone.isInEcm()) {
-            // In ECM mode do not show selection options
-        } else {
+        if (!mTelephonyManager.getEmergencyCallbackMode()) {
             super.showDialog(state);
         }
     }
@@ -67,26 +70,22 @@
 
         if (positiveResult && (getValue() != null)) {
             int buttonCdmaRoamingMode = Integer.parseInt(getValue());
-            int settingsCdmaRoamingMode =
-                    Settings.Global.getInt(mPhone.getContext().getContentResolver(),
-                    Settings.Global.CDMA_ROAMING_MODE, Phone.CDMA_RM_HOME);
+            int settingsCdmaRoamingMode = Settings.Global.getInt(
+                    getContext().getContentResolver(),
+                    Settings.Global.CDMA_ROAMING_MODE,
+                    TelephonyManager.CDMA_ROAMING_MODE_HOME);
             if (buttonCdmaRoamingMode != settingsCdmaRoamingMode) {
-                int statusCdmaRoamingMode;
-                switch(buttonCdmaRoamingMode) {
-                    case Phone.CDMA_RM_ANY:
-                        statusCdmaRoamingMode = Phone.CDMA_RM_ANY;
-                        break;
-                    case Phone.CDMA_RM_HOME:
-                    default:
-                        statusCdmaRoamingMode = Phone.CDMA_RM_HOME;
+                int cdmaRoamingMode = TelephonyManager.CDMA_ROAMING_MODE_ANY;
+                if (buttonCdmaRoamingMode != TelephonyManager.CDMA_ROAMING_MODE_ANY) {
+                    cdmaRoamingMode = TelephonyManager.CDMA_ROAMING_MODE_HOME;
                 }
                 //Set the Settings.Secure network mode
-                Settings.Global.putInt(mPhone.getContext().getContentResolver(),
+                Settings.Global.putInt(
+                        getContext().getContentResolver(),
                         Settings.Global.CDMA_ROAMING_MODE,
-                        buttonCdmaRoamingMode );
+                        buttonCdmaRoamingMode);
                 //Set the roaming preference mode
-                mPhone.setCdmaRoamingPreference(statusCdmaRoamingMode, mHandler
-                        .obtainMessage(MyHandler.MESSAGE_SET_ROAMING_PREFERENCE));
+                setCdmaRoamingMode(cdmaRoamingMode);
             }
         } else {
             Log.d(LOG_TAG, String.format("onDialogClosed: positiveResult=%b value=%s -- do nothing",
@@ -113,27 +112,28 @@
         }
 
         private void handleQueryCdmaRoamingPreference(Message msg) {
-            AsyncResult ar = (AsyncResult) msg.obj;
+            int cdmaRoamingMode = msg.arg1;
 
-            if (ar.exception == null) {
-                int statusCdmaRoamingMode = ((int[])ar.result)[0];
+            if (cdmaRoamingMode != TelephonyManager.CDMA_ROAMING_MODE_RADIO_DEFAULT) {
                 int settingsRoamingMode = Settings.Global.getInt(
-                        mPhone.getContext().getContentResolver(),
-                        Settings.Global.CDMA_ROAMING_MODE, Phone.CDMA_RM_HOME);
+                        getContext().getContentResolver(),
+                        Settings.Global.CDMA_ROAMING_MODE,
+                        TelephonyManager.CDMA_ROAMING_MODE_HOME);
+
                 //check that statusCdmaRoamingMode is from an accepted value
-                if (statusCdmaRoamingMode == Phone.CDMA_RM_HOME ||
-                        statusCdmaRoamingMode == Phone.CDMA_RM_ANY ) {
+                if (cdmaRoamingMode == TelephonyManager.CDMA_ROAMING_MODE_HOME
+                        || cdmaRoamingMode == TelephonyManager.CDMA_ROAMING_MODE_ANY) {
                     //check changes in statusCdmaRoamingMode and updates settingsRoamingMode
-                    if (statusCdmaRoamingMode != settingsRoamingMode) {
-                        settingsRoamingMode = statusCdmaRoamingMode;
+                    if (cdmaRoamingMode != settingsRoamingMode) {
+                        settingsRoamingMode = cdmaRoamingMode;
                         //changes the Settings.Secure accordingly to statusCdmaRoamingMode
                         Settings.Global.putInt(
-                                mPhone.getContext().getContentResolver(),
+                                getContext().getContentResolver(),
                                 Settings.Global.CDMA_ROAMING_MODE,
-                                settingsRoamingMode );
+                                settingsRoamingMode);
                     }
                     //changes the mButtonPreferredNetworkMode accordingly to modemNetworkMode
-                    setValue(Integer.toString(statusCdmaRoamingMode));
+                    setValue(Integer.toString(cdmaRoamingMode));
                 }
                 else {
                     if(DBG) Log.i(LOG_TAG, "reset cdma roaming mode to default" );
@@ -143,29 +143,45 @@
         }
 
         private void handleSetCdmaRoamingPreference(Message msg) {
-            AsyncResult ar = (AsyncResult) msg.obj;
+            boolean isSuccessed = (boolean) msg.obj;
 
-            if ((ar.exception == null) && (getValue() != null)) {
+            if (isSuccessed && (getValue() != null)) {
                 int cdmaRoamingMode = Integer.parseInt(getValue());
-                Settings.Global.putInt(mPhone.getContext().getContentResolver(),
+                Settings.Global.putInt(
+                        getContext().getContentResolver(),
                         Settings.Global.CDMA_ROAMING_MODE,
                         cdmaRoamingMode );
             } else {
-                mPhone.queryCdmaRoamingPreference(obtainMessage(MESSAGE_GET_ROAMING_PREFERENCE));
+                queryCdmaRoamingMode();
             }
         }
 
         private void resetCdmaRoamingModeToDefault() {
             //set the mButtonCdmaRoam
-            setValue(Integer.toString(Phone.CDMA_RM_ANY));
+            setValue(Integer.toString(TelephonyManager.CDMA_ROAMING_MODE_ANY));
             //set the Settings.System
-            Settings.Global.putInt(mPhone.getContext().getContentResolver(),
-                        Settings.Global.CDMA_ROAMING_MODE,
-                        Phone.CDMA_RM_ANY );
+            Settings.Global.putInt(
+                    getContext().getContentResolver(),
+                    Settings.Global.CDMA_ROAMING_MODE,
+                    TelephonyManager.CDMA_ROAMING_MODE_ANY);
             //Set the Status
-            mPhone.setCdmaRoamingPreference(Phone.CDMA_RM_ANY,
-                    obtainMessage(MyHandler.MESSAGE_SET_ROAMING_PREFERENCE));
+            setCdmaRoamingMode(TelephonyManager.CDMA_ROAMING_MODE_ANY);
         }
     }
 
+    private void queryCdmaRoamingMode() {
+        ThreadUtils.postOnBackgroundThread(() -> {
+            Message msg = mHandler.obtainMessage(MyHandler.MESSAGE_GET_ROAMING_PREFERENCE);
+            msg.arg1 = mTelephonyManager.getCdmaRoamingMode();
+            msg.sendToTarget();
+        });
+    }
+
+    private void setCdmaRoamingMode(int mode) {
+        ThreadUtils.postOnBackgroundThread(() -> {
+            Message msg = mHandler.obtainMessage(MyHandler.MESSAGE_SET_ROAMING_PREFERENCE);
+            msg.obj = mTelephonyManager.setCdmaRoamingMode(mode);
+            msg.sendToTarget();
+        });
+    }
 }
diff --git a/src/com/android/phone/CdmaVoicePrivacySwitchPreference.java b/src/com/android/phone/CdmaVoicePrivacySwitchPreference.java
index 5a99bb7..b79a3f0 100644
--- a/src/com/android/phone/CdmaVoicePrivacySwitchPreference.java
+++ b/src/com/android/phone/CdmaVoicePrivacySwitchPreference.java
@@ -16,8 +16,6 @@
 
 package com.android.phone;
 
-import com.android.internal.telephony.Phone;
-
 import android.content.Context;
 import android.os.AsyncResult;
 import android.os.Handler;
@@ -26,6 +24,8 @@
 import android.util.AttributeSet;
 import android.util.Log;
 
+import com.android.internal.telephony.Phone;
+
 public class CdmaVoicePrivacySwitchPreference extends SwitchPreference {
     private static final String LOG_TAG = "CdmaVoicePrivacySwitchPreference";
     private final boolean DBG = (PhoneGlobals.DBG_LEVEL >= 2);
diff --git a/src/com/android/phone/CellInfoUtil.java b/src/com/android/phone/CellInfoUtil.java
index 2c5f2a8..8272029 100644
--- a/src/com/android/phone/CellInfoUtil.java
+++ b/src/com/android/phone/CellInfoUtil.java
@@ -26,7 +26,6 @@
 import android.telephony.CellInfoGsm;
 import android.telephony.CellInfoLte;
 import android.telephony.CellInfoWcdma;
-import android.telephony.TelephonyManager;
 import android.text.BidiFormatter;
 import android.text.TextDirectionHeuristics;
 import android.text.TextUtils;
@@ -47,47 +46,6 @@
     }
 
     /**
-     * Get the network type from a CellInfo. Network types include
-     * {@link TelephonyManager#NETWORK_TYPE_LTE}, {@link TelephonyManager#NETWORK_TYPE_UMTS},
-     * {@link TelephonyManager#NETWORK_TYPE_GSM}, {@link TelephonyManager#NETWORK_TYPE_CDMA} and
-     * {@link TelephonyManager#NETWORK_TYPE_UNKNOWN}
-     * @return network types
-     */
-    public static int getNetworkType(CellInfo cellInfo) {
-        if (cellInfo instanceof CellInfoLte) {
-            return TelephonyManager.NETWORK_TYPE_LTE;
-        } else if (cellInfo instanceof CellInfoWcdma) {
-            return TelephonyManager.NETWORK_TYPE_UMTS;
-        } else if (cellInfo instanceof CellInfoGsm) {
-            return TelephonyManager.NETWORK_TYPE_GSM;
-        } else if (cellInfo instanceof CellInfoCdma) {
-            return TelephonyManager.NETWORK_TYPE_CDMA;
-        } else {
-            Log.e(TAG, "Invalid CellInfo type");
-            return TelephonyManager.NETWORK_TYPE_UNKNOWN;
-        }
-    }
-
-    /**
-     * Get signal level as an int from 0..4.
-     * @return Signal strength level
-     */
-    public static int getLevel(CellInfo cellInfo) {
-        if (cellInfo instanceof CellInfoLte) {
-            return ((CellInfoLte) cellInfo).getCellSignalStrength().getLevel();
-        } else if (cellInfo instanceof CellInfoWcdma) {
-            return ((CellInfoWcdma) cellInfo).getCellSignalStrength().getLevel();
-        } else if (cellInfo instanceof CellInfoGsm) {
-            return ((CellInfoGsm) cellInfo).getCellSignalStrength().getLevel();
-        } else if (cellInfo instanceof CellInfoCdma) {
-            return ((CellInfoCdma) cellInfo).getCellSignalStrength().getLevel();
-        } else {
-            Log.e(TAG, "Invalid CellInfo type");
-            return 0;
-        }
-    }
-
-    /**
      * Wrap a CellIdentity into a CellInfo.
      */
     public static CellInfo wrapCellInfoWithCellIdentity(CellIdentity cellIdentity) {
@@ -169,6 +127,35 @@
         return oi;
     }
 
+    /**
+     * Creates a CellInfo object from OperatorInfo. GsmCellInfo is used here only because
+     * operatorInfo does not contain technology type while CellInfo is an abstract object that
+     * requires to specify technology type. It doesn't matter which CellInfo type to use here, since
+     * we only want to wrap the operator info and PLMN to a CellInfo object.
+     */
+    public static CellInfo convertOperatorInfoToCellInfo(OperatorInfo operatorInfo) {
+        String operatorNumeric = operatorInfo.getOperatorNumeric();
+        String mcc = null;
+        String mnc = null;
+        if (operatorNumeric != null && operatorNumeric.matches("^[0-9]{5,6}$")) {
+            mcc = operatorNumeric.substring(0, 3);
+            mnc = operatorNumeric.substring(3);
+        }
+        CellIdentityGsm cig = new CellIdentityGsm(
+                Integer.MAX_VALUE /* lac */,
+                Integer.MAX_VALUE /* cid */,
+                Integer.MAX_VALUE /* arfcn */,
+                Integer.MAX_VALUE /* bsic */,
+                mcc,
+                mnc,
+                operatorInfo.getOperatorAlphaLong(),
+                operatorInfo.getOperatorAlphaShort());
+
+        CellInfoGsm ci = new CellInfoGsm();
+        ci.setCellIdentity(cig);
+        return ci;
+    }
+
     /** Checks whether the network operator is forbidden. */
     public static boolean isForbidden(CellInfo cellInfo, List<String> forbiddenPlmns) {
         String plmn = CellInfoUtil.getOperatorInfoFromCellInfo(cellInfo).getOperatorNumeric();
diff --git a/src/com/android/phone/EccShortcutAdapter.java b/src/com/android/phone/EccShortcutAdapter.java
index 19e8380..e14b90a 100644
--- a/src/com/android/phone/EccShortcutAdapter.java
+++ b/src/com/android/phone/EccShortcutAdapter.java
@@ -16,14 +16,15 @@
 
 package com.android.phone;
 
-import android.annotation.NonNull;
-import android.annotation.Nullable;
 import android.content.Context;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.android.phone.ecc.CountryEccInfo;
 import com.android.phone.ecc.EccInfo;
 
diff --git a/src/com/android/phone/EmergencyActionGroup.java b/src/com/android/phone/EmergencyActionGroup.java
index d72c265..4f9121a 100644
--- a/src/com/android/phone/EmergencyActionGroup.java
+++ b/src/com/android/phone/EmergencyActionGroup.java
@@ -143,7 +143,7 @@
                 ComponentName name = EmergencyAssistanceHelper.getComponentName(info);
 
                 button.setTag(R.id.tag_intent,
-                        new Intent(TelephonyManager.ACTION_EMERGENCY_ASSISTANCE)
+                        new Intent(EmergencyAssistanceHelper.getIntentAction(getContext()))
                                 .setComponent(name));
                 button.setText(info.loadLabel(getContext().getPackageManager()));
                 visible = true;
diff --git a/src/com/android/phone/EmergencyAssistanceHelper.java b/src/com/android/phone/EmergencyAssistanceHelper.java
index 3053125..9e1ac21 100644
--- a/src/com/android/phone/EmergencyAssistanceHelper.java
+++ b/src/com/android/phone/EmergencyAssistanceHelper.java
@@ -26,6 +26,7 @@
 import android.provider.Settings;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
+import android.util.FeatureFlagUtils;
 
 import java.util.List;
 
@@ -35,6 +36,24 @@
 public class EmergencyAssistanceHelper {
 
     /**
+     * Get intent action of target emergency app.
+     *
+     * @param context The context of the application.
+     * @return A string of intent action to launch target emergency app by feature flag, it will be
+     * used for team food.
+     */
+    public static String getIntentAction(Context context) {
+        if (FeatureFlagUtils.isEnabled(context, FeatureFlagUtils.SAFETY_HUB)) {
+            String action = context.getResources().getString(R.string.config_emergency_app_intent);
+            if (!action.isEmpty()) {
+                return action;
+            }
+        }
+
+        return TelephonyManager.ACTION_EMERGENCY_ASSISTANCE;
+    }
+
+    /**
      * Query activities of emergency assistance.
      *
      * @param context The context of the application.
@@ -46,7 +65,7 @@
 
         if (infos == null || infos.isEmpty()) {
             PackageManager packageManager = context.getPackageManager();
-            Intent queryIntent = new Intent(TelephonyManager.ACTION_EMERGENCY_ASSISTANCE);
+            Intent queryIntent = new Intent(getIntentAction(context));
             infos = packageManager.queryIntentActivities(queryIntent, 0);
 
             PackageInfo bestMatch = null;
@@ -93,7 +112,7 @@
         List<ResolveInfo> infos = null;
 
         if (!TextUtils.isEmpty(assistPackage)) {
-            Intent queryIntent = new Intent(TelephonyManager.ACTION_EMERGENCY_ASSISTANCE)
+            Intent queryIntent = new Intent(getIntentAction(context))
                     .setPackage(assistPackage);
             infos = context.getPackageManager().queryIntentActivities(queryIntent, 0);
         }
diff --git a/src/com/android/phone/EmergencyDialer.java b/src/com/android/phone/EmergencyDialer.java
index b7d10bd..cb12cbb 100644
--- a/src/com/android/phone/EmergencyDialer.java
+++ b/src/com/android/phone/EmergencyDialer.java
@@ -343,16 +343,29 @@
         }
 
         // Allow this activity to be displayed in front of the keyguard / lockscreen.
-        WindowManager.LayoutParams lp = getWindow().getAttributes();
-        lp.flags |= WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED;
+        setShowWhenLocked(true);
+        // Allow turning screen on
+        setTurnScreenOn(true);
 
-        // When no proximity sensor is available, use a shorter timeout.
-        // TODO: Do we enable this for non proximity devices any more?
-        // lp.userActivityTimeout = USER_ACTIVITY_TIMEOUT_WHEN_NO_PROX_SENSOR;
+        CarrierConfigManager configMgr = getSystemService(CarrierConfigManager.class);
+        PersistableBundle carrierConfig =
+                configMgr.getConfigForSubId(SubscriptionManager.getDefaultVoiceSubscriptionId());
 
-        getWindow().setAttributes(lp);
-
+        // Disable emergency dialer shortcut when can't get the location information or inserting
+        // the SIM of the blacklisted carrier.
+        boolean isSupport = carrierConfig.getBoolean(
+                CarrierConfigManager.KEY_SUPPORT_EMERGENCY_DIALER_SHORTCUT_BOOL);
+        Log.d(LOG_TAG, "Is the carrier supported: " + isSupport);
+        TelephonyManager tm = getSystemService(TelephonyManager.class);
+        String countryIso = tm.getNetworkCountryIso();
         mAreEmergencyDialerShortcutsEnabled = false;
+        if (isSupport && !TextUtils.isEmpty(countryIso)) {
+            if (EccInfoHelper.isCountryEccInfoAvailable(this, countryIso)) {
+                mAreEmergencyDialerShortcutsEnabled = true;
+            } else {
+                Log.d(LOG_TAG, "ECC info is unavailable. Disable emergency dialer shortcut.");
+            }
+        }
         Log.d(LOG_TAG, "Enable emergency dialer shortcut: "
                 + mAreEmergencyDialerShortcutsEnabled);
 
@@ -403,11 +416,6 @@
         // Check whether we should show the onscreen "Dial" button and co.
         // Read carrier config through the public API because PhoneGlobals is not available when we
         // run as a secondary user.
-        CarrierConfigManager configMgr =
-                (CarrierConfigManager) getSystemService(Context.CARRIER_CONFIG_SERVICE);
-        PersistableBundle carrierConfig =
-                configMgr.getConfigForSubId(SubscriptionManager.getDefaultVoiceSubscriptionId());
-
         if (carrierConfig.getBoolean(CarrierConfigManager.KEY_SHOW_ONSCREEN_DIAL_BUTTON_BOOL)) {
             mDialButton.setOnClickListener(this);
         } else {
@@ -454,7 +462,7 @@
         mEmergencyInfoGroup = (EmergencyInfoGroup) findViewById(R.id.emergency_info_button);
 
         if (mAreEmergencyDialerShortcutsEnabled) {
-            mEccInfoHelper = new EccInfoHelper(new IsoToEccProtobufRepository());
+            mEccInfoHelper = new EccInfoHelper(IsoToEccProtobufRepository.getInstance());
             setupEmergencyShortcutsView();
         }
     }
@@ -924,7 +932,7 @@
         AudioManager audioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
         int ringerMode = audioManager.getRingerMode();
         if ((ringerMode == AudioManager.RINGER_MODE_SILENT)
-            || (ringerMode == AudioManager.RINGER_MODE_VIBRATE)) {
+                || (ringerMode == AudioManager.RINGER_MODE_VIBRATE)) {
             return;
         }
 
@@ -1050,8 +1058,8 @@
                 boolean isCellAvailable =
                         ss.getRilVoiceRadioTechnology() != RIL_RADIO_TECHNOLOGY_UNKNOWN;
                 Log.i(LOG_TAG, "showWfcWarningTask: isWfcAvailable=" + isWfcAvailable
-                                + " isCellAvailable=" + isCellAvailable
-                                + "(rat=" + ss.getRilVoiceRadioTechnology() + ")");
+                        + " isCellAvailable=" + isCellAvailable
+                        + "(rat=" + ss.getRilVoiceRadioTechnology() + ")");
                 return isWfcAvailable && !isCellAvailable;
             }
 
diff --git a/src/com/android/phone/EmergencyInfoGroup.java b/src/com/android/phone/EmergencyInfoGroup.java
index 3eb4de8..6ce10aa 100644
--- a/src/com/android/phone/EmergencyInfoGroup.java
+++ b/src/com/android/phone/EmergencyInfoGroup.java
@@ -26,8 +26,6 @@
 import android.graphics.drawable.Drawable;
 import android.os.UserHandle;
 import android.os.UserManager;
-import android.support.v4.graphics.drawable.RoundedBitmapDrawable;
-import android.support.v4.graphics.drawable.RoundedBitmapDrawableFactory;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.AttributeSet;
@@ -40,6 +38,9 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.core.graphics.drawable.RoundedBitmapDrawable;
+import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
+
 import com.android.internal.util.UserIcons;
 
 import java.util.List;
@@ -125,7 +126,8 @@
 
         if (infos != null && infos.size() > 0) {
             final String packageName = infos.get(0).activityInfo.packageName;
-            final Intent intent = new Intent(TelephonyManager.ACTION_EMERGENCY_ASSISTANCE)
+            final Intent intent = new Intent(
+                    EmergencyAssistanceHelper.getIntentAction(getContext()))
                     .setPackage(packageName);
             setTag(R.id.tag_intent, intent);
             setUserIcon();
diff --git a/src/com/android/phone/EmergencyShortcutButton.java b/src/com/android/phone/EmergencyShortcutButton.java
index 4190609..59b3794 100644
--- a/src/com/android/phone/EmergencyShortcutButton.java
+++ b/src/com/android/phone/EmergencyShortcutButton.java
@@ -18,7 +18,6 @@
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
-import android.annotation.NonNull;
 import android.content.Context;
 import android.metrics.LogMaker;
 import android.os.SystemClock;
@@ -31,6 +30,8 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+
 import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 
diff --git a/src/com/android/phone/FakePhoneActivity.java b/src/com/android/phone/FakePhoneActivity.java
index 686a766..34b7197 100644
--- a/src/com/android/phone/FakePhoneActivity.java
+++ b/src/com/android/phone/FakePhoneActivity.java
@@ -19,14 +19,15 @@
 import android.app.Activity;
 import android.app.NotificationManager;
 import android.os.Bundle;
-import com.android.internal.telephony.test.SimulatedRadioControl;
 import android.util.Log;
-import android.view.View.OnClickListener;
 import android.view.View;
+import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.Toast;
 
+import com.android.internal.telephony.test.SimulatedRadioControl;
+
 /**
  * A simple activity that presents you with a UI for faking incoming phone operations.
  */
diff --git a/src/com/android/phone/GsmUmtsCallForwardOptions.java b/src/com/android/phone/GsmUmtsCallForwardOptions.java
index 77cc6cc..6d80621 100644
--- a/src/com/android/phone/GsmUmtsCallForwardOptions.java
+++ b/src/com/android/phone/GsmUmtsCallForwardOptions.java
@@ -1,9 +1,5 @@
 package com.android.phone;
 
-import com.android.internal.telephony.CallForwardInfo;
-import com.android.internal.telephony.CommandsInterface;
-import com.android.internal.telephony.Phone;
-
 import android.app.ActionBar;
 import android.content.Intent;
 import android.database.Cursor;
@@ -14,8 +10,11 @@
 import android.util.Log;
 import android.view.MenuItem;
 
-import java.util.ArrayList;
+import com.android.internal.telephony.CallForwardInfo;
+import com.android.internal.telephony.CommandsInterface;
+import com.android.internal.telephony.Phone;
 
+import java.util.ArrayList;
 
 public class GsmUmtsCallForwardOptions extends TimeConsumingPreferenceActivity {
     private static final String LOG_TAG = "GsmUmtsCallForwardOptions";
@@ -32,6 +31,7 @@
     private static final String KEY_TOGGLE = "toggle";
     private static final String KEY_STATUS = "status";
     private static final String KEY_NUMBER = "number";
+    private static final String KEY_ENABLE = "enable";
 
     private CallForwardEditPreference mButtonCFU;
     private CallForwardEditPreference mButtonCFB;
@@ -103,18 +103,22 @@
         if (mFirstResume) {
             if (mIcicle == null) {
                 Log.d(LOG_TAG, "start to init ");
-                mPreferences.get(mInitIndex).init(this, false, mPhone, mReplaceInvalidCFNumbers);
+                CallForwardEditPreference pref = mPreferences.get(mInitIndex);
+                pref.init(this, mPhone, mReplaceInvalidCFNumbers);
+                pref.startCallForwardOptionsQuery();
+
             } else {
                 mInitIndex = mPreferences.size();
 
                 for (CallForwardEditPreference pref : mPreferences) {
                     Bundle bundle = mIcicle.getParcelable(pref.getKey());
                     pref.setToggled(bundle.getBoolean(KEY_TOGGLE));
+                    pref.setEnabled(bundle.getBoolean(KEY_ENABLE));
                     CallForwardInfo cf = new CallForwardInfo();
                     cf.number = bundle.getString(KEY_NUMBER);
                     cf.status = bundle.getInt(KEY_STATUS);
-                    pref.handleCallForwardResult(cf);
-                    pref.init(this, true, mPhone, mReplaceInvalidCFNumbers);
+                    pref.init(this, mPhone, mReplaceInvalidCFNumbers);
+                    pref.restoreCallForwardInfo(cf);
                 }
             }
             mFirstResume = false;
@@ -129,6 +133,7 @@
         for (CallForwardEditPreference pref : mPreferences) {
             Bundle bundle = new Bundle();
             bundle.putBoolean(KEY_TOGGLE, pref.isToggled());
+            bundle.putBoolean(KEY_ENABLE, pref.isEnabled());
             if (pref.callForwardInfo != null) {
                 bundle.putString(KEY_NUMBER, pref.callForwardInfo.number);
                 bundle.putInt(KEY_STATUS, pref.callForwardInfo.status);
@@ -141,7 +146,9 @@
     public void onFinished(Preference preference, boolean reading) {
         if (mInitIndex < mPreferences.size()-1 && !isFinishing()) {
             mInitIndex++;
-            mPreferences.get(mInitIndex).init(this, false, mPhone, mReplaceInvalidCFNumbers);
+            CallForwardEditPreference pref = mPreferences.get(mInitIndex);
+            pref.init(this, mPhone, mReplaceInvalidCFNumbers);
+            pref.startCallForwardOptionsQuery();
         }
 
         super.onFinished(preference, reading);
diff --git a/src/com/android/phone/GsmUmtsOptions.java b/src/com/android/phone/GsmUmtsOptions.java
index 19cd3ef..35aab34 100644
--- a/src/com/android/phone/GsmUmtsOptions.java
+++ b/src/com/android/phone/GsmUmtsOptions.java
@@ -16,6 +16,7 @@
 
 package com.android.phone;
 
+import android.content.Context;
 import android.content.Intent;
 import android.os.PersistableBundle;
 import android.preference.Preference;
@@ -23,10 +24,10 @@
 import android.preference.PreferenceScreen;
 import android.provider.Settings;
 import android.telephony.CarrierConfigManager;
+import android.telephony.TelephonyManager;
 
 import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneConstants;
 import com.android.settingslib.RestrictedLockUtils;
 
@@ -36,6 +37,7 @@
 public class GsmUmtsOptions {
     private static final String LOG_TAG = "GsmUmtsOptions";
 
+    private CarrierConfigManager mCarrierConfigManager;
     private RestrictedPreference mButtonAPNExpand;
     private Preference mCategoryAPNExpand;
     Preference mCarrierSettingPref;
@@ -51,9 +53,11 @@
     private PreferenceScreen mPrefScreen;
 
     public GsmUmtsOptions(PreferenceFragment prefFragment, PreferenceScreen prefScreen,
-            final int subId, INetworkQueryService queryService) {
+            final int subId) {
+        final Context context = prefFragment.getContext();
         mPrefFragment = prefFragment;
         mPrefScreen = prefScreen;
+        mCarrierConfigManager = new CarrierConfigManager(context);
         mPrefFragment.addPreferencesFromResource(R.xml.gsm_umts_options);
         mButtonAPNExpand = (RestrictedPreference) mPrefScreen.findPreference(BUTTON_APN_EXPAND_KEY);
         mCategoryAPNExpand = mPrefScreen.findPreference(CATEGORY_APN_EXPAND_KEY);
@@ -63,25 +67,24 @@
 
         mNetworkOperator.initialize();
 
-        update(subId, queryService);
+        update(subId);
     }
 
-    // Unlike mPrefFragment or mPrefScreen, subId or queryService may change during lifecycle of
-    // GsmUmtsOptions. When that happens, we update GsmUmtsOptions with new parameters.
-    protected void update(final int subId, INetworkQueryService queryService) {
+    // Unlike mPrefFragment or mPrefScreen, subId  may change during lifecycle of GsmUmtsOptions.
+    // When that happens, we update GsmUmtsOptions with new parameters.
+    protected void update(final int subId) {
         boolean addAPNExpand = true;
         boolean addNetworkOperatorsCategory = true;
         boolean addCarrierSettings = true;
-        Phone phone = PhoneGlobals.getPhone(subId);
-        if (phone == null) return;
-        if (phone.getPhoneType() != PhoneConstants.PHONE_TYPE_GSM) {
+        final TelephonyManager telephonyManager = TelephonyManager.from(mPrefFragment.getContext())
+                .createForSubscriptionId(subId);
+        if (telephonyManager.getPhoneType() != PhoneConstants.PHONE_TYPE_GSM) {
             log("Not a GSM phone");
             addAPNExpand = false;
             mNetworkOperator.setEnabled(false);
         } else {
             log("Not a CDMA phone");
-            PersistableBundle carrierConfig =
-                    PhoneGlobals.getInstance().getCarrierConfigForSubId(subId);
+            PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(subId);
 
             // Determine which options to display. For GSM these are defaulted to true in
             // CarrierConfigManager, but they maybe overriden by DefaultCarrierConfigService or a
@@ -98,7 +101,7 @@
             }
 
             if (carrierConfig.getBoolean(CarrierConfigManager.KEY_CSP_ENABLED_BOOL)) {
-                if (phone.isCspPlmnEnabled()) {
+                if (telephonyManager.isManualNetworkSelectionAllowed()) {
                     log("[CSP] Enabling Operator Selection menu.");
                     mNetworkOperator.setEnabled(true);
                 } else {
@@ -145,7 +148,7 @@
 
         if (addNetworkOperatorsCategory) {
             mPrefScreen.addPreference(mNetworkOperator);
-            mNetworkOperator.update(subId, queryService);
+            mNetworkOperator.update(subId);
         } else {
             mPrefScreen.removePreference(mNetworkOperator);
         }
diff --git a/src/com/android/phone/IccPanel.java b/src/com/android/phone/IccPanel.java
index e603a06..be182233 100644
--- a/src/com/android/phone/IccPanel.java
+++ b/src/com/android/phone/IccPanel.java
@@ -19,11 +19,11 @@
 import android.app.Dialog;
 import android.app.StatusBarManager;
 import android.content.Context;
+import android.os.Bundle;
 import android.view.Gravity;
 import android.view.KeyEvent;
-import android.view.WindowManager;
 import android.view.Window;
-import android.os.Bundle;
+import android.view.WindowManager;
 
 /**
  * Base class for ICC-related panels in the Phone UI.
diff --git a/src/com/android/phone/ImsUtil.java b/src/com/android/phone/ImsUtil.java
index 4d8ff80..ee23e6f 100644
--- a/src/com/android/phone/ImsUtil.java
+++ b/src/com/android/phone/ImsUtil.java
@@ -25,7 +25,6 @@
 
 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();
@@ -53,11 +52,20 @@
      * @return {@code true} if WFC is supported by the platform and has been enabled by the user.
      */
     public static boolean isWfcEnabled(Context context) {
-        ImsManager imsManager = getDefaultImsManagerInstance(context);
+        return isWfcEnabled(context, SubscriptionManager.getDefaultVoicePhoneId());
+    }
+
+    /**
+     * @return {@code true} if WFC is supported per Slot and has been enabled by the user.
+     */
+    public static boolean isWfcEnabled(Context context, int phoneId) {
+        ImsManager imsManager = ImsManager.getInstance(context, phoneId);
         boolean isEnabledByPlatform = imsManager.isWfcEnabledByPlatform();
         boolean isEnabledByUser = imsManager.isWfcEnabledByUser();
-        if (DBG) Log.d(LOG_TAG, "isWfcEnabled :: isEnabledByPlatform=" + isEnabledByPlatform);
-        if (DBG) Log.d(LOG_TAG, "isWfcEnabled :: isEnabledByUser=" + isEnabledByUser);
+        if (DBG) Log.d(LOG_TAG, "isWfcEnabled :: isEnabledByPlatform=" + isEnabledByPlatform
+                + " phoneId=" + phoneId);
+        if (DBG) Log.d(LOG_TAG, "isWfcEnabled :: isEnabledByUser=" + isEnabledByUser
+                + " phoneId=" + phoneId);
         return isEnabledByPlatform && isEnabledByUser;
     }
 
@@ -66,10 +74,20 @@
      * enabled, this will return {@code false}.
      */
     public static boolean isWfcModeWifiOnly(Context context) {
-        boolean isWifiOnlyMode = getDefaultImsManagerInstance(context).getWfcMode()
-                == ImsConfig.WfcModeFeatureValueConstants.WIFI_ONLY;
-        if (DBG) Log.d(LOG_TAG, "isWfcModeWifiOnly :: isWifiOnlyMode" + isWifiOnlyMode);
-        return isWfcEnabled(context) && isWifiOnlyMode;
+        return isWfcModeWifiOnly(context, SubscriptionManager.getDefaultVoicePhoneId());
+    }
+
+    /**
+     * @return {@code true} if the Slot is configured to use "Wi-Fi only" mode. If WFC is not
+     * enabled, this will return {@code false}.
+     */
+    public static boolean isWfcModeWifiOnly(Context context, int phoneId) {
+        ImsManager imsManager = ImsManager.getInstance(context, phoneId);
+        boolean isWifiOnlyMode =
+                imsManager.getWfcMode() == ImsConfig.WfcModeFeatureValueConstants.WIFI_ONLY;
+        if (DBG) Log.d(LOG_TAG, "isWfcModeWifiOnly :: isWifiOnlyMode" + isWifiOnlyMode
+                + " phoneId=" + phoneId);
+        return isWfcEnabled(context, phoneId) && isWifiOnlyMode;
     }
 
     /**
@@ -81,9 +99,21 @@
      * @return {@code true} if use of WFC should be promoted, {@code false} otherwise.
      */
     public static boolean shouldPromoteWfc(Context context) {
+        return shouldPromoteWfc(context, SubscriptionManager.getDefaultVoicePhoneId());
+    }
+
+    /**
+     * When a call cannot be placed, determines if the use of WFC should be promoted, per the
+     * carrier config of the slot.  Use of WFC is promoted to the user if the device is
+     * connected to a WIFI network, WFC is disabled but provisioned, and the carrier config
+     * indicates that the features should be promoted.
+     *
+     * @return {@code true} if use of WFC should be promoted, {@code false} otherwise.
+     */
+    public static boolean shouldPromoteWfc(Context context, int phoneId) {
         CarrierConfigManager cfgManager = (CarrierConfigManager) context
                 .getSystemService(Context.CARRIER_CONFIG_SERVICE);
-        if (cfgManager == null || !cfgManager.getConfig()
+        if (cfgManager == null || cfgManager.getConfigForSubId(getSubId(phoneId))
                 .getBoolean(CarrierConfigManager.KEY_CARRIER_PROMOTE_WFC_ON_CALL_FAIL_BOOL)) {
             return false;
         }
@@ -97,7 +127,8 @@
         if (cm != null) {
             NetworkInfo ni = cm.getActiveNetworkInfo();
             if (ni != null && ni.isConnected()) {
-                return ni.getType() == ConnectivityManager.TYPE_WIFI && !isWfcEnabled(context);
+                return ni.getType() == ConnectivityManager.TYPE_WIFI && !isWfcEnabled(context,
+                        phoneId);
             }
         }
         return false;
@@ -106,4 +137,13 @@
     private static ImsManager getDefaultImsManagerInstance(Context context) {
         return ImsManager.getInstance(context, SubscriptionManager.getDefaultVoicePhoneId());
     }
+
+    private static int getSubId(int phoneId) {
+        final int[] subIds = SubscriptionManager.getSubId(phoneId);
+        int subId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+        if (subIds != null && subIds.length >= 1) {
+            subId = subIds[0];
+        }
+        return subId;
+    }
 }
diff --git a/src/com/android/phone/MobileDataPreference.java b/src/com/android/phone/MobileDataPreference.java
index 38d700e..e1ceab0 100644
--- a/src/com/android/phone/MobileDataPreference.java
+++ b/src/com/android/phone/MobileDataPreference.java
@@ -52,6 +52,9 @@
 
     public int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
     public boolean mChecked;
+    // Whether to show the dialog to ask switching default data subscription.
+    // Should be true only when a multi-sim phone only supports data connection on a single phone,
+    // and user is enabling data on the non-default phone.
     public boolean mMultiSimDialog;
     private TelephonyManager mTelephonyManager;
     private SubscriptionManager mSubscriptionManager;
@@ -60,6 +63,11 @@
         super(context, attrs, com.android.internal.R.attr.switchPreferenceStyle);
     }
 
+    // Must be called to avoid binder leakage.
+    void dispose() {
+        mListener.setListener(false, mSubId, getContext());
+    }
+
     @Override
     protected void onRestoreInstanceState(Parcelable s) {
         CellDataState state = (CellDataState) s;
@@ -123,47 +131,46 @@
         final SubscriptionInfo currentSir = mSubscriptionManager.getActiveSubscriptionInfo(
                 mSubId);
         final SubscriptionInfo nextSir = mSubscriptionManager.getDefaultDataSubscriptionInfo();
-        boolean isMultiSim = (mTelephonyManager.getSimCount() > 1);
+        final boolean isMultiSim = (mTelephonyManager.getSimCount() > 1);
+        final boolean isMultipleDataOnCapable =
+                (mTelephonyManager.getNumberOfModemsWithSimultaneousDataConnections() > 1);
+        final boolean isDefaultDataSubscription = (nextSir != null && currentSir != null
+                && currentSir.getSubscriptionId() == nextSir.getSubscriptionId());
         if (mChecked) {
-            // If the device is single SIM or is enabling data on the active data SIM then forgo
-            // the pop-up.
-            if (isMultiSim || (nextSir != null && currentSir != null
-                    && currentSir.getSubscriptionId() == nextSir.getSubscriptionId())) {
-                setMobileDataEnabled(false);
-                if (nextSir != null && currentSir != null
-                        && currentSir.getSubscriptionId() == nextSir.getSubscriptionId()) {
-                    disableDataForOtherSubscriptions(mSubId);
-                }
-                return;
-            }
-            // disabling data; show confirmation dialog which eventually
-            // calls setMobileDataEnabled() once user confirms.
-            mMultiSimDialog = false;
-            super.performClick(preferenceScreen);
-        } else {
-            // If we are showing the Sim Card tile then we are a Multi-Sim device.
-            if (isMultiSim) {
-                mMultiSimDialog = true;
-                if (nextSir != null && currentSir != null
-                        && currentSir.getSubscriptionId() == nextSir.getSubscriptionId()) {
-                    setMobileDataEnabled(true);
-                    disableDataForOtherSubscriptions(mSubId);
-                    return;
-                }
+            if (!isMultiSim) {
+                // disabling data; show confirmation dialog which eventually
+                // calls setMobileDataEnabled() once user confirms.
+                mMultiSimDialog = false;
                 super.performClick(preferenceScreen);
             } else {
-                setMobileDataEnabled(true);
+                // Don't show any dialog.
+                setMobileDataEnabled(false /* enabled */, false /* disableOtherSubscriptions */);
+            }
+        } else {
+            if (isMultiSim && !isMultipleDataOnCapable && !isDefaultDataSubscription) {
+                // enabling data and setting to default; show confirmation dialog which eventually
+                // calls setMobileDataEnabled() once user confirms.
+                mMultiSimDialog = true;
+                super.performClick(preferenceScreen);
+            } else {
+                // Don't show any dialog.
+                setMobileDataEnabled(true /* enabled */, false /* disableOtherSubscriptions */);
             }
         }
     }
 
-    private void setMobileDataEnabled(boolean enabled) {
+    private void setMobileDataEnabled(boolean enabled, boolean disableOtherSubscriptions) {
         if (DBG) Log.d(TAG, "setMobileDataEnabled(" + enabled + "," + mSubId + ")");
 
         MetricsLogger.action(getContext(), MetricsEvent.ACTION_MOBILE_NETWORK_MOBILE_DATA_TOGGLE,
                 enabled);
 
         mTelephonyManager.setDataEnabled(mSubId, enabled);
+
+        if (disableOtherSubscriptions) {
+            disableDataForOtherSubscriptions(mSubId);
+        }
+
         setChecked(enabled);
     }
 
@@ -232,11 +239,10 @@
         }
         if (mMultiSimDialog) {
             mSubscriptionManager.setDefaultDataSubId(mSubId);
-            setMobileDataEnabled(true);
-            disableDataForOtherSubscriptions(mSubId);
+            setMobileDataEnabled(true /* enabled */, true /* disableOtherSubscriptions */);
         } else {
             // TODO: extend to modify policy enabled flag.
-            setMobileDataEnabled(false);
+            setMobileDataEnabled(false /* enabled */, false /* disableOtherSubscriptions */);
         }
     }
 
diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index f128f9a..9d6108e 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -24,21 +24,18 @@
 import android.app.Fragment;
 import android.app.FragmentManager;
 import android.content.BroadcastReceiver;
-import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.ServiceConnection;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.database.ContentObserver;
 import android.database.Cursor;
 import android.net.Uri;
-import android.os.AsyncResult;
+import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
-import android.os.IBinder;
 import android.os.Message;
 import android.os.PersistableBundle;
 import android.os.SystemProperties;
@@ -76,9 +73,7 @@
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 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 com.android.phone.settings.PhoneAccountSettingsFragment;
 import com.android.settingslib.RestrictedLockUtils;
 
 import java.util.ArrayList;
@@ -109,6 +104,9 @@
     private static final String KEY_ENABLE_ESIM_UI_BY_DEFAULT =
             "esim.enable_esim_system_ui_by_default";
 
+    private static final String LEGACY_ACTION_CONFIGURE_PHONE_ACCOUNT =
+            "android.telecom.action.CONNECTION_SERVICE_CONFIGURE";
+
     private enum TabState {
         NO_TABS, UPDATE, DO_NOTHING
     }
@@ -149,6 +147,45 @@
         return super.onOptionsItemSelected(item);
     }
 
+
+    /**
+     * Returns true if Wifi calling is enabled for at least one phone.
+     */
+    public static boolean isWifiCallingEnabled(Context context) {
+        int phoneCount = TelephonyManager.from(context).getPhoneCount();
+        for (int i = 0; i < phoneCount; i++) {
+            if (isWifiCallingEnabled(context, i)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Returns true if Wifi calling is enabled for the specific phone with id {@code phoneId}.
+     */
+    public static boolean isWifiCallingEnabled(Context context, int phoneId) {
+        final PhoneAccountHandle simCallManager =
+                TelecomManager.from(context).getSimCallManager();
+
+        boolean isWifiCallingEnabled;
+        if (simCallManager != null) {
+            Intent intent = MobileNetworkSettings.buildPhoneAccountConfigureIntent(
+                    context, simCallManager);
+            PackageManager pm = context.getPackageManager();
+            isWifiCallingEnabled = intent != null
+                    && !pm.queryIntentActivities(intent, 0 /* flags */).isEmpty();
+        } else {
+            ImsManager imsMgr = ImsManager.getInstance(context, phoneId);
+            isWifiCallingEnabled = imsMgr != null
+                    && imsMgr.isWfcEnabledByPlatform()
+                    && imsMgr.isWfcProvisionedOnDevice()
+                    && isImsServiceStateReady(imsMgr);
+        }
+
+        return isWifiCallingEnabled;
+    }
+
     /**
      * Whether to show the entry point to eUICC settings.
      *
@@ -201,15 +238,17 @@
      * doesn't set {@link CarrierConfigManager#KEY_HIDE_ENHANCED_4G_LTE_BOOL} to false.
      */
     public static boolean hideEnhanced4gLteSettings(Context context) {
-        List<SubscriptionInfo> sil =
+        final CarrierConfigManager carrierConfigManager = new CarrierConfigManager(context);
+        final List<SubscriptionInfo> sil =
                 SubscriptionManager.from(context).getActiveSubscriptionInfoList();
         // Check all active subscriptions. We only hide the button if it's disabled for all
         // active subscriptions.
         if (sil != null) {
             for (SubscriptionInfo subInfo : sil) {
-                ImsManager imsManager = ImsManager.getInstance(context, subInfo.getSimSlotIndex());
-                PersistableBundle carrierConfig = PhoneGlobals.getInstance()
-                        .getCarrierConfigForSubId(subInfo.getSubscriptionId());
+                int phoneId = SubscriptionManager.getPhoneId(subInfo.getSubscriptionId());
+                ImsManager imsManager = ImsManager.getInstance(context, phoneId);
+                PersistableBundle carrierConfig = carrierConfigManager.getConfigForSubId(
+                        subInfo.getSubscriptionId());
                 if ((imsManager.isVolteEnabledByPlatform()
                         && imsManager.isVolteProvisionedOnDevice())
                         || carrierConfig.getBoolean(
@@ -236,6 +275,63 @@
         }
     }
 
+    private static boolean isImsServiceStateReady(ImsManager imsMgr) {
+        boolean isImsServiceStateReady = false;
+
+        try {
+            if (imsMgr != null && imsMgr.getImsServiceState() == ImsFeature.STATE_READY) {
+                isImsServiceStateReady = true;
+            }
+        } catch (ImsException ex) {
+            Log.e(MobileNetworkFragment.LOG_TAG,
+                    "Exception when trying to get ImsServiceStatus: " + ex);
+        }
+
+        Log.d(MobileNetworkFragment.LOG_TAG, "isImsServiceStateReady=" + isImsServiceStateReady);
+        return isImsServiceStateReady;
+    }
+
+
+    private static Intent buildPhoneAccountConfigureIntent(
+            Context context, PhoneAccountHandle accountHandle) {
+        Intent intent = buildConfigureIntent(
+                context, accountHandle, TelecomManager.ACTION_CONFIGURE_PHONE_ACCOUNT);
+
+        if (intent == null) {
+            // If the new configuration didn't work, try the old configuration intent.
+            intent = buildConfigureIntent(
+                    context, accountHandle, LEGACY_ACTION_CONFIGURE_PHONE_ACCOUNT);
+            if (intent != null) {
+                Log.w(MobileNetworkFragment.LOG_TAG,
+                        "Phone account using old configuration intent: " + accountHandle);
+            }
+        }
+        return intent;
+    }
+
+    private static Intent buildConfigureIntent(
+            Context context, PhoneAccountHandle accountHandle, String actionStr) {
+        if (accountHandle == null || accountHandle.getComponentName() == null
+                || TextUtils.isEmpty(accountHandle.getComponentName().getPackageName())) {
+            return null;
+        }
+
+        // Build the settings intent.
+        Intent intent = new Intent(actionStr);
+        intent.setPackage(accountHandle.getComponentName().getPackageName());
+        intent.addCategory(Intent.CATEGORY_DEFAULT);
+        intent.putExtra(TelecomManager.EXTRA_PHONE_ACCOUNT_HANDLE, accountHandle);
+
+        // Check to see that the phone account package can handle the setting intent.
+        PackageManager pm = context.getPackageManager();
+        List<ResolveInfo> resolutions = pm.queryIntentActivities(intent, 0);
+        if (resolutions.size() == 0) {
+            intent = null;  // set no intent if the package cannot handle it.
+        }
+
+        return intent;
+    }
+
     public static class MobileNetworkFragment extends PreferenceFragment implements
             Preference.OnPreferenceChangeListener, RoamingDialogFragment.RoamingDialogListener {
 
@@ -293,6 +389,8 @@
 
         private SubscriptionManager mSubscriptionManager;
         private TelephonyManager mTelephonyManager;
+        private CarrierConfigManager mCarrierConfigManager;
+        private int mSubId;
 
         //UI objects
         private AdvancedOptionsPreference mAdvancedOptions;
@@ -313,7 +411,6 @@
         private List<SubscriptionInfo> mActiveSubInfos;
 
         private UserManager mUm;
-        private Phone mPhone;
         private ImsManager mImsMgr;
         private MyHandler mHandler;
         private boolean mOkClicked;
@@ -327,8 +424,9 @@
         CdmaOptions mCdmaOptions;
 
         private Preference mClickedPreference;
-        private boolean mShow4GForLTE;
+        private boolean mShow4GForLTE = false;
         private boolean mIsGlobalCdma;
+        private boolean mOnlyAutoSelectInHomeNW;
         private boolean mUnavailable;
 
         private class PhoneCallStateListener extends PhoneStateListener {
@@ -348,20 +446,20 @@
                 updatePreferredNetworkType();
             }
 
-            /*
-             * Listen to different subId if mPhone is updated.
+            /**
+             * Listen to different subId if it's changed.
              */
-            protected void updatePhone() {
-                int newSubId = (mPhone != null
-                        && SubscriptionManager.isValidSubscriptionId(mPhone.getSubId()))
-                        ? mPhone.getSubId()
-                        : SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+            protected void updateSubscriptionId(Integer subId) {
+                if (subId.equals(PhoneCallStateListener.this.mSubId)) {
+                    return;
+                }
 
-                // Now, listen to new subId if it's valid.
+                PhoneCallStateListener.this.mSubId = subId;
+
                 mTelephonyManager.listen(this, PhoneStateListener.LISTEN_NONE);
 
-                mSubId = newSubId;
-                if (SubscriptionManager.isValidSubscriptionId(mSubId)) {
+                // Now, listen to new subId if it's valid.
+                if (SubscriptionManager.isValidSubscriptionId(subId)) {
                     mTelephonyManager.listen(this, PhoneStateListener.LISTEN_CALL_STATE);
                 }
             }
@@ -369,56 +467,9 @@
 
         private final PhoneCallStateListener mPhoneStateListener = new PhoneCallStateListener();
 
-        /**
-         * Service connection code for the NetworkQueryService.
-         * Handles the work of binding to a local object so that we can make
-         * the appropriate service calls.
-         */
-
-        /** Local service interface */
-        private INetworkQueryService mNetworkQueryService = null;
-
-        private void setNetworkQueryService() {
-            mButtonNetworkSelect = (NetworkSelectListPreference) getPreferenceScreen()
-                    .findPreference(NetworkOperators.BUTTON_NETWORK_SELECT_KEY);
-            if (mButtonNetworkSelect != null) {
-                mButtonNetworkSelect.setNetworkQueryService(mNetworkQueryService);
-            }
-
-        }
-        /** Service connection */
-        private final ServiceConnection mNetworkQueryServiceConnection = new ServiceConnection() {
-
-            /** Handle the task of binding the local object to the service */
-            public void onServiceConnected(ComponentName className, IBinder service) {
-                if (DBG) log("connection created, binding local service.");
-                mNetworkQueryService = ((NetworkQueryService.LocalBinder) service).getService();
-                setNetworkQueryService();
-            }
-
-            /** Handle the task of cleaning up the local binding */
-            public void onServiceDisconnected(ComponentName className) {
-                if (DBG) log("connection disconnected, cleaning local binding.");
-                mNetworkQueryService = null;
-                setNetworkQueryService();
-            }
-        };
-
-        private void bindNetworkQueryService() {
-            getContext().startService(new Intent(getContext(), NetworkQueryService.class));
-            getContext().bindService(new Intent(getContext(), NetworkQueryService.class).setAction(
-                        NetworkQueryService.ACTION_LOCAL_BINDER),
-                        mNetworkQueryServiceConnection, Context.BIND_AUTO_CREATE);
-        }
-
-        private void unbindNetworkQueryService() {
-            // unbind the service.
-            getContext().unbindService(mNetworkQueryServiceConnection);
-        }
-
         @Override
         public void onPositiveButtonClick(DialogFragment dialog) {
-            mPhone.setDataRoamingEnabled(true);
+            mTelephonyManager.setDataRoamingEnabled(true);
             mButtonDataRoam.setChecked(true);
             MetricsLogger.action(getContext(),
                     getMetricsEventCategory(getPreferenceScreen(), mButtonDataRoam),
@@ -449,7 +500,6 @@
             sendMetricsEventPreferenceClicked(preferenceScreen, preference);
 
             /** TODO: Refactor and get rid of the if's using subclasses */
-            final int phoneSubId = mPhone.getSubId();
             if (preference.getKey().equals(BUTTON_4G_LTE_KEY)) {
                 return true;
             } else if (mGsmUmtsOptions != null &&
@@ -457,7 +507,7 @@
                 return true;
             } else if (mCdmaOptions != null &&
                     mCdmaOptions.preferenceTreeClick(preference) == true) {
-                if (mPhone.isInEcm()) {
+                if (mTelephonyManager.getEmergencyCallbackMode()) {
 
                     mClickedPreference = preference;
 
@@ -470,8 +520,8 @@
             } else if (preference == mButtonPreferredNetworkMode) {
                 //displays the value taken from the Settings.System
                 int settingsNetworkMode = android.provider.Settings.Global.getInt(
-                        mPhone.getContext().getContentResolver(),
-                        android.provider.Settings.Global.PREFERRED_NETWORK_MODE + phoneSubId,
+                        getContext().getContentResolver(),
+                        android.provider.Settings.Global.PREFERRED_NETWORK_MODE + mSubId,
                         preferredNetworkMode);
                 mButtonPreferredNetworkMode.setValue(Integer.toString(settingsNetworkMode));
                 return true;
@@ -494,8 +544,8 @@
                 return true;
             }  else if (preference == mButtonEnabledNetworks) {
                 int settingsNetworkMode = android.provider.Settings.Global.getInt(
-                        mPhone.getContext().getContentResolver(),
-                        android.provider.Settings.Global.PREFERRED_NETWORK_MODE + phoneSubId,
+                        getContext().getContentResolver(),
+                        android.provider.Settings.Global.PREFERRED_NETWORK_MODE + mSubId,
                         preferredNetworkMode);
                 mButtonEnabledNetworks.setValue(Integer.toString(settingsNetworkMode));
                 return true;
@@ -670,27 +720,26 @@
         private void updatePhone(int slotId) {
             final SubscriptionInfo sir = mSubscriptionManager
                     .getActiveSubscriptionInfoForSimSlotIndex(slotId);
+
             if (sir != null) {
-                int phoneId = SubscriptionManager.getPhoneId(sir.getSubscriptionId());
-                if (SubscriptionManager.isValidPhoneId(phoneId)) {
-                    mPhone = PhoneFactory.getPhone(phoneId);
+                mSubId = sir.getSubscriptionId();
+
+                Log.i(LOG_TAG, "updatePhone:- slotId=" + slotId + " sir=" + sir);
+
+                mImsMgr = ImsManager.getInstance(getContext(),
+                        SubscriptionManager.getPhoneId(mSubId));
+                mTelephonyManager = new TelephonyManager(getContext(), mSubId);
+                if (mImsMgr == null) {
+                    log("updatePhone :: Could not get ImsManager instance!");
+                } else if (DBG) {
+                    log("updatePhone :: mImsMgr=" + mImsMgr);
                 }
-            }
-            if (mPhone == null) {
-                // Do the best we can
-                mPhone = PhoneGlobals.getPhone();
-            }
-            Log.i(LOG_TAG, "updatePhone:- slotId=" + slotId + " sir=" + sir);
-
-            mImsMgr = ImsManager.getInstance(mPhone.getContext(), mPhone.getPhoneId());
-            mTelephonyManager = new TelephonyManager(mPhone.getContext(), mPhone.getSubId());
-            if (mImsMgr == null) {
-                log("updatePhone :: Could not get ImsManager instance!");
-            } else if (DBG) {
-                log("updatePhone :: mImsMgr=" + mImsMgr);
+            } else {
+                // There is no active subscription in the given slot.
+                mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
             }
 
-            mPhoneStateListener.updatePhone();
+            mPhoneStateListener.updateSubscriptionId(mSubId);
         }
 
         private TabHost.TabContentFactory mEmptyTabContent = new TabHost.TabContentFactory() {
@@ -737,6 +786,7 @@
             mSubscriptionManager = SubscriptionManager.from(activity);
             mTelephonyManager = (TelephonyManager) activity.getSystemService(
                             Context.TELEPHONY_SERVICE);
+            mCarrierConfigManager = new CarrierConfigManager(getContext());
 
             if (icicle != null) {
                 mExpandAdvancedFields = icicle.getBoolean(EXPAND_ADVANCED_FIELDS, false);
@@ -744,8 +794,6 @@
                 mExpandAdvancedFields = true;
             }
 
-            bindNetworkQueryService();
-
             addPreferencesFromResource(R.xml.network_setting_fragment);
 
             mButton4glte = (SwitchPreference)findPreference(BUTTON_4G_LTE_KEY);
@@ -757,16 +805,6 @@
             mMobileDataPref = (MobileDataPreference) findPreference(BUTTON_MOBILE_DATA_ENABLE_KEY);
             mDataUsagePref = (DataUsagePreference) findPreference(BUTTON_DATA_USAGE_KEY);
 
-            try {
-                Context con = activity.createPackageContext("com.android.systemui", 0);
-                int id = con.getResources().getIdentifier("config_show4GForLTE",
-                        "bool", "com.android.systemui");
-                mShow4GForLTE = con.getResources().getBoolean(id);
-            } catch (PackageManager.NameNotFoundException e) {
-                Log.e(LOG_TAG, "NameNotFoundException for show4GFotLTE");
-                mShow4GForLTE = false;
-            }
-
             //get UI object references
             PreferenceScreen prefSet = getPreferenceScreen();
 
@@ -789,6 +827,11 @@
             int max = mSubscriptionManager.getActiveSubscriptionInfoCountMax();
             mActiveSubInfos = new ArrayList<SubscriptionInfo>(max);
 
+            int currentTab = mTabHost != null ? mTabHost.getCurrentTab() : 0;
+            updatePhone(currentTab);
+            if (hasActiveSubscriptions()) {
+                updateEnabledNetworksEntries();
+            }
             Log.i(LOG_TAG, "onCreate:-");
         }
 
@@ -843,8 +886,10 @@
 
         @Override
         public void onDestroy() {
-            unbindNetworkQueryService();
             super.onDestroy();
+            if (mMobileDataPref != null) {
+                mMobileDataPref.dispose();
+            }
         }
 
         @Override
@@ -864,7 +909,7 @@
             // Set UI state in onResume because a user could go home, launch some
             // app to change this setting's backend, and re-launch this settings app
             // and the UI state would be inconsistent with actual state
-            mButtonDataRoam.setChecked(mPhone.getDataRoamingEnabled());
+            mButtonDataRoam.setChecked(mTelephonyManager.isDataRoamingEnabled());
 
             if (getPreferenceScreen().findPreference(BUTTON_PREFERED_NETWORK_MODE) != null
                     || getPreferenceScreen().findPreference(BUTTON_ENABLED_NETWORKS_KEY) != null)  {
@@ -910,24 +955,26 @@
             prefSet.addPreference(mButtonDataRoam);
             prefSet.addPreference(mDataUsagePref);
 
-            // Customized preferences needs to be initialized with subId.
-            mMobileDataPref.initialize(phoneSubId);
-            mDataUsagePref.initialize(phoneSubId);
-
             mMobileDataPref.setEnabled(hasActiveSubscriptions);
             mButtonDataRoam.setEnabled(hasActiveSubscriptions);
             mDataUsagePref.setEnabled(hasActiveSubscriptions);
 
-            // Initialize states of mButtonDataRoam.
-            mButtonDataRoam.setChecked(mPhone.getDataRoamingEnabled());
-            mButtonDataRoam.setDisabledByAdmin(false);
-            if (mButtonDataRoam.isEnabled()) {
-                if (RestrictedLockUtils.hasBaseUserRestriction(context,
-                        UserManager.DISALLOW_DATA_ROAMING, UserHandle.myUserId())) {
-                    mButtonDataRoam.setEnabled(false);
-                } else {
-                    mButtonDataRoam.checkRestrictionAndSetDisabled(
-                            UserManager.DISALLOW_DATA_ROAMING);
+            if (hasActiveSubscriptions) {
+                // Customized preferences needs to be initialized with subId.
+                mMobileDataPref.initialize(phoneSubId);
+                mDataUsagePref.initialize(phoneSubId);
+
+                // Initialize states of mButtonDataRoam.
+                mButtonDataRoam.setChecked(mTelephonyManager.isDataRoamingEnabled());
+                mButtonDataRoam.setDisabledByAdmin(false);
+                if (mButtonDataRoam.isEnabled()) {
+                    if (RestrictedLockUtils.hasBaseUserRestriction(context,
+                            UserManager.DISALLOW_DATA_ROAMING, UserHandle.myUserId())) {
+                        mButtonDataRoam.setEnabled(false);
+                    } else {
+                        mButtonDataRoam.checkRestrictionAndSetDisabled(
+                                UserManager.DISALLOW_DATA_ROAMING);
+                    }
                 }
             }
         }
@@ -935,7 +982,6 @@
         private void updateBody() {
             final Activity activity = getActivity();
             final PreferenceScreen prefSet = getPreferenceScreen();
-            final int phoneSubId = mPhone.getSubId();
             final boolean hasActiveSubscriptions = hasActiveSubscriptions();
 
             if (activity == null || activity.isDestroyed()) {
@@ -950,18 +996,27 @@
 
             prefSet.removeAll();
 
-            updateBodyBasicFields(activity, prefSet, phoneSubId, hasActiveSubscriptions);
+            updateBodyBasicFields(activity, prefSet, mSubId, hasActiveSubscriptions);
 
-            if (mExpandAdvancedFields) {
-                updateBodyAdvancedFields(activity, prefSet, phoneSubId, hasActiveSubscriptions);
+            if (hasActiveSubscriptions) {
+                if (mExpandAdvancedFields) {
+                    updateBodyAdvancedFields(activity, prefSet, mSubId, hasActiveSubscriptions);
+                } else {
+                    prefSet.addPreference(mAdvancedOptions);
+                }
             } else {
-                prefSet.addPreference(mAdvancedOptions);
+                // Shows the "Carrier" preference that allows user to add a e-sim profile.
+                if (showEuiccSettings(getContext())) {
+                    mEuiccSettingsPref.setSummary(null /* summary */);
+                    prefSet.addPreference(mEuiccSettingsPref);
+                }
             }
         }
 
         private void updateBodyAdvancedFields(Activity activity, PreferenceScreen prefSet,
                 int phoneSubId, boolean hasActiveSubscriptions) {
-            boolean isLteOnCdma = mPhone.getLteOnCdmaMode() == PhoneConstants.LTE_ON_CDMA_TRUE;
+            boolean isLteOnCdma = mTelephonyManager.getLteOnCdmaMode()
+                    == PhoneConstants.LTE_ON_CDMA_TRUE;
 
             if (DBG) {
                 log("updateBody: isLteOnCdma=" + isLteOnCdma + " phoneSubId=" + phoneSubId);
@@ -982,12 +1037,11 @@
             }
 
             int settingsNetworkMode = android.provider.Settings.Global.getInt(
-                    mPhone.getContext().getContentResolver(),
+                    getContext().getContentResolver(),
                     android.provider.Settings.Global.PREFERRED_NETWORK_MODE + phoneSubId,
                     preferredNetworkMode);
 
-            PersistableBundle carrierConfig =
-                    PhoneGlobals.getInstance().getCarrierConfigForSubId(mPhone.getSubId());
+            PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(mSubId);
             mIsGlobalCdma = isLteOnCdma
                     && carrierConfig.getBoolean(CarrierConfigManager.KEY_SHOW_CDMA_CHOICES_BOOL);
             if (carrierConfig.getBoolean(
@@ -997,17 +1051,17 @@
                 prefSet.removePreference(mLteDataServicePref);
             } else if (carrierConfig.getBoolean(CarrierConfigManager
                     .KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL)
-                    && !mPhone.getServiceState().getRoaming()
-                    && mPhone.getServiceState().getDataRegState()
+                    && !mTelephonyManager.getServiceState().getRoaming()
+                    && mTelephonyManager.getServiceState().getDataRegState()
                     == ServiceState.STATE_IN_SERVICE) {
                 prefSet.removePreference(mButtonPreferredNetworkMode);
                 prefSet.removePreference(mButtonEnabledNetworks);
 
-                final int phoneType = mPhone.getPhoneType();
+                final int phoneType = mTelephonyManager.getPhoneType();
                 if (phoneType == PhoneConstants.PHONE_TYPE_CDMA) {
-                    updateCdmaOptions(this, prefSet, mPhone);
+                    updateCdmaOptions(this, prefSet, mSubId);
                 } else if (phoneType == PhoneConstants.PHONE_TYPE_GSM) {
-                    updateGsmUmtsOptions(this, prefSet, phoneSubId, mNetworkQueryService);
+                    updateGsmUmtsOptions(this, prefSet, phoneSubId);
                 } else {
                     throw new IllegalStateException("Unexpected phone type: " + phoneType);
                 }
@@ -1022,99 +1076,11 @@
                 // change Preferred Network Mode.
                 mButtonPreferredNetworkMode.setOnPreferenceChangeListener(this);
 
-                updateCdmaOptions(this, prefSet, mPhone);
-                updateGsmUmtsOptions(this, prefSet, phoneSubId, mNetworkQueryService);
+                updateCdmaOptions(this, prefSet, mSubId);
+                updateGsmUmtsOptions(this, prefSet, phoneSubId);
             } else {
                 prefSet.removePreference(mButtonPreferredNetworkMode);
-                final int phoneType = mPhone.getPhoneType();
-                if (phoneType == PhoneConstants.PHONE_TYPE_CDMA) {
-                    int lteForced = android.provider.Settings.Global.getInt(
-                            mPhone.getContext().getContentResolver(),
-                            android.provider.Settings.Global.LTE_SERVICE_FORCED + mPhone.getSubId(),
-                            0);
-
-                    if (isLteOnCdma) {
-                        if (lteForced == 0) {
-                            mButtonEnabledNetworks.setEntries(
-                                    R.array.enabled_networks_cdma_choices);
-                            mButtonEnabledNetworks.setEntryValues(
-                                    R.array.enabled_networks_cdma_values);
-                        } else {
-                            switch (settingsNetworkMode) {
-                                case Phone.NT_MODE_CDMA:
-                                case Phone.NT_MODE_CDMA_NO_EVDO:
-                                case Phone.NT_MODE_EVDO_NO_CDMA:
-                                    mButtonEnabledNetworks.setEntries(
-                                            R.array.enabled_networks_cdma_no_lte_choices);
-                                    mButtonEnabledNetworks.setEntryValues(
-                                            R.array.enabled_networks_cdma_no_lte_values);
-                                    break;
-                                case Phone.NT_MODE_GLOBAL:
-                                case Phone.NT_MODE_LTE_CDMA_AND_EVDO:
-                                case Phone.NT_MODE_LTE_CDMA_EVDO_GSM_WCDMA:
-                                case Phone.NT_MODE_LTE_ONLY:
-                                    mButtonEnabledNetworks.setEntries(
-                                            R.array.enabled_networks_cdma_only_lte_choices);
-                                    mButtonEnabledNetworks.setEntryValues(
-                                            R.array.enabled_networks_cdma_only_lte_values);
-                                    break;
-                                default:
-                                    mButtonEnabledNetworks.setEntries(
-                                            R.array.enabled_networks_cdma_choices);
-                                    mButtonEnabledNetworks.setEntryValues(
-                                            R.array.enabled_networks_cdma_values);
-                                    break;
-                            }
-                        }
-                    }
-                    updateCdmaOptions(this, prefSet, mPhone);
-
-                } else if (phoneType == PhoneConstants.PHONE_TYPE_GSM) {
-                    if (isSupportTdscdma()) {
-                        mButtonEnabledNetworks.setEntries(
-                                R.array.enabled_networks_tdscdma_choices);
-                        mButtonEnabledNetworks.setEntryValues(
-                                R.array.enabled_networks_tdscdma_values);
-                    } else if (!carrierConfig.getBoolean(CarrierConfigManager.KEY_PREFER_2G_BOOL)
-                            && !getResources().getBoolean(R.bool.config_enabled_lte)) {
-                        mButtonEnabledNetworks.setEntries(
-                                R.array.enabled_networks_except_gsm_lte_choices);
-                        mButtonEnabledNetworks.setEntryValues(
-                                R.array.enabled_networks_except_gsm_lte_values);
-                    } else if (!carrierConfig.getBoolean(CarrierConfigManager.KEY_PREFER_2G_BOOL)) {
-                        int select = (mShow4GForLTE == true) ?
-                                R.array.enabled_networks_except_gsm_4g_choices
-                                : R.array.enabled_networks_except_gsm_choices;
-                        mButtonEnabledNetworks.setEntries(select);
-                        mButtonEnabledNetworks.setEntryValues(
-                                R.array.enabled_networks_except_gsm_values);
-                    } else if (!getResources().getBoolean(R.bool.config_enabled_lte)) {
-                        mButtonEnabledNetworks.setEntries(
-                                R.array.enabled_networks_except_lte_choices);
-                        mButtonEnabledNetworks.setEntryValues(
-                                R.array.enabled_networks_except_lte_values);
-                    } else if (mIsGlobalCdma) {
-                        mButtonEnabledNetworks.setEntries(
-                                R.array.enabled_networks_cdma_choices);
-                        mButtonEnabledNetworks.setEntryValues(
-                                R.array.enabled_networks_cdma_values);
-                    } else {
-                        int select = (mShow4GForLTE == true) ? R.array.enabled_networks_4g_choices
-                                : R.array.enabled_networks_choices;
-                        mButtonEnabledNetworks.setEntries(select);
-                        mButtonEnabledNetworks.setEntryValues(
-                                R.array.enabled_networks_values);
-                    }
-                    updateGsmUmtsOptions(this, prefSet, phoneSubId, mNetworkQueryService);
-                } else {
-                    throw new IllegalStateException("Unexpected phone type: " + phoneType);
-                }
-                if (isWorldMode()) {
-                    mButtonEnabledNetworks.setEntries(
-                            R.array.preferred_network_mode_choices_world_mode);
-                    mButtonEnabledNetworks.setEntryValues(
-                            R.array.preferred_network_mode_values_world_mode);
-                }
+                updateEnabledNetworksEntries();
                 mButtonEnabledNetworks.setOnPreferenceChangeListener(this);
                 if (DBG) log("settingsNetworkMode: " + settingsNetworkMode);
             }
@@ -1163,8 +1129,12 @@
             UpdatePreferredNetworkModeSummary(settingsNetworkMode);
             UpdateEnabledNetworksValueAndSummary(settingsNetworkMode);
             // Display preferred network type based on what modem returns b/18676277
-            mPhone.setPreferredNetworkType(settingsNetworkMode, mHandler
-                    .obtainMessage(MyHandler.MESSAGE_SET_PREFERRED_NETWORK_TYPE));
+            new SetPreferredNetworkAsyncTask(
+                    mTelephonyManager,
+                    mSubId,
+                    settingsNetworkMode,
+                    mHandler.obtainMessage(MyHandler.MESSAGE_SET_PREFERRED_NETWORK_TYPE))
+                    .executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
 
             /**
              * Enable/disable depending upon if there are any active subscriptions.
@@ -1177,19 +1147,22 @@
              */
             int variant4glteTitleIndex = carrierConfig.getInt(
                     CarrierConfigManager.KEY_ENHANCED_4G_LTE_TITLE_VARIANT_INT);
-            String[] variantTitles = getContext().getResources()
-                    .getStringArray(R.array.enhanced_4g_lte_mode_title_variant);
-            // Default index 0 indicates the default title string
+            CharSequence[] variantTitles = getContext().getResources()
+                    .getTextArray(R.array.enhanced_4g_lte_mode_title_variant);
+            CharSequence[] variantSumaries = getContext().getResources()
+                    .getTextArray(R.array.enhanced_4g_lte_mode_sumary_variant);
+            // Default index 0 indicates the default title/sumary string
             CharSequence enhanced4glteModeTitle = variantTitles[0];
-            CharSequence enhanced4glteModeSummary = getContext().getResources()
-                    .getString(R.string.enhanced_4g_lte_mode_summary);
+            CharSequence enhanced4glteModeSummary = variantSumaries[0];
             if (variant4glteTitleIndex >= 0 && variant4glteTitleIndex < variantTitles.length) {
                 enhanced4glteModeTitle = variantTitles[variant4glteTitleIndex];
-                // Workaround for b/119068616, O2 persists to replace LTE with 4G or hide it.
-                if (variant4glteTitleIndex == 2) {
-                    enhanced4glteModeSummary = null;
-                }
             }
+            if (variant4glteTitleIndex >= 0 && variant4glteTitleIndex < variantSumaries.length) {
+                enhanced4glteModeSummary = variantSumaries[variant4glteTitleIndex];
+            }
+
+            mOnlyAutoSelectInHomeNW = carrierConfig.getBoolean(
+                    CarrierConfigManager.KEY_ONLY_AUTO_SELECT_IN_HOME_NETWORK_BOOL);
             mButton4glte.setTitle(enhanced4glteModeTitle);
             mButton4glte.setSummary(enhanced4glteModeSummary);
             mLteDataServicePref.setEnabled(hasActiveSubscriptions);
@@ -1222,6 +1195,121 @@
             if (ps != null) {
                 ps.setEnabled(hasActiveSubscriptions);
             }
+            ps = findPreference(NetworkOperators.BUTTON_AUTO_SELECT_KEY);
+            if (ps != null) {
+                ps.setSummary(null);
+                if (mTelephonyManager.getServiceState().getRoaming()) {
+                    ps.setEnabled(true);
+                } else {
+                    ps.setEnabled(!mOnlyAutoSelectInHomeNW);
+                    if (mOnlyAutoSelectInHomeNW) {
+                        ps.setSummary(getResources().getString(
+                                R.string.manual_mode_disallowed_summary,
+                                mTelephonyManager.getSimOperatorName()));
+                    }
+                }
+            }
+        }
+
+        // Requires that mSubId is up to date
+        void updateEnabledNetworksEntries() {
+            final int phoneType = mTelephonyManager.getPhoneType();
+            final PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(mSubId);
+            mShow4GForLTE = carrierConfig != null ? carrierConfig.getBoolean(
+                    CarrierConfigManager.KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL) : false;
+            if (phoneType == PhoneConstants.PHONE_TYPE_CDMA) {
+                final int lteForced = android.provider.Settings.Global.getInt(
+                        getContext().getContentResolver(),
+                        android.provider.Settings.Global.LTE_SERVICE_FORCED + mSubId,
+                        0);
+                final boolean isLteOnCdma = mTelephonyManager.getLteOnCdmaMode()
+                        == PhoneConstants.LTE_ON_CDMA_TRUE;
+                final int settingsNetworkMode = android.provider.Settings.Global.getInt(
+                        getContext().getContentResolver(),
+                        android.provider.Settings.Global.PREFERRED_NETWORK_MODE + mSubId,
+                        preferredNetworkMode);
+                if (isLteOnCdma) {
+                    if (lteForced == 0) {
+                        mButtonEnabledNetworks.setEntries(
+                                R.array.enabled_networks_cdma_choices);
+                        mButtonEnabledNetworks.setEntryValues(
+                                R.array.enabled_networks_cdma_values);
+                    } else {
+                        switch (settingsNetworkMode) {
+                            case Phone.NT_MODE_CDMA:
+                            case Phone.NT_MODE_CDMA_NO_EVDO:
+                            case Phone.NT_MODE_EVDO_NO_CDMA:
+                                mButtonEnabledNetworks.setEntries(
+                                        R.array.enabled_networks_cdma_no_lte_choices);
+                                mButtonEnabledNetworks.setEntryValues(
+                                        R.array.enabled_networks_cdma_no_lte_values);
+                                break;
+                            case Phone.NT_MODE_GLOBAL:
+                            case Phone.NT_MODE_LTE_CDMA_AND_EVDO:
+                            case Phone.NT_MODE_LTE_CDMA_EVDO_GSM_WCDMA:
+                            case Phone.NT_MODE_LTE_ONLY:
+                                mButtonEnabledNetworks.setEntries(
+                                        R.array.enabled_networks_cdma_only_lte_choices);
+                                mButtonEnabledNetworks.setEntryValues(
+                                        R.array.enabled_networks_cdma_only_lte_values);
+                                break;
+                            default:
+                                mButtonEnabledNetworks.setEntries(
+                                        R.array.enabled_networks_cdma_choices);
+                                mButtonEnabledNetworks.setEntryValues(
+                                        R.array.enabled_networks_cdma_values);
+                                break;
+                        }
+                    }
+                }
+                updateCdmaOptions(this, getPreferenceScreen(), mSubId);
+
+            } else if (phoneType == PhoneConstants.PHONE_TYPE_GSM) {
+                if (isSupportTdscdma()) {
+                    mButtonEnabledNetworks.setEntries(
+                            R.array.enabled_networks_tdscdma_choices);
+                    mButtonEnabledNetworks.setEntryValues(
+                            R.array.enabled_networks_tdscdma_values);
+                } else if (!carrierConfig.getBoolean(CarrierConfigManager.KEY_PREFER_2G_BOOL)
+                        && !getResources().getBoolean(R.bool.config_enabled_lte)) {
+                    mButtonEnabledNetworks.setEntries(
+                            R.array.enabled_networks_except_gsm_lte_choices);
+                    mButtonEnabledNetworks.setEntryValues(
+                            R.array.enabled_networks_except_gsm_lte_values);
+                } else if (!carrierConfig.getBoolean(CarrierConfigManager.KEY_PREFER_2G_BOOL)) {
+                    int select = mShow4GForLTE
+                            ? R.array.enabled_networks_except_gsm_4g_choices
+                            : R.array.enabled_networks_except_gsm_choices;
+                    mButtonEnabledNetworks.setEntries(select);
+                    mButtonEnabledNetworks.setEntryValues(
+                            R.array.enabled_networks_except_gsm_values);
+                } else if (!getResources().getBoolean(R.bool.config_enabled_lte)) {
+                    mButtonEnabledNetworks.setEntries(
+                            R.array.enabled_networks_except_lte_choices);
+                    mButtonEnabledNetworks.setEntryValues(
+                            R.array.enabled_networks_except_lte_values);
+                } else if (mIsGlobalCdma) {
+                    mButtonEnabledNetworks.setEntries(
+                            R.array.enabled_networks_cdma_choices);
+                    mButtonEnabledNetworks.setEntryValues(
+                            R.array.enabled_networks_cdma_values);
+                } else {
+                    int select = mShow4GForLTE ? R.array.enabled_networks_4g_choices
+                            : R.array.enabled_networks_choices;
+                    mButtonEnabledNetworks.setEntries(select);
+                    mButtonEnabledNetworks.setEntryValues(
+                            R.array.enabled_networks_values);
+                }
+                updateGsmUmtsOptions(this, getPreferenceScreen(), mSubId);
+            } else {
+                throw new IllegalStateException("Unexpected phone type: " + phoneType);
+            }
+            if (isWorldMode()) {
+                mButtonEnabledNetworks.setEntries(
+                        R.array.preferred_network_mode_choices_world_mode);
+                mButtonEnabledNetworks.setEntryValues(
+                        R.array.preferred_network_mode_values_world_mode);
+            }
         }
 
         @Override
@@ -1251,7 +1339,7 @@
         public boolean onPreferenceChange(Preference preference, Object objValue) {
             sendMetricsEventPreferenceChanged(getPreferenceScreen(), preference, objValue);
 
-            final int phoneSubId = mPhone.getSubId();
+            final int phoneSubId = mSubId;
             if (preference == mButtonPreferredNetworkMode) {
                 //NOTE onPreferenceChange seems to be called even if there is no change
                 //Check if the button value is changed from the System.Setting
@@ -1259,7 +1347,7 @@
                 int buttonNetworkMode;
                 buttonNetworkMode = Integer.parseInt((String) objValue);
                 int settingsNetworkMode = android.provider.Settings.Global.getInt(
-                        mPhone.getContext().getContentResolver(),
+                        getContext().getContentResolver(),
                         android.provider.Settings.Global.PREFERRED_NETWORK_MODE + phoneSubId,
                         preferredNetworkMode);
                 if (buttonNetworkMode != settingsNetworkMode) {
@@ -1298,12 +1386,16 @@
                     }
 
                     android.provider.Settings.Global.putInt(
-                            mPhone.getContext().getContentResolver(),
+                            getContext().getContentResolver(),
                             android.provider.Settings.Global.PREFERRED_NETWORK_MODE + phoneSubId,
                             buttonNetworkMode );
                     //Set the modem network mode
-                    mPhone.setPreferredNetworkType(modemNetworkMode, mHandler
-                            .obtainMessage(MyHandler.MESSAGE_SET_PREFERRED_NETWORK_TYPE));
+                    new SetPreferredNetworkAsyncTask(
+                            mTelephonyManager,
+                            mSubId,
+                            modemNetworkMode,
+                            mHandler.obtainMessage(MyHandler.MESSAGE_SET_PREFERRED_NETWORK_TYPE))
+                            .executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
                 }
             } else if (preference == mButtonEnabledNetworks) {
                 mButtonEnabledNetworks.setValue((String) objValue);
@@ -1311,7 +1403,7 @@
                 buttonNetworkMode = Integer.parseInt((String) objValue);
                 if (DBG) log("buttonNetworkMode: " + buttonNetworkMode);
                 int settingsNetworkMode = android.provider.Settings.Global.getInt(
-                        mPhone.getContext().getContentResolver(),
+                        getContext().getContentResolver(),
                         android.provider.Settings.Global.PREFERRED_NETWORK_MODE + phoneSubId,
                         preferredNetworkMode);
                 if (buttonNetworkMode != settingsNetworkMode) {
@@ -1346,12 +1438,16 @@
                     UpdateEnabledNetworksValueAndSummary(buttonNetworkMode);
 
                     android.provider.Settings.Global.putInt(
-                            mPhone.getContext().getContentResolver(),
+                            getContext().getContentResolver(),
                             android.provider.Settings.Global.PREFERRED_NETWORK_MODE + phoneSubId,
                             buttonNetworkMode );
                     //Set the modem network mode
-                    mPhone.setPreferredNetworkType(modemNetworkMode, mHandler
-                            .obtainMessage(MyHandler.MESSAGE_SET_PREFERRED_NETWORK_TYPE));
+                    new SetPreferredNetworkAsyncTask(
+                            mTelephonyManager,
+                            mSubId,
+                            modemNetworkMode,
+                            mHandler.obtainMessage(MyHandler.MESSAGE_SET_PREFERRED_NETWORK_TYPE))
+                            .executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
                 }
             } else if (preference == mButton4glte) {
                 boolean enhanced4gMode = !mButton4glte.isChecked();
@@ -1362,11 +1458,11 @@
 
                 //normally called on the toggle click
                 if (!mButtonDataRoam.isChecked()) {
-                    PersistableBundle carrierConfig =
-                            PhoneGlobals.getInstance().getCarrierConfigForSubId(mPhone.getSubId());
+                    PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(
+                            mSubId);
                     if (carrierConfig != null && carrierConfig.getBoolean(
                             CarrierConfigManager.KEY_DISABLE_CHARGE_INDICATION_BOOL)) {
-                        mPhone.setDataRoamingEnabled(true);
+                        mTelephonyManager.setDataRoamingEnabled(true);
                         MetricsLogger.action(getContext(),
                                 getMetricsEventCategory(getPreferenceScreen(), mButtonDataRoam),
                                 true);
@@ -1377,13 +1473,15 @@
                         // First confirm with a warning dialog about charges
                         mOkClicked = false;
                         RoamingDialogFragment fragment = new RoamingDialogFragment();
-                        fragment.setPhone(mPhone);
+                        Bundle b = new Bundle();
+                        b.putInt(RoamingDialogFragment.SUB_ID_KEY, mSubId);
+                        fragment.setArguments(b);
                         fragment.show(getFragmentManager(), ROAMING_TAG);
                         // Don't update the toggle unless the confirm button is actually pressed.
                         return false;
                     }
                 } else {
-                    mPhone.setDataRoamingEnabled(false);
+                    mTelephonyManager.setDataRoamingEnabled(false);
                     MetricsLogger.action(getContext(),
                             getMetricsEventCategory(getPreferenceScreen(), mButtonDataRoam),
                             false);
@@ -1413,7 +1511,7 @@
         }
 
         private boolean is4gLtePrefEnabled(PersistableBundle carrierConfig) {
-            return (mTelephonyManager.getCallState(mPhone.getSubId())
+            return (mTelephonyManager.getCallState(mSubId)
                     == TelephonyManager.CALL_STATE_IDLE)
                     && mImsMgr != null
                     && mImsMgr.isNonTtyOrTtyOnVolteEnabled()
@@ -1442,26 +1540,25 @@
                     return;
                 }
 
-                AsyncResult ar = (AsyncResult) msg.obj;
-                final int phoneSubId = mPhone.getSubId();
+                boolean success = (boolean) msg.obj;
 
-                if (ar.exception == null) {
+                if (success) {
                     int networkMode;
                     if (getPreferenceScreen().findPreference(
                             BUTTON_PREFERED_NETWORK_MODE) != null)  {
                         networkMode =  Integer.parseInt(mButtonPreferredNetworkMode.getValue());
                         android.provider.Settings.Global.putInt(
-                                mPhone.getContext().getContentResolver(),
+                                getContext().getContentResolver(),
                                 android.provider.Settings.Global.PREFERRED_NETWORK_MODE
-                                        + phoneSubId,
+                                        + mSubId,
                                 networkMode );
                     }
                     if (getPreferenceScreen().findPreference(BUTTON_ENABLED_NETWORKS_KEY) != null) {
                         networkMode = Integer.parseInt(mButtonEnabledNetworks.getValue());
                         android.provider.Settings.Global.putInt(
-                                mPhone.getContext().getContentResolver(),
+                                getContext().getContentResolver(),
                                 android.provider.Settings.Global.PREFERRED_NETWORK_MODE
-                                        + phoneSubId,
+                                        + mSubId,
                                 networkMode );
                     }
                 } else {
@@ -1473,11 +1570,9 @@
         }
 
         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,
+                    getContext().getContentResolver(),
+                    android.provider.Settings.Global.PREFERRED_NETWORK_MODE + mSubId,
                     preferredNetworkMode);
 
             if (DBG) {
@@ -1522,7 +1617,7 @@
                             R.string.preferred_network_mode_gsm_wcdma_summary);
                     break;
                 case Phone.NT_MODE_CDMA:
-                    switch (mPhone.getLteOnCdmaMode()) {
+                    switch (mTelephonyManager.getLteOnCdmaMode()) {
                         case PhoneConstants.LTE_ON_CDMA_TRUE:
                             mButtonPreferredNetworkMode.setSummary(
                                     R.string.preferred_network_mode_cdma_summary);
@@ -1575,9 +1670,9 @@
                             R.string.preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary);
                     break;
                 case Phone.NT_MODE_LTE_CDMA_EVDO_GSM_WCDMA:
-                    if (mPhone.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA ||
-                            mIsGlobalCdma ||
-                            isWorldMode()) {
+                    if (mTelephonyManager.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA
+                            || mIsGlobalCdma
+                            || isWorldMode()) {
                         mButtonPreferredNetworkMode.setSummary(
                                 R.string.preferred_network_mode_global_summary);
                     } else {
@@ -1712,9 +1807,9 @@
                         }
                         mButtonEnabledNetworks.setValue(
                                 Integer.toString(Phone.NT_MODE_LTE_CDMA_EVDO_GSM_WCDMA));
-                        if (mPhone.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA ||
-                                mIsGlobalCdma ||
-                                isWorldMode()) {
+                        if (mTelephonyManager.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA
+                                || mIsGlobalCdma
+                                || isWorldMode()) {
                             mButtonEnabledNetworks.setSummary(R.string.network_global);
                         } else {
                             mButtonEnabledNetworks.setSummary((mShow4GForLTE == true)
@@ -1753,30 +1848,23 @@
                 return;
             }
 
-            boolean removePref = false;
+            // Removes the preference if the wifi calling is disabled.
+            if (!isWifiCallingEnabled(getContext(), SubscriptionManager.getPhoneId(mSubId))) {
+                mCallingCategory.removePreference(mWiFiCallingPref);
+                return;
+            }
+
             final PhoneAccountHandle simCallManager =
                     TelecomManager.from(getContext()).getSimCallManager();
 
             if (simCallManager != null) {
-                Intent intent = PhoneAccountSettingsFragment.buildPhoneAccountConfigureIntent(
+                Intent intent = MobileNetworkSettings.buildPhoneAccountConfigureIntent(
                         getContext(), simCallManager);
-                if (intent != null) {
-                    PackageManager pm = mPhone.getContext().getPackageManager();
-                    List<ResolveInfo> resolutions = pm.queryIntentActivities(intent, 0);
-                    if (!resolutions.isEmpty()) {
-                        mWiFiCallingPref.setTitle(resolutions.get(0).loadLabel(pm));
-                        mWiFiCallingPref.setSummary(null);
-                        mWiFiCallingPref.setIntent(intent);
-                    } else {
-                        removePref = true;
-                    }
-                } else {
-                    removePref = true;
-                }
-            } else if (mImsMgr == null
-                    || !mImsMgr.isWfcEnabledByPlatform()
-                    || !mImsMgr.isWfcProvisionedOnDevice()) {
-                removePref = true;
+                PackageManager pm = getContext().getPackageManager();
+                List<ResolveInfo> resolutions = pm.queryIntentActivities(intent, 0);
+                mWiFiCallingPref.setTitle(resolutions.get(0).loadLabel(pm));
+                mWiFiCallingPref.setSummary(null);
+                mWiFiCallingPref.setIntent(intent);
             } else {
                 int resId = com.android.internal.R.string.wifi_calling_off_summary;
                 if (mImsMgr.isWfcEnabledByUser()) {
@@ -1801,13 +1889,9 @@
                 mWiFiCallingPref.setSummary(resId);
             }
 
-            if (removePref) {
-                mCallingCategory.removePreference(mWiFiCallingPref);
-            } else {
-                mCallingCategory.addPreference(mWiFiCallingPref);
-                mWiFiCallingPref.setEnabled(mTelephonyManager.getCallState(mPhone.getSubId())
-                        == TelephonyManager.CALL_STATE_IDLE && hasActiveSubscriptions());
-            }
+            mCallingCategory.addPreference(mWiFiCallingPref);
+            mWiFiCallingPref.setEnabled(mTelephonyManager.getCallState(mSubId)
+                    == TelephonyManager.CALL_STATE_IDLE && hasActiveSubscriptions());
         }
 
         private void updateEnhanced4gLteState() {
@@ -1815,27 +1899,21 @@
                 return;
             }
 
-            PersistableBundle carrierConfig = PhoneGlobals.getInstance()
-                    .getCarrierConfigForSubId(mPhone.getSubId());
+            PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(mSubId);
 
-            try {
-                if ((mImsMgr == null
-                        || mImsMgr.getImsServiceState() != ImsFeature.STATE_READY
-                        || !mImsMgr.isVolteEnabledByPlatform()
-                        || !mImsMgr.isVolteProvisionedOnDevice()
-                        || carrierConfig.getBoolean(
-                        CarrierConfigManager.KEY_HIDE_ENHANCED_4G_LTE_BOOL))) {
-                    getPreferenceScreen().removePreference(mButton4glte);
-                } else {
-                    mButton4glte.setEnabled(is4gLtePrefEnabled(carrierConfig)
-                            && hasActiveSubscriptions());
-                    boolean enh4glteMode = mImsMgr.isEnhanced4gLteModeSettingEnabledByUser()
-                            && mImsMgr.isNonTtyOrTtyOnVolteEnabled();
-                    mButton4glte.setChecked(enh4glteMode);
-                }
-            } catch (ImsException ex) {
-                log("Exception when trying to get ImsServiceStatus: " + ex);
+            if ((mImsMgr == null
+                    || !mImsMgr.isVolteEnabledByPlatform()
+                    || !mImsMgr.isVolteProvisionedOnDevice()
+                    || !isImsServiceStateReady(mImsMgr)
+                    || carrierConfig.getBoolean(
+                    CarrierConfigManager.KEY_HIDE_ENHANCED_4G_LTE_BOOL))) {
                 getPreferenceScreen().removePreference(mButton4glte);
+            } else {
+                mButton4glte.setEnabled(is4gLtePrefEnabled(carrierConfig)
+                        && hasActiveSubscriptions());
+                boolean enh4glteMode = mImsMgr.isEnhanced4gLteModeSettingEnabledByUser()
+                        && mImsMgr.isNonTtyOrTtyOnVolteEnabled();
+                mButton4glte.setChecked(enh4glteMode);
             }
         }
 
@@ -1844,21 +1922,21 @@
                 return;
             }
 
-            PersistableBundle carrierConfig = PhoneGlobals.getInstance()
-                    .getCarrierConfigForSubId(mPhone.getSubId());
+            PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(mSubId);
 
             if (mImsMgr != null
                     && mImsMgr.isVtEnabledByPlatform()
                     && mImsMgr.isVtProvisionedOnDevice()
+                    && isImsServiceStateReady(mImsMgr)
                     && (carrierConfig.getBoolean(
                         CarrierConfigManager.KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS)
-                        || mPhone.mDcTracker.isDataEnabled())) {
+                        || mTelephonyManager.isDataEnabled())) {
                 mCallingCategory.addPreference(mVideoCallingPref);
                 if (!mButton4glte.isChecked()) {
                     mVideoCallingPref.setEnabled(false);
                     mVideoCallingPref.setChecked(false);
                 } else {
-                    mVideoCallingPref.setEnabled(mTelephonyManager.getCallState(mPhone.getSubId())
+                    mVideoCallingPref.setEnabled(mTelephonyManager.getCallState(mSubId)
                             == TelephonyManager.CALL_STATE_IDLE && hasActiveSubscriptions());
                     mVideoCallingPref.setChecked(mImsMgr.isVtEnabledByUser());
                     mVideoCallingPref.setOnPreferenceChangeListener(this);
@@ -1870,7 +1948,7 @@
 
         private void updatePreferredNetworkType() {
             boolean enabled = mTelephonyManager.getCallState(
-                    mPhone.getSubId()) == TelephonyManager.CALL_STATE_IDLE
+                    mSubId) == TelephonyManager.CALL_STATE_IDLE
                     && hasActiveSubscriptions();
             Log.i(LOG_TAG, "updatePreferredNetworkType: " + enabled);
             // TODO: Disentangle enabled networks vs preferred network mode, it looks like
@@ -1960,7 +2038,7 @@
                 return;
             }
 
-            updateGsmUmtsOptions(this, prefSet, mPhone.getSubId(), mNetworkQueryService);
+            updateGsmUmtsOptions(this, prefSet, mSubId);
 
             PreferenceCategory networkOperatorCategory =
                     (PreferenceCategory) prefSet.findPreference(
@@ -1983,10 +2061,11 @@
             if (prefSet == null) {
                 return;
             }
-            updateCdmaOptions(this, prefSet, mPhone);
+            updateCdmaOptions(this, prefSet, mSubId);
             CdmaSystemSelectListPreference systemSelect =
                     (CdmaSystemSelectListPreference)prefSet.findPreference
                             (BUTTON_CDMA_SYSTEM_SELECT_KEY);
+            systemSelect.setSubscriptionId(mSubId);
             if (systemSelect != null) {
                 systemSelect.setEnabled(enable);
             }
@@ -1997,7 +2076,7 @@
                 return true;
             }
 
-            String operatorNumeric = mPhone.getServiceState().getOperatorNumeric();
+            String operatorNumeric = mTelephonyManager.getServiceState().getOperatorNumeric();
             String[] numericArray = getResources().getStringArray(
                     R.array.config_support_tdscdma_roaming_on_networks);
             if (numericArray.length == 0 || operatorNumeric == null) {
@@ -2112,28 +2191,54 @@
         }
 
         private void updateGsmUmtsOptions(PreferenceFragment prefFragment,
-                PreferenceScreen prefScreen, final int subId, INetworkQueryService queryService) {
+                PreferenceScreen prefScreen, final int subId) {
             // We don't want to re-create GsmUmtsOptions if already exists. Otherwise, the
             // preferences inside it will also be re-created which causes unexpected behavior.
             // For example, the open dialog gets dismissed or detached after pause / resume.
             if (mGsmUmtsOptions == null) {
-                mGsmUmtsOptions = new GsmUmtsOptions(prefFragment, prefScreen, subId, queryService);
+                mGsmUmtsOptions = new GsmUmtsOptions(prefFragment, prefScreen, subId);
             } else {
-                mGsmUmtsOptions.update(subId, queryService);
+                mGsmUmtsOptions.update(subId);
             }
         }
 
         private void updateCdmaOptions(PreferenceFragment prefFragment, PreferenceScreen prefScreen,
-                Phone phone) {
+                int subId) {
             // We don't want to re-create CdmaOptions if already exists. Otherwise, the preferences
             // inside it will also be re-created which causes unexpected behavior. For example,
             // the open dialog gets dismissed or detached after pause / resume.
             if (mCdmaOptions == null) {
-                mCdmaOptions = new CdmaOptions(prefFragment, prefScreen, phone);
+                mCdmaOptions = new CdmaOptions(prefFragment, prefScreen, subId);
             } else {
-                mCdmaOptions.update(phone);
+                mCdmaOptions.updateSubscriptionId(subId);
             }
         }
     }
-}
 
+    private static final class SetPreferredNetworkAsyncTask extends AsyncTask<Void, Void, Boolean> {
+
+        private final TelephonyManager mTelephonyManager;
+        private final int mSubId;
+        private final int mNetworkType;
+        private final Message mCallback;
+
+        SetPreferredNetworkAsyncTask(
+                TelephonyManager tm, int subId, int networkType, Message callback) {
+            mTelephonyManager = tm;
+            mSubId = subId;
+            mNetworkType = networkType;
+            mCallback = callback;
+        }
+
+        @Override
+        protected Boolean doInBackground(Void... voids) {
+            return mTelephonyManager.setPreferredNetworkType(mSubId, mNetworkType);
+        }
+
+        @Override
+        protected void onPostExecute(Boolean isSuccessed) {
+            mCallback.obj = isSuccessed;
+            mCallback.sendToTarget();
+        }
+    }
+}
diff --git a/src/com/android/phone/NetworkOperatorPreference.java b/src/com/android/phone/NetworkOperatorPreference.java
index 26c3fde..09c494c 100644
--- a/src/com/android/phone/NetworkOperatorPreference.java
+++ b/src/com/android/phone/NetworkOperatorPreference.java
@@ -24,7 +24,6 @@
 import android.preference.Preference;
 import android.telephony.CellInfo;
 import android.telephony.SignalStrength;
-import android.telephony.TelephonyManager;
 import android.util.Log;
 import android.view.Gravity;
 
@@ -73,7 +72,7 @@
             networkTitle += " " + getContext().getResources().getString(R.string.forbidden_network);
         }
         setTitle(networkTitle);
-        int level = CellInfoUtil.getLevel(mCellInfo);
+        int level = mCellInfo.getCellSignalStrength().getLevel();
         if (DBG) Log.d(TAG, "refresh level: " + String.valueOf(level));
         if (mLevel != level) {
             mLevel = level;
@@ -88,18 +87,17 @@
         updateIcon(level);
     }
 
-    private int getIconId(int networkType) {
-        if (networkType == TelephonyManager.NETWORK_TYPE_CDMA) {
-            return R.drawable.signal_strength_1x;
-        } else if (networkType == TelephonyManager.NETWORK_TYPE_LTE) {
-            return mShow4GForLTE
-                ? R.drawable.signal_strength_4g : R.drawable.signal_strength_lte;
-        } else if (networkType == TelephonyManager.NETWORK_TYPE_UMTS) {
-            return R.drawable.signal_strength_3g;
-        } else if (networkType == TelephonyManager.NETWORK_TYPE_GSM) {
-            return R.drawable.signal_strength_g;
-        } else {
-            return 0;
+    private int getIconIdForCell(CellInfo ci) {
+        final int type = ci.getCellIdentity().getType();
+        switch (type) {
+            case CellInfo.TYPE_GSM: return R.drawable.signal_strength_g;
+            case CellInfo.TYPE_WCDMA: // fall through
+            case CellInfo.TYPE_TDSCDMA: return R.drawable.signal_strength_3g;
+            case CellInfo.TYPE_LTE:
+                return mShow4GForLTE
+                        ? R.drawable.signal_strength_4g : R.drawable.signal_strength_lte;
+            case CellInfo.TYPE_CDMA: return R.drawable.signal_strength_1x;
+            default: return 0;
         }
     }
 
@@ -116,7 +114,7 @@
         signalDrawable.setDarkIntensity(0);
 
         // Make the network type drawable
-        int iconType = getIconId(CellInfoUtil.getNetworkType(mCellInfo));
+        int iconType = getIconIdForCell(mCellInfo);
         Drawable networkDrawable =
                 iconType == NO_CELL_DATA_CONNECTED_ICON
                         ? EMPTY_DRAWABLE
diff --git a/src/com/android/phone/NetworkOperators.java b/src/com/android/phone/NetworkOperators.java
index 4467345..938ca34 100644
--- a/src/com/android/phone/NetworkOperators.java
+++ b/src/com/android/phone/NetworkOperators.java
@@ -19,7 +19,6 @@
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.Intent;
-import android.os.AsyncResult;
 import android.os.Handler;
 import android.os.Message;
 import android.preference.Preference;
@@ -30,12 +29,11 @@
 import android.telephony.TelephonyManager;
 import android.util.AttributeSet;
 import android.util.Log;
+import android.widget.Toast;
 
 import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.internal.telephony.CommandException;
-import com.android.internal.telephony.Phone;
-import com.android.internal.telephony.PhoneFactory;
+import com.android.settingslib.utils.ThreadUtils;
 
 /**
  * "Networks" settings UI for the Phone app.
@@ -55,16 +53,14 @@
     public static final String BUTTON_CHOOSE_NETWORK_KEY = "button_choose_network_key";
     public static final String CATEGORY_NETWORK_OPERATORS_KEY = "network_operators_category_key";
 
-    int mPhoneId = SubscriptionManager.INVALID_PHONE_INDEX;
-    private static final int ALREADY_IN_AUTO_SELECTION = 1;
-
     //preference objects
     private NetworkSelectListPreference mNetworkSelect;
     private TwoStatePreference mAutoSelect;
     private Preference mChooseNetwork;
+    private ProgressDialog mProgressDialog;
 
     private int mSubId;
-    private ProgressDialog mProgressDialog;
+    private TelephonyManager mTelephonyManager;
 
     // There's two sets of Auto-Select UI in this class.
     // If {@code com.android.internal.R.bool.config_enableNewAutoSelectNetworkUI} set as true
@@ -94,17 +90,17 @@
             removePreference(mChooseNetwork);
         }
         mProgressDialog = new ProgressDialog(getContext());
+        mTelephonyManager = TelephonyManager.from(getContext());
     }
 
     /**
-     * Update NetworkOperators instance if like subId or queryService are updated.
+     * Update NetworkOperators instance if like subId is updated.
      *
      * @param subId Corresponding subscription ID of this network.
-     * @param queryService The service to do network queries.
      */
-    protected void update(final int subId, INetworkQueryService queryService) {
+    protected void update(final int subId) {
         mSubId = subId;
-        mPhoneId = SubscriptionManager.getPhoneId(mSubId);
+        mTelephonyManager = TelephonyManager.from(getContext()).createForSubscriptionId(mSubId);
 
         if (mAutoSelect != null) {
             mAutoSelect.setOnPreferenceChangeListener(this);
@@ -112,18 +108,16 @@
 
         if (mEnableNewManualSelectNetworkUI) {
             if (mChooseNetwork != null) {
-                TelephonyManager telephonyManager = (TelephonyManager)
-                        getContext().getSystemService(Context.TELEPHONY_SERVICE);
-                if (DBG) logd("data connection status " + telephonyManager.getDataState());
-                if (telephonyManager.getDataState() == telephonyManager.DATA_CONNECTED) {
-                    mChooseNetwork.setSummary(telephonyManager.getNetworkOperatorName());
+                ServiceState ss = mTelephonyManager.getServiceState();
+                if (ss != null && ss.getState() == ServiceState.STATE_IN_SERVICE) {
+                    mChooseNetwork.setSummary(mTelephonyManager.getNetworkOperatorName());
                 } else {
                     mChooseNetwork.setSummary(R.string.network_disconnected);
                 }
             }
         } else {
             if (mNetworkSelect != null) {
-                mNetworkSelect.initialize(mSubId, queryService, this, mProgressDialog);
+                mNetworkSelect.initialize(mSubId, this, mProgressDialog);
             }
         }
         getNetworkSelectionMode();
@@ -152,48 +146,44 @@
     private final Handler mHandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
-            AsyncResult ar;
             switch (msg.what) {
                 case EVENT_AUTO_SELECT_DONE:
                     mAutoSelect.setEnabled(true);
                     dismissProgressBar();
 
-                    ar = (AsyncResult) msg.obj;
-                    if (ar.exception != null) {
-                        if (DBG) logd("automatic network selection: failed!");
-                        displayNetworkSelectionFailed(ar.exception);
-                    } else {
+                    boolean isSuccessed = (boolean) msg.obj;
+
+                    if (isSuccessed) {
                         if (DBG) logd("automatic network selection: succeeded!");
-                        displayNetworkSelectionSucceeded(msg.arg1);
+                        displayNetworkSelectionSucceeded();
+                    } else {
+                        if (DBG) logd("automatic network selection: failed!");
+                        displayNetworkSelectionFailed();
                     }
 
                     break;
                 case EVENT_GET_NETWORK_SELECTION_MODE_DONE:
-                    ar = (AsyncResult) msg.obj;
-                    if (ar.exception != null) {
+                    int networkSelectionMode = msg.arg1;
+                    if (networkSelectionMode == TelephonyManager.NETWORK_SELECTION_MODE_UNKNOWN) {
                         if (DBG) logd("get network selection mode: failed!");
-                    } else if (ar.result != null) {
-                        try {
-                            int[] modes = (int[]) ar.result;
-                            boolean autoSelect = (modes[0] == 0);
-                            if (DBG) {
-                                logd("get network selection mode: "
-                                        + (autoSelect ? "auto" : "manual") + " selection");
+                    } else {
+                        boolean autoSelect = networkSelectionMode
+                                == TelephonyManager.NETWORK_SELECTION_MODE_AUTO;
+                        if (DBG) {
+                            logd("get network selection mode: "
+                                    + (autoSelect ? "auto" : "manual") + " selection");
+                        }
+                        if (mAutoSelect != null) {
+                            mAutoSelect.setChecked(autoSelect);
+                        }
+                        if (mEnableNewManualSelectNetworkUI) {
+                            if (mChooseNetwork != null) {
+                                mChooseNetwork.setEnabled(!autoSelect);
                             }
-                            if (mAutoSelect != null) {
-                                mAutoSelect.setChecked(autoSelect);
+                        } else {
+                            if (mNetworkSelect != null) {
+                                mNetworkSelect.setEnabled(!autoSelect);
                             }
-                            if (mEnableNewManualSelectNetworkUI) {
-                                if (mChooseNetwork != null) {
-                                    mChooseNetwork.setEnabled(!autoSelect);
-                                }
-                            } else {
-                                if (mNetworkSelect != null) {
-                                    mNetworkSelect.setEnabled(!autoSelect);
-                                }
-                            }
-                        } catch (Exception e) {
-                            if (DBG) loge("get network selection mode: unable to parse result.");
                         }
                     }
             }
@@ -202,42 +192,13 @@
     };
 
     // Used by both mAutoSelect and mNetworkSelect buttons.
-    protected void displayNetworkSelectionFailed(Throwable ex) {
-        String status;
-        if ((ex != null && ex instanceof CommandException)
-                && ((CommandException) ex).getCommandError()
-                == CommandException.Error.ILLEGAL_SIM_OR_ME) {
-            status = getContext().getResources().getString(R.string.not_allowed);
-        } else {
-            status = getContext().getResources().getString(R.string.connect_later);
-        }
-
-        final PhoneGlobals app = PhoneGlobals.getInstance();
-        app.notificationMgr.postTransientNotification(
-                NotificationMgr.NETWORK_SELECTION_NOTIFICATION, status);
-
-        TelephonyManager tm = (TelephonyManager) app.getSystemService(Context.TELEPHONY_SERVICE);
-        Phone phone = PhoneFactory.getPhone(mPhoneId);
-        if (phone != null) {
-            ServiceState ss = tm.getServiceStateForSubscriber(phone.getSubId());
-            if (ss != null) {
-                app.notificationMgr.updateNetworkSelection(ss.getState(), phone.getSubId());
-            }
-        }
+    protected void displayNetworkSelectionFailed() {
+        Toast.makeText(getContext(), R.string.connect_later, Toast.LENGTH_LONG).show();
     }
 
     // Used by both mAutoSelect and mNetworkSelect buttons.
-    protected void displayNetworkSelectionSucceeded(int msgArg1) {
-        String status = null;
-        if (msgArg1 == ALREADY_IN_AUTO_SELECTION) {
-            status = getContext().getResources().getString(R.string.already_auto);
-        } else {
-            status = getContext().getResources().getString(R.string.registration_done);
-        }
-
-        final PhoneGlobals app = PhoneGlobals.getInstance();
-        app.notificationMgr.postTransientNotification(
-                NotificationMgr.NETWORK_SELECTION_NOTIFICATION, status);
+    protected void displayNetworkSelectionSucceeded() {
+        Toast.makeText(getContext(), R.string.registration_done, Toast.LENGTH_LONG).show();
     }
 
     private void selectNetworkAutomatic(boolean autoSelect) {
@@ -256,10 +217,17 @@
             if (DBG) logd("select network automatically...");
             showAutoSelectProgressBar();
             mAutoSelect.setEnabled(false);
-            Message msg = mHandler.obtainMessage(EVENT_AUTO_SELECT_DONE);
-            Phone phone = PhoneFactory.getPhone(mPhoneId);
-            if (phone != null) {
-                phone.setNetworkSelectionModeAutomatic(msg);
+            if (SubscriptionManager.isValidSubscriptionId(mSubId)) {
+                ThreadUtils.postOnBackgroundThread(() -> {
+                    mTelephonyManager.setNetworkSelectionModeAutomatic();
+                    // Because TelephonyManager#setNetworkSelectionModeAutomatic doesn't have a
+                    // return value, we query the current network selection mode to tell if the
+                    // TelephonyManager#setNetworkSelectionModeAutomatic is successed.
+                    int networkSelectionMode = mTelephonyManager.getNetworkSelectionMode();
+                    Message msg = mHandler.obtainMessage(EVENT_AUTO_SELECT_DONE);
+                    msg.obj = networkSelectionMode == TelephonyManager.NETWORK_SELECTION_MODE_AUTO;
+                    msg.sendToTarget();
+                });
             }
         } else {
             if (mEnableNewManualSelectNetworkUI) {
@@ -277,11 +245,12 @@
 
     protected void getNetworkSelectionMode() {
         if (DBG) logd("getting network selection mode...");
-        Message msg = mHandler.obtainMessage(EVENT_GET_NETWORK_SELECTION_MODE_DONE);
-        Phone phone = PhoneFactory.getPhone(mPhoneId);
-        if (phone != null) {
-            phone.getNetworkSelectionMode(msg);
-        }
+        ThreadUtils.postOnBackgroundThread(() -> {
+            int networkSelectionMode = mTelephonyManager.getNetworkSelectionMode();
+            Message msg = mHandler.obtainMessage(EVENT_GET_NETWORK_SELECTION_MODE_DONE);
+            msg.arg1 = networkSelectionMode;
+            msg.sendToTarget();
+        });
     }
 
     private void dismissProgressBar() {
@@ -300,10 +269,10 @@
     }
 
     /**
-     * Open the Choose netwotk page via {@alink NetworkSelectSettingActivity}
+     * Open the Choose network page via {@alink NetworkSelectSettingActivity}
      */
     public void openChooseNetworkPage() {
-        Intent intent = NetworkSelectSettingActivity.getIntent(getContext(), mPhoneId);
+        Intent intent = NetworkSelectSettingActivity.getIntent(getContext(), mSubId);
         getContext().startActivity(intent);
     }
 
@@ -326,4 +295,4 @@
     private void loge(String msg) {
         Log.e(LOG_TAG, "[NetworksList] " + msg);
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/phone/NetworkQueryService.java b/src/com/android/phone/NetworkQueryService.java
index 22b5509..e67582f 100644
--- a/src/com/android/phone/NetworkQueryService.java
+++ b/src/com/android/phone/NetworkQueryService.java
@@ -19,7 +19,6 @@
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
-import android.os.AsyncResult;
 import android.os.Binder;
 import android.os.Handler;
 import android.os.IBinder;
@@ -33,13 +32,14 @@
 import android.telephony.NetworkScan;
 import android.telephony.NetworkScanRequest;
 import android.telephony.RadioAccessSpecifier;
+import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.telephony.TelephonyScanManager;
 import android.util.Log;
 
+import com.android.internal.telephony.CellNetworkScanResult;
 import com.android.internal.telephony.OperatorInfo;
-import com.android.internal.telephony.Phone;
-import com.android.internal.telephony.PhoneFactory;
+import com.android.settingslib.utils.ThreadUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -185,7 +185,7 @@
          * completion.
          */
         public void startNetworkQuery(
-                INetworkQueryServiceCallback cb, int phoneId, boolean isIncrementalResult) {
+                INetworkQueryServiceCallback cb, int subId, boolean isIncrementalResult) {
             if (cb != null) {
                 // register the callback to the list of callbacks.
                 synchronized (mCallbacks) {
@@ -233,16 +233,23 @@
                                         networkScanCallback);
                                 mState = QUERY_IS_RUNNING;
                             } else {
-                                Phone phone = PhoneFactory.getPhone(phoneId);
-                                if (phone != null) {
-                                    phone.getAvailableNetworks(
-                                            mHandler.obtainMessage(
-                                                    EVENT_NETWORK_SCAN_VIA_PHONE_COMPLETED));
+                                if (SubscriptionManager.isValidSubscriptionId(subId)) {
                                     mState = QUERY_IS_RUNNING;
-                                    if (DBG) log("start network scan via Phone");
+                                    ThreadUtils.postOnBackgroundThread(() -> {
+                                        if (DBG) log("start network scan via Phone xxx");
+                                        TelephonyManager telephonyManager =
+                                                TelephonyManager.from(getApplicationContext())
+                                                        .createForSubscriptionId(subId);
+                                        CellNetworkScanResult result =
+                                                telephonyManager.getAvailableNetworks();
+                                        Message msg = mHandler.obtainMessage(
+                                                EVENT_NETWORK_SCAN_VIA_PHONE_COMPLETED);
+                                        msg.obj = result;
+                                        msg.sendToTarget();
+                                    });
                                 } else {
                                     if (DBG) {
-                                        log("phone is null");
+                                        log("SubscriptionId is invalid");
                                     }
                                 }
                             }
@@ -316,8 +323,7 @@
     }
 
     /**
-     * Broadcast the results from the query to all registered callback
-     * objects. 
+     * Broadcast the results from the query to all registered callback objects.
      */
     private void broadcastQueryResults(Message msg) {
         // reset the state.
@@ -331,11 +337,11 @@
                 try {
                     switch (msg.what) {
                         case EVENT_NETWORK_SCAN_VIA_PHONE_COMPLETED:
-                            AsyncResult ar = (AsyncResult) msg.obj;
-                            if (ar != null) {
-                                cb.onResults(getCellInfoList((List<OperatorInfo>) ar.result));
+                            CellNetworkScanResult result = (CellNetworkScanResult) msg.obj;
+                            if (result.getOperators() != null) {
+                                cb.onResults(getCellInfoList(result.getOperators()));
                             } else {
-                                if (DBG) log("AsyncResult is null.");
+                                if (DBG) log("Operators list is null.");
                             }
                             // Send the onComplete() callback to indicate the one-time network
                             // scan has completed.
diff --git a/src/com/android/phone/NetworkScanHelper.java b/src/com/android/phone/NetworkScanHelper.java
new file mode 100644
index 0000000..a21f547
--- /dev/null
+++ b/src/com/android/phone/NetworkScanHelper.java
@@ -0,0 +1,286 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.annotation.IntDef;
+import android.telephony.AccessNetworkConstants.AccessNetworkType;
+import android.telephony.CellInfo;
+import android.telephony.NetworkScan;
+import android.telephony.NetworkScanRequest;
+import android.telephony.RadioAccessSpecifier;
+import android.telephony.TelephonyManager;
+import android.telephony.TelephonyScanManager;
+import android.util.Log;
+
+import com.android.internal.telephony.CellNetworkScanResult;
+
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.SettableFuture;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.stream.Collectors;
+
+/**
+ * A helper class that builds the common interface and performs the network scan for two different
+ * network scan APIs.
+ */
+public class NetworkScanHelper {
+    public static final String TAG = "NetworkScanHelper";
+    private static final boolean DBG = true;
+
+    /**
+     * Callbacks interface to inform the network scan results.
+     */
+    public interface NetworkScanCallback {
+        /**
+         * Called when the results is returned from {@link TelephonyManager}. This method will be
+         * called at least one time if there is no error occurred during the network scan.
+         *
+         * <p> This method can be called multiple times in one network scan, until
+         * {@link #onComplete()} or {@link #onError(int)} is called.
+         *
+         * @param results
+         */
+        void onResults(List<CellInfo> results);
+
+        /**
+         * Called when the current network scan process is finished. No more
+         * {@link #onResults(List)} will be called for the current network scan after this method is
+         * called.
+         */
+        void onComplete();
+
+        /**
+         * Called when an error occurred during the network scan process.
+         *
+         * <p> There is no more result returned from {@link TelephonyManager} if an error occurred.
+         *
+         * <p> {@link #onComplete()} will not be called if an error occurred.
+         *
+         * @see {@link android.telephony.NetworkScan.ScanErrorCode}
+         */
+        void onError(int errorCode);
+    }
+
+    @Retention(RetentionPolicy.SOURCE)
+    @IntDef({NETWORK_SCAN_TYPE_WAIT_FOR_ALL_RESULTS, NETWORK_SCAN_TYPE_INCREMENTAL_RESULTS})
+    public @interface NetworkQueryType {}
+
+    /**
+     * Performs the network scan using {@link TelephonyManager#getAvailableNetworks()}. The network
+     * scan results won't be returned to the caller until the network scan is completed.
+     *
+     * <p> This is typically used when the modem doesn't support the new network scan api
+     * {@link TelephonyManager#requestNetworkScan(
+     * NetworkScanRequest, Executor, TelephonyScanManager.NetworkScanCallback)}.
+     */
+    public static final int NETWORK_SCAN_TYPE_WAIT_FOR_ALL_RESULTS = 1;
+
+    /**
+     * Performs the network scan using {@link TelephonyManager#requestNetworkScan(
+     * NetworkScanRequest, Executor, TelephonyScanManager.NetworkScanCallback)} The network scan
+     * results will be returned to the caller periodically in a small time window until the network
+     * scan is completed. The complete results should be returned in the last called of
+     * {@link NetworkScanCallback#onResults(List)}.
+     *
+     * <p> This is recommended to be used if modem supports the new network scan api
+     * {@link TelephonyManager#requestNetworkScan(
+     * NetworkScanRequest, Executor, TelephonyScanManager.NetworkScanCallback)}
+     */
+    public static final int NETWORK_SCAN_TYPE_INCREMENTAL_RESULTS = 2;
+
+    /** The constants below are used in the async network scan. */
+    private static final boolean INCREMENTAL_RESULTS = true;
+    private static final int SEARCH_PERIODICITY_SEC = 5;
+    private static final int MAX_SEARCH_TIME_SEC = 300;
+    private static final int INCREMENTAL_RESULTS_PERIODICITY_SEC = 3;
+
+    private static final NetworkScanRequest NETWORK_SCAN_REQUEST =
+            new NetworkScanRequest(
+                    NetworkScanRequest.SCAN_TYPE_ONE_SHOT,
+                    new RadioAccessSpecifier[]{
+                            // GSM
+                            new RadioAccessSpecifier(
+                                    AccessNetworkType.GERAN,
+                                    null /* bands */,
+                                    null /* channels */),
+                            // LTE
+                            new RadioAccessSpecifier(
+                                    AccessNetworkType.EUTRAN,
+                                    null /* bands */,
+                                    null /* channels */),
+                            // WCDMA
+                            new RadioAccessSpecifier(
+                                    AccessNetworkType.UTRAN,
+                                    null /* bands */,
+                                    null /* channels */)
+                    },
+                    SEARCH_PERIODICITY_SEC,
+                    MAX_SEARCH_TIME_SEC,
+                    INCREMENTAL_RESULTS,
+                    INCREMENTAL_RESULTS_PERIODICITY_SEC,
+                    null /* List of PLMN ids (MCC-MNC) */);
+
+    private final NetworkScanCallback mNetworkScanCallback;
+    private final TelephonyManager mTelephonyManager;
+    private final TelephonyScanManager.NetworkScanCallback mInternalNetworkScanCallback;
+    private final Executor mExecutor;
+
+    private NetworkScan mNetworkScanRequester;
+
+    /** Callbacks for sync network scan */
+    private ListenableFuture<List<CellInfo>> mNetworkScanFuture;
+
+    public NetworkScanHelper(TelephonyManager tm, NetworkScanCallback callback, Executor executor) {
+        mTelephonyManager = tm;
+        mNetworkScanCallback = callback;
+        mInternalNetworkScanCallback = new NetworkScanCallbackImpl();
+        mExecutor = executor;
+    }
+
+    /**
+     * Performs a network scan for the given type {@code type}.
+     * {@link #NETWORK_SCAN_TYPE_INCREMENTAL_RESULTS} is recommended if modem supports
+     * {@link TelephonyManager#requestNetworkScan(
+     * NetworkScanRequest, Executor, TelephonyScanManager.NetworkScanCallback)}.
+     *
+     * @param type used to tell which network scan API should be used.
+     */
+    public void startNetworkScan(@NetworkQueryType int type) {
+        if (type == NETWORK_SCAN_TYPE_WAIT_FOR_ALL_RESULTS) {
+            mNetworkScanFuture = SettableFuture.create();
+            Futures.addCallback(mNetworkScanFuture, new FutureCallback<List<CellInfo>>() {
+                @Override
+                public void onSuccess(List<CellInfo> result) {
+                    onResults(result);
+                    onComplete();
+                }
+
+                @Override
+                public void onFailure(Throwable t) {
+                    int errCode = Integer.parseInt(t.getMessage());
+                    onError(errCode);
+                }
+            });
+            mExecutor.execute(new NetworkScanSyncTask(
+                    mTelephonyManager, (SettableFuture) mNetworkScanFuture));
+        } else if (type == NETWORK_SCAN_TYPE_INCREMENTAL_RESULTS) {
+            if (DBG) Log.d(TAG, "start network scan async");
+            mNetworkScanRequester = mTelephonyManager.requestNetworkScan(
+                    NETWORK_SCAN_REQUEST,
+                    mExecutor,
+                    mInternalNetworkScanCallback);
+        }
+    }
+
+    /**
+     * The network scan of type {@link #NETWORK_SCAN_TYPE_WAIT_FOR_ALL_RESULTS} can't be stopped,
+     * however, the result of the current network scan won't be returned to the callback after
+     * calling this method.
+     */
+    public void stopNetworkQuery() {
+        if (mNetworkScanRequester != null) {
+            mNetworkScanRequester.stopScan();
+            mNetworkScanFuture = null;
+        }
+
+        if (mNetworkScanFuture != null) {
+            mNetworkScanFuture.cancel(true /* mayInterruptIfRunning */);
+            mNetworkScanFuture = null;
+        }
+    }
+
+    private void onResults(List<CellInfo> cellInfos) {
+        mNetworkScanCallback.onResults(cellInfos);
+    }
+
+    private void onComplete() {
+        mNetworkScanCallback.onComplete();
+    }
+
+    private void onError(int errCode) {
+        mNetworkScanCallback.onError(errCode);
+    }
+
+    /**
+     * Converts the status code of {@link CellNetworkScanResult} to one of the
+     * {@link android.telephony.NetworkScan.ScanErrorCode}.
+     * @param errCode status code from {@link CellNetworkScanResult}.
+     *
+     * @return one of the scan error code from {@link android.telephony.NetworkScan.ScanErrorCode}.
+     */
+    private static int convertToScanErrorCode(int errCode) {
+        switch (errCode) {
+            case CellNetworkScanResult.STATUS_RADIO_NOT_AVAILABLE:
+                return NetworkScan.ERROR_RADIO_INTERFACE_ERROR;
+            case CellNetworkScanResult.STATUS_RADIO_GENERIC_FAILURE:
+            default:
+                return NetworkScan.ERROR_MODEM_ERROR;
+        }
+    }
+
+    private final class NetworkScanCallbackImpl extends TelephonyScanManager.NetworkScanCallback {
+        public void onResults(List<CellInfo> results) {
+            if (DBG) Log.d(TAG, "async scan onResults() results = " + results);
+            NetworkScanHelper.this.onResults(results);
+        }
+
+        public void onComplete() {
+            if (DBG) Log.d(TAG, "async scan onComplete()");
+            NetworkScanHelper.this.onComplete();
+        }
+
+        public void onError(@NetworkScan.ScanErrorCode int errCode) {
+            if (DBG) Log.d(TAG, "async scan onError() errorCode = " + errCode);
+            NetworkScanHelper.this.onError(errCode);
+        }
+    }
+
+    private static final class NetworkScanSyncTask implements Runnable {
+        private final SettableFuture<List<CellInfo>> mCallback;
+        private final TelephonyManager mTelephonyManager;
+
+        NetworkScanSyncTask(
+                TelephonyManager telephonyManager, SettableFuture<List<CellInfo>> callback) {
+            mTelephonyManager = telephonyManager;
+            mCallback = callback;
+        }
+
+        @Override
+        public void run() {
+            if (DBG) Log.d(TAG, "sync scan start");
+            CellNetworkScanResult result = mTelephonyManager.getAvailableNetworks();
+            if (result.getStatus() == CellNetworkScanResult.STATUS_SUCCESS) {
+                List<CellInfo> cellInfos = result.getOperators()
+                        .stream()
+                        .map(operatorInfo
+                                -> CellInfoUtil.convertOperatorInfoToCellInfo(operatorInfo))
+                        .collect(Collectors.toList());
+                if (DBG) Log.d(TAG, "sync scan complete");
+                mCallback.set(cellInfos);
+            } else {
+                mCallback.setException(new Throwable(
+                        Integer.toString(convertToScanErrorCode(result.getStatus()))));
+            }
+        }
+    }
+}
diff --git a/src/com/android/phone/NetworkSelectListPreference.java b/src/com/android/phone/NetworkSelectListPreference.java
index 341ac8d..df3f44a 100644
--- a/src/com/android/phone/NetworkSelectListPreference.java
+++ b/src/com/android/phone/NetworkSelectListPreference.java
@@ -19,13 +19,11 @@
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.os.AsyncResult;
 import android.os.AsyncTask;
 import android.os.Handler;
 import android.os.Message;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.os.RemoteException;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.telephony.CellInfo;
@@ -33,11 +31,6 @@
 import android.telephony.CellInfoGsm;
 import android.telephony.CellInfoLte;
 import android.telephony.CellInfoWcdma;
-import android.telephony.CellSignalStrengthCdma;
-import android.telephony.CellSignalStrengthGsm;
-import android.telephony.CellSignalStrengthLte;
-import android.telephony.CellSignalStrengthWcdma;
-import android.telephony.NetworkScan;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.text.BidiFormatter;
@@ -45,16 +38,19 @@
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Log;
+import android.widget.Toast;
 
 import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.telephony.OperatorInfo;
-import com.android.internal.telephony.Phone;
-import com.android.internal.telephony.PhoneFactory;
+import com.android.phone.NetworkScanHelper.NetworkScanCallback;
+import com.android.settingslib.utils.ThreadUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 
 /**
@@ -69,22 +65,24 @@
     private static final String LOG_TAG = "networkSelect";
     private static final boolean DBG = true;
 
-    private static final int EVENT_NETWORK_SELECTION_DONE = 1;
+    private static final int EVENT_MANUALLY_NETWORK_SELECTION_DONE = 1;
     private static final int EVENT_NETWORK_SCAN_RESULTS = 2;
-    private static final int EVENT_NETWORK_SCAN_ERROR = 3;
-    private static final int EVENT_NETWORK_SCAN_COMPLETED = 4;
+    private static final int EVENT_NETWORK_SCAN_COMPLETED = 3;
+    private static final int EVENT_NETWORK_SCAN_ERROR = 4;
 
     //dialog ids
     private static final int DIALOG_NETWORK_SELECTION = 100;
     private static final int DIALOG_NETWORK_LIST_LOAD = 200;
 
-    private int mPhoneId = SubscriptionManager.INVALID_PHONE_INDEX;
+    private final ExecutorService mNetworkScanExecutor = Executors.newFixedThreadPool(1);
+
     private List<CellInfo> mCellInfoList;
     private CellInfo mCellInfo;
 
     private int mSubId;
+    private TelephonyManager mTelephonyManager;
+    private NetworkScanHelper mNetworkScanHelper;
     private NetworkOperators mNetworkOperators;
-    private boolean mNeedScanAgain;
     private List<String> mForbiddenPlmns;
 
     private ProgressDialog mProgressDialog;
@@ -112,7 +110,7 @@
             @Override
             protected void onPostExecute(List<String> result) {
                 mForbiddenPlmns = result;
-                loadNetworksList(true);
+                loadNetworksList();
             }
         }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
     }
@@ -120,26 +118,21 @@
     private final Handler mHandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
-            AsyncResult ar;
             switch (msg.what) {
-                case EVENT_NETWORK_SELECTION_DONE:
+                case EVENT_MANUALLY_NETWORK_SELECTION_DONE:
                     if (DBG) logd("hideProgressPanel");
-                    try {
-                        dismissProgressBar();
-                    } catch (IllegalArgumentException e) {
-                    }
-                    setEnabled(true);
+                    dismissProgressDialog();
 
-                    ar = (AsyncResult) msg.obj;
-                    if (ar.exception != null) {
-                        if (DBG) logd("manual network selection: failed!");
-                        mNetworkOperators.displayNetworkSelectionFailed(ar.exception);
-                    } else {
+                    boolean isSuccessed = (boolean) msg.obj;
+                    if (isSuccessed) {
                         if (DBG) {
                             logd("manual network selection: succeeded! "
                                     + getNetworkTitle(mCellInfo));
                         }
-                        mNetworkOperators.displayNetworkSelectionSucceeded(msg.arg1);
+                        mNetworkOperators.displayNetworkSelectionSucceeded();
+                    } else {
+                        if (DBG) logd("manual network selection: failed!");
+                        mNetworkOperators.displayNetworkSelectionFailed();
                     }
                     mNetworkOperators.getNetworkSelectionMode();
                     break;
@@ -147,130 +140,41 @@
                 case EVENT_NETWORK_SCAN_RESULTS:
                     List<CellInfo> results = (List<CellInfo>) msg.obj;
                     results.removeIf(cellInfo -> cellInfo == null);
-                    if (results.size() > 0) {
-                        boolean isInvalidCellInfoList = true;
-                        // Regard the list as invalid only if all the elements in the list are
-                        // invalid.
-                        for (CellInfo cellInfo : results) {
-                            if (!isInvalidCellInfo(cellInfo)) {
-                                isInvalidCellInfoList = false;
-                                break;
-                            }
-                        }
-                        if (isInvalidCellInfoList) {
-                            mNeedScanAgain = true;
-                            if (DBG) {
-                                logd("Invalid cell info. Stop current network scan "
-                                        + "and start a new one via old API");
-                            }
-                            // Stop current network scan flow. This behavior will result in a
-                            // onComplete() callback, after which we will start a new network query
-                            // via Phone.getAvailableNetworks(). This behavior might also result in
-                            // a onError() callback if the modem did not stop network query
-                            // successfully. In this case we will display network query failed
-                            // instead of resending a new request.
-                            try {
-                                if (mNetworkQueryService != null) {
-                                    mNetworkQueryService.stopNetworkQuery();
-                                }
-                            } catch (RemoteException e) {
-                                loge("exception from stopNetworkQuery " + e);
-                            }
-                        } else {
-                            // TODO(b/70530820): Display the scan results incrementally after
-                            // finalizing the UI desing on Mobile Network Setting page. For now,
-                            // just update the CellInfo list when received the onResult callback,
-                            // and display the scan result when received the onComplete callback
-                            // in the end.
-                            mCellInfoList = new ArrayList<>(results);
-                            if (DBG) logd("CALLBACK_SCAN_RESULTS" + mCellInfoList.toString());
-                        }
-                    }
-
-                    break;
-
-                case EVENT_NETWORK_SCAN_ERROR:
-                    int error = msg.arg1;
-                    if (DBG) logd("error while querying available networks " + error);
-                    if (error == NetworkScan.ERROR_UNSUPPORTED) {
-                        if (DBG) {
-                            logd("Modem does not support: try to scan network again via Phone");
-                        }
-                        if (!mNeedScanAgain) {
-                            // Avoid blinking while showing the dialog again.
-                            showProgressDialog(DIALOG_NETWORK_LIST_LOAD);
-                        }
-                        loadNetworksList(false);
-                    } else {
-                        try {
-                            if (mNetworkQueryService != null) {
-                                mNetworkQueryService.unregisterCallback(mCallback);
-                            }
-                        } catch (RemoteException e) {
-                            loge("onError: exception from unregisterCallback " + e);
-                        }
-                        displayNetworkQueryFailed(error);
-                    }
+                    mCellInfoList = new ArrayList<>(results);
+                    if (DBG) logd("CALLBACK_SCAN_RESULTS" + mCellInfoList.toString());
                     break;
 
                 case EVENT_NETWORK_SCAN_COMPLETED:
-                    if (mNeedScanAgain) {
-                        logd("CellInfo is invalid to display. Start a new scan via Phone. ");
-                        loadNetworksList(false);
-                        mNeedScanAgain = false;
-                    } else {
-                        try {
-                            if (mNetworkQueryService != null) {
-                                mNetworkQueryService.unregisterCallback(mCallback);
-                            }
-                        } catch (RemoteException e) {
-                            loge("onComplete: exception from unregisterCallback " + e);
-                        }
-                        if (DBG) logd("scan complete, load the cellInfosList");
-                        // Modify UI to indicate users that the scan has completed.
-                        networksListLoaded();
-                    }
+                    if (DBG) logd("scan complete, load the cellInfosList");
+                    dismissProgressDialog();
+                    networksListLoaded();
+                    break;
+                case EVENT_NETWORK_SCAN_ERROR:
+                    dismissProgressDialog();
+                    displayNetworkQueryFailed();
+                    mNetworkOperators.getNetworkSelectionMode();
                     break;
             }
             return;
         }
     };
 
-    INetworkQueryService mNetworkQueryService = null;
-    /**
-     * This implementation of INetworkQueryServiceCallback is used to receive
-     * callback notifications from the network query service.
-     */
-    private final INetworkQueryServiceCallback mCallback = new INetworkQueryServiceCallback.Stub() {
-
-        /** Returns the scan results to the user, this callback will be called at lease one time. */
+    private final NetworkScanHelper.NetworkScanCallback mCallback = new NetworkScanCallback() {
         public void onResults(List<CellInfo> results) {
             if (DBG) logd("get scan results: " + results.toString());
             Message msg = mHandler.obtainMessage(EVENT_NETWORK_SCAN_RESULTS, results);
             msg.sendToTarget();
         }
 
-        /**
-         * Informs the user that the scan has stopped.
-         *
-         * This callback will be called when the scan is finished or cancelled by the user.
-         * The related NetworkScanRequest will be deleted after this callback.
-         */
         public void onComplete() {
             if (DBG) logd("network scan completed.");
             Message msg = mHandler.obtainMessage(EVENT_NETWORK_SCAN_COMPLETED);
             msg.sendToTarget();
         }
 
-        /**
-         * Informs the user that there is some error about the scan.
-         *
-         * This callback will be called whenever there is any error about the scan, and the scan
-         * will be terminated. onComplete() will NOT be called.
-         */
         public void onError(int error) {
-            if (DBG) logd("get onError callback with error code: " + error);
-            Message msg = mHandler.obtainMessage(EVENT_NETWORK_SCAN_ERROR, error, 0 /* arg2 */);
+            if (DBG) logd("network scan error.");
+            Message msg = mHandler.obtainMessage(EVENT_NETWORK_SCAN_ERROR);
             msg.sendToTarget();
         }
     };
@@ -279,17 +183,10 @@
     //implemented for DialogInterface.OnCancelListener
     public void onCancel(DialogInterface dialog) {
         if (DBG) logd("user manually close the dialog");
-        // request that the service stop the query with this callback object.
-        try {
-            if (mNetworkQueryService != null) {
-                mNetworkQueryService.stopNetworkQuery();
-                mNetworkQueryService.unregisterCallback(mCallback);
-            }
-            // If cancelled, we query NetworkSelectMode and update states of AutoSelect button.
-            mNetworkOperators.getNetworkSelectionMode();
-        } catch (RemoteException e) {
-            loge("onCancel: exception from stopNetworkQuery " + e);
-        }
+        mNetworkScanHelper.stopNetworkQuery();
+
+        // If cancelled, we query NetworkSelectMode and update states of AutoSelect button.
+        mNetworkOperators.getNetworkSelectionMode();
     }
 
     @Override
@@ -301,31 +198,19 @@
         }
     }
 
-    // This method is provided besides initialize() because bind to network query service
-    // may be binded after initialize(). In that case this method needs to be called explicitly
-    // to set mNetworkQueryService. Otherwise mNetworkQueryService will remain null.
-    public void setNetworkQueryService(INetworkQueryService queryService) {
-        mNetworkQueryService = queryService;
-    }
-
     // This initialize method needs to be called for this preference to work properly.
-    protected void initialize(int subId, INetworkQueryService queryService,
-                              NetworkOperators networkOperators, ProgressDialog progressDialog) {
+    protected void initialize(int subId, NetworkOperators networkOperators,
+            ProgressDialog progressDialog) {
         mSubId = subId;
-        mNetworkQueryService = queryService;
         mNetworkOperators = networkOperators;
         // This preference should share the same progressDialog with networkOperators category.
         mProgressDialog = progressDialog;
-        mNeedScanAgain = false;
 
-        if (SubscriptionManager.isValidSubscriptionId(mSubId)) {
-            mPhoneId = SubscriptionManager.getPhoneId(mSubId);
-        }
+        mTelephonyManager = TelephonyManager.from(getContext()).createForSubscriptionId(mSubId);
+        mNetworkScanHelper = new NetworkScanHelper(
+                mTelephonyManager, mCallback, mNetworkScanExecutor);
 
-        TelephonyManager telephonyManager = (TelephonyManager)
-                getContext().getSystemService(Context.TELEPHONY_SERVICE);
-
-        setSummary(telephonyManager.getNetworkOperatorName());
+        setSummary(mTelephonyManager.getNetworkOperatorName());
 
         setOnPreferenceChangeListener(this);
     }
@@ -337,78 +222,32 @@
     }
 
     private void destroy() {
-        try {
-            dismissProgressBar();
-        } catch (IllegalArgumentException e) {
-            loge("onDestroy: exception from dismissProgressBar " + e);
+        dismissProgressDialog();
+
+        if (mNetworkScanHelper != null) {
+            mNetworkScanHelper.stopNetworkQuery();
         }
 
-        try {
-            if (mNetworkQueryService != null) {
-                // used to un-register callback
-                mNetworkQueryService.unregisterCallback(mCallback);
-            }
-        } catch (RemoteException e) {
-            loge("onDestroy: exception from unregisterCallback " + e);
-        }
+        mNetworkScanExecutor.shutdown();
     }
 
     private void displayEmptyNetworkList() {
-        String status = getContext().getResources().getString(R.string.empty_networks_list);
-
-        final PhoneGlobals app = PhoneGlobals.getInstance();
-        app.notificationMgr.postTransientNotification(
-                NotificationMgr.NETWORK_SELECTION_NOTIFICATION, status);
+        Toast.makeText(getContext(), R.string.empty_networks_list, Toast.LENGTH_LONG).show();
     }
 
-    private void displayNetworkSelectionInProgress() {
-        showProgressDialog(DIALOG_NETWORK_SELECTION);
+    private void displayNetworkQueryFailed() {
+        Toast.makeText(getContext(), R.string.network_query_error, Toast.LENGTH_LONG).show();
     }
 
-    private void displayNetworkQueryFailed(int error) {
-        String status = getContext().getResources().getString(R.string.network_query_error);
-
-        try {
-            dismissProgressBar();
-        } catch (IllegalArgumentException e1) {
-            // do nothing
-        }
-
-        final PhoneGlobals app = PhoneGlobals.getInstance();
-        app.notificationMgr.postTransientNotification(
-                NotificationMgr.NETWORK_SELECTION_NOTIFICATION, status);
-    }
-
-    private void loadNetworksList(boolean isIncrementalResult) {
+    private void loadNetworksList() {
         if (DBG) logd("load networks list...");
-        try {
-            if (mNetworkQueryService != null) {
-                mNetworkQueryService.startNetworkQuery(mCallback, mPhoneId, isIncrementalResult);
-            } else {
-                displayNetworkQueryFailed(NetworkQueryService.QUERY_EXCEPTION);
-            }
-        } catch (RemoteException e) {
-            loge("loadNetworksList: exception from startNetworkQuery " + e);
-            displayNetworkQueryFailed(NetworkQueryService.QUERY_EXCEPTION);
-        }
+        mNetworkScanHelper.startNetworkScan(
+                NetworkScanHelper.NETWORK_SCAN_TYPE_WAIT_FOR_ALL_RESULTS);
     }
 
     private void networksListLoaded() {
         if (DBG) logd("networks list loaded");
 
-        // update the state of the preferences.
-        if (DBG) logd("hideProgressPanel");
-
-        // Always try to dismiss the dialog because activity may
-        // be moved to background after dialog is shown.
-        try {
-            dismissProgressBar();
-        } catch (IllegalArgumentException e) {
-            // It's not a error in following scenario, we just ignore it.
-            // "Load list" dialog will not show, if NetworkQueryService is
-            // connected after this activity is moved to background.
-            loge("Fail to dismiss network load list dialog " + e);
-        }
         mNetworkOperators.getNetworkSelectionMode();
         if (mCellInfoList != null) {
             // create a preference for each item in the list.
@@ -419,14 +258,12 @@
             for (CellInfo cellInfo: mCellInfoList) {
                 // Display each operator name only once.
                 String networkTitle = getNetworkTitle(cellInfo);
-                if (!networkEntriesList.contains(networkTitle)) {
-                    if (CellInfoUtil.isForbidden(cellInfo, mForbiddenPlmns)) {
-                        networkTitle += " "
-                                + getContext().getResources().getString(R.string.forbidden_network);
-                    }
-                    networkEntriesList.add(networkTitle);
-                    networkEntryValuesList.add(getOperatorNumeric(cellInfo));
+                if (CellInfoUtil.isForbidden(cellInfo, mForbiddenPlmns)) {
+                    networkTitle += " "
+                            + getContext().getResources().getString(R.string.forbidden_network);
                 }
+                networkEntriesList.add(networkTitle);
+                networkEntryValuesList.add(getOperatorNumeric(cellInfo));
             }
             setEntries(networkEntriesList.toArray(new CharSequence[networkEntriesList.size()]));
             setEntryValues(networkEntryValuesList.toArray(
@@ -438,9 +275,13 @@
         }
     }
 
-    private void dismissProgressBar() {
+    private void dismissProgressDialog() {
         if (mProgressDialog != null && mProgressDialog.isShowing()) {
-            mProgressDialog.dismiss();
+            try {
+                mProgressDialog.dismiss();
+            } catch (IllegalArgumentException ex) {
+                loge("Can't close the progress dialog " + ex);
+            }
         }
     }
 
@@ -449,7 +290,7 @@
             mProgressDialog = new ProgressDialog(getContext());
         } else {
             // Dismiss progress bar if it's showing now.
-            dismissProgressBar();
+            dismissProgressDialog();
         }
 
         switch (id) {
@@ -491,16 +332,20 @@
         MetricsLogger.action(getContext(),
                 MetricsEvent.ACTION_MOBILE_NETWORK_MANUAL_SELECT_NETWORK);
 
-        Message msg = mHandler.obtainMessage(EVENT_NETWORK_SELECTION_DONE);
-        Phone phone = PhoneFactory.getPhone(mPhoneId);
-        if (phone != null) {
-            OperatorInfo operatorInfo = getOperatorInfoFromCellInfo(mCellInfo);
-            if (DBG) logd("manually selected network: " + operatorInfo.toString());
-            phone.selectNetworkManually(operatorInfo, true, msg);
-            displayNetworkSelectionInProgress();
+        if (SubscriptionManager.isValidSubscriptionId(mSubId)) {
+            ThreadUtils.postOnBackgroundThread(() -> {
+                final OperatorInfo operatorInfo = getOperatorInfoFromCellInfo(mCellInfo);
+                if (DBG) logd("manually selected network: " + operatorInfo.toString());
+                boolean isSuccessed = mTelephonyManager.setNetworkSelectionModeManual(
+                        operatorInfo, true /* persistSelection */);
+                Message msg = mHandler.obtainMessage(EVENT_MANUALLY_NETWORK_SELECTION_DONE);
+                msg.obj = isSuccessed;
+                msg.sendToTarget();
+            });
         } else {
-            loge("Error selecting network. phone is null.");
+            loge("Error selecting network, subscription Id is invalid " + mSubId);
         }
+
         return true;
     }
 
@@ -569,46 +414,6 @@
         return oi;
     }
 
-
-    /**
-     * Check if the CellInfo is valid to display. If a CellInfo has signal strength but does
-     * not have operator info, it is invalid to display.
-     */
-    private boolean isInvalidCellInfo(CellInfo cellInfo) {
-        if (DBG) logd("Check isInvalidCellInfo: " + cellInfo.toString());
-        CharSequence al = null;
-        CharSequence as = null;
-        boolean hasSignalStrength = false;
-        if (cellInfo instanceof CellInfoLte) {
-            CellInfoLte lte = (CellInfoLte) cellInfo;
-            al = lte.getCellIdentity().getOperatorAlphaLong();
-            as = lte.getCellIdentity().getOperatorAlphaShort();
-            hasSignalStrength = !lte.getCellSignalStrength().equals(new CellSignalStrengthLte());
-        } else if (cellInfo instanceof CellInfoWcdma) {
-            CellInfoWcdma wcdma = (CellInfoWcdma) cellInfo;
-            al = wcdma.getCellIdentity().getOperatorAlphaLong();
-            as = wcdma.getCellIdentity().getOperatorAlphaShort();
-            hasSignalStrength = !wcdma.getCellSignalStrength().equals(
-                    new CellSignalStrengthWcdma());
-        } else if (cellInfo instanceof CellInfoGsm) {
-            CellInfoGsm gsm = (CellInfoGsm) cellInfo;
-            al = gsm.getCellIdentity().getOperatorAlphaLong();
-            as = gsm.getCellIdentity().getOperatorAlphaShort();
-            hasSignalStrength = !gsm.getCellSignalStrength().equals(new CellSignalStrengthGsm());
-        } else if (cellInfo instanceof CellInfoCdma) {
-            CellInfoCdma cdma = (CellInfoCdma) cellInfo;
-            al = cdma.getCellIdentity().getOperatorAlphaLong();
-            as = cdma.getCellIdentity().getOperatorAlphaShort();
-            hasSignalStrength = !cdma.getCellSignalStrength().equals(new CellSignalStrengthCdma());
-        } else {
-            return true;
-        }
-        if (TextUtils.isEmpty(al) && TextUtils.isEmpty(as) && hasSignalStrength) {
-            return true;
-        }
-        return false;
-    }
-
     @Override
     protected Parcelable onSaveInstanceState() {
         final Parcelable superState = super.onSaveInstanceState();
@@ -697,4 +502,4 @@
     private void loge(String msg) {
         Log.e(LOG_TAG, "[NetworksList] " + msg);
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/phone/NetworkSelectSetting.java b/src/com/android/phone/NetworkSelectSetting.java
index d1bd995..d9731be 100644
--- a/src/com/android/phone/NetworkSelectSetting.java
+++ b/src/com/android/phone/NetworkSelectSetting.java
@@ -17,23 +17,18 @@
 
 import android.app.ActionBar;
 import android.app.Activity;
-import android.content.ComponentName;
 import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.content.pm.PackageManager;
-import android.os.AsyncResult;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
-import android.os.IBinder;
 import android.os.Message;
-import android.os.RemoteException;
+import android.os.PersistableBundle;
 import android.preference.Preference;
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceScreen;
 import android.telephony.AccessNetworkConstants;
+import android.telephony.CarrierConfigManager;
 import android.telephony.CellIdentity;
 import android.telephony.CellInfo;
 import android.telephony.NetworkRegistrationState;
@@ -48,14 +43,16 @@
 import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.telephony.OperatorInfo;
-import com.android.internal.telephony.Phone;
-import com.android.internal.telephony.PhoneFactory;
+import com.android.phone.NetworkScanHelper.NetworkScanCallback;
+import com.android.settingslib.utils.ThreadUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  * "Choose network" settings UI for the Phone app.
@@ -65,7 +62,7 @@
     private static final String TAG = "NetworkSelectSetting";
     private static final boolean DBG = true;
 
-    private static final int EVENT_NETWORK_SELECTION_DONE = 1;
+    private static final int EVENT_SET_NETWORK_SELECTION_MANUALLY_DONE = 1;
     private static final int EVENT_NETWORK_SCAN_RESULTS = 2;
     private static final int EVENT_NETWORK_SCAN_ERROR = 3;
     private static final int EVENT_NETWORK_SCAN_COMPLETED = 4;
@@ -82,13 +79,14 @@
     private View mProgressHeader;
     private Preference mStatusMessagePreference;
     private List<CellInfo> mCellInfoList;
-    private int mPhoneId = SubscriptionManager.INVALID_PHONE_INDEX;
+    private int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
     private ViewGroup mFrameLayout;
     private NetworkOperatorPreference mSelectedNetworkOperatorPreference;
     private TelephonyManager mTelephonyManager;
-    private NetworkOperators mNetworkOperators;
     private List<String> mForbiddenPlmns;
-    private boolean mShow4GForLTE;
+    private boolean mShow4GForLTE = false;
+    private NetworkScanHelper mNetworkScanHelper;
+    private final ExecutorService mNetworkScanExecutor = Executors.newFixedThreadPool(1);
 
     private final Runnable mUpdateNetworkOperatorsRunnable = () -> {
         updateNetworkOperatorsPreferenceCategory();
@@ -97,9 +95,9 @@
     /**
      * Create a new instance of this fragment.
      */
-    public static NetworkSelectSetting newInstance(int phoneId) {
+    public static NetworkSelectSetting newInstance(int subId) {
         Bundle args = new Bundle();
-        args.putInt(NetworkSelectSettingActivity.KEY_PHONE_ID, phoneId);
+        args.putInt(NetworkSelectSettingActivity.KEY_SUBSCRIPTION_ID, subId);
         NetworkSelectSetting fragment = new NetworkSelectSetting();
         fragment.setArguments(args);
 
@@ -111,7 +109,7 @@
         if (DBG) logd("onCreate");
         super.onCreate(icicle);
 
-        mPhoneId = getArguments().getInt(NetworkSelectSettingActivity.KEY_PHONE_ID);
+        mSubId = getArguments().getInt(NetworkSelectSettingActivity.KEY_SUBSCRIPTION_ID);
 
         addPreferencesFromResource(R.xml.choose_network);
         mConnectedNetworkOperatorsPreference =
@@ -120,17 +118,14 @@
                 (PreferenceCategory) findPreference(PREF_KEY_NETWORK_OPERATORS);
         mStatusMessagePreference = new Preference(getContext());
         mSelectedNetworkOperatorPreference = null;
-        mTelephonyManager = (TelephonyManager)
-                getContext().getSystemService(Context.TELEPHONY_SERVICE);
-        mNetworkOperators = new NetworkOperators(getContext());
-        try {
-            Context con = getActivity().createPackageContext("com.android.systemui", 0);
-            int id = con.getResources().getIdentifier("config_show4GForLTE",
-                    "bool", "com.android.systemui");
-            mShow4GForLTE = con.getResources().getBoolean(id);
-        } catch (PackageManager.NameNotFoundException e) {
-            Log.e(TAG, "NameNotFoundException for show4GFotLTE");
-            mShow4GForLTE = false;
+        mTelephonyManager = TelephonyManager.from(getContext()).createForSubscriptionId(mSubId);
+        mNetworkScanHelper = new NetworkScanHelper(
+                mTelephonyManager, mCallback, mNetworkScanExecutor);
+        PersistableBundle bundle = ((CarrierConfigManager) getContext().getSystemService(
+                Context.CARRIER_CONFIG_SERVICE)).getConfigForSubId(mSubId);
+        if (bundle != null) {
+            mShow4GForLTE = bundle.getBoolean(
+                    CarrierConfigManager.KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL);
         }
         setRetainInstance(true);
     }
@@ -178,7 +173,7 @@
             @Override
             protected void onPostExecute(List<String> result) {
                 mForbiddenPlmns = result;
-                bindNetworkQueryService();
+                loadNetworksList();
             }
         }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
     }
@@ -211,9 +206,7 @@
                     MetricsEvent.ACTION_MOBILE_NETWORK_MANUAL_SELECT_NETWORK);
 
             // Connect to the network
-            Message msg = mHandler.obtainMessage(EVENT_NETWORK_SELECTION_DONE);
-            Phone phone = PhoneFactory.getPhone(mPhoneId);
-            if (phone != null) {
+            if (SubscriptionManager.isValidSubscriptionId(mSubId)) {
                 if (DBG) {
                     logd("Connect to the network: " + CellInfoUtil.getNetworkTitle(cellInfo));
                 }
@@ -230,14 +223,20 @@
                     }
                 }
 
-                // Select network manually via Phone
                 OperatorInfo operatorInfo = CellInfoUtil.getOperatorInfoFromCellInfo(cellInfo);
                 if (DBG) logd("manually selected network operator: " + operatorInfo.toString());
-                phone.selectNetworkManually(operatorInfo, true, msg);
+
+                ThreadUtils.postOnBackgroundThread(() -> {
+                    Message msg = mHandler.obtainMessage(EVENT_SET_NETWORK_SELECTION_MANUALLY_DONE);
+                    msg.obj = mTelephonyManager.setNetworkSelectionModeManual(
+                            operatorInfo, true /* persistSelection */);
+                    msg.sendToTarget();
+                });
+
                 setProgressBarVisible(true);
                 return true;
             } else {
-                loge("Error selecting network. phone is null.");
+                loge("Error selecting network. Subscription Id is invalid.");
                 mSelectedNetworkOperatorPreference = null;
                 return false;
             }
@@ -262,30 +261,26 @@
         if (DBG) logd("onStop");
         getView().removeCallbacks(mUpdateNetworkOperatorsRunnable);
         stopNetworkQuery();
-        // Unbind the NetworkQueryService
-        unbindNetworkQueryService();
     }
 
     private final Handler mHandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
-            AsyncResult ar;
             switch (msg.what) {
-                case EVENT_NETWORK_SELECTION_DONE:
+                case EVENT_SET_NETWORK_SELECTION_MANUALLY_DONE:
                     if (DBG) logd("network selection done: hide the progress header");
                     setProgressBarVisible(false);
 
-                    ar = (AsyncResult) msg.obj;
-                    if (ar.exception != null) {
-                        if (DBG) logd("manual network selection: failed! ");
-                        updateNetworkSelection();
-                        // Set summary as "Couldn't connect" to the selected network.
-                        mSelectedNetworkOperatorPreference.setSummary(
-                                R.string.network_could_not_connect);
-                    } else {
+                    boolean isSuccessed = (boolean) msg.obj;
+                    if (isSuccessed) {
                         if (DBG) logd("manual network selection: succeeded! ");
                         // Set summary as "Connected" to the selected network.
                         mSelectedNetworkOperatorPreference.setSummary(R.string.network_connected);
+                    } else {
+                        if (DBG) logd("manual network selection: failed! ");
+                        // Set summary as "Couldn't connect" to the selected network.
+                        mSelectedNetworkOperatorPreference.setSummary(
+                                R.string.network_could_not_connect);
                     }
                     break;
 
@@ -324,52 +319,23 @@
     private void loadNetworksList() {
         if (DBG) logd("load networks list...");
         setProgressBarVisible(true);
-        try {
-            if (mNetworkQueryService != null) {
-                if (DBG) logd("start network query");
-                mNetworkQueryService
-                        .startNetworkQuery(mCallback, mPhoneId, true /* is incremental result */);
-            } else {
-                if (DBG) logd("unable to start network query, mNetworkQueryService is null");
-                addMessagePreference(R.string.network_query_error);
-            }
-        } catch (RemoteException e) {
-            loge("loadNetworksList: exception from startNetworkQuery " + e);
-            addMessagePreference(R.string.network_query_error);
-        }
+        mNetworkScanHelper.startNetworkScan(
+                NetworkScanHelper.NETWORK_SCAN_TYPE_INCREMENTAL_RESULTS);
     }
 
-    /**
-     * This implementation of INetworkQueryServiceCallback is used to receive
-     * callback notifications from the network query service.
-     */
-    private final INetworkQueryServiceCallback mCallback = new INetworkQueryServiceCallback.Stub() {
-
-        /** Returns the scan results to the user, this callback will be called at lease one time. */
+    private final NetworkScanHelper.NetworkScanCallback mCallback = new NetworkScanCallback() {
         public void onResults(List<CellInfo> results) {
             if (DBG) logd("get scan results.");
             Message msg = mHandler.obtainMessage(EVENT_NETWORK_SCAN_RESULTS, results);
             msg.sendToTarget();
         }
 
-        /**
-         * Informs the user that the scan has stopped.
-         *
-         * This callback will be called when the scan is finished or cancelled by the user.
-         * The related NetworkScanRequest will be deleted after this callback.
-         */
         public void onComplete() {
             if (DBG) logd("network scan completed.");
             Message msg = mHandler.obtainMessage(EVENT_NETWORK_SCAN_COMPLETED);
             msg.sendToTarget();
         }
 
-        /**
-         * Informs the user that there is some error about the scan.
-         *
-         * This callback will be called whenever there is any error about the scan, and the scan
-         * will be terminated. onComplete() will NOT be called.
-         */
         public void onError(int error) {
             if (DBG) logd("get onError callback with error code: " + error);
             Message msg = mHandler.obtainMessage(EVENT_NETWORK_SCAN_ERROR, error, 0 /* arg2 */);
@@ -377,9 +343,6 @@
         }
     };
 
-    /**
-     * Updates network operators from {@link INetworkQueryServiceCallback#onResults()}.
-     */
     private void updateNetworkOperators() {
         if (DBG) logd("updateNetworkOperators");
         if (getActivity() != null) {
@@ -432,7 +395,7 @@
         if (DBG) logd("Force config ConnectedNetworkOperatorsPreferenceCategory");
         if (mTelephonyManager.getDataState() == mTelephonyManager.DATA_CONNECTED) {
             // Try to get the network registration states
-            ServiceState ss = mTelephonyManager.getServiceStateForSubscriber(mPhoneId);
+            ServiceState ss = mTelephonyManager.getServiceState();
             List<NetworkRegistrationState> networkList =
                     ss.getNetworkRegistrationStates(AccessNetworkConstants.TransportType.WWAN);
             if (networkList == null || networkList.size() == 0) {
@@ -455,7 +418,6 @@
 
                 mConnectedNetworkOperatorsPreference.addPreference(pref);
             } else {
-                loge("Invalid CellIfno: " + cellInfo.toString());
                 // Remove the connected network operators category
                 removeConnectedNetworkOperatorPreference();
             }
@@ -567,99 +529,35 @@
         if (DBG) logd("before aggregate: " + cellInfoList.toString());
         Map<String, CellInfo> map = new HashMap<>();
         for (CellInfo cellInfo: cellInfoList) {
-            String networkTitle = CellInfoUtil.getNetworkTitle(cellInfo);
-            if (cellInfo.isRegistered() || !map.containsKey(networkTitle)) {
-                map.put(networkTitle, cellInfo);
+            String plmn = CellInfoUtil.getOperatorInfoFromCellInfo(cellInfo).getOperatorNumeric();
+            if (cellInfo.isRegistered() || !map.containsKey(plmn)) {
+                map.put(plmn, cellInfo);
             } else {
-                if (map.get(networkTitle).isRegistered()
-                        || CellInfoUtil.getLevel(map.get(networkTitle))
-                        > CellInfoUtil.getLevel(cellInfo)) {
+                if (map.get(plmn).isRegistered()
+                        || map.get(plmn).getCellSignalStrength().getLevel()
+                        > cellInfo.getCellSignalStrength().getLevel()) {
                     // Skip if the stored cellInfo is registered or has higher signal strength level
                     continue;
                 }
                 // Otherwise replace it with the new CellInfo
-                map.put(networkTitle, cellInfo);
+                map.put(plmn, cellInfo);
             }
         }
         return new ArrayList<>(map.values());
     }
 
-    /**
-     * Service connection code for the NetworkQueryService.
-     * Handles the work of binding to a local object so that we can make
-     * the appropriate service calls.
-     */
-
-    /** Local service interface */
-    private INetworkQueryService mNetworkQueryService = null;
-    /** Flag indicating whether we have called bind on the service. */
-    boolean mShouldUnbind;
-
-    /** Service connection */
-    private final ServiceConnection mNetworkQueryServiceConnection = new ServiceConnection() {
-
-        /** Handle the task of binding the local object to the service */
-        public void onServiceConnected(ComponentName className, IBinder service) {
-            if (DBG) logd("connection created, binding local service.");
-            mNetworkQueryService = ((NetworkQueryService.LocalBinder) service).getService();
-            // Load the network list only when the service is well connected.
-            loadNetworksList();
-        }
-
-        /** Handle the task of cleaning up the local binding */
-        public void onServiceDisconnected(ComponentName className) {
-            if (DBG) logd("connection disconnected, cleaning local binding.");
-            mNetworkQueryService = null;
-        }
-    };
-
-    private void bindNetworkQueryService() {
-        if (DBG) logd("bindNetworkQueryService");
-        getContext().bindService(new Intent(getContext(), NetworkQueryService.class).setAction(
-                NetworkQueryService.ACTION_LOCAL_BINDER),
-                mNetworkQueryServiceConnection, Context.BIND_AUTO_CREATE);
-        mShouldUnbind = true;
-    }
-
-    private void unbindNetworkQueryService() {
-        if (DBG) logd("unbindNetworkQueryService");
-        if (mShouldUnbind) {
-            if (DBG) logd("mShouldUnbind is true");
-            // unbind the service.
-            getContext().unbindService(mNetworkQueryServiceConnection);
-            mShouldUnbind = false;
-        }
-    }
-
-    /**
-     * Call {@link NotificationMgr#updateNetworkSelection(int, int)} to send notification about
-     * no service of user selected operator
-     */
-    private void updateNetworkSelection() {
-        if (DBG) logd("Update notification about no service of user selected operator");
-        final PhoneGlobals app = PhoneGlobals.getInstance();
-        Phone phone = PhoneFactory.getPhone(mPhoneId);
-        if (phone != null) {
-            ServiceState ss = mTelephonyManager.getServiceStateForSubscriber(phone.getSubId());
-            if (ss != null) {
-                app.notificationMgr.updateNetworkSelection(ss.getState(), phone.getSubId());
-            }
-        }
-    }
-
     private void stopNetworkQuery() {
-        // Stop the network query process
-        try {
-            if (mNetworkQueryService != null) {
-                if (DBG) logd("Stop network query");
-                mNetworkQueryService.stopNetworkQuery();
-                mNetworkQueryService.unregisterCallback(mCallback);
-            }
-        } catch (RemoteException e) {
-            loge("Exception from stopNetworkQuery " + e);
+        if (mNetworkScanHelper != null) {
+            mNetworkScanHelper.stopNetworkQuery();
         }
     }
 
+    @Override
+    public void onDestroy() {
+        mNetworkScanExecutor.shutdown();
+        super.onDestroy();
+    }
+
     private void logd(String msg) {
         Log.d(TAG, msg);
     }
diff --git a/src/com/android/phone/NetworkSelectSettingActivity.java b/src/com/android/phone/NetworkSelectSettingActivity.java
index a151c81..5b29b281 100644
--- a/src/com/android/phone/NetworkSelectSettingActivity.java
+++ b/src/com/android/phone/NetworkSelectSettingActivity.java
@@ -31,14 +31,14 @@
  */
 public class NetworkSelectSettingActivity extends Activity {
     private static final String TAG = "NetworkSelectSettingActivity";
-    public static final String KEY_PHONE_ID = "phone_id";
+    public static final String KEY_SUBSCRIPTION_ID = "subscription_id";
 
     /**
      * Returns the Android Intent that led to this Activity being created.
      */
-    public static Intent getIntent(Context context, int phoneId) {
+    public static Intent getIntent(Context context, int subId) {
         Intent intent = new Intent(context, NetworkSelectSettingActivity.class);
-        intent.putExtra(KEY_PHONE_ID, phoneId);
+        intent.putExtra(KEY_SUBSCRIPTION_ID, subId);
         return intent;
     }
 
@@ -46,7 +46,7 @@
     public void onCreate(Bundle savedState) {
         Log.d(TAG, "onCreate()");
         super.onCreate(savedState);
-        int phoneId = getIntent().getExtras().getInt(KEY_PHONE_ID);
+        int subId = getIntent().getExtras().getInt(KEY_SUBSCRIPTION_ID);
         setContentView(R.layout.choose_network);
 
         FragmentManager fragmentManager = getFragmentManager();
@@ -54,7 +54,7 @@
         if (fragment == null) {
             fragmentManager.beginTransaction()
                     .add(R.id.choose_network_content,
-                            NetworkSelectSetting.newInstance(phoneId), TAG)
+                            NetworkSelectSetting.newInstance(subId), TAG)
                     .commit();
         }
     }
diff --git a/src/com/android/phone/NotificationMgr.java b/src/com/android/phone/NotificationMgr.java
index 1b2d49e..de3fffc 100644
--- a/src/com/android/phone/NotificationMgr.java
+++ b/src/com/android/phone/NotificationMgr.java
@@ -30,7 +30,10 @@
 import android.content.pm.UserInfo;
 import android.content.res.Resources;
 import android.net.Uri;
+import android.os.Handler;
+import android.os.Message;
 import android.os.PersistableBundle;
+import android.os.SystemClock;
 import android.os.SystemProperties;
 import android.os.UserHandle;
 import android.os.UserManager;
@@ -50,6 +53,7 @@
 import android.text.TextUtils;
 import android.util.ArrayMap;
 import android.util.Log;
+import android.util.SparseArray;
 import android.widget.Toast;
 
 import com.android.internal.telephony.Phone;
@@ -89,6 +93,14 @@
     static final int DATA_DISCONNECTED_ROAMING_NOTIFICATION = 5;
     static final int SELECTED_OPERATOR_FAIL_NOTIFICATION = 6;
 
+    // Event for network selection notification.
+    private static final int EVENT_PENDING_NETWORK_SELECTION_NOTIFICATION = 1;
+
+    private static final long NETWORK_SELECTION_NOTIFICATION_MAX_PENDING_TIME_IN_MS = 10000L;
+    private static final int NETWORK_SELECTION_NOTIFICATION_MAX_PENDING_TIMES = 10;
+
+    private static final int STATE_UNKNOWN_SERVICE = -1;
+
     /** The singleton NotificationMgr instance. */
     private static NotificationMgr sInstance;
 
@@ -103,12 +115,36 @@
     private TelecomManager mTelecomManager;
     private TelephonyManager mTelephonyManager;
 
-    // used to track the notification of selected network unavailable
-    private boolean mSelectedUnavailableNotify = false;
+    // used to track the notification of selected network unavailable, per subscription id.
+    private SparseArray<Boolean> mSelectedUnavailableNotify = new SparseArray<>();
 
     // used to track whether the message waiting indicator is visible, per subscription id.
     private ArrayMap<Integer, Boolean> mMwiVisible = new ArrayMap<Integer, Boolean>();
 
+    // those flags are used to track whether to show network selection notification or not.
+    private SparseArray<Integer> mPreviousServiceState = new SparseArray<>();
+    private SparseArray<Long> mOOSTimestamp = new SparseArray<>();
+    private SparseArray<Integer> mPendingEventCounter = new SparseArray<>();
+    // maps each subId to selected network operator name.
+    private SparseArray<String> mSelectedNetworkOperatorName = new SparseArray<>();
+
+    private final Handler mHandler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+                case EVENT_PENDING_NETWORK_SELECTION_NOTIFICATION:
+                    int subId = (int) msg.obj;
+                    TelephonyManager telephonyManager =
+                            mTelephonyManager.createForSubscriptionId(subId);
+                    if (telephonyManager.getServiceState() != null) {
+                        shouldShowNotification(telephonyManager.getServiceState().getState(),
+                                subId);
+                    }
+                    break;
+            }
+        }
+    };
+
     /**
      * Private constructor (this is a singleton).
      * @see #init(PhoneGlobals)
@@ -569,6 +605,9 @@
     private void showNetworkSelection(String operator, int subId) {
         if (DBG) log("showNetworkSelection(" + operator + ")...");
 
+        if (!TextUtils.isEmpty(operator)) {
+            operator = String.format(" (%s)", operator);
+        }
         Notification.Builder builder = new Notification.Builder(mContext)
                 .setSmallIcon(android.R.drawable.stat_sys_warning)
                 .setContentTitle(mContext.getString(R.string.notification_network_selection_title))
@@ -589,19 +628,21 @@
         intent.putExtra(GsmUmtsOptions.EXTRA_SUB_ID, subId);
         builder.setContentIntent(PendingIntent.getActivity(mContext, 0, intent, 0));
         mNotificationManager.notifyAsUser(
-                null /* tag */,
+                Integer.toString(subId) /* tag */,
                 SELECTED_OPERATOR_FAIL_NOTIFICATION,
                 builder.build(),
                 UserHandle.ALL);
+        mSelectedUnavailableNotify.put(subId, true);
     }
 
     /**
      * Turn off the network selection "no service" notification
      */
-    private void cancelNetworkSelection() {
+    private void cancelNetworkSelection(int subId) {
         if (DBG) log("cancelNetworkSelection()...");
         mNotificationManager.cancelAsUser(
-                null /* tag */, SELECTED_OPERATOR_FAIL_NOTIFICATION, UserHandle.ALL);
+                Integer.toString(subId) /* tag */, SELECTED_OPERATOR_FAIL_NOTIFICATION,
+                UserHandle.ALL);
     }
 
     /**
@@ -642,18 +683,34 @@
                             + (isManualSelection ? selectedNetworkOperatorName : ""));
                 }
 
-                if (serviceState == ServiceState.STATE_OUT_OF_SERVICE && isManualSelection) {
-                    showNetworkSelection(selectedNetworkOperatorName, subId);
-                    mSelectedUnavailableNotify = true;
+                if (isManualSelection) {
+                    mSelectedNetworkOperatorName.put(subId, selectedNetworkOperatorName);
+                    shouldShowNotification(serviceState, subId);
                 } else {
-                    if (mSelectedUnavailableNotify) {
-                        cancelNetworkSelection();
-                        mSelectedUnavailableNotify = false;
-                    }
+                    dismissNetworkSelectionNotification(subId);
+                    clearUpNetworkSelectionNotificationParam(subId);
                 }
             } else {
                 if (DBG) log("updateNetworkSelection()..." + "state = " +
                         serviceState + " not updating network due to invalid subId " + subId);
+                dismissNetworkSelectionNotificationForInactiveSubId();
+            }
+        }
+    }
+
+    private void dismissNetworkSelectionNotification(int subId) {
+        if (mSelectedUnavailableNotify.get(subId, false)) {
+            cancelNetworkSelection(subId);
+            mSelectedUnavailableNotify.remove(subId);
+        }
+    }
+
+    private void dismissNetworkSelectionNotificationForInactiveSubId() {
+        for (int i = 0; i < mSelectedUnavailableNotify.size(); i++) {
+            int subId = mSelectedUnavailableNotify.keyAt(i);
+            if (!mSubscriptionManager.isActiveSubId(subId)) {
+                dismissNetworkSelectionNotification(subId);
+                clearUpNetworkSelectionNotificationParam(subId);
             }
         }
     }
@@ -674,4 +731,65 @@
     private void logi(String msg) {
         Log.i(LOG_TAG, msg);
     }
+
+    /**
+     * In case network selection notification shows up repeatedly under
+     * unstable network condition. The logic is to check whether or not
+     * the service state keeps in no service condition for at least
+     * {@link #NETWORK_SELECTION_NOTIFICATION_MAX_PENDING_TIME_IN_MS}.
+     * And checking {@link #NETWORK_SELECTION_NOTIFICATION_MAX_PENDING_TIMES} times.
+     * To avoid the notification showing up for the momentary state.
+     */
+    private void shouldShowNotification(int serviceState, int subId) {
+        if (serviceState == ServiceState.STATE_OUT_OF_SERVICE) {
+            if (mPreviousServiceState.get(subId, STATE_UNKNOWN_SERVICE)
+                    != ServiceState.STATE_OUT_OF_SERVICE) {
+                mOOSTimestamp.put(subId, getTimeStamp());
+            }
+            if ((getTimeStamp() - mOOSTimestamp.get(subId, 0L)
+                    >= NETWORK_SELECTION_NOTIFICATION_MAX_PENDING_TIME_IN_MS)
+                    || mPendingEventCounter.get(subId, 0)
+                    > NETWORK_SELECTION_NOTIFICATION_MAX_PENDING_TIMES) {
+                showNetworkSelection(mSelectedNetworkOperatorName.get(subId), subId);
+                clearUpNetworkSelectionNotificationParam(subId);
+            } else {
+                startPendingNetworkSelectionNotification(subId);
+            }
+        } else {
+            dismissNetworkSelectionNotification(subId);
+        }
+        mPreviousServiceState.put(subId, serviceState);
+        if (DBG) {
+            log("shouldShowNotification()..." + " subId = " + subId
+                    + " serviceState = " + serviceState
+                    + " mOOSTimestamp = " + mOOSTimestamp
+                    + " mPendingEventCounter = " + mPendingEventCounter);
+        }
+    }
+
+    private void startPendingNetworkSelectionNotification(int subId) {
+        if (!mHandler.hasMessages(EVENT_PENDING_NETWORK_SELECTION_NOTIFICATION, subId)) {
+            if (DBG) {
+                log("startPendingNetworkSelectionNotification: subId = " + subId);
+            }
+            mHandler.sendMessageDelayed(
+                    mHandler.obtainMessage(EVENT_PENDING_NETWORK_SELECTION_NOTIFICATION, subId),
+                    NETWORK_SELECTION_NOTIFICATION_MAX_PENDING_TIME_IN_MS);
+            mPendingEventCounter.put(subId, mPendingEventCounter.get(subId, 0) + 1);
+        }
+    }
+
+    private void clearUpNetworkSelectionNotificationParam(int subId) {
+        if (mHandler.hasMessages(EVENT_PENDING_NETWORK_SELECTION_NOTIFICATION, subId)) {
+            mHandler.removeMessages(EVENT_PENDING_NETWORK_SELECTION_NOTIFICATION, subId);
+        }
+        mPreviousServiceState.remove(subId);
+        mOOSTimestamp.remove(subId);
+        mPendingEventCounter.remove(subId);
+        mSelectedNetworkOperatorName.remove(subId);
+    }
+
+    private static long getTimeStamp() {
+        return SystemClock.elapsedRealtime();
+    }
 }
diff --git a/src/com/android/phone/NumberVerificationManager.java b/src/com/android/phone/NumberVerificationManager.java
new file mode 100644
index 0000000..9ec16f8
--- /dev/null
+++ b/src/com/android/phone/NumberVerificationManager.java
@@ -0,0 +1,192 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.phone;
+
+import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.RemoteException;
+import android.telephony.NumberVerificationCallback;
+import android.telephony.PhoneNumberRange;
+import android.telephony.ServiceState;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.android.internal.telephony.Call;
+import com.android.internal.telephony.INumberVerificationCallback;
+import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.PhoneFactory;
+
+/**
+ * Singleton for managing the call based number verification requests.
+ */
+public class NumberVerificationManager {
+    interface PhoneListSupplier {
+        Phone[] getPhones();
+    }
+
+    private static NumberVerificationManager sInstance;
+    private static String sAuthorizedPackageOverride;
+
+    private PhoneNumberRange mCurrentRange;
+    private INumberVerificationCallback mCallback;
+    private final PhoneListSupplier mPhoneListSupplier;
+
+    // We don't really care what thread this runs on, since it's only used for a non-blocking
+    // timeout.
+    private Handler mHandler;
+
+    NumberVerificationManager(PhoneListSupplier phoneListSupplier) {
+        mPhoneListSupplier = phoneListSupplier;
+        mHandler = new Handler(Looper.getMainLooper());
+    }
+
+    private NumberVerificationManager() {
+        this(PhoneFactory::getPhones);
+    }
+
+    /**
+     * Check whether the incoming call matches one of the active filters. If so, call the callback
+     * that says that the number has been successfully verified.
+     * @param number A phone number
+     * @return true if the number matches, false otherwise
+     */
+    public synchronized boolean checkIncomingCall(String number) {
+        if (mCurrentRange == null || mCallback == null) {
+            return false;
+        }
+
+        if (mCurrentRange.matches(number)) {
+            mCurrentRange = null;
+            try {
+                mCallback.onCallReceived(number);
+                return true;
+            } catch (RemoteException e) {
+                Log.w(NumberVerificationManager.class.getSimpleName(),
+                        "Remote exception calling verification complete callback");
+                // Intercept the call even if there was a remote exception -- it's still going to be
+                // a strange call from a robot number
+                return true;
+            } finally {
+                mCallback = null;
+            }
+        }
+        return false;
+    }
+
+    synchronized void requestVerification(PhoneNumberRange numberRange,
+            INumberVerificationCallback callback, long timeoutMillis) {
+        if (!checkNumberVerificationFeasibility(callback)) {
+            return;
+        }
+
+        mCallback = callback;
+        mCurrentRange = numberRange;
+
+        mHandler.postDelayed(() -> {
+            synchronized (NumberVerificationManager.this) {
+                // Check whether the verification finished already -- if so, don't call anything.
+                if (mCallback != null && mCurrentRange != null) {
+                    try {
+                        mCallback.onVerificationFailed(NumberVerificationCallback.REASON_TIMED_OUT);
+                    } catch (RemoteException e) {
+                        Log.w(NumberVerificationManager.class.getSimpleName(),
+                                "Remote exception calling verification error callback");
+                    }
+                    mCallback = null;
+                    mCurrentRange = null;
+                }
+            }
+        }, timeoutMillis);
+    }
+
+    private boolean checkNumberVerificationFeasibility(INumberVerificationCallback callback) {
+        int reason = -1;
+        try {
+            if (mCurrentRange != null || mCallback != null) {
+                reason = NumberVerificationCallback.REASON_CONCURRENT_REQUESTS;
+                return false;
+            }
+            boolean doesAnyPhoneHaveRoomForIncomingCall = false;
+            boolean isAnyPhoneVoiceRegistered = false;
+            for (Phone phone : mPhoneListSupplier.getPhones()) {
+                // abort if any phone is in an emergency call or ecbm
+                if (phone.isInEmergencyCall()) {
+                    reason = NumberVerificationCallback.REASON_IN_EMERGENCY_CALL;
+                    return false;
+                }
+                if (phone.isInEcm()) {
+                    reason = NumberVerificationCallback.REASON_IN_ECBM;
+                    return false;
+                }
+
+                // make sure at least one phone is registered for voice
+                if (phone.getServiceState().getVoiceRegState() == ServiceState.STATE_IN_SERVICE) {
+                    isAnyPhoneVoiceRegistered = true;
+                }
+                // make sure at least one phone has room for an incoming call.
+                if (phone.getRingingCall().getState() == Call.State.IDLE
+                        && (phone.getForegroundCall().getState() == Call.State.IDLE
+                        || phone.getBackgroundCall().getState() == Call.State.IDLE)) {
+                    doesAnyPhoneHaveRoomForIncomingCall = true;
+                }
+            }
+            if (!isAnyPhoneVoiceRegistered) {
+                reason = NumberVerificationCallback.REASON_NETWORK_NOT_AVAILABLE;
+                return false;
+            }
+            if (!doesAnyPhoneHaveRoomForIncomingCall) {
+                reason = NumberVerificationCallback.REASON_TOO_MANY_CALLS;
+                return false;
+            }
+        } finally {
+            if (reason >= 0) {
+                try {
+                    callback.onVerificationFailed(reason);
+                } catch (RemoteException e) {
+                    Log.w(NumberVerificationManager.class.getSimpleName(),
+                            "Remote exception calling verification error callback");
+                }
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Get the singleton instance of NumberVerificationManager.
+     * @return
+     */
+    public static NumberVerificationManager getInstance() {
+        if (sInstance == null) {
+            sInstance = new NumberVerificationManager();
+        }
+        return sInstance;
+    }
+
+    static String getAuthorizedPackage(Context context) {
+        return !TextUtils.isEmpty(sAuthorizedPackageOverride) ? sAuthorizedPackageOverride :
+                context.getResources().getString(R.string.platform_number_verification_package);
+    }
+
+    /**
+     * Used by shell commands to override the authorized package name for number verification.
+     * @param pkgName
+     */
+    static void overrideAuthorizedPackage(String pkgName) {
+        sAuthorizedPackageOverride = pkgName;
+    }
+}
diff --git a/src/com/android/phone/PhoneApp.java b/src/com/android/phone/PhoneApp.java
index bf30d58..333e0ec 100644
--- a/src/com/android/phone/PhoneApp.java
+++ b/src/com/android/phone/PhoneApp.java
@@ -17,17 +17,16 @@
 package com.android.phone;
 
 import android.app.Application;
-import android.content.res.Configuration;
 import android.os.UserHandle;
 
-import com.android.services.telephony.TelephonyGlobals;
+import com.android.phone.ecc.IsoToEccProtobufRepository;
+import com.android.services.telephony.TelecomAccountRegistry;
 
 /**
  * Top-level Application class for the Phone app.
  */
 public class PhoneApp extends Application {
     PhoneGlobals mPhoneGlobals;
-    TelephonyGlobals mTelephonyGlobals;
 
     public PhoneApp() {
     }
@@ -40,8 +39,12 @@
             mPhoneGlobals = new PhoneGlobals(this);
             mPhoneGlobals.onCreate();
 
-            mTelephonyGlobals = new TelephonyGlobals(this);
-            mTelephonyGlobals.onCreate();
+            TelecomAccountRegistry.getInstance(this).setupOnBoot();
         }
+
+        new Thread(() -> {
+            // Preload ECC table in background.
+            IsoToEccProtobufRepository.getInstance().loadMappingTable(PhoneApp.this);
+        }).start();
     }
 }
diff --git a/src/com/android/phone/PhoneGlobals.java b/src/com/android/phone/PhoneGlobals.java
index d4da7fe..ccbb4d0 100644
--- a/src/com/android/phone/PhoneGlobals.java
+++ b/src/com/android/phone/PhoneGlobals.java
@@ -25,6 +25,7 @@
 import android.content.ContextWrapper;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.res.XmlResourceParser;
 import android.media.AudioManager;
 import android.net.ConnectivityManager;
 import android.net.Uri;
@@ -41,15 +42,16 @@
 import android.os.UserManager;
 import android.preference.PreferenceManager;
 import android.provider.Settings;
+import android.telecom.TelecomManager;
 import android.telephony.CarrierConfigManager;
 import android.telephony.ServiceState;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
+import android.telephony.data.ApnSetting;
 import android.util.LocalLog;
 import android.util.Log;
 import android.widget.Toast;
 
-import com.android.internal.telephony.Call;
 import com.android.internal.telephony.CallManager;
 import com.android.internal.telephony.IccCardConstants;
 import com.android.internal.telephony.MmiCode;
@@ -58,11 +60,11 @@
 import com.android.internal.telephony.PhoneFactory;
 import com.android.internal.telephony.SettingsObserver;
 import com.android.internal.telephony.TelephonyCapabilities;
+import com.android.internal.telephony.TelephonyComponentFactory;
 import com.android.internal.telephony.TelephonyIntents;
 import com.android.internal.telephony.dataconnection.DataConnectionReasons;
 import com.android.internal.telephony.dataconnection.DataConnectionReasons.DataDisallowedReasonType;
 import com.android.internal.util.IndentingPrintWriter;
-import com.android.phone.common.CallLogAsync;
 import com.android.phone.settings.SettingsConstants;
 import com.android.phone.vvm.CarrierVvmPackageInstalledReceiver;
 import com.android.services.telephony.sip.SipAccountRegistry;
@@ -141,7 +143,6 @@
     public PhoneInterfaceManager phoneMgr;
     CarrierConfigLoader configLoader;
 
-    private CallGatewayManager callGatewayManager;
     private Phone phoneInEcm;
 
     static boolean sVoiceCapable = true;
@@ -282,6 +283,9 @@
         //   getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY_VOICE_CALLS);
 
         if (mCM == null) {
+            // Inject telephony component factory if configured using other jars.
+            XmlResourceParser parser = getResources().getXml(R.xml.telephony_injection);
+            TelephonyComponentFactory.getInstance().injectTheComponentFactory(parser);
             // Initialize the telephony framework
             PhoneFactory.makeDefaultPhones(this);
 
@@ -320,17 +324,13 @@
 
             if (DBG) Log.d(LOG_TAG, "onCreate: mUpdateLock: " + mUpdateLock);
 
-            CallLogger callLogger = new CallLogger(this, new CallLogAsync());
-
-            callGatewayManager = CallGatewayManager.getInstance();
-
             // Create the CallerInfoCache singleton, which remembers custom ring tone and
             // send-to-voicemail settings.
             //
             // The asynchronous caching will start just after this call.
             callerInfoCache = CallerInfoCache.init(this);
 
-            phoneMgr = PhoneInterfaceManager.init(this, PhoneFactory.getDefaultPhone());
+            phoneMgr = PhoneInterfaceManager.init(this);
 
             configLoader = CarrierConfigLoader.init(this);
 
@@ -345,9 +345,6 @@
             // register for MMI/USSD
             mCM.registerForMmiComplete(mHandler, MMI_COMPLETE, null);
 
-            // register connection tracking to PhoneUtils
-            PhoneUtils.initializeConnectionHandler(mCM);
-
             // Register for misc other intent broadcasts.
             IntentFilter intentFilter =
                     new IntentFilter(Intent.ACTION_AIRPLANE_MODE_CHANGED);
@@ -371,11 +368,6 @@
             PreferenceManager.setDefaultValues(this, R.xml.network_setting_fragment, false);
 
             PreferenceManager.setDefaultValues(this, R.xml.call_feature_setting, false);
-
-            // Make sure the audio mode (along with some
-            // audio-mode-related state of our own) is initialized
-            // correctly, given the current state of the phone.
-            PhoneUtils.setAudioMode(mCM);
         }
 
         // XXX pre-load the SimProvider so that it's ready
@@ -408,14 +400,6 @@
     }
 
     /**
-     * Returns the singleton instance of the PhoneApp if running as the
-     * primary user, otherwise null.
-     */
-    static PhoneGlobals getInstanceIfPrimary() {
-        return sMe;
-    }
-
-    /**
      * Returns the default phone.
      *
      * WARNING: This method should be used carefully, now that there may be multiple phones.
@@ -437,7 +421,7 @@
     }
 
     public PersistableBundle getCarrierConfigForSubId(int subId) {
-        return configLoader.getConfigForSubId(subId);
+        return configLoader.getConfigForSubId(subId, getOpPackageName());
     }
 
     private void registerSettingsObserver() {
@@ -495,52 +479,6 @@
     }
 
     /**
-     * Controls whether or not the screen is allowed to sleep.
-     *
-     * Once sleep is allowed (WakeState is SLEEP), it will rely on the
-     * settings for the poke lock to determine when to timeout and let
-     * the device sleep {@link PhoneGlobals#setScreenTimeout}.
-     *
-     * @param ws tells the device to how to wake.
-     */
-    /* package */ void requestWakeState(WakeState ws) {
-        if (VDBG) Log.d(LOG_TAG, "requestWakeState(" + ws + ")...");
-        synchronized (this) {
-            if (mWakeState != ws) {
-                switch (ws) {
-                    case PARTIAL:
-                        // acquire the processor wake lock, and release the FULL
-                        // lock if it is being held.
-                        mPartialWakeLock.acquire();
-                        if (mWakeLock.isHeld()) {
-                            mWakeLock.release();
-                        }
-                        break;
-                    case FULL:
-                        // acquire the full wake lock, and release the PARTIAL
-                        // lock if it is being held.
-                        mWakeLock.acquire();
-                        if (mPartialWakeLock.isHeld()) {
-                            mPartialWakeLock.release();
-                        }
-                        break;
-                    case SLEEP:
-                    default:
-                        // release both the PARTIAL and FULL locks.
-                        if (mWakeLock.isHeld()) {
-                            mWakeLock.release();
-                        }
-                        if (mPartialWakeLock.isHeld()) {
-                            mPartialWakeLock.release();
-                        }
-                        break;
-                }
-                mWakeState = ws;
-            }
-        }
-    }
-
-    /**
      * If we are not currently keeping the screen on, then poke the power
      * manager to wake up the screen for the user activity timeout duration.
      */
@@ -553,52 +491,6 @@
         }
     }
 
-    /**
-     * Sets the wake state and screen timeout based on the current state
-     * of the phone, and the current state of the in-call UI.
-     *
-     * This method is a "UI Policy" wrapper around
-     * {@link PhoneGlobals#requestWakeState} and {@link PhoneGlobals#setScreenTimeout}.
-     *
-     * It's safe to call this method regardless of the state of the Phone
-     * (e.g. whether or not it's idle), and regardless of the state of the
-     * Phone UI (e.g. whether or not the InCallScreen is active.)
-     */
-    /* package */ void updateWakeState() {
-        PhoneConstants.State state = mCM.getState();
-
-        // True if the speakerphone is in use.  (If so, we *always* use
-        // the default timeout.  Since the user is obviously not holding
-        // the phone up to his/her face, we don't need to worry about
-        // false touches, and thus don't need to turn the screen off so
-        // aggressively.)
-        // Note that we need to make a fresh call to this method any
-        // time the speaker state changes.  (That happens in
-        // PhoneUtils.turnOnSpeaker().)
-        boolean isSpeakerInUse = (state == PhoneConstants.State.OFFHOOK) && PhoneUtils.isSpeakerOn(this);
-
-        // TODO (bug 1440854): The screen timeout *might* also need to
-        // depend on the bluetooth state, but this isn't as clear-cut as
-        // the speaker state (since while using BT it's common for the
-        // user to put the phone straight into a pocket, in which case the
-        // timeout should probably still be short.)
-
-        // Decide whether to force the screen on or not.
-        //
-        // Force the screen to be on if the phone is ringing or dialing,
-        // or if we're displaying the "Call ended" UI for a connection in
-        // the "disconnected" state.
-        // However, if the phone is disconnected while the user is in the
-        // middle of selecting a quick response message, we should not force
-        // the screen to be on.
-        //
-        boolean isRinging = (state == PhoneConstants.State.RINGING);
-        boolean isDialing = (mCM.getFgPhone().getForegroundCall().getState() == Call.State.DIALING);
-        boolean keepScreenOn = isRinging || isDialing;
-        // keepScreenOn == true means we'll hold a full wake lock:
-        requestWakeState(keepScreenOn ? WakeState.FULL : WakeState.SLEEP);
-    }
-
     KeyguardManager getKeyguardManager() {
         return mKeyguardManager;
     }
@@ -665,7 +557,9 @@
         if (isAirplaneNewlyOn) {
             // If we are trying to turn off the radio, make sure there are no active
             // emergency calls.  If there are, switch airplane mode back to off.
-            if (PhoneUtils.isInEmergencyCall(mCM)) {
+            TelecomManager tm = (TelecomManager) context.getSystemService(TELECOM_SERVICE);
+
+            if (tm != null && tm.isInEmergencyCall()) {
                 // Switch airplane mode back to off.
                 ConnectivityManager.from(this).setAirplaneMode(false);
                 Toast.makeText(this, R.string.radio_off_during_emergency_call, Toast.LENGTH_LONG)
@@ -824,7 +718,7 @@
         }
 
         DataConnectionReasons reasons = new DataConnectionReasons();
-        boolean dataAllowed = phone.isDataAllowed(reasons);
+        boolean dataAllowed = phone.isDataAllowed(ApnSetting.TYPE_DEFAULT, reasons);
         mDataRoamingNotifLog.log("dataAllowed=" + dataAllowed + ", reasons=" + reasons);
         if (VDBG) Log.v(LOG_TAG, "dataAllowed=" + dataAllowed + ", reasons=" + reasons);
         if (!mNoDataDueToRoaming
@@ -862,41 +756,20 @@
     }
 
     /**
-     * Dismisses the message waiting (voicemail) indicator.
+     * Called when the network selection on the subscription {@code subId} is changed by the user.
      *
-     * @param subId the subscription id we should dismiss the notification for.
+     * @param subId the subscription id.
      */
-    public void clearMwiIndicator(int subId) {
-        // Setting voiceMessageCount to 0 will remove the current notification and clear the system
-        // cached value.
+    public void onNetworkSelectionChanged(int subId) {
         Phone phone = getPhone(subId);
-        if (phone == null) {
-            Log.w(LOG_TAG, "clearMwiIndicator on null phone, subId:" + subId);
+        if (phone != null) {
+            notificationMgr.updateNetworkSelection(phone.getServiceState().getState(), subId);
         } else {
-            phone.setVoiceMessageCount(0);
+            Log.w(LOG_TAG, "onNetworkSelectionChanged on null phone, subId: " + subId);
         }
     }
 
     /**
-     * Enables or disables the visual voicemail check for message waiting indicator. Default value
-     * is true. MWI is the traditional voicemail notification which should be suppressed if visual
-     * voicemail is active. {@link NotificationMgr#updateMwi(int, boolean, boolean)} currently
-     * checks the {@link android.provider.VoicemailContract.Status#CONFIGURATION_STATE} to suppress
-     * the MWI, but there are several issues. b/31229016 is a bug that when the device boots the
-     * configuration state will be cleared and the MWI for voicemail that arrives when the device
-     * is offline will be cleared, even if the account cannot be activated. A full solution will be
-     * adding a setMwiEnabled() method and stop checking the configuration state, but that is too
-     * risky at this moment. This is a temporary workaround to shut down the configuration state
-     * check if visual voicemail cannot be activated.
-     * <p>TODO(twyen): implement the setMwiEnabled() mentioned above.
-     *
-     * @param subId the account to set the enabled state
-     */
-    public void setShouldCheckVisualVoicemailConfigurationForMwi(int subId, boolean enabled) {
-        notificationMgr.setShouldCheckVisualVoicemailConfigurationForMwi(subId, enabled);
-    }
-
-    /**
      * Dump the state of the object, add calls to other objects as desired.
      *
      * @param fd File descriptor
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 393168b..f247109 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -16,6 +16,8 @@
 
 package com.android.phone;
 
+import static android.content.pm.PackageManager.PERMISSION_GRANTED;
+
 import static com.android.internal.telephony.PhoneConstants.SUBSCRIPTION_KEY;
 
 import android.Manifest.permission;
@@ -25,6 +27,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.ComponentInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
@@ -55,12 +58,17 @@
 import android.telecom.TelecomManager;
 import android.telephony.CarrierConfigManager;
 import android.telephony.CellInfo;
+import android.telephony.CellInfoGsm;
+import android.telephony.CellInfoWcdma;
+import android.telephony.CellLocation;
 import android.telephony.ClientRequestStats;
+import android.telephony.ICellInfoCallback;
 import android.telephony.IccOpenLogicalChannelResponse;
 import android.telephony.LocationAccessPolicy;
 import android.telephony.ModemActivityInfo;
 import android.telephony.NeighboringCellInfo;
 import android.telephony.NetworkScanRequest;
+import android.telephony.PhoneNumberRange;
 import android.telephony.RadioAccessFamily;
 import android.telephony.Rlog;
 import android.telephony.ServiceState;
@@ -70,29 +78,39 @@
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyHistogram;
 import android.telephony.TelephonyManager;
+import android.telephony.UiccCardInfo;
 import android.telephony.UiccSlotInfo;
 import android.telephony.UssdResponse;
 import android.telephony.VisualVoicemailSmsFilterSettings;
+import android.telephony.cdma.CdmaCellLocation;
+import android.telephony.data.ApnSetting;
+import android.telephony.emergency.EmergencyNumber;
+import android.telephony.gsm.GsmCellLocation;
+import android.telephony.ims.aidl.IImsCapabilityCallback;
 import android.telephony.ims.aidl.IImsConfig;
+import android.telephony.ims.aidl.IImsConfigCallback;
 import android.telephony.ims.aidl.IImsMmTelFeature;
 import android.telephony.ims.aidl.IImsRcsFeature;
 import android.telephony.ims.aidl.IImsRegistration;
+import android.telephony.ims.aidl.IImsRegistrationCallback;
 import android.telephony.ims.stub.ImsRegistrationImplBase;
 import android.text.TextUtils;
 import android.util.ArraySet;
-import android.util.EventLog;
 import android.util.Log;
 import android.util.Pair;
 import android.util.Slog;
 
+import com.android.ims.ImsException;
 import com.android.ims.ImsManager;
 import com.android.ims.internal.IImsServiceFeatureCallback;
 import com.android.internal.telephony.CallManager;
 import com.android.internal.telephony.CallStateException;
 import com.android.internal.telephony.CarrierInfoManager;
+import com.android.internal.telephony.CarrierResolver;
 import com.android.internal.telephony.CellNetworkScanResult;
 import com.android.internal.telephony.CommandException;
 import com.android.internal.telephony.DefaultPhoneNotifier;
+import com.android.internal.telephony.INumberVerificationCallback;
 import com.android.internal.telephony.ITelephony;
 import com.android.internal.telephony.IccCard;
 import com.android.internal.telephony.LocaleTracker;
@@ -100,6 +118,7 @@
 import com.android.internal.telephony.NetworkScanRequestTracker;
 import com.android.internal.telephony.OperatorInfo;
 import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.PhoneConfigurationManager;
 import com.android.internal.telephony.PhoneConstantConversions;
 import com.android.internal.telephony.PhoneConstants;
 import com.android.internal.telephony.PhoneFactory;
@@ -107,6 +126,8 @@
 import com.android.internal.telephony.RIL;
 import com.android.internal.telephony.RILConstants;
 import com.android.internal.telephony.ServiceStateTracker;
+import com.android.internal.telephony.SmsApplication;
+import com.android.internal.telephony.SmsApplication.SmsApplicationData;
 import com.android.internal.telephony.SubscriptionController;
 import com.android.internal.telephony.TelephonyPermissions;
 import com.android.internal.telephony.euicc.EuiccConnector;
@@ -130,6 +151,8 @@
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -145,10 +168,6 @@
 
     // Message codes used with mMainThreadHandler
     private static final int CMD_HANDLE_PIN_MMI = 1;
-    private static final int CMD_HANDLE_NEIGHBORING_CELL = 2;
-    private static final int EVENT_NEIGHBORING_CELL_DONE = 3;
-    private static final int CMD_ANSWER_RINGING_CALL = 4;
-    private static final int CMD_END_CALL = 5;  // not used yet
     private static final int CMD_TRANSMIT_APDU_LOGICAL_CHANNEL = 7;
     private static final int EVENT_TRANSMIT_APDU_LOGICAL_CHANNEL_DONE = 8;
     private static final int CMD_OPEN_CHANNEL = 9;
@@ -161,8 +180,8 @@
     private static final int EVENT_NV_WRITE_ITEM_DONE = 16;
     private static final int CMD_NV_WRITE_CDMA_PRL = 17;
     private static final int EVENT_NV_WRITE_CDMA_PRL_DONE = 18;
-    private static final int CMD_NV_RESET_CONFIG = 19;
-    private static final int EVENT_NV_RESET_CONFIG_DONE = 20;
+    private static final int CMD_RESET_MODEM_CONFIG = 19;
+    private static final int EVENT_RESET_MODEM_CONFIG_DONE = 20;
     private static final int CMD_GET_PREFERRED_NETWORK_TYPE = 21;
     private static final int EVENT_GET_PREFERRED_NETWORK_TYPE_DONE = 22;
     private static final int CMD_SET_PREFERRED_NETWORK_TYPE = 23;
@@ -194,6 +213,22 @@
     private static final int EVENT_GET_FORBIDDEN_PLMNS_DONE = 49;
     private static final int CMD_SWITCH_SLOTS = 50;
     private static final int EVENT_SWITCH_SLOTS_DONE = 51;
+    private static final int CMD_GET_NETWORK_SELECTION_MODE = 52;
+    private static final int EVENT_GET_NETWORK_SELECTION_MODE_DONE = 53;
+    private static final int CMD_GET_CDMA_ROAMING_MODE = 54;
+    private static final int EVENT_GET_CDMA_ROAMING_MODE_DONE = 55;
+    private static final int CMD_SET_CDMA_ROAMING_MODE = 56;
+    private static final int EVENT_SET_CDMA_ROAMING_MODE_DONE = 57;
+    private static final int CMD_SET_CDMA_SUBSCRIPTION_MODE = 58;
+    private static final int EVENT_SET_CDMA_SUBSCRIPTION_MODE_DONE = 59;
+    private static final int CMD_GET_ALL_CELL_INFO = 60;
+    private static final int EVENT_GET_ALL_CELL_INFO_DONE = 61;
+    private static final int CMD_GET_CELL_LOCATION = 62;
+    private static final int EVENT_GET_CELL_LOCATION_DONE = 63;
+    private static final int CMD_MODEM_REBOOT = 64;
+    private static final int EVENT_CMD_MODEM_REBOOT_DONE = 65;
+    private static final int CMD_REQUEST_CELL_INFO_UPDATE = 66;
+    private static final int EVENT_REQUEST_CELL_INFO_UPDATE_DONE = 67;
 
     // Parameters of select command.
     private static final int SELECT_COMMAND = 0xA4;
@@ -209,13 +244,13 @@
     private static PhoneInterfaceManager sInstance;
 
     private PhoneGlobals mApp;
-    private Phone mPhone;
     private CallManager mCM;
     private UserManager mUserManager;
     private AppOpsManager mAppOps;
     private MainThreadHandler mMainThreadHandler;
     private SubscriptionController mSubscriptionController;
     private SharedPreferences mTelephonySharedPreferences;
+    private PhoneConfigurationManager mPhoneConfigurationManager;
 
     private static final String PREF_CARRIERS_ALPHATAG_PREFIX = "carrier_alphtag_";
     private static final String PREF_CARRIERS_NUMBER_PREFIX = "carrier_number_";
@@ -226,6 +261,9 @@
 
     private NetworkScanRequestTracker mNetworkScanRequestTracker;
 
+    private static final int TYPE_ALLOCATION_CODE_LENGTH = 8;
+    private static final int MANUFACTURER_CODE_LENGTH = 8;
+
     /**
      * A request object to use for transmitting data to an ICC.
      */
@@ -271,15 +309,29 @@
         // SubscriptionManager.INVALID_SUBSCRIPTION_ID
         public Integer subId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
 
+        // In cases where subId is unavailable, the caller needs to specify the phone.
+        public Phone phone;
+
+        public WorkSource workSource;
+
         public MainThreadRequest(Object argument) {
             this.argument = argument;
         }
 
-        public MainThreadRequest(Object argument, Integer subId) {
+        MainThreadRequest(Object argument, Phone phone, WorkSource workSource) {
+            this.argument = argument;
+            if (phone != null) {
+                this.phone = phone;
+            }
+            this.workSource = workSource;
+        }
+
+        MainThreadRequest(Object argument, Integer subId, WorkSource workSource) {
             this.argument = argument;
             if (subId != null) {
                 this.subId = subId;
             }
+            this.workSource = workSource;
         }
     }
 
@@ -316,42 +368,38 @@
             AsyncResult ar;
             UiccCard uiccCard;
             IccAPDUArgument iccArgument;
+            final Phone defaultPhone = getDefaultPhone();
 
             switch (msg.what) {
-                 case CMD_HANDLE_USSD_REQUEST: {
-                     request = (MainThreadRequest) msg.obj;
-                     final Phone phone = getPhoneFromRequest(request);
-                     Pair<String, ResultReceiver> ussdObject = (Pair) request.argument;
-                     String ussdRequest =  ussdObject.first;
-                     ResultReceiver wrappedCallback = ussdObject.second;
+                case CMD_HANDLE_USSD_REQUEST: {
+                    request = (MainThreadRequest) msg.obj;
+                    final Phone phone = getPhoneFromRequest(request);
+                    Pair<String, ResultReceiver> ussdObject = (Pair) request.argument;
+                    String ussdRequest =  ussdObject.first;
+                    ResultReceiver wrappedCallback = ussdObject.second;
 
-                     if (!isUssdApiAllowed(request.subId)) {
-                         // Carrier does not support use of this API, return failure.
-                         Rlog.w(LOG_TAG, "handleUssdRequest: carrier does not support USSD apis.");
-                         UssdResponse response = new UssdResponse(ussdRequest, null);
-                         Bundle returnData = new Bundle();
-                         returnData.putParcelable(TelephonyManager.USSD_RESPONSE, response);
-                         wrappedCallback.send(TelephonyManager.USSD_RETURN_FAILURE, returnData);
+                    if (!isUssdApiAllowed(request.subId)) {
+                        // Carrier does not support use of this API, return failure.
+                        Rlog.w(LOG_TAG, "handleUssdRequest: carrier does not support USSD apis.");
+                        UssdResponse response = new UssdResponse(ussdRequest, null);
+                        Bundle returnData = new Bundle();
+                        returnData.putParcelable(TelephonyManager.USSD_RESPONSE, response);
+                        wrappedCallback.send(TelephonyManager.USSD_RETURN_FAILURE, returnData);
 
-                         request.result = true;
-                         synchronized (request) {
-                             request.notifyAll();
-                         }
-                         return;
-                     }
+                        request.result = true;
+                        notifyRequester(request);
+                        return;
+                    }
 
-                     try {
-                         request.result = phone != null ?
-                                 phone.handleUssdRequest(ussdRequest, wrappedCallback)
-                                 : false;
-                     } catch (CallStateException cse) {
-                         request.result = false;
-                     }
-                     // Wake up the requesting thread
-                     synchronized (request) {
-                         request.notifyAll();
-                     }
-                     break;
+                    try {
+                        request.result = phone != null
+                                ? phone.handleUssdRequest(ussdRequest, wrappedCallback) : false;
+                    } catch (CallStateException cse) {
+                        request.result = false;
+                    }
+                    // Wake up the requesting thread
+                    notifyRequester(request);
+                    break;
                 }
 
                 case CMD_HANDLE_PIN_MMI: {
@@ -361,68 +409,10 @@
                             getPhoneFromRequest(request).handlePinMmi((String) request.argument)
                             : false;
                     // Wake up the requesting thread
-                    synchronized (request) {
-                        request.notifyAll();
-                    }
+                    notifyRequester(request);
                     break;
                 }
 
-                case CMD_HANDLE_NEIGHBORING_CELL:
-                    request = (MainThreadRequest) msg.obj;
-                    onCompleted = obtainMessage(EVENT_NEIGHBORING_CELL_DONE,
-                            request);
-                    mPhone.getNeighboringCids(onCompleted, (WorkSource)request.argument);
-                    break;
-
-                case EVENT_NEIGHBORING_CELL_DONE:
-                    ar = (AsyncResult) msg.obj;
-                    request = (MainThreadRequest) ar.userObj;
-                    if (ar.exception == null && ar.result != null) {
-                        request.result = ar.result;
-                    } else {
-                        // create an empty list to notify the waiting thread
-                        request.result = new ArrayList<NeighboringCellInfo>(0);
-                    }
-                    // Wake up the requesting thread
-                    synchronized (request) {
-                        request.notifyAll();
-                    }
-                    break;
-
-                case CMD_ANSWER_RINGING_CALL:
-                    request = (MainThreadRequest) msg.obj;
-                    int answer_subId = request.subId;
-                    answerRingingCallInternal(answer_subId);
-                    break;
-
-                case CMD_END_CALL:
-                    request = (MainThreadRequest) msg.obj;
-                    int end_subId = request.subId;
-                    final boolean hungUp;
-                    Phone phone = getPhone(end_subId);
-                    if (phone == null) {
-                        if (DBG) log("CMD_END_CALL: no phone for id: " + end_subId);
-                        break;
-                    }
-                    int phoneType = phone.getPhoneType();
-                    if (phoneType == PhoneConstants.PHONE_TYPE_CDMA) {
-                        // CDMA: If the user presses the Power button we treat it as
-                        // ending the complete call session
-                        hungUp = PhoneUtils.hangupRingingAndActive(getPhone(end_subId));
-                    } else if (phoneType == PhoneConstants.PHONE_TYPE_GSM) {
-                        // GSM: End the call as per the Phone state
-                        hungUp = PhoneUtils.hangup(mCM);
-                    } else {
-                        throw new IllegalStateException("Unexpected phone type: " + phoneType);
-                    }
-                    if (DBG) log("CMD_END_CALL: " + (hungUp ? "hung up!" : "no call to hang up"));
-                    request.result = hungUp;
-                    // Wake up the requesting thread
-                    synchronized (request) {
-                        request.notifyAll();
-                    }
-                    break;
-
                 case CMD_TRANSMIT_APDU_LOGICAL_CHANNEL:
                     request = (MainThreadRequest) msg.obj;
                     iccArgument = (IccAPDUArgument) request.argument;
@@ -430,9 +420,7 @@
                     if (uiccCard == null) {
                         loge("iccTransmitApduLogicalChannel: No UICC");
                         request.result = new IccIoResult(0x6F, 0, (byte[])null);
-                        synchronized (request) {
-                            request.notifyAll();
-                        }
+                        notifyRequester(request);
                     } else {
                         onCompleted = obtainMessage(EVENT_TRANSMIT_APDU_LOGICAL_CHANNEL_DONE,
                             request);
@@ -459,9 +447,7 @@
                             loge("iccTransmitApduLogicalChannel: Unknown exception");
                         }
                     }
-                    synchronized (request) {
-                        request.notifyAll();
-                    }
+                    notifyRequester(request);
                     break;
 
                 case CMD_TRANSMIT_APDU_BASIC_CHANNEL:
@@ -471,9 +457,7 @@
                     if (uiccCard == null) {
                         loge("iccTransmitApduBasicChannel: No UICC");
                         request.result = new IccIoResult(0x6F, 0, (byte[])null);
-                        synchronized (request) {
-                            request.notifyAll();
-                        }
+                        notifyRequester(request);
                     } else {
                         onCompleted = obtainMessage(EVENT_TRANSMIT_APDU_BASIC_CHANNEL_DONE,
                             request);
@@ -499,9 +483,7 @@
                             loge("iccTransmitApduBasicChannel: Unknown exception");
                         }
                     }
-                    synchronized (request) {
-                        request.notifyAll();
-                    }
+                    notifyRequester(request);
                     break;
 
                 case CMD_EXCHANGE_SIM_IO:
@@ -511,9 +493,7 @@
                     if (uiccCard == null) {
                         loge("iccExchangeSimIO: No UICC");
                         request.result = new IccIoResult(0x6F, 0, (byte[])null);
-                        synchronized (request) {
-                            request.notifyAll();
-                        }
+                        notifyRequester(request);
                     } else {
                         onCompleted = obtainMessage(EVENT_EXCHANGE_SIM_IO_DONE,
                                 request);
@@ -531,9 +511,7 @@
                     } else {
                         request.result = new IccIoResult(0x6f, 0, (byte[])null);
                     }
-                    synchronized (request) {
-                        request.notifyAll();
-                    }
+                    notifyRequester(request);
                     break;
 
                 case CMD_SEND_ENVELOPE:
@@ -542,9 +520,7 @@
                     if (uiccCard == null) {
                         loge("sendEnvelopeWithStatus: No UICC");
                         request.result = new IccIoResult(0x6F, 0, (byte[])null);
-                        synchronized (request) {
-                            request.notifyAll();
-                        }
+                        notifyRequester(request);
                     } else {
                         onCompleted = obtainMessage(EVENT_SEND_ENVELOPE_DONE, request);
                         uiccCard.sendEnvelopeWithStatus((String)request.argument, onCompleted);
@@ -567,9 +543,7 @@
                             loge("sendEnvelopeWithStatus: exception:" + ar.exception);
                         }
                     }
-                    synchronized (request) {
-                        request.notifyAll();
-                    }
+                    notifyRequester(request);
                     break;
 
                 case CMD_OPEN_CHANNEL:
@@ -580,9 +554,7 @@
                         loge("iccOpenLogicalChannel: No UICC");
                         request.result = new IccOpenLogicalChannelResponse(-1,
                             IccOpenLogicalChannelResponse.STATUS_MISSING_RESOURCE, null);
-                        synchronized (request) {
-                            request.notifyAll();
-                        }
+                        notifyRequester(request);
                     } else {
                         onCompleted = obtainMessage(EVENT_OPEN_CHANNEL_DONE, request);
                         uiccCard.iccOpenLogicalChannel(openChannelArgs.first,
@@ -628,9 +600,7 @@
                             IccOpenLogicalChannelResponse.INVALID_CHANNEL, errorCode, null);
                     }
                     request.result = openChannelResp;
-                    synchronized (request) {
-                        request.notifyAll();
-                    }
+                    notifyRequester(request);
                     break;
 
                 case CMD_CLOSE_CHANNEL:
@@ -639,9 +609,7 @@
                     if (uiccCard == null) {
                         loge("iccCloseLogicalChannel: No UICC");
                         request.result = false;
-                        synchronized (request) {
-                            request.notifyAll();
-                        }
+                        notifyRequester(request);
                     } else {
                         onCompleted = obtainMessage(EVENT_CLOSE_CHANNEL_DONE, request);
                         uiccCard.iccCloseLogicalChannel((Integer) request.argument, onCompleted);
@@ -655,7 +623,8 @@
                 case CMD_NV_READ_ITEM:
                     request = (MainThreadRequest) msg.obj;
                     onCompleted = obtainMessage(EVENT_NV_READ_ITEM_DONE, request);
-                    mPhone.nvReadItem((Integer) request.argument, onCompleted);
+                    defaultPhone.nvReadItem((Integer) request.argument, onCompleted,
+                            request.workSource);
                     break;
 
                 case EVENT_NV_READ_ITEM_DONE:
@@ -674,16 +643,15 @@
                             loge("nvReadItem: Unknown exception");
                         }
                     }
-                    synchronized (request) {
-                        request.notifyAll();
-                    }
+                    notifyRequester(request);
                     break;
 
                 case CMD_NV_WRITE_ITEM:
                     request = (MainThreadRequest) msg.obj;
                     onCompleted = obtainMessage(EVENT_NV_WRITE_ITEM_DONE, request);
                     Pair<Integer, String> idValue = (Pair<Integer, String>) request.argument;
-                    mPhone.nvWriteItem(idValue.first, idValue.second, onCompleted);
+                    defaultPhone.nvWriteItem(idValue.first, idValue.second, onCompleted,
+                            request.workSource);
                     break;
 
                 case EVENT_NV_WRITE_ITEM_DONE:
@@ -693,21 +661,21 @@
                 case CMD_NV_WRITE_CDMA_PRL:
                     request = (MainThreadRequest) msg.obj;
                     onCompleted = obtainMessage(EVENT_NV_WRITE_CDMA_PRL_DONE, request);
-                    mPhone.nvWriteCdmaPrl((byte[]) request.argument, onCompleted);
+                    defaultPhone.nvWriteCdmaPrl((byte[]) request.argument, onCompleted);
                     break;
 
                 case EVENT_NV_WRITE_CDMA_PRL_DONE:
                     handleNullReturnEvent(msg, "nvWriteCdmaPrl");
                     break;
 
-                case CMD_NV_RESET_CONFIG:
+                case CMD_RESET_MODEM_CONFIG:
                     request = (MainThreadRequest) msg.obj;
-                    onCompleted = obtainMessage(EVENT_NV_RESET_CONFIG_DONE, request);
-                    mPhone.nvResetConfig((Integer) request.argument, onCompleted);
+                    onCompleted = obtainMessage(EVENT_RESET_MODEM_CONFIG_DONE, request);
+                    defaultPhone.resetModemConfig(onCompleted);
                     break;
 
-                case EVENT_NV_RESET_CONFIG_DONE:
-                    handleNullReturnEvent(msg, "nvResetConfig");
+                case EVENT_RESET_MODEM_CONFIG_DONE:
+                    handleNullReturnEvent(msg, "resetModemConfig");
                     break;
 
                 case CMD_GET_PREFERRED_NETWORK_TYPE:
@@ -732,9 +700,7 @@
                             loge("getPreferredNetworkType: Unknown exception");
                         }
                     }
-                    synchronized (request) {
-                        request.notifyAll();
-                    }
+                    notifyRequester(request);
                     break;
 
                 case CMD_SET_PREFERRED_NETWORK_TYPE:
@@ -751,16 +717,14 @@
                 case CMD_INVOKE_OEM_RIL_REQUEST_RAW:
                     request = (MainThreadRequest)msg.obj;
                     onCompleted = obtainMessage(EVENT_INVOKE_OEM_RIL_REQUEST_RAW_DONE, request);
-                    mPhone.invokeOemRilRequestRaw((byte[])request.argument, onCompleted);
+                    defaultPhone.invokeOemRilRequestRaw((byte[]) request.argument, onCompleted);
                     break;
 
                 case EVENT_INVOKE_OEM_RIL_REQUEST_RAW_DONE:
                     ar = (AsyncResult)msg.obj;
                     request = (MainThreadRequest)ar.userObj;
                     request.result = ar;
-                    synchronized (request) {
-                        request.notifyAll();
-                    }
+                    notifyRequester(request);
                     break;
 
                 case CMD_SET_VOICEMAIL_NUMBER:
@@ -820,9 +784,7 @@
                         cellScanResult = new CellNetworkScanResult(errorCode, null);
                     }
                     request.result = cellScanResult;
-                    synchronized (request) {
-                        request.notifyAll();
-                    }
+                    notifyRequester(request);
                     break;
 
                 case CMD_SET_NETWORK_SELECTION_MODE_MANUAL:
@@ -836,13 +798,22 @@
                     break;
 
                 case EVENT_SET_NETWORK_SELECTION_MODE_MANUAL_DONE:
-                    handleNullReturnEvent(msg, "setNetworkSelectionModeManual");
+                    ar = (AsyncResult) msg.obj;
+                    request = (MainThreadRequest) ar.userObj;
+                    if (ar.exception == null) {
+                        request.result = true;
+                    } else {
+                        request.result = false;
+                        loge("setNetworkSelectionModeManual " + ar.exception);
+                    }
+                    notifyRequester(request);
+                    mApp.onNetworkSelectionChanged(request.subId);
                     break;
 
                 case CMD_GET_MODEM_ACTIVITY_INFO:
                     request = (MainThreadRequest) msg.obj;
                     onCompleted = obtainMessage(EVENT_GET_MODEM_ACTIVITY_INFO_DONE, request);
-                    mPhone.getModemActivityInfo(onCompleted);
+                    defaultPhone.getModemActivityInfo(onCompleted, request.workSource);
                     break;
 
                 case EVENT_GET_MODEM_ACTIVITY_INFO_DONE:
@@ -864,17 +835,15 @@
                     if (request.result == null) {
                         request.result = new ModemActivityInfo(0, 0, 0, null, 0, 0);
                     }
-                    synchronized (request) {
-                        request.notifyAll();
-                    }
+                    notifyRequester(request);
                     break;
 
                 case CMD_SET_ALLOWED_CARRIERS:
                     request = (MainThreadRequest) msg.obj;
                     onCompleted = obtainMessage(EVENT_SET_ALLOWED_CARRIERS_DONE, request);
-                    mPhone.setAllowedCarriers(
+                    defaultPhone.setAllowedCarriers(
                             (List<CarrierIdentifier>) request.argument,
-                            onCompleted);
+                            onCompleted, request.workSource);
                     break;
 
                 case EVENT_SET_ALLOWED_CARRIERS_DONE:
@@ -896,15 +865,13 @@
                     if (request.result == null) {
                         request.result = new int[]{-1};
                     }
-                    synchronized (request) {
-                        request.notifyAll();
-                    }
+                    notifyRequester(request);
                     break;
 
                 case CMD_GET_ALLOWED_CARRIERS:
                     request = (MainThreadRequest) msg.obj;
                     onCompleted = obtainMessage(EVENT_GET_ALLOWED_CARRIERS_DONE, request);
-                    mPhone.getAllowedCarriers(onCompleted);
+                    defaultPhone.getAllowedCarriers(onCompleted, request.workSource);
                     break;
 
                 case EVENT_GET_ALLOWED_CARRIERS_DONE:
@@ -926,9 +893,7 @@
                     if (request.result == null) {
                         request.result = new ArrayList<CarrierIdentifier>(0);
                     }
-                    synchronized (request) {
-                        request.notifyAll();
-                    }
+                    notifyRequester(request);
                     break;
 
                 case EVENT_GET_FORBIDDEN_PLMNS_DONE:
@@ -945,9 +910,7 @@
                             loge("getForbiddenPlmns: Unknown exception");
                         }
                     }
-                    synchronized (request) {
-                        request.notifyAll();
-                    }
+                    notifyRequester(request);
                     break;
 
                 case CMD_GET_FORBIDDEN_PLMNS:
@@ -957,9 +920,7 @@
                         loge("getForbiddenPlmns() UiccCard is null");
                         request.result = new IllegalArgumentException(
                                 "getForbiddenPlmns() UiccCard is null");
-                        synchronized (request) {
-                            request.notifyAll();
-                        }
+                        notifyRequester(request);
                         break;
                     }
                     Integer appType = (Integer) request.argument;
@@ -968,9 +929,7 @@
                         loge("getForbiddenPlmns() no app with specified type -- "
                                 + appType);
                         request.result = new IllegalArgumentException("Failed to get UICC App");
-                        synchronized (request) {
-                            request.notifyAll();
-                        }
+                        notifyRequester(request);
                         break;
                     } else {
                         if (DBG) logv("getForbiddenPlmns() found app " + uiccApp.getAid()
@@ -992,17 +951,150 @@
                     ar = (AsyncResult) msg.obj;
                     request = (MainThreadRequest) ar.userObj;
                     request.result = (ar.exception == null);
+                    notifyRequester(request);
+                    break;
+                case CMD_GET_NETWORK_SELECTION_MODE:
+                    request = (MainThreadRequest) msg.obj;
+                    onCompleted = obtainMessage(EVENT_GET_NETWORK_SELECTION_MODE_DONE, request);
+                    getPhoneFromRequest(request).getNetworkSelectionMode(onCompleted);
+                    break;
+
+                case EVENT_GET_NETWORK_SELECTION_MODE_DONE:
+                    ar = (AsyncResult) msg.obj;
+                    request = (MainThreadRequest) ar.userObj;
+                    if (ar.exception != null) {
+                        request.result = TelephonyManager.NETWORK_SELECTION_MODE_UNKNOWN;
+                    } else {
+                        int mode = ((int[]) ar.result)[0];
+                        if (mode == 0) {
+                            request.result = TelephonyManager.NETWORK_SELECTION_MODE_AUTO;
+                        } else {
+                            request.result = TelephonyManager.NETWORK_SELECTION_MODE_MANUAL;
+                        }
+                    }
+                    notifyRequester(request);
+                    break;
+                case CMD_GET_CDMA_ROAMING_MODE:
+                    request = (MainThreadRequest) msg.obj;
+                    onCompleted = obtainMessage(EVENT_GET_CDMA_ROAMING_MODE_DONE, request);
+                    getPhoneFromRequest(request).queryCdmaRoamingPreference(onCompleted);
+                    break;
+                case EVENT_GET_CDMA_ROAMING_MODE_DONE:
+                    ar = (AsyncResult) msg.obj;
+                    request = (MainThreadRequest) ar.userObj;
+                    if (ar.exception != null) {
+                        request.result = TelephonyManager.CDMA_ROAMING_MODE_RADIO_DEFAULT;
+                    } else {
+                        request.result = ((int[]) ar.result)[0];
+                    }
+                    notifyRequester(request);
+                    break;
+                case CMD_SET_CDMA_ROAMING_MODE:
+                    request = (MainThreadRequest) msg.obj;
+                    onCompleted = obtainMessage(EVENT_SET_CDMA_ROAMING_MODE_DONE, request);
+                    int mode = (int) request.argument;
+                    getPhoneFromRequest(request).setCdmaRoamingPreference(mode, onCompleted);
+                    break;
+                case EVENT_SET_CDMA_ROAMING_MODE_DONE:
+                    ar = (AsyncResult) msg.obj;
+                    request = (MainThreadRequest) ar.userObj;
+                    request.result = ar.exception == null;
+                    notifyRequester(request);
+                    break;
+                case CMD_SET_CDMA_SUBSCRIPTION_MODE:
+                    request = (MainThreadRequest) msg.obj;
+                    onCompleted = obtainMessage(EVENT_SET_CDMA_SUBSCRIPTION_MODE_DONE, request);
+                    int subscriptionMode = (int) request.argument;
+                    getPhoneFromRequest(request).setCdmaSubscription(subscriptionMode, onCompleted);
+                    break;
+                case EVENT_SET_CDMA_SUBSCRIPTION_MODE_DONE:
+                    ar = (AsyncResult) msg.obj;
+                    request = (MainThreadRequest) ar.userObj;
+                    request.result = ar.exception == null;
+                    notifyRequester(request);
+                    break;
+                case CMD_GET_ALL_CELL_INFO:
+                    request = (MainThreadRequest) msg.obj;
+                    onCompleted = obtainMessage(EVENT_GET_ALL_CELL_INFO_DONE, request);
+                    request.phone.requestCellInfoUpdate(request.workSource, onCompleted);
+                    break;
+                case EVENT_GET_ALL_CELL_INFO_DONE:
+                    ar = (AsyncResult) msg.obj;
+                    request = (MainThreadRequest) ar.userObj;
+                    // If a timeout occurs, the response will be null
+                    request.result = (ar.exception == null && ar.result != null)
+                            ? ar.result : new ArrayList<CellInfo>();
                     synchronized (request) {
                         request.notifyAll();
                     }
                     break;
+                case CMD_REQUEST_CELL_INFO_UPDATE:
+                    request = (MainThreadRequest) msg.obj;
+                    request.phone.requestCellInfoUpdate(request.workSource,
+                            obtainMessage(EVENT_REQUEST_CELL_INFO_UPDATE_DONE, request));
+                    break;
+                case EVENT_REQUEST_CELL_INFO_UPDATE_DONE:
+                    ar = (AsyncResult) msg.obj;
+                    request = (MainThreadRequest) ar.userObj;
+                    ICellInfoCallback cb = (ICellInfoCallback) request.argument;
+                    try {
+                        if (ar.exception != null) {
+                            // something went wrong... the response is null
+                            Log.e(LOG_TAG, "Exception retrieving CellInfo=" + ar.exception);
+                            cb.onCellInfo(null);
+                        } else if (ar.result == null) {
+                            // timeout occurred, so force the result to non-null "empty"
+                            Log.w(LOG_TAG, "Timeout Waiting for CellInfo!");
+                            cb.onCellInfo(new ArrayList<CellInfo>());
+                        } else {
+                            // use the result as returned
+                            cb.onCellInfo((List<CellInfo>) ar.result);
+                        }
+                    } catch (RemoteException re) {
+                        Log.w(LOG_TAG, "Discarded CellInfo due to Callback RemoteException");
+                    }
+                    break;
+                case CMD_GET_CELL_LOCATION:
+                    request = (MainThreadRequest) msg.obj;
+                    WorkSource ws = (WorkSource) request.argument;
+                    Phone phone = getPhoneFromRequest(request);
+                    phone.getCellLocation(ws, obtainMessage(EVENT_GET_CELL_LOCATION_DONE, request));
+                    break;
+                case EVENT_GET_CELL_LOCATION_DONE:
+                    ar = (AsyncResult) msg.obj;
+                    request = (MainThreadRequest) ar.userObj;
+                    if (ar.exception == null) {
+                        request.result = ar.result;
+                    } else {
+                        phone = getPhoneFromRequest(request);
+                        request.result = (phone.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA)
+                                ? new CdmaCellLocation() : new GsmCellLocation();
+                    }
 
+                    synchronized (request) {
+                        request.notifyAll();
+                    }
+                    break;
+                case CMD_MODEM_REBOOT:
+                    request = (MainThreadRequest) msg.obj;
+                    onCompleted = obtainMessage(EVENT_RESET_MODEM_CONFIG_DONE, request);
+                    defaultPhone.rebootModem(onCompleted);
+                    break;
+                case EVENT_CMD_MODEM_REBOOT_DONE:
+                    handleNullReturnEvent(msg, "rebootModem");
+                    break;
                 default:
                     Log.w(LOG_TAG, "MainThreadHandler: unexpected message code: " + msg.what);
                     break;
             }
         }
 
+        private void notifyRequester(MainThreadRequest request) {
+            synchronized (request) {
+                request.notifyAll();
+            }
+        }
+
         private void handleNullReturnEvent(Message msg, String command) {
             AsyncResult ar = (AsyncResult) msg.obj;
             MainThreadRequest request = (MainThreadRequest) ar.userObj;
@@ -1016,9 +1108,7 @@
                     loge(command + ": Unknown exception");
                 }
             }
-            synchronized (request) {
-                request.notifyAll();
-            }
+            notifyRequester(request);
         }
     }
 
@@ -1028,7 +1118,18 @@
      * @see #sendRequestAsync
      */
     private Object sendRequest(int command, Object argument) {
-        return sendRequest(command, argument, SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+        return sendRequest(
+                command, argument, SubscriptionManager.INVALID_SUBSCRIPTION_ID, null, null);
+    }
+
+    /**
+     * Posts the specified command to be executed on the main thread,
+     * waits for the request to complete, and returns the result.
+     * @see #sendRequestAsync
+     */
+    private Object sendRequest(int command, Object argument, WorkSource workSource) {
+        return sendRequest(command, argument,  SubscriptionManager.INVALID_SUBSCRIPTION_ID,
+                null, workSource);
     }
 
     /**
@@ -1037,11 +1138,48 @@
      * @see #sendRequestAsync
      */
     private Object sendRequest(int command, Object argument, Integer subId) {
+        return sendRequest(command, argument, subId, null, null);
+    }
+
+    /**
+     * Posts the specified command to be executed on the main thread,
+     * waits for the request to complete, and returns the result.
+     * @see #sendRequestAsync
+     */
+    private Object sendRequest(int command, Object argument, int subId, WorkSource workSource) {
+        return sendRequest(command, argument, subId, null, workSource);
+    }
+
+    /**
+     * Posts the specified command to be executed on the main thread,
+     * waits for the request to complete, and returns the result.
+     * @see #sendRequestAsync
+     */
+    private Object sendRequest(int command, Object argument, Phone phone, WorkSource workSource) {
+        return sendRequest(
+                command, argument, SubscriptionManager.INVALID_SUBSCRIPTION_ID, phone, workSource);
+    }
+
+    /**
+     * Posts the specified command to be executed on the main thread,
+     * waits for the request to complete, and returns the result.
+     * @see #sendRequestAsync
+     */
+    private Object sendRequest(
+            int command, Object argument, Integer subId, Phone phone, WorkSource workSource) {
         if (Looper.myLooper() == mMainThreadHandler.getLooper()) {
             throw new RuntimeException("This method will deadlock if called from the main thread.");
         }
 
-        MainThreadRequest request = new MainThreadRequest(argument, subId);
+        MainThreadRequest request = null;
+        if (subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID && phone != null) {
+            throw new IllegalArgumentException("subId and phone cannot both be specified!");
+        } else if (phone != null) {
+            request = new MainThreadRequest(argument, phone, workSource);
+        } else {
+            request = new MainThreadRequest(argument, subId, workSource);
+        }
+
         Message msg = mMainThreadHandler.obtainMessage(command, request);
         msg.sendToTarget();
 
@@ -1070,10 +1208,19 @@
 
     /**
      * Same as {@link #sendRequestAsync(int)} except it takes an argument.
-     * @see {@link #sendRequest(int,Object)}
+     * @see {@link #sendRequest(int)}
      */
     private void sendRequestAsync(int command, Object argument) {
-        MainThreadRequest request = new MainThreadRequest(argument);
+        sendRequestAsync(command, argument, null, null);
+    }
+
+    /**
+     * Same as {@link #sendRequestAsync(int,Object)} except it takes a Phone and WorkSource.
+     * @see {@link #sendRequest(int,Object)}
+     */
+    private void sendRequestAsync(
+            int command, Object argument, Phone phone, WorkSource workSource) {
+        MainThreadRequest request = new MainThreadRequest(argument, phone, workSource);
         Message msg = mMainThreadHandler.obtainMessage(command, request);
         msg.sendToTarget();
     }
@@ -1082,10 +1229,10 @@
      * Initialize the singleton PhoneInterfaceManager instance.
      * This is only done once, at startup, from PhoneApp.onCreate().
      */
-    /* package */ static PhoneInterfaceManager init(PhoneGlobals app, Phone phone) {
+    /* package */ static PhoneInterfaceManager init(PhoneGlobals app) {
         synchronized (PhoneInterfaceManager.class) {
             if (sInstance == null) {
-                sInstance = new PhoneInterfaceManager(app, phone);
+                sInstance = new PhoneInterfaceManager(app);
             } else {
                 Log.wtf(LOG_TAG, "init() called multiple times!  sInstance = " + sInstance);
             }
@@ -1094,21 +1241,26 @@
     }
 
     /** Private constructor; @see init() */
-    private PhoneInterfaceManager(PhoneGlobals app, Phone phone) {
+    private PhoneInterfaceManager(PhoneGlobals app) {
         mApp = app;
-        mPhone = phone;
         mCM = PhoneGlobals.getInstance().mCM;
         mUserManager = (UserManager) app.getSystemService(Context.USER_SERVICE);
         mAppOps = (AppOpsManager)app.getSystemService(Context.APP_OPS_SERVICE);
         mMainThreadHandler = new MainThreadHandler();
-        mTelephonySharedPreferences =
-                PreferenceManager.getDefaultSharedPreferences(mPhone.getContext());
         mSubscriptionController = SubscriptionController.getInstance();
+        mTelephonySharedPreferences =
+                PreferenceManager.getDefaultSharedPreferences(mApp);
         mNetworkScanRequestTracker = new NetworkScanRequestTracker();
+        mPhoneConfigurationManager = PhoneConfigurationManager.getInstance();
 
         publish();
     }
 
+    private Phone getDefaultPhone() {
+        Phone thePhone = getPhone(getDefaultSubscription());
+        return (thePhone != null) ? thePhone : PhoneFactory.getDefaultPhone();
+    }
+
     private void publish() {
         if (DBG) log("publish: " + this);
 
@@ -1117,7 +1269,7 @@
 
     private Phone getPhoneFromRequest(MainThreadRequest request) {
         return (request.subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID)
-                ? mPhone : getPhone(request.subId);
+                ? getDefaultPhone() : getPhone(request.subId);
     }
 
     private UiccCard getUiccCardFromRequest(MainThreadRequest request) {
@@ -1130,9 +1282,6 @@
     private Phone getPhone(int subId) {
         return PhoneFactory.getPhone(mSubscriptionController.getPhoneId(subId));
     }
-    //
-    // Implementation of the ITelephony interface.
-    //
 
     public void dial(String number) {
         dialForSubscriber(getPreferredVoiceSubscription(), number);
@@ -1144,17 +1293,22 @@
         // ACTION_DIAL intent, which is available to any app since it puts up
         // the UI before it does anything.
 
-        String url = createTelUrl(number);
-        if (url == null) {
-            return;
-        }
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            String url = createTelUrl(number);
+            if (url == null) {
+                return;
+            }
 
-        // PENDING: should we just silently fail if phone is offhook or ringing?
-        PhoneConstants.State state = mCM.getState(subId);
-        if (state != PhoneConstants.State.OFFHOOK && state != PhoneConstants.State.RINGING) {
-            Intent  intent = new Intent(Intent.ACTION_DIAL, Uri.parse(url));
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            mApp.startActivity(intent);
+            // PENDING: should we just silently fail if phone is offhook or ringing?
+            PhoneConstants.State state = mCM.getState(subId);
+            if (state != PhoneConstants.State.OFFHOOK && state != PhoneConstants.State.RINGING) {
+                Intent intent = new Intent(Intent.ACTION_DIAL, Uri.parse(url));
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                mApp.startActivity(intent);
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
@@ -1175,168 +1329,33 @@
             return;
         }
 
-        String url = createTelUrl(number);
-        if (url == null) {
-            return;
-        }
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            String url = createTelUrl(number);
+            if (url == null) {
+                return;
+            }
 
-        boolean isValid = false;
-        final List<SubscriptionInfo> slist = getActiveSubscriptionInfoList();
-        if (slist != null) {
-            for (SubscriptionInfo subInfoRecord : slist) {
-                if (subInfoRecord.getSubscriptionId() == subId) {
-                    isValid = true;
-                    break;
+            boolean isValid = false;
+            final List<SubscriptionInfo> slist = getActiveSubscriptionInfoListPrivileged();
+            if (slist != null) {
+                for (SubscriptionInfo subInfoRecord : slist) {
+                    if (subInfoRecord.getSubscriptionId() == subId) {
+                        isValid = true;
+                        break;
+                    }
                 }
             }
-        }
-        if (isValid == false) {
-            return;
-        }
-
-        Intent intent = new Intent(Intent.ACTION_CALL, Uri.parse(url));
-        intent.putExtra(SUBSCRIPTION_KEY, subId);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        mApp.startActivity(intent);
-    }
-
-    /**
-     * End a call based on call state
-     * @return true is a call was ended
-     */
-    public boolean endCall() {
-        return endCallForSubscriber(getDefaultSubscription());
-    }
-
-    /**
-     * End a call based on the call state of the subId
-     * @return true is a call was ended
-     */
-    public boolean endCallForSubscriber(int subId) {
-        if (mApp.checkCallingOrSelfPermission(permission.MODIFY_PHONE_STATE)
-                != PackageManager.PERMISSION_GRANTED) {
-            Log.i(LOG_TAG, "endCall: called without modify phone state.");
-            EventLog.writeEvent(0x534e4554, "67862398", -1, "");
-            throw new SecurityException("MODIFY_PHONE_STATE permission required.");
-        }
-        return (Boolean) sendRequest(CMD_END_CALL, null, new Integer(subId));
-    }
-
-    public void answerRingingCall() {
-        answerRingingCallForSubscriber(getDefaultSubscription());
-    }
-
-    public void answerRingingCallForSubscriber(int subId) {
-        if (DBG) log("answerRingingCall...");
-        // TODO: there should eventually be a separate "ANSWER_PHONE" permission,
-        // but that can probably wait till the big TelephonyManager API overhaul.
-        // For now, protect this call with the MODIFY_PHONE_STATE permission.
-        enforceModifyPermission();
-        sendRequest(CMD_ANSWER_RINGING_CALL, null, new Integer(subId));
-    }
-
-    /**
-     * Make the actual telephony calls to implement answerRingingCall().
-     * This should only be called from the main thread of the Phone app.
-     * @see #answerRingingCall
-     *
-     * TODO: it would be nice to return true if we answered the call, or
-     * false if there wasn't actually a ringing incoming call, or some
-     * other error occurred.  (In other words, pass back the return value
-     * from PhoneUtils.answerCall() or PhoneUtils.answerAndEndActive().)
-     * But that would require calling this method via sendRequest() rather
-     * than sendRequestAsync(), and right now we don't actually *need* that
-     * return value, so let's just return void for now.
-     */
-    private void answerRingingCallInternal(int subId) {
-        final boolean hasRingingCall = !getPhone(subId).getRingingCall().isIdle();
-        if (hasRingingCall) {
-            final boolean hasActiveCall = !getPhone(subId).getForegroundCall().isIdle();
-            final boolean hasHoldingCall = !getPhone(subId).getBackgroundCall().isIdle();
-            if (hasActiveCall && hasHoldingCall) {
-                // Both lines are in use!
-                // TODO: provide a flag to let the caller specify what
-                // policy to use if both lines are in use.  (The current
-                // behavior is hardwired to "answer incoming, end ongoing",
-                // which is how the CALL button is specced to behave.)
-                PhoneUtils.answerAndEndActive(mCM, mCM.getFirstActiveRingingCall());
-                return;
-            } else {
-                // answerCall() will automatically hold the current active
-                // call, if there is one.
-                PhoneUtils.answerCall(mCM.getFirstActiveRingingCall());
+            if (!isValid) {
                 return;
             }
-        } else {
-            // No call was ringing.
-            return;
-        }
-    }
 
-    /**
-     * This method is no longer used and can be removed once TelephonyManager stops referring to it.
-     */
-    public void silenceRinger() {
-        Log.e(LOG_TAG, "silenseRinger not supported");
-    }
-
-    @Override
-    public boolean isOffhook(String callingPackage) {
-        return isOffhookForSubscriber(getDefaultSubscription(), callingPackage);
-    }
-
-    @Override
-    public boolean isOffhookForSubscriber(int subId, String callingPackage) {
-        if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
-                mApp, subId, callingPackage, "isOffhookForSubscriber")) {
-            return false;
-        }
-
-        final Phone phone = getPhone(subId);
-        if (phone != null) {
-            return (phone.getState() == PhoneConstants.State.OFFHOOK);
-        } else {
-            return false;
-        }
-    }
-
-    @Override
-    public boolean isRinging(String callingPackage) {
-        return (isRingingForSubscriber(getDefaultSubscription(), callingPackage));
-    }
-
-    @Override
-    public boolean isRingingForSubscriber(int subId, String callingPackage) {
-        if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
-                mApp, subId, callingPackage, "isRingingForSubscriber")) {
-            return false;
-        }
-
-        final Phone phone = getPhone(subId);
-        if (phone != null) {
-            return (phone.getState() == PhoneConstants.State.RINGING);
-        } else {
-            return false;
-        }
-    }
-
-    @Override
-    public boolean isIdle(String callingPackage) {
-        return isIdleForSubscriber(getDefaultSubscription(), callingPackage);
-    }
-
-    @Override
-    public boolean isIdleForSubscriber(int subId, String callingPackage) {
-        if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
-                mApp, subId, callingPackage, "isIdleForSubscriber")) {
-            return false;
-        }
-
-        final Phone phone = getPhone(subId);
-        if (phone != null) {
-            return (phone.getState() == PhoneConstants.State.IDLE);
-        } else {
-            return false;
+            Intent intent = new Intent(Intent.ACTION_CALL, Uri.parse(url));
+            intent.putExtra(SUBSCRIPTION_KEY, subId);
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            mApp.startActivity(intent);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
@@ -1365,9 +1384,15 @@
 
     public int[] supplyPinReportResultForSubscriber(int subId, String pin) {
         enforceModifyPermission();
-        final UnlockSim checkSimPin = new UnlockSim(getPhone(subId).getIccCard());
-        checkSimPin.start();
-        return checkSimPin.unlockSim(null, pin);
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            final UnlockSim checkSimPin = new UnlockSim(getPhone(subId).getIccCard());
+            checkSimPin.start();
+            return checkSimPin.unlockSim(null, pin);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     /** {@hide} */
@@ -1377,9 +1402,15 @@
 
     public int[] supplyPukReportResultForSubscriber(int subId, String puk, String pin) {
         enforceModifyPermission();
-        final UnlockSim checkSimPuk = new UnlockSim(getPhone(subId).getIccCard());
-        checkSimPuk.start();
-        return checkSimPuk.unlockSim(puk, pin);
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            final UnlockSim checkSimPuk = new UnlockSim(getPhone(subId).getIccCard());
+            checkSimPuk.start();
+            return checkSimPuk.unlockSim(puk, pin);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     /**
@@ -1490,9 +1521,14 @@
         // No permission check needed here: this call is harmless, and it's
         // needed for the ServiceState.requestStateUpdate() call (which is
         // already intentionally exposed to 3rd parties.)
-        final Phone phone = getPhone(subId);
-        if (phone != null) {
-            phone.updateServiceLocation();
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            final Phone phone = getPhone(subId);
+            if (phone != null) {
+                phone.updateServiceLocation();
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
@@ -1507,28 +1543,44 @@
                 mApp, subId, callingPackage, "isRadioOnForSubscriber")) {
             return false;
         }
-        return isRadioOnForSubscriber(subId);
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            return isRadioOnForSubscriber(subId);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     private boolean isRadioOnForSubscriber(int subId) {
-        final Phone phone = getPhone(subId);
-        if (phone != null) {
-            return phone.getServiceState().getState() != ServiceState.STATE_POWER_OFF;
-        } else {
-            return false;
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            final Phone phone = getPhone(subId);
+            if (phone != null) {
+                return phone.getServiceState().getState() != ServiceState.STATE_POWER_OFF;
+            } else {
+                return false;
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
     public void toggleRadioOnOff() {
         toggleRadioOnOffForSubscriber(getDefaultSubscription());
-
     }
 
     public void toggleRadioOnOffForSubscriber(int subId) {
         enforceModifyPermission();
-        final Phone phone = getPhone(subId);
-        if (phone != null) {
-            phone.setRadioPower(!isRadioOnForSubscriber(subId));
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            final Phone phone = getPhone(subId);
+            if (phone != null) {
+                phone.setRadioPower(!isRadioOnForSubscriber(subId));
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
@@ -1538,15 +1590,20 @@
 
     public boolean setRadioForSubscriber(int subId, boolean turnOn) {
         enforceModifyPermission();
-        final Phone phone = getPhone(subId);
-        if (phone == null) {
-            return false;
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            final Phone phone = getPhone(subId);
+            if (phone == null) {
+                return false;
+            }
+            if ((phone.getServiceState().getState() != ServiceState.STATE_POWER_OFF) != turnOn) {
+                toggleRadioOnOffForSubscriber(subId);
+            }
+            return true;
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
-        if ((phone.getServiceState().getState() !=
-                ServiceState.STATE_POWER_OFF) != turnOn) {
-            toggleRadioOnOffForSubscriber(subId);
-        }
-        return true;
     }
 
     public boolean needMobileRadioShutdown() {
@@ -1554,23 +1611,35 @@
          * If any of the Radios are available, it will need to be
          * shutdown. So return true if any Radio is available.
          */
-        for (int i = 0; i < TelephonyManager.getDefault().getPhoneCount(); i++) {
-            Phone phone = PhoneFactory.getPhone(i);
-            if (phone != null && phone.isRadioAvailable()) return true;
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            for (int i = 0; i < TelephonyManager.getDefault().getPhoneCount(); i++) {
+                Phone phone = PhoneFactory.getPhone(i);
+                if (phone != null && phone.isRadioAvailable()) return true;
+            }
+            logv(TelephonyManager.getDefault().getPhoneCount() + " Phones are shutdown.");
+            return false;
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
-        logv(TelephonyManager.getDefault().getPhoneCount() + " Phones are shutdown.");
-        return false;
     }
 
+    @Override
     public void shutdownMobileRadios() {
-        for (int i = 0; i < TelephonyManager.getDefault().getPhoneCount(); i++) {
-            logv("Shutting down Phone " + i);
-            shutdownRadioUsingPhoneId(i);
+        enforceModifyPermission();
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            for (int i = 0; i < TelephonyManager.getDefault().getPhoneCount(); i++) {
+                logv("Shutting down Phone " + i);
+                shutdownRadioUsingPhoneId(i);
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
     private void shutdownRadioUsingPhoneId(int phoneId) {
-        enforceModifyPermission();
         Phone phone = PhoneFactory.getPhone(phoneId);
         if (phone != null && phone.isRadioAvailable()) {
             phone.shutdownRadio();
@@ -1579,24 +1648,36 @@
 
     public boolean setRadioPower(boolean turnOn) {
         enforceModifyPermission();
-        final Phone defaultPhone = PhoneFactory.getDefaultPhone();
-        if (defaultPhone != null) {
-            defaultPhone.setRadioPower(turnOn);
-            return true;
-        } else {
-            loge("There's no default phone.");
-            return false;
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            final Phone defaultPhone = PhoneFactory.getDefaultPhone();
+            if (defaultPhone != null) {
+                defaultPhone.setRadioPower(turnOn);
+                return true;
+            } else {
+                loge("There's no default phone.");
+                return false;
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
     public boolean setRadioPowerForSubscriber(int subId, boolean turnOn) {
         enforceModifyPermission();
-        final Phone phone = getPhone(subId);
-        if (phone != null) {
-            phone.setRadioPower(turnOn);
-            return true;
-        } else {
-            return false;
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            final Phone phone = getPhone(subId);
+            if (phone != null) {
+                phone.setRadioPower(turnOn);
+                return true;
+            } else {
+                return false;
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
@@ -1604,13 +1685,19 @@
     @Override
     public boolean enableDataConnectivity() {
         enforceModifyPermission();
-        int subId = mSubscriptionController.getDefaultDataSubId();
-        final Phone phone = getPhone(subId);
-        if (phone != null) {
-            phone.setUserDataEnabled(true);
-            return true;
-        } else {
-            return false;
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            int subId = mSubscriptionController.getDefaultDataSubId();
+            final Phone phone = getPhone(subId);
+            if (phone != null) {
+                phone.getDataEnabledSettings().setUserDataEnabled(true);
+                return true;
+            } else {
+                return false;
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
@@ -1618,23 +1705,34 @@
     @Override
     public boolean disableDataConnectivity() {
         enforceModifyPermission();
-        int subId = mSubscriptionController.getDefaultDataSubId();
-        final Phone phone = getPhone(subId);
-        if (phone != null) {
-            phone.setUserDataEnabled(false);
-            return true;
-        } else {
-            return false;
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            int subId = mSubscriptionController.getDefaultDataSubId();
+            final Phone phone = getPhone(subId);
+            if (phone != null) {
+                phone.getDataEnabledSettings().setUserDataEnabled(false);
+                return true;
+            } else {
+                return false;
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
     @Override
     public boolean isDataConnectivityPossible(int subId) {
-        final Phone phone = getPhone(subId);
-        if (phone != null) {
-            return phone.isDataAllowed();
-        } else {
-            return false;
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            final Phone phone = getPhone(subId);
+            if (phone != null) {
+                return phone.isDataAllowed(ApnSetting.TYPE_DEFAULT);
+            } else {
+                return false;
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
@@ -1643,20 +1741,32 @@
     }
 
     public void handleUssdRequest(int subId, String ussdRequest, ResultReceiver wrappedCallback) {
-      enforceCallPermission();
-      if (!SubscriptionManager.isValidSubscriptionId(subId)) {
-          return;
-      }
-      Pair<String, ResultReceiver> ussdObject = new Pair(ussdRequest, wrappedCallback);
-      sendRequest(CMD_HANDLE_USSD_REQUEST, ussdObject, subId);
+        enforceCallPermission();
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            if (!SubscriptionManager.isValidSubscriptionId(subId)) {
+                return;
+            }
+            Pair<String, ResultReceiver> ussdObject = new Pair(ussdRequest, wrappedCallback);
+            sendRequest(CMD_HANDLE_USSD_REQUEST, ussdObject, subId);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     };
 
     public boolean handlePinMmiForSubscriber(int subId, String dialString) {
         enforceModifyPermission();
-        if (!SubscriptionManager.isValidSubscriptionId(subId)) {
-            return false;
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            if (!SubscriptionManager.isValidSubscriptionId(subId)) {
+                return false;
+            }
+            return (Boolean) sendRequest(CMD_HANDLE_PIN_MMI, dialString, subId);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
-        return (Boolean) sendRequest(CMD_HANDLE_PIN_MMI, dialString, subId);
     }
 
     public int getCallState() {
@@ -1664,50 +1774,68 @@
     }
 
     public int getCallStateForSlot(int slotIndex) {
-        Phone phone = PhoneFactory.getPhone(slotIndex);
-        return phone == null ? TelephonyManager.CALL_STATE_IDLE :
-            PhoneConstantConversions.convertCallState(phone.getState());
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            Phone phone = PhoneFactory.getPhone(slotIndex);
+            return phone == null ? TelephonyManager.CALL_STATE_IDLE :
+                    PhoneConstantConversions.convertCallState(phone.getState());
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     @Override
     public int getDataState() {
-        Phone phone = getPhone(mSubscriptionController.getDefaultDataSubId());
-        if (phone != null) {
-            return PhoneConstantConversions.convertDataState(phone.getDataConnectionState());
-        } else {
-            return PhoneConstantConversions.convertDataState(PhoneConstants.DataState.DISCONNECTED);
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            Phone phone = getPhone(mSubscriptionController.getDefaultDataSubId());
+            if (phone != null) {
+                return PhoneConstantConversions.convertDataState(phone.getDataConnectionState());
+            } else {
+                return PhoneConstantConversions.convertDataState(
+                        PhoneConstants.DataState.DISCONNECTED);
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
     @Override
     public int getDataActivity() {
-        Phone phone = getPhone(mSubscriptionController.getDefaultDataSubId());
-        if (phone != null) {
-            return DefaultPhoneNotifier.convertDataActivityState(phone.getDataActivityState());
-        } else {
-            return TelephonyManager.DATA_ACTIVITY_NONE;
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            Phone phone = getPhone(mSubscriptionController.getDefaultDataSubId());
+            if (phone != null) {
+                return DefaultPhoneNotifier.convertDataActivityState(phone.getDataActivityState());
+            } else {
+                return TelephonyManager.DATA_ACTIVITY_NONE;
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
     @Override
     public Bundle getCellLocation(String callingPackage) {
-        mPhone.getContext().getSystemService(AppOpsManager.class)
+        mApp.getSystemService(AppOpsManager.class)
                 .checkPackage(Binder.getCallingUid(), callingPackage);
-        if (!LocationAccessPolicy.canAccessCellLocation(mPhone.getContext(),
-                callingPackage, Binder.getCallingUid(), Binder.getCallingPid(), true)) {
-            return null;
-        }
-
-        if (DBG_LOC) log("getCellLocation: is active user");
-        Bundle data = new Bundle();
-        Phone phone = getPhone(mSubscriptionController.getDefaultDataSubId());
-        if (phone == null) {
+        if (!LocationAccessPolicy.canAccessCellLocation(mApp, callingPackage,
+                Binder.getCallingUid(), Binder.getCallingPid(), true)) {
             return null;
         }
 
         WorkSource workSource = getWorkSource(Binder.getCallingUid());
-        phone.getCellLocation(workSource).fillInNotifierBundle(data);
-        return data;
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            if (DBG_LOC) log("getCellLocation: is active user");
+            Bundle data = new Bundle();
+            int subId = mSubscriptionController.getDefaultDataSubId();
+            CellLocation cl = (CellLocation) sendRequest(CMD_GET_CELL_LOCATION, workSource, subId);
+            cl.fillInNotifierBundle(data);
+            return data;
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     @Override
@@ -1727,21 +1855,20 @@
                     == getVoiceNetworkTypeForSubscriber(subId, mApp.getPackageName())) {
                 return "";
             }
+            Phone phone = PhoneFactory.getPhone(phoneId);
+            if (phone != null) {
+                ServiceStateTracker sst = phone.getServiceStateTracker();
+                if (sst != null) {
+                    LocaleTracker lt = sst.getLocaleTracker();
+                    if (lt != null) {
+                        return lt.getCurrentCountry();
+                    }
+                }
+            }
+            return "";
         } finally {
             Binder.restoreCallingIdentity(identity);
         }
-
-        Phone phone = PhoneFactory.getPhone(phoneId);
-        if (phone != null) {
-            ServiceStateTracker sst = phone.getServiceStateTracker();
-            if (sst != null) {
-                LocaleTracker lt = sst.getLocaleTracker();
-                if (lt != null) {
-                    return lt.getCurrentCountry();
-                }
-            }
-        }
-        return "";
     }
 
     @Override
@@ -1753,9 +1880,15 @@
     public void enableLocationUpdatesForSubscriber(int subId) {
         mApp.enforceCallingOrSelfPermission(
                 android.Manifest.permission.CONTROL_LOCATION_UPDATES, null);
-        final Phone phone = getPhone(subId);
-        if (phone != null) {
-            phone.enableLocationUpdates();
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            final Phone phone = getPhone(subId);
+            if (phone != null) {
+                phone.enableLocationUpdates();
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
@@ -1768,20 +1901,40 @@
     public void disableLocationUpdatesForSubscriber(int subId) {
         mApp.enforceCallingOrSelfPermission(
                 android.Manifest.permission.CONTROL_LOCATION_UPDATES, null);
-        final Phone phone = getPhone(subId);
-        if (phone != null) {
-            phone.disableLocationUpdates();
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            final Phone phone = getPhone(subId);
+            if (phone != null) {
+                phone.disableLocationUpdates();
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
+    /**
+     * Returns the target SDK version number for a given package name.
+     *
+     * @return target SDK if the package is found or INT_MAX.
+     */
+    private int getTargetSdk(String packageName) {
+        try {
+            final ApplicationInfo ai = mApp.getPackageManager().getApplicationInfo(
+                            packageName, 0);
+            if (ai != null) return ai.targetSdkVersion;
+        } catch (PackageManager.NameNotFoundException unexpected) {
+        }
+        return Integer.MAX_VALUE;
+    }
+
     @Override
     @SuppressWarnings("unchecked")
     public List<NeighboringCellInfo> getNeighboringCellInfo(String callingPackage) {
-        mPhone.getContext().getSystemService(AppOpsManager.class)
-                .checkPackage(Binder.getCallingUid(), callingPackage);
-        if (!LocationAccessPolicy.canAccessCellLocation(mPhone.getContext(),
-                callingPackage, Binder.getCallingUid(), Binder.getCallingPid(), true)) {
-            return null;
+        final int targetSdk = getTargetSdk(callingPackage);
+        if (targetSdk >= android.os.Build.VERSION_CODES.Q) {
+            throw new SecurityException(
+                    "getNeighboringCellInfo() is unavailable to callers targeting Q+ SDK levels.");
         }
 
         if (mAppOps.noteOp(AppOpsManager.OP_NEIGHBORING_CELLS, Binder.getCallingUid(),
@@ -1791,44 +1944,98 @@
 
         if (DBG_LOC) log("getNeighboringCellInfo: is active user");
 
-        ArrayList<NeighboringCellInfo> cells = null;
+        List<CellInfo> info = getAllCellInfo(callingPackage);
+        if (info == null) return null;
 
-        WorkSource workSource = getWorkSource(Binder.getCallingUid());
-        try {
-            cells = (ArrayList<NeighboringCellInfo>) sendRequest(
-                    CMD_HANDLE_NEIGHBORING_CELL, workSource,
-                    SubscriptionManager.INVALID_SUBSCRIPTION_ID);
-        } catch (RuntimeException e) {
-            Log.e(LOG_TAG, "getNeighboringCellInfo " + e);
+        List<NeighboringCellInfo> neighbors = new ArrayList<NeighboringCellInfo>();
+        for (CellInfo ci : info) {
+            if (ci instanceof CellInfoGsm) {
+                neighbors.add(new NeighboringCellInfo((CellInfoGsm) ci));
+            } else if (ci instanceof CellInfoWcdma) {
+                neighbors.add(new NeighboringCellInfo((CellInfoWcdma) ci));
+            }
         }
-        return cells;
+        return (neighbors.size()) > 0 ? neighbors : null;
     }
 
-
-    @Override
-    public List<CellInfo> getAllCellInfo(String callingPackage) {
-        mPhone.getContext().getSystemService(AppOpsManager.class)
-                .checkPackage(Binder.getCallingUid(), callingPackage);
-        if (!LocationAccessPolicy.canAccessCellLocation(mPhone.getContext(),
-                callingPackage, Binder.getCallingUid(), Binder.getCallingPid(), true)) {
-            return null;
-        }
-
-        if (DBG_LOC) log("getAllCellInfo: is active user");
-        WorkSource workSource = getWorkSource(Binder.getCallingUid());
+    private List<CellInfo> getCachedCellInfo() {
         List<CellInfo> cellInfos = new ArrayList<CellInfo>();
         for (Phone phone : PhoneFactory.getPhones()) {
-            final List<CellInfo> info = phone.getAllCellInfo(workSource);
+            List<CellInfo> info = phone.getAllCellInfo();
             if (info != null) cellInfos.addAll(info);
         }
         return cellInfos;
     }
 
     @Override
+    public List<CellInfo> getAllCellInfo(String callingPackage) {
+        mApp.getSystemService(AppOpsManager.class)
+                .checkPackage(Binder.getCallingUid(), callingPackage);
+        if (!LocationAccessPolicy.canAccessCellLocation(mApp,
+                callingPackage, Binder.getCallingUid(), Binder.getCallingPid(), true)) {
+            return null;
+        }
+
+        final int targetSdk = getTargetSdk(callingPackage);
+        if (targetSdk >= android.os.Build.VERSION_CODES.Q) {
+            return getCachedCellInfo();
+        }
+
+        if (DBG_LOC) log("getAllCellInfo: is active user");
+        WorkSource workSource = getWorkSource(Binder.getCallingUid());
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            List<CellInfo> cellInfos = new ArrayList<CellInfo>();
+            for (Phone phone : PhoneFactory.getPhones()) {
+                final List<CellInfo> info = (List<CellInfo>) sendRequest(
+                        CMD_GET_ALL_CELL_INFO, null, phone, workSource);
+                if (info != null) cellInfos.addAll(info);
+            }
+            return cellInfos;
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
+    @Override
+    public void requestCellInfoUpdate(int subId, ICellInfoCallback cb, String callingPackage) {
+        requestCellInfoUpdateInternal(
+                subId, cb, callingPackage, getWorkSource(Binder.getCallingUid()));
+    }
+
+    @Override
+    public void requestCellInfoUpdateWithWorkSource(
+            int subId, ICellInfoCallback cb, String callingPackage, WorkSource workSource) {
+        enforceModifyPermission();
+        requestCellInfoUpdateInternal(subId, cb, callingPackage, workSource);
+    }
+
+    private void requestCellInfoUpdateInternal(
+            int subId, ICellInfoCallback cb, String callingPackage, WorkSource workSource) {
+        mApp.getSystemService(AppOpsManager.class)
+                .checkPackage(Binder.getCallingUid(), callingPackage);
+        if (!LocationAccessPolicy.canAccessCellLocation(mApp, callingPackage,
+                Binder.getCallingUid(), Binder.getCallingPid(), true)) {
+            return;
+        }
+
+        final Phone phone = getPhone(subId);
+        if (phone == null) throw new IllegalArgumentException("Invalid Subscription Id: " + subId);
+
+        sendRequestAsync(CMD_REQUEST_CELL_INFO_UPDATE, cb, phone, workSource);
+    }
+
+    @Override
     public void setCellInfoListRate(int rateInMillis) {
         enforceModifyPermission();
         WorkSource workSource = getWorkSource(Binder.getCallingUid());
-        mPhone.setCellInfoListRate(rateInMillis, workSource);
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            getDefaultPhone().setCellInfoListRate(rateInMillis, workSource);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     @Override
@@ -1842,7 +2049,24 @@
                 mApp, subId, callingPackage, "getImeiForSlot")) {
             return null;
         }
-        return phone.getImei();
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            return phone.getImei();
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
+    @Override
+    public String getTypeAllocationCodeForSlot(int slotIndex) {
+        Phone phone = PhoneFactory.getPhone(slotIndex);
+        String tac = null;
+        if (phone != null) {
+            String imei = phone.getImei();
+            tac = imei == null ? null : imei.substring(0, TYPE_ALLOCATION_CODE_LENGTH);
+        }
+        return tac;
     }
 
     @Override
@@ -1851,12 +2075,30 @@
         if (phone == null) {
             return null;
         }
+
         int subId = phone.getSubId();
         if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
                 mApp, subId, callingPackage, "getMeidForSlot")) {
             return null;
         }
-        return phone.getMeid();
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            return phone.getMeid();
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
+    @Override
+    public String getManufacturerCodeForSlot(int slotIndex) {
+        Phone phone = PhoneFactory.getPhone(slotIndex);
+        String manufacturerCode = null;
+        if (phone != null) {
+            String meid = phone.getMeid();
+            manufacturerCode = meid == null ? null : meid.substring(0, MANUFACTURER_CODE_LENGTH);
+        }
+        return manufacturerCode;
     }
 
     @Override
@@ -1870,19 +2112,75 @@
                 mApp, subId, callingPackage, "getDeviceSoftwareVersionForSlot")) {
             return null;
         }
-        return phone.getDeviceSvn();
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            return phone.getDeviceSvn();
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     @Override
     public int getSubscriptionCarrierId(int subId) {
-        final Phone phone = getPhone(subId);
-        return phone == null ? TelephonyManager.UNKNOWN_CARRIER_ID : phone.getCarrierId();
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            final Phone phone = getPhone(subId);
+            return phone == null ? TelephonyManager.UNKNOWN_CARRIER_ID : phone.getCarrierId();
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     @Override
     public String getSubscriptionCarrierName(int subId) {
-        final Phone phone = getPhone(subId);
-        return phone == null ? null : phone.getCarrierName();
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            final Phone phone = getPhone(subId);
+            return phone == null ? null : phone.getCarrierName();
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
+    @Override
+    public int getSubscriptionPreciseCarrierId(int subId) {
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            final Phone phone = getPhone(subId);
+            return phone == null ? TelephonyManager.UNKNOWN_CARRIER_ID
+                    : phone.getPreciseCarrierId();
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
+    @Override
+    public String getSubscriptionPreciseCarrierName(int subId) {
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            final Phone phone = getPhone(subId);
+            return phone == null ? null : phone.getPreciseCarrierName();
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
+    @Override
+    public int getCarrierIdFromMccMnc(int slotIndex, String mccmnc, boolean isSubscriptionMccMnc) {
+        if (!isSubscriptionMccMnc) {
+            enforceReadPrivilegedPermission("getCarrierIdFromMccMnc");
+        }
+        final Phone phone = PhoneFactory.getPhone(slotIndex);
+        if (phone == null) {
+            return TelephonyManager.UNKNOWN_CARRIER_ID;
+        }
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            return CarrierResolver.getCarrierIdFromMccMnc(phone.getContext(), mccmnc);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     //
@@ -1908,8 +2206,7 @@
     }
 
     private void enforceConnectivityInternalPermission() {
-        mApp.enforceCallingOrSelfPermission(
-                android.Manifest.permission.CONNECTIVITY_INTERNAL,
+        mApp.enforceCallingOrSelfPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL,
                 "ConnectivityService");
     }
 
@@ -1940,11 +2237,16 @@
 
     @Override
     public int getActivePhoneTypeForSlot(int slotIndex) {
-        final Phone phone = PhoneFactory.getPhone(slotIndex);
-        if (phone == null) {
-            return PhoneConstants.PHONE_TYPE_NONE;
-        } else {
-            return phone.getPhoneType();
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            final Phone phone = PhoneFactory.getPhone(slotIndex);
+            if (phone == null) {
+                return PhoneConstants.PHONE_TYPE_NONE;
+            } else {
+                return phone.getPhoneType();
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
@@ -1962,11 +2264,17 @@
                 mApp, subId, callingPackage, "getCdmaEriIconIndexForSubscriber")) {
             return -1;
         }
-        final Phone phone = getPhone(subId);
-        if (phone != null) {
-            return phone.getCdmaEriIconIndex();
-        } else {
-            return -1;
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            final Phone phone = getPhone(subId);
+            if (phone != null) {
+                return phone.getCdmaEriIconIndex();
+            } else {
+                return -1;
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
@@ -1986,11 +2294,17 @@
                 mApp, subId, callingPackage, "getCdmaEriIconModeForSubscriber")) {
             return -1;
         }
-        final Phone phone = getPhone(subId);
-        if (phone != null) {
-            return phone.getCdmaEriIconMode();
-        } else {
-            return -1;
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            final Phone phone = getPhone(subId);
+            if (phone != null) {
+                return phone.getCdmaEriIconMode();
+            } else {
+                return -1;
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
@@ -2008,11 +2322,17 @@
                 mApp, subId, callingPackage, "getCdmaEriIconTextForSubscriber")) {
             return null;
         }
-        final Phone phone = getPhone(subId);
-        if (phone != null) {
-            return phone.getCdmaEriText();
-        } else {
-            return null;
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            final Phone phone = getPhone(subId);
+            if (phone != null) {
+                return phone.getCdmaEriText();
+            } else {
+                return null;
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
@@ -2023,11 +2343,18 @@
     public String getCdmaMdn(int subId) {
         TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
                 mApp, subId, "getCdmaMdn");
-        final Phone phone = getPhone(subId);
-        if (mPhone.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA && phone != null) {
-            return phone.getLine1Number();
-        } else {
-            return null;
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            final Phone phone = getPhone(subId);
+            if (phone != null && phone.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA) {
+                return phone.getLine1Number();
+            } else {
+                loge("getCdmaMdn: no phone found. Invalid subId: " + subId);
+                return null;
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
@@ -2038,19 +2365,54 @@
     public String getCdmaMin(int subId) {
         TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
                 mApp, subId, "getCdmaMin");
-        final Phone phone = getPhone(subId);
-        if (phone != null && phone.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA) {
-            return phone.getCdmaMin();
-        } else {
-            return null;
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            final Phone phone = getPhone(subId);
+            if (phone != null && phone.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA) {
+                return phone.getCdmaMin();
+            } else {
+                return null;
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
+    @Override
+    public void requestNumberVerification(PhoneNumberRange range, long timeoutMillis,
+            INumberVerificationCallback callback, String callingPackage) {
+        if (mApp.checkCallingOrSelfPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
+                != PERMISSION_GRANTED) {
+            throw new SecurityException("Caller must hold the MODIFY_PHONE_STATE permission");
+        }
+        mAppOps.checkPackage(Binder.getCallingUid(), callingPackage);
+
+        String authorizedPackage = NumberVerificationManager.getAuthorizedPackage(mApp);
+        if (!TextUtils.equals(callingPackage, authorizedPackage)) {
+            throw new SecurityException("Calling package must be configured in the device config");
+        }
+
+        if (range == null) {
+            throw new NullPointerException("Range must be non-null");
+        }
+
+        timeoutMillis = Math.min(timeoutMillis,
+                TelephonyManager.MAX_NUMBER_VERIFICATION_TIMEOUT_MILLIS);
+
+        NumberVerificationManager.getInstance().requestVerification(range, callback, timeoutMillis);
+    }
+
     /**
      * Returns true if CDMA provisioning needs to run.
      */
     public boolean needsOtaServiceProvisioning() {
-        return mPhone.needsOtaServiceProvisioning();
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            return getDefaultPhone().needsOtaServiceProvisioning();
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     /**
@@ -2059,23 +2421,35 @@
     @Override
     public boolean setVoiceMailNumber(int subId, String alphaTag, String number) {
         TelephonyPermissions.enforceCallingOrSelfCarrierPrivilege(subId, "setVoiceMailNumber");
-        Boolean success = (Boolean) sendRequest(CMD_SET_VOICEMAIL_NUMBER,
-                new Pair<String, String>(alphaTag, number), new Integer(subId));
-        return success;
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            Boolean success = (Boolean) sendRequest(CMD_SET_VOICEMAIL_NUMBER,
+                    new Pair<String, String>(alphaTag, number), new Integer(subId));
+            return success;
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     @Override
     public Bundle getVisualVoicemailSettings(String callingPackage, int subId) {
         mAppOps.checkPackage(Binder.getCallingUid(), callingPackage);
-        String systemDialer = TelecomManager.from(mPhone.getContext()).getSystemDialerPackage();
+        String systemDialer = TelecomManager.from(mApp).getSystemDialerPackage();
         if (!TextUtils.equals(callingPackage, systemDialer)) {
             throw new SecurityException("caller must be system dialer");
         }
-        PhoneAccountHandle phoneAccountHandle = PhoneAccountHandleConverter.fromSubId(subId);
-        if (phoneAccountHandle == null){
-            return null;
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            PhoneAccountHandle phoneAccountHandle = PhoneAccountHandleConverter.fromSubId(subId);
+            if (phoneAccountHandle == null) {
+                return null;
+            }
+            return VisualVoicemailSettingsUtil.dump(mApp, phoneAccountHandle);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
-        return VisualVoicemailSettingsUtil.dump(mPhone.getContext(), phoneAccountHandle);
     }
 
     @Override
@@ -2085,10 +2459,10 @@
                 mApp, subId, callingPackage, "getVisualVoicemailPackageName")) {
             return null;
         }
+
         final long identity = Binder.clearCallingIdentity();
         try {
-            return RemoteVvmTaskManager
-                    .getRemotePackage(mPhone.getContext(), subId).getPackageName();
+            return RemoteVvmTaskManager.getRemotePackage(mApp, subId).getPackageName();
         } finally {
             Binder.restoreCallingIdentity(identity);
         }
@@ -2098,31 +2472,54 @@
     public void enableVisualVoicemailSmsFilter(String callingPackage, int subId,
             VisualVoicemailSmsFilterSettings settings) {
         mAppOps.checkPackage(Binder.getCallingUid(), callingPackage);
-        VisualVoicemailSmsFilterConfig
-                .enableVisualVoicemailSmsFilter(mPhone.getContext(), callingPackage, subId,
-                        settings);
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            VisualVoicemailSmsFilterConfig.enableVisualVoicemailSmsFilter(
+                    mApp, callingPackage, subId, settings);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     @Override
     public void disableVisualVoicemailSmsFilter(String callingPackage, int subId) {
         mAppOps.checkPackage(Binder.getCallingUid(), callingPackage);
-        VisualVoicemailSmsFilterConfig
-                .disableVisualVoicemailSmsFilter(mPhone.getContext(), callingPackage, subId);
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            VisualVoicemailSmsFilterConfig.disableVisualVoicemailSmsFilter(
+                    mApp, callingPackage, subId);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     @Override
     public VisualVoicemailSmsFilterSettings getVisualVoicemailSmsFilterSettings(
             String callingPackage, int subId) {
         mAppOps.checkPackage(Binder.getCallingUid(), callingPackage);
-        return VisualVoicemailSmsFilterConfig
-                .getVisualVoicemailSmsFilterSettings(mPhone.getContext(), callingPackage, subId);
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            return VisualVoicemailSmsFilterConfig.getVisualVoicemailSmsFilterSettings(
+                    mApp, callingPackage, subId);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     @Override
     public VisualVoicemailSmsFilterSettings getActiveVisualVoicemailSmsFilterSettings(int subId) {
-        enforceReadPrivilegedPermission();
-        return VisualVoicemailSmsFilterConfig
-                .getActiveVisualVoicemailSmsFilterSettings(mPhone.getContext(), subId);
+        enforceReadPrivilegedPermission("getActiveVisualVoicemailSmsFilterSettings");
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            return VisualVoicemailSmsFilterConfig.getActiveVisualVoicemailSmsFilterSettings(
+                    mApp, subId);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     @Override
@@ -2154,11 +2551,17 @@
     public void setVoiceActivationState(int subId, int activationState) {
         TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
                 mApp, subId, "setVoiceActivationState");
-        final Phone phone = getPhone(subId);
-        if (phone != null) {
-            phone.setVoiceActivationState(activationState);
-        } else {
-            loge("setVoiceActivationState fails with invalid subId: " + subId);
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            final Phone phone = getPhone(subId);
+            if (phone != null) {
+                phone.setVoiceActivationState(activationState);
+            } else {
+                loge("setVoiceActivationState fails with invalid subId: " + subId);
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
@@ -2169,11 +2572,17 @@
     public void setDataActivationState(int subId, int activationState) {
         TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
                 mApp, subId, "setDataActivationState");
-        final Phone phone = getPhone(subId);
-        if (phone != null) {
-            phone.setDataActivationState(activationState);
-        } else {
-            loge("setVoiceActivationState fails with invalid subId: " + subId);
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            final Phone phone = getPhone(subId);
+            if (phone != null) {
+                phone.setDataActivationState(activationState);
+            } else {
+                loge("setVoiceActivationState fails with invalid subId: " + subId);
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
@@ -2182,12 +2591,18 @@
      */
     @Override
     public int getVoiceActivationState(int subId, String callingPackage) {
-        enforceReadPrivilegedPermission();
+        enforceReadPrivilegedPermission("getVoiceActivationState");
+
         final Phone phone = getPhone(subId);
-        if (phone != null) {
-            return phone.getVoiceActivationState();
-        } else {
-            return TelephonyManager.SIM_ACTIVATION_STATE_UNKNOWN;
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            if (phone != null) {
+                return phone.getVoiceActivationState();
+            } else {
+                return TelephonyManager.SIM_ACTIVATION_STATE_UNKNOWN;
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
@@ -2196,33 +2611,41 @@
      */
     @Override
     public int getDataActivationState(int subId, String callingPackage) {
-        enforceReadPrivilegedPermission();
-        final Phone phone = getPhone(subId);
-        if (phone != null) {
-            return phone.getDataActivationState();
-        } else {
-            return TelephonyManager.SIM_ACTIVATION_STATE_UNKNOWN;
-        }
-    }
+        enforceReadPrivilegedPermission("getDataActivationState");
 
-    /**
-     * Returns the unread count of voicemails
-     */
-    public int getVoiceMessageCount() {
-        return getVoiceMessageCountForSubscriber(getDefaultSubscription());
+        final Phone phone = getPhone(subId);
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            if (phone != null) {
+                return phone.getDataActivationState();
+            } else {
+                return TelephonyManager.SIM_ACTIVATION_STATE_UNKNOWN;
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     /**
      * Returns the unread count of voicemails for a subId
      */
     @Override
-    public int getVoiceMessageCountForSubscriber( int subId) {
-        final Phone phone = getPhone(subId);
-        if (phone != null) {
-            return phone.getVoiceMessageCount();
-        } else {
+    public int getVoiceMessageCountForSubscriber(int subId, String callingPackage) {
+        if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
+                mApp, subId, callingPackage, "getVoiceMessageCountForSubscriber")) {
             return 0;
         }
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            final Phone phone = getPhone(subId);
+            if (phone != null) {
+                return phone.getVoiceMessageCount();
+            } else {
+                return 0;
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     /**
@@ -2231,8 +2654,13 @@
      */
     @Override
     public boolean isConcurrentVoiceAndDataAllowed(int subId) {
-        final Phone phone = getPhone(subId);
-        return (phone == null ? false : phone.isConcurrentVoiceAndDataAllowed());
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            final Phone phone = getPhone(subId);
+            return (phone == null ? false : phone.isConcurrentVoiceAndDataAllowed());
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     /**
@@ -2242,13 +2670,21 @@
      */
     @Override
     public void sendDialerSpecialCode(String callingPackage, String inputCode) {
+        final Phone defaultPhone = getDefaultPhone();
         mAppOps.checkPackage(Binder.getCallingUid(), callingPackage);
-        String defaultDialer = TelecomManager.from(mPhone.getContext()).getDefaultDialerPackage();
+        String defaultDialer = TelecomManager.from(defaultPhone.getContext())
+                .getDefaultDialerPackage();
         if (!TextUtils.equals(callingPackage, defaultDialer)) {
             TelephonyPermissions.enforceCallingOrSelfCarrierPrivilege(
                     getDefaultSubscription(), "sendDialerSpecialCode");
         }
-        mPhone.sendDialerSpecialCode(inputCode);
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            defaultPhone.sendDialerSpecialCode(inputCode);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     /**
@@ -2259,14 +2695,404 @@
      */
     @Override
     public int getNetworkType() {
-        final Phone phone = getPhone(getDefaultSubscription());
-        if (phone != null) {
-            return phone.getServiceState().getDataNetworkType();
-        } else {
-            return TelephonyManager.NETWORK_TYPE_UNKNOWN;
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            final Phone phone = getPhone(getDefaultSubscription());
+            if (phone != null) {
+                return phone.getServiceState().getDataNetworkType();
+            } else {
+                return TelephonyManager.NETWORK_TYPE_UNKNOWN;
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
+    @Override
+    public int getNetworkSelectionMode(int subId) {
+        if (!isActiveSubscription(subId)) {
+            return TelephonyManager.NETWORK_SELECTION_MODE_UNKNOWN;
+        }
+
+        return (int) sendRequest(CMD_GET_NETWORK_SELECTION_MODE, null /* argument */, subId);
+    }
+
+    @Override
+    public void registerImsRegistrationCallback(int subId, IImsRegistrationCallback c)
+            throws RemoteException {
+        enforceReadPrivilegedPermission("registerImsRegistrationCallback");
+        // TODO: Refactor to remove ImsManager dependence and query through ImsPhone directly.
+        final long token = Binder.clearCallingIdentity();
+        try {
+            ImsManager.getInstance(mApp, getSlotIndexOrException(subId))
+                    .addRegistrationCallbackForSubscription(c, subId);
+        } finally {
+            Binder.restoreCallingIdentity(token);
+        }
+    }
+
+    @Override
+    public void unregisterImsRegistrationCallback(int subId, IImsRegistrationCallback c) {
+        enforceReadPrivilegedPermission("unregisterImsRegistrationCallback");
+        // TODO: Refactor to remove ImsManager dependence and query through ImsPhone directly.
+        Binder.withCleanCallingIdentity(() ->
+                ImsManager.getInstance(mApp, getSlotIndexOrException(subId))
+                        .removeRegistrationCallbackForSubscription(c, subId));
+    }
+
+    @Override
+    public void registerMmTelCapabilityCallback(int subId, IImsCapabilityCallback c)
+            throws RemoteException {
+        enforceReadPrivilegedPermission("registerMmTelCapabilityCallback");
+        // TODO: Refactor to remove ImsManager dependence and query through ImsPhone directly.
+        final long token = Binder.clearCallingIdentity();
+        try {
+            ImsManager.getInstance(mApp, getSlotIndexOrException(subId))
+                    .addCapabilitiesCallbackForSubscription(c, subId);
+        } finally {
+            Binder.restoreCallingIdentity(token);
+        }
+    }
+
+    @Override
+    public void unregisterMmTelCapabilityCallback(int subId, IImsCapabilityCallback c) {
+        enforceReadPrivilegedPermission("unregisterMmTelCapabilityCallback");
+        // TODO: Refactor to remove ImsManager dependence and query through ImsPhone directly.
+        Binder.withCleanCallingIdentity(() ->
+                ImsManager.getInstance(mApp, getSlotIndexOrException(subId))
+                        .removeCapabilitiesCallbackForSubscription(c, subId));
+    }
+
+    @Override
+    public boolean isCapable(int subId, int capability, int regTech) {
+        enforceReadPrivilegedPermission("isCapable");
+        // TODO: Refactor to remove ImsManager dependence and query through ImsPhone directly.
+        final long token = Binder.clearCallingIdentity();
+        try {
+            return ImsManager.getInstance(mApp,
+                    getSlotIndexOrException(subId)).queryMmTelCapability(capability, regTech);
+        } catch (ImsException e) {
+            Log.w(LOG_TAG, "IMS isCapable - service unavailable: " + e.getMessage());
+            return false;
+        } finally {
+            Binder.restoreCallingIdentity(token);
+        }
+    }
+
+    @Override
+    public boolean isAvailable(int subId, int capability, int regTech) {
+        enforceReadPrivilegedPermission("isAvailable");
+        final long token = Binder.clearCallingIdentity();
+        try {
+            Phone phone = getPhone(subId);
+            if (phone == null) return false;
+            return phone.isImsCapabilityAvailable(capability, regTech);
+        } finally {
+            Binder.restoreCallingIdentity(token);
+        }
+    }
+
+    @Override
+    public boolean isAdvancedCallingSettingEnabled(int subId) {
+        enforceReadPrivilegedPermission("enforceReadPrivilegedPermission");
+        // TODO: Refactor to remove ImsManager dependence and query through ImsPhone directly.
+        final long token = Binder.clearCallingIdentity();
+        try {
+            return ImsManager.getInstance(mApp,
+                    getSlotIndexOrException(subId)).isEnhanced4gLteModeSettingEnabledByUser();
+        } finally {
+            Binder.restoreCallingIdentity(token);
+        }
+    }
+
+    @Override
+    public void setAdvancedCallingSetting(int subId, boolean isEnabled) {
+        TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(mApp, subId,
+                "setAdvancedCallingSetting");
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            // TODO: Refactor to remove ImsManager dependence and query through ImsPhone directly.
+            ImsManager.getInstance(mApp,
+                    getSlotIndexOrException(subId)).setEnhanced4gLteModeSetting(isEnabled);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
+    @Override
+    public boolean isVtSettingEnabled(int subId) {
+        enforceReadPrivilegedPermission("isVtSettingEnabled");
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            // TODO: Refactor to remove ImsManager dependence and query through ImsPhone directly.
+            return ImsManager.getInstance(mApp,
+                    getSlotIndexOrException(subId)).isVtEnabledByUser();
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
+    @Override
+    public void setVtSetting(int subId, boolean isEnabled) {
+        TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(mApp, subId,
+                "setVtSetting");
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            // TODO: Refactor to remove ImsManager dependence and query through ImsPhone directly.
+            ImsManager.getInstance(mApp, getSlotIndexOrException(subId)).setVtSetting(isEnabled);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
+    @Override
+    public boolean isVoWiFiSettingEnabled(int subId) {
+        enforceReadPrivilegedPermission("isVoWiFiSettingEnabled");
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            // TODO: Refactor to remove ImsManager dependence and query through ImsPhone directly.
+            return ImsManager.getInstance(mApp,
+                    getSlotIndexOrException(subId)).isWfcEnabledByUser();
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
+    @Override
+    public void setVoWiFiSetting(int subId, boolean isEnabled) {
+        TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(mApp, subId,
+                "setVoWiFiSetting");
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            // TODO: Refactor to remove ImsManager dependence and query through ImsPhone directly.
+            ImsManager.getInstance(mApp, getSlotIndexOrException(subId)).setWfcSetting(isEnabled);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
+    @Override
+    public boolean isVoWiFiRoamingSettingEnabled(int subId) {
+        enforceReadPrivilegedPermission("isVoWiFiRoamingSettingEnabled");
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            // TODO: Refactor to remove ImsManager dependence and query through ImsPhone directly.
+            return ImsManager.getInstance(mApp,
+                    getSlotIndexOrException(subId)).isWfcRoamingEnabledByUser();
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
+    @Override
+    public void setVoWiFiRoamingSetting(int subId, boolean isEnabled) {
+        TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(mApp, subId,
+                "setVoWiFiRoamingSetting");
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            // TODO: Refactor to remove ImsManager dependence and query through ImsPhone directly.
+            ImsManager.getInstance(mApp,
+                    getSlotIndexOrException(subId)).setWfcRoamingSetting(isEnabled);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
+    @Override
+    public void setVoWiFiNonPersistent(int subId, boolean isCapable, int mode) {
+        TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(mApp, subId,
+                "setVoWiFiNonPersistent");
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            // TODO: Refactor to remove ImsManager dependence and query through ImsPhone directly.
+            ImsManager.getInstance(mApp,
+                    getSlotIndexOrException(subId)).setWfcNonPersistent(isCapable, mode);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
+    @Override
+    public int getVoWiFiModeSetting(int subId) {
+        enforceReadPrivilegedPermission("getVoWiFiModeSetting");
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            // TODO: Refactor to remove ImsManager dependence and query through ImsPhone directly.
+            return ImsManager.getInstance(mApp,
+                    getSlotIndexOrException(subId)).getWfcMode(false /*isRoaming*/);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
+    @Override
+    public void setVoWiFiModeSetting(int subId, int mode) {
+        TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(mApp, subId,
+                "setVoWiFiModeSetting");
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            // TODO: Refactor to remove ImsManager dependence and query through ImsPhone directly.
+            ImsManager.getInstance(mApp,
+                    getSlotIndexOrException(subId)).setWfcMode(mode, false /*isRoaming*/);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
+    @Override
+    public int getVoWiFiRoamingModeSetting(int subId) {
+        enforceReadPrivilegedPermission("getVoWiFiRoamingModeSetting");
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            // TODO: Refactor to remove ImsManager dependence and query through ImsPhone directly.
+            return ImsManager.getInstance(mApp,
+                    getSlotIndexOrException(subId)).getWfcMode(true /*isRoaming*/);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
+    @Override
+    public void setVoWiFiRoamingModeSetting(int subId, int mode) {
+        TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(mApp, subId,
+                "setVoWiFiRoamingModeSetting");
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            // TODO: Refactor to remove ImsManager dependence and query through ImsPhone directly.
+            ImsManager.getInstance(mApp,
+                    getSlotIndexOrException(subId)).setWfcMode(mode, true /*isRoaming*/);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
+    @Override
+    public void setRttCapabilitySetting(int subId, boolean isEnabled) {
+        TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(mApp, subId,
+                "setRttCapabilityEnabled");
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            // TODO: Refactor to remove ImsManager dependence and query through ImsPhone directly.
+            ImsManager.getInstance(mApp,
+                    getSlotIndexOrException(subId)).setRttEnabled(isEnabled);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
+    @Override
+    public boolean isTtyOverVolteEnabled(int subId) {
+        enforceReadPrivilegedPermission("isTtyOverVolteEnabled");
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            // TODO: Refactor to remove ImsManager dependence and query through ImsPhone directly.
+            return ImsManager.getInstance(mApp,
+                    getSlotIndexOrException(subId)).isTtyOnVoLteCapable();
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
+    @Override
+    public void registerImsProvisioningChangedCallback(int subId, IImsConfigCallback callback) {
+        enforceReadPrivilegedPermission("registerImsProvisioningChangedCallback");
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            // TODO: Refactor to remove ImsManager dependence and query through ImsPhone directly.
+            ImsManager.getInstance(mApp, getSlotIndexOrException(subId))
+                    .getConfigInterface().addConfigCallback(callback);
+        } catch (ImsException e) {
+            throw new IllegalArgumentException(e.getMessage());
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
+    @Override
+    public void unregisterImsProvisioningChangedCallback(int subId, IImsConfigCallback callback) {
+        enforceReadPrivilegedPermission("unregisterImsProvisioningChangedCallback");
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            // TODO: Refactor to remove ImsManager dependence and query through ImsPhone directly.
+            ImsManager.getInstance(mApp, getSlotIndexOrException(subId))
+                    .getConfigInterface().removeConfigCallback(callback);
+        } catch (ImsException e) {
+            throw new IllegalArgumentException(e.getMessage());
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
+    @Override
+    public int getImsProvisioningInt(int subId, int key) {
+        enforceReadPrivilegedPermission("getImsProvisioningInt");
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            // TODO: Refactor to remove ImsManager dependence and query through ImsPhone directly.
+            return ImsManager.getInstance(mApp,
+                    getSlotIndexOrException(subId)).getConfigInterface().getConfigInt(key);
+        } catch (ImsException e) {
+            throw new IllegalArgumentException(e.getMessage());
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
+    @Override
+    public String getImsProvisioningString(int subId, int key) {
+        enforceReadPrivilegedPermission("getImsProvisioningString");
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            // TODO: Refactor to remove ImsManager dependence and query through ImsPhone directly.
+            return ImsManager.getInstance(mApp,
+                    getSlotIndexOrException(subId)).getConfigInterface().getConfigString(key);
+        } catch (ImsException e) {
+            throw new IllegalArgumentException(e.getMessage());
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
+    @Override
+    public int setImsProvisioningInt(int subId, int key, int value) {
+        TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(mApp, subId,
+                "setImsProvisioningInt");
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            // TODO: Refactor to remove ImsManager dependence and query through ImsPhone directly.
+            return ImsManager.getInstance(mApp,
+                    getSlotIndexOrException(subId)).getConfigInterface().setConfig(key, value);
+        } catch (ImsException e) {
+            throw new IllegalArgumentException(e.getMessage());
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
+    @Override
+    public int setImsProvisioningString(int subId, int key, String value) {
+        TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(mApp, subId,
+                "setImsProvisioningString");
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            // TODO: Refactor to remove ImsManager dependence and query through ImsPhone directly.
+            return ImsManager.getInstance(mApp,
+                    getSlotIndexOrException(subId)).getConfigInterface().setConfig(key, value);
+        } catch (ImsException e) {
+            throw new IllegalArgumentException(e.getMessage());
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
+    private int getSlotIndexOrException(int subId) throws IllegalArgumentException {
+        int slotId = SubscriptionManager.getSlotIndex(subId);
+        if (!SubscriptionManager.isValidSlotIndex(slotId)) {
+            throw new IllegalArgumentException("Invalid Subscription Id.");
+        }
+        return slotId;
+    }
+
     /**
      * Returns the network type for a subId
      */
@@ -2277,11 +3103,16 @@
             return TelephonyManager.NETWORK_TYPE_UNKNOWN;
         }
 
-        final Phone phone = getPhone(subId);
-        if (phone != null) {
-            return phone.getServiceState().getDataNetworkType();
-        } else {
-            return TelephonyManager.NETWORK_TYPE_UNKNOWN;
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            final Phone phone = getPhone(subId);
+            if (phone != null) {
+                return phone.getServiceState().getDataNetworkType();
+            } else {
+                return TelephonyManager.NETWORK_TYPE_UNKNOWN;
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
@@ -2303,11 +3134,16 @@
             return TelephonyManager.NETWORK_TYPE_UNKNOWN;
         }
 
-        final Phone phone = getPhone(subId);
-        if (phone != null) {
-            return phone.getServiceState().getDataNetworkType();
-        } else {
-            return TelephonyManager.NETWORK_TYPE_UNKNOWN;
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            final Phone phone = getPhone(subId);
+            if (phone != null) {
+                return phone.getServiceState().getDataNetworkType();
+            } else {
+                return TelephonyManager.NETWORK_TYPE_UNKNOWN;
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
@@ -2321,11 +3157,16 @@
             return TelephonyManager.NETWORK_TYPE_UNKNOWN;
         }
 
-        final Phone phone = getPhone(subId);
-        if (phone != null) {
-            return phone.getServiceState().getVoiceNetworkType();
-        } else {
-            return TelephonyManager.NETWORK_TYPE_UNKNOWN;
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            final Phone phone = getPhone(subId);
+            if (phone != null) {
+                return phone.getServiceState().getVoiceNetworkType();
+            } else {
+                return TelephonyManager.NETWORK_TYPE_UNKNOWN;
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
@@ -2343,11 +3184,16 @@
      */
     @Override
     public boolean hasIccCardUsingSlotIndex(int slotIndex) {
-        final Phone phone = PhoneFactory.getPhone(slotIndex);
-        if (phone != null) {
-            return phone.getIccCard().hasIccCard();
-        } else {
-            return false;
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            final Phone phone = PhoneFactory.getPhone(slotIndex);
+            if (phone != null) {
+                return phone.getIccCard().hasIccCard();
+            } else {
+                return false;
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
@@ -2372,18 +3218,19 @@
             return PhoneConstants.LTE_ON_CDMA_UNKNOWN;
         }
 
-        final Phone phone = getPhone(subId);
-        if (phone == null) {
-            return PhoneConstants.LTE_ON_CDMA_UNKNOWN;
-        } else {
-            return phone.getLteOnCdmaMode();
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            final Phone phone = getPhone(subId);
+            if (phone == null) {
+                return PhoneConstants.LTE_ON_CDMA_UNKNOWN;
+            } else {
+                return phone.getLteOnCdmaMode();
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
-    public void setPhone(Phone phone) {
-        mPhone = phone;
-    }
-
     /**
      * {@hide}
      * Returns Default subId, 0 in the case of single standby.
@@ -2400,21 +3247,36 @@
         return mSubscriptionController.getDefaultVoiceSubId();
     }
 
+    private boolean isActiveSubscription(int subId) {
+        return mSubscriptionController.isActiveSubId(subId);
+    }
+
     /**
      * @see android.telephony.TelephonyManager.WifiCallingChoices
      */
     public int getWhenToMakeWifiCalls() {
-        return Settings.System.getInt(mPhone.getContext().getContentResolver(),
-                Settings.System.WHEN_TO_MAKE_WIFI_CALLS, getWhenToMakeWifiCallsDefaultPreference());
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            return Settings.System.getInt(mApp.getContentResolver(),
+                    Settings.System.WHEN_TO_MAKE_WIFI_CALLS,
+                    getWhenToMakeWifiCallsDefaultPreference());
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     /**
      * @see android.telephony.TelephonyManager.WifiCallingChoices
      */
     public void setWhenToMakeWifiCalls(int preference) {
-        if (DBG) log("setWhenToMakeWifiCallsStr, storing setting = " + preference);
-        Settings.System.putInt(mPhone.getContext().getContentResolver(),
-                Settings.System.WHEN_TO_MAKE_WIFI_CALLS, preference);
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            if (DBG) log("setWhenToMakeWifiCallsStr, storing setting = " + preference);
+            Settings.System.putInt(mApp.getContentResolver(),
+                    Settings.System.WHEN_TO_MAKE_WIFI_CALLS, preference);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     private static int getWhenToMakeWifiCallsDefaultPreference() {
@@ -2427,24 +3289,32 @@
             int subId, String callingPackage, String aid, int p2) {
         TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
                 mApp, subId, "iccOpenLogicalChannel");
+        mAppOps.checkPackage(Binder.getCallingUid(), callingPackage);
 
-        if (TextUtils.equals(ISDR_AID, aid)) {
-            // Only allows LPA to open logical channel to ISD-R.
-            mAppOps.checkPackage(Binder.getCallingUid(), callingPackage);
-            ComponentInfo bestComponent =
-                    EuiccConnector.findBestComponent(mPhone.getContext().getPackageManager());
-            if (bestComponent == null
-                    || !TextUtils.equals(callingPackage, bestComponent.packageName)) {
-                loge("The calling package is not allowed to access ISD-R.");
-                throw new SecurityException("The calling package is not allowed to access ISD-R.");
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            if (TextUtils.equals(ISDR_AID, aid)) {
+                // Only allows LPA to open logical channel to ISD-R.
+                ComponentInfo bestComponent = EuiccConnector.findBestComponent(getDefaultPhone()
+                        .getContext().getPackageManager());
+                if (bestComponent == null
+                        || !TextUtils.equals(callingPackage, bestComponent.packageName)) {
+                    loge("The calling package is not allowed to access ISD-R.");
+                    throw new SecurityException(
+                            "The calling package is not allowed to access ISD-R.");
+                }
             }
-        }
 
-        if (DBG) log("iccOpenLogicalChannel: subId=" + subId + " aid=" + aid + " p2=" + p2);
-        IccOpenLogicalChannelResponse response = (IccOpenLogicalChannelResponse)sendRequest(
-                CMD_OPEN_CHANNEL, new Pair<String, Integer>(aid, p2), subId);
-        if (DBG) log("iccOpenLogicalChannel: " + response);
-        return response;
+            if (DBG) {
+                log("iccOpenLogicalChannel: subId=" + subId + " aid=" + aid + " p2=" + p2);
+            }
+            IccOpenLogicalChannelResponse response = (IccOpenLogicalChannelResponse) sendRequest(
+                    CMD_OPEN_CHANNEL, new Pair<String, Integer>(aid, p2), subId);
+            if (DBG) log("iccOpenLogicalChannel: " + response);
+            return response;
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     @Override
@@ -2452,13 +3322,18 @@
         TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
                 mApp, subId, "iccCloseLogicalChannel");
 
-        if (DBG) log("iccCloseLogicalChannel: subId=" + subId + " chnl=" + channel);
-        if (channel < 0) {
-          return false;
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            if (DBG) log("iccCloseLogicalChannel: subId=" + subId + " chnl=" + channel);
+            if (channel < 0) {
+                return false;
+            }
+            Boolean success = (Boolean) sendRequest(CMD_CLOSE_CHANNEL, channel, subId);
+            if (DBG) log("iccCloseLogicalChannel: " + success);
+            return success;
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
-        Boolean success = (Boolean)sendRequest(CMD_CLOSE_CHANNEL, channel, subId);
-        if (DBG) log("iccCloseLogicalChannel: " + success);
-        return success;
     }
 
     @Override
@@ -2467,27 +3342,32 @@
         TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
                 mApp, subId, "iccTransmitApduLogicalChannel");
 
-        if (DBG) {
-            log("iccTransmitApduLogicalChannel: subId=" + subId + " chnl=" + channel +
-                    " cla=" + cla + " cmd=" + command + " p1=" + p1 + " p2=" + p2 + " p3=" + p3 +
-                    " data=" + data);
-        }
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            if (DBG) {
+                log("iccTransmitApduLogicalChannel: subId=" + subId + " chnl=" + channel
+                        + " cla=" + cla + " cmd=" + command + " p1=" + p1 + " p2=" + p2 + " p3="
+                        + p3 + " data=" + data);
+            }
 
-        if (channel < 0) {
-            return "";
-        }
+            if (channel < 0) {
+                return "";
+            }
 
-        IccIoResult response = (IccIoResult)sendRequest(CMD_TRANSMIT_APDU_LOGICAL_CHANNEL,
-                new IccAPDUArgument(channel, cla, command, p1, p2, p3, data), subId);
-        if (DBG) log("iccTransmitApduLogicalChannel: " + response);
+            IccIoResult response = (IccIoResult) sendRequest(CMD_TRANSMIT_APDU_LOGICAL_CHANNEL,
+                    new IccAPDUArgument(channel, cla, command, p1, p2, p3, data), subId);
+            if (DBG) log("iccTransmitApduLogicalChannel: " + response);
 
-        // Append the returned status code to the end of the response payload.
-        String s = Integer.toHexString(
-                (response.sw1 << 8) + response.sw2 + 0x10000).substring(1);
-        if (response.payload != null) {
-            s = IccUtils.bytesToHexString(response.payload) + s;
+            // Append the returned status code to the end of the response payload.
+            String s = Integer.toHexString(
+                    (response.sw1 << 8) + response.sw2 + 0x10000).substring(1);
+            if (response.payload != null) {
+                s = IccUtils.bytesToHexString(response.payload) + s;
+            }
+            return s;
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
-        return s;
     }
 
     @Override
@@ -2495,36 +3375,42 @@
             int command, int p1, int p2, int p3, String data) {
         TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
                 mApp, subId, "iccTransmitApduBasicChannel");
+        mAppOps.checkPackage(Binder.getCallingUid(), callingPackage);
 
-        if (command == SELECT_COMMAND && p1 == SELECT_P1 && p2 == SELECT_P2 && p3 == SELECT_P3
-                && TextUtils.equals(ISDR_AID, data)) {
-            // Only allows LPA to select ISD-R.
-            mAppOps.checkPackage(Binder.getCallingUid(), callingPackage);
-            ComponentInfo bestComponent =
-                    EuiccConnector.findBestComponent(mPhone.getContext().getPackageManager());
-            if (bestComponent == null
-                    || !TextUtils.equals(callingPackage, bestComponent.packageName)) {
-                loge("The calling package is not allowed to select ISD-R.");
-                throw new SecurityException("The calling package is not allowed to select ISD-R.");
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            if (command == SELECT_COMMAND && p1 == SELECT_P1 && p2 == SELECT_P2 && p3 == SELECT_P3
+                    && TextUtils.equals(ISDR_AID, data)) {
+                // Only allows LPA to select ISD-R.
+                ComponentInfo bestComponent = EuiccConnector.findBestComponent(getDefaultPhone()
+                        .getContext().getPackageManager());
+                if (bestComponent == null
+                        || !TextUtils.equals(callingPackage, bestComponent.packageName)) {
+                    loge("The calling package is not allowed to select ISD-R.");
+                    throw new SecurityException(
+                            "The calling package is not allowed to select ISD-R.");
+                }
             }
-        }
 
-        if (DBG) {
-            log("iccTransmitApduBasicChannel: subId=" + subId + " cla=" + cla + " cmd=" + command
-                    + " p1=" + p1 + " p2=" + p2 + " p3=" + p3 + " data=" + data);
-        }
+            if (DBG) {
+                log("iccTransmitApduBasicChannel: subId=" + subId + " cla=" + cla + " cmd="
+                        + command + " p1=" + p1 + " p2=" + p2 + " p3=" + p3 + " data=" + data);
+            }
 
-        IccIoResult response = (IccIoResult)sendRequest(CMD_TRANSMIT_APDU_BASIC_CHANNEL,
-                new IccAPDUArgument(0, cla, command, p1, p2, p3, data), subId);
-        if (DBG) log("iccTransmitApduBasicChannel: " + response);
+            IccIoResult response = (IccIoResult) sendRequest(CMD_TRANSMIT_APDU_BASIC_CHANNEL,
+                    new IccAPDUArgument(0, cla, command, p1, p2, p3, data), subId);
+            if (DBG) log("iccTransmitApduBasicChannel: " + response);
 
-        // Append the returned status code to the end of the response payload.
-        String s = Integer.toHexString(
-                (response.sw1 << 8) + response.sw2 + 0x10000).substring(1);
-        if (response.payload != null) {
-            s = IccUtils.bytesToHexString(response.payload) + s;
+            // Append the returned status code to the end of the response payload.
+            String s = Integer.toHexString(
+                    (response.sw1 << 8) + response.sw2 + 0x10000).substring(1);
+            if (response.payload != null) {
+                s = IccUtils.bytesToHexString(response.payload) + s;
+            }
+            return s;
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
-        return s;
     }
 
     @Override
@@ -2533,33 +3419,38 @@
         TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
                 mApp, subId, "iccExchangeSimIO");
 
-        if (DBG) {
-            log("Exchange SIM_IO " + subId + ":" + fileID + ":" + command + " " +
-                p1 + " " + p2 + " " + p3 + ":" + filePath);
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            if (DBG) {
+                log("Exchange SIM_IO " + subId + ":" + fileID + ":" + command + " "
+                        + p1 + " " + p2 + " " + p3 + ":" + filePath);
+            }
+
+            IccIoResult response =
+                    (IccIoResult) sendRequest(CMD_EXCHANGE_SIM_IO,
+                            new IccAPDUArgument(-1, fileID, command, p1, p2, p3, filePath),
+                            subId);
+
+            if (DBG) {
+                log("Exchange SIM_IO [R]" + response);
+            }
+
+            byte[] result = null;
+            int length = 2;
+            if (response.payload != null) {
+                length = 2 + response.payload.length;
+                result = new byte[length];
+                System.arraycopy(response.payload, 0, result, 0, response.payload.length);
+            } else {
+                result = new byte[length];
+            }
+
+            result[length - 1] = (byte) response.sw2;
+            result[length - 2] = (byte) response.sw1;
+            return result;
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
-
-        IccIoResult response =
-            (IccIoResult)sendRequest(CMD_EXCHANGE_SIM_IO,
-                    new IccAPDUArgument(-1, fileID, command, p1, p2, p3, filePath),
-                    subId);
-
-        if (DBG) {
-          log("Exchange SIM_IO [R]" + response);
-        }
-
-        byte[] result = null;
-        int length = 2;
-        if (response.payload != null) {
-            length = 2 + response.payload.length;
-            result = new byte[length];
-            System.arraycopy(response.payload, 0, result, 0, response.payload.length);
-        } else {
-            result = new byte[length];
-        }
-
-        result[length - 1] = (byte) response.sw2;
-        result[length - 2] = (byte) response.sw1;
-        return result;
     }
 
     /**
@@ -2571,17 +3462,25 @@
                 mApp, subId, callingPackage, "getForbiddenPlmns")) {
             return null;
         }
-        if (appType != TelephonyManager.APPTYPE_USIM && appType != TelephonyManager.APPTYPE_SIM) {
-            loge("getForbiddenPlmnList(): App Type must be USIM or SIM");
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            if (appType != TelephonyManager.APPTYPE_USIM
+                    && appType != TelephonyManager.APPTYPE_SIM) {
+                loge("getForbiddenPlmnList(): App Type must be USIM or SIM");
+                return null;
+            }
+            Object response = sendRequest(
+                    CMD_GET_FORBIDDEN_PLMNS, new Integer(appType), subId);
+            if (response instanceof String[]) {
+                return (String[]) response;
+            }
+            // Response is an Exception of some kind,
+            // which is signalled to the user as a NULL retval
             return null;
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
-        Object response = sendRequest(
-            CMD_GET_FORBIDDEN_PLMNS, new Integer(appType), subId);
-        if (response instanceof String[]) {
-            return (String[]) response;
-        }
-        // Response is an Exception of some kind, which is signalled to the user as a NULL retval
-        return null;
     }
 
     @Override
@@ -2589,16 +3488,21 @@
         TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
                 mApp, subId, "sendEnvelopeWithStatus");
 
-        IccIoResult response = (IccIoResult)sendRequest(CMD_SEND_ENVELOPE, content, subId);
-        if (response.payload == null) {
-          return "";
-        }
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            IccIoResult response = (IccIoResult) sendRequest(CMD_SEND_ENVELOPE, content, subId);
+            if (response.payload == null) {
+                return "";
+            }
 
-        // Append the returned status code to the end of the response payload.
-        String s = Integer.toHexString(
-                (response.sw1 << 8) + response.sw2 + 0x10000).substring(1);
-        s = IccUtils.bytesToHexString(response.payload) + s;
-        return s;
+            // Append the returned status code to the end of the response payload.
+            String s = Integer.toHexString(
+                    (response.sw1 << 8) + response.sw2 + 0x10000).substring(1);
+            s = IccUtils.bytesToHexString(response.payload) + s;
+            return s;
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     /**
@@ -2610,12 +3514,19 @@
      */
     @Override
     public String nvReadItem(int itemID) {
+        WorkSource workSource = getWorkSource(Binder.getCallingUid());
         TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
                 mApp, getDefaultSubscription(), "nvReadItem");
-        if (DBG) log("nvReadItem: item " + itemID);
-        String value = (String) sendRequest(CMD_NV_READ_ITEM, itemID);
-        if (DBG) log("nvReadItem: item " + itemID + " is \"" + value + '"');
-        return value;
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            if (DBG) log("nvReadItem: item " + itemID);
+            String value = (String) sendRequest(CMD_NV_READ_ITEM, itemID, workSource);
+            if (DBG) log("nvReadItem: item " + itemID + " is \"" + value + '"');
+            return value;
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     /**
@@ -2628,13 +3539,20 @@
      */
     @Override
     public boolean nvWriteItem(int itemID, String itemValue) {
+        WorkSource workSource = getWorkSource(Binder.getCallingUid());
         TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
                 mApp, getDefaultSubscription(), "nvWriteItem");
-        if (DBG) log("nvWriteItem: item " + itemID + " value \"" + itemValue + '"');
-        Boolean success = (Boolean) sendRequest(CMD_NV_WRITE_ITEM,
-                new Pair<Integer, String>(itemID, itemValue));
-        if (DBG) log("nvWriteItem: item " + itemID + ' ' + (success ? "ok" : "fail"));
-        return success;
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            if (DBG) log("nvWriteItem: item " + itemID + " value \"" + itemValue + '"');
+            Boolean success = (Boolean) sendRequest(CMD_NV_WRITE_ITEM,
+                    new Pair<Integer, String>(itemID, itemValue), workSource);
+            if (DBG) log("nvWriteItem: item " + itemID + ' ' + (success ? "ok" : "fail"));
+            return success;
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     /**
@@ -2648,46 +3566,84 @@
     public boolean nvWriteCdmaPrl(byte[] preferredRoamingList) {
         TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
                 mApp, getDefaultSubscription(), "nvWriteCdmaPrl");
-        if (DBG) log("nvWriteCdmaPrl: value: " + HexDump.toHexString(preferredRoamingList));
-        Boolean success = (Boolean) sendRequest(CMD_NV_WRITE_CDMA_PRL, preferredRoamingList);
-        if (DBG) log("nvWriteCdmaPrl: " + (success ? "ok" : "fail"));
-        return success;
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            if (DBG) log("nvWriteCdmaPrl: value: " + HexDump.toHexString(preferredRoamingList));
+            Boolean success = (Boolean) sendRequest(CMD_NV_WRITE_CDMA_PRL, preferredRoamingList);
+            if (DBG) log("nvWriteCdmaPrl: " + (success ? "ok" : "fail"));
+            return success;
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     /**
-     * Perform the specified type of NV config reset.
+     * Rollback modem configurations to factory default except some config which are in whitelist.
      * Used for device configuration by some CDMA operators.
      *
-     * @param resetType the type of reset to perform (1 == factory reset; 2 == NV-only reset)
+     * @param slotIndex - device slot.
+     *
      * @return true on success; false on any failure
      */
     @Override
-    public boolean nvResetConfig(int resetType) {
-        TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
-                mApp, getDefaultSubscription(), "nvResetConfig");
-        if (DBG) log("nvResetConfig: type " + resetType);
-        Boolean success = (Boolean) sendRequest(CMD_NV_RESET_CONFIG, resetType);
-        if (DBG) log("nvResetConfig: type " + resetType + ' ' + (success ? "ok" : "fail"));
-        return success;
+    public boolean resetModemConfig(int slotIndex) {
+        Phone phone = PhoneFactory.getPhone(slotIndex);
+        if (phone != null) {
+            TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
+                    mApp, phone.getSubId(), "resetModemConfig");
+
+            final long identity = Binder.clearCallingIdentity();
+            try {
+                Boolean success = (Boolean) sendRequest(CMD_RESET_MODEM_CONFIG, null);
+                if (DBG) log("resetModemConfig:" + ' ' + (success ? "ok" : "fail"));
+                return success;
+            } finally {
+                Binder.restoreCallingIdentity(identity);
+            }
+        }
+        return false;
     }
 
     /**
-     * {@hide}
-     * Returns Default sim, 0 in the case of single standby.
+     * Generate a radio modem reset. Used for device configuration by some CDMA operators.
+     *
+     * @param slotIndex - device slot.
+     *
+     * @return true on success; false on any failure
      */
-    public int getDefaultSim() {
-        //TODO Need to get it from Telephony Devcontroller
-        return 0;
+    @Override
+    public boolean rebootModem(int slotIndex) {
+        Phone phone = PhoneFactory.getPhone(slotIndex);
+        if (phone != null) {
+            TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
+                    mApp, phone.getSubId(), "rebootModem");
+
+            final long identity = Binder.clearCallingIdentity();
+            try {
+                Boolean success = (Boolean) sendRequest(CMD_MODEM_REBOOT, null);
+                if (DBG) log("rebootModem:" + ' ' + (success ? "ok" : "fail"));
+                return success;
+            } finally {
+                Binder.restoreCallingIdentity(identity);
+            }
+        }
+        return false;
     }
 
     public String[] getPcscfAddress(String apnType, String callingPackage) {
+        final Phone defaultPhone = getDefaultPhone();
         if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
-                mApp, mPhone.getSubId(), callingPackage, "getPcscfAddress")) {
+                mApp, defaultPhone.getSubId(), callingPackage, "getPcscfAddress")) {
             return new String[0];
         }
 
-
-        return mPhone.getPcscfAddress(apnType);
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            return defaultPhone.getPcscfAddress(apnType);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     /**
@@ -2696,7 +3652,13 @@
      */
     public void enableIms(int slotId) {
         enforceModifyPermission();
-        PhoneFactory.getImsResolver().enableIms(slotId);
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            PhoneFactory.getImsResolver().enableIms(slotId);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     /**
@@ -2705,7 +3667,13 @@
      */
     public void disableIms(int slotId) {
         enforceModifyPermission();
-        PhoneFactory.getImsResolver().disableIms(slotId);
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            PhoneFactory.getImsResolver().disableIms(slotId);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     /**
@@ -2716,7 +3684,13 @@
     public IImsMmTelFeature getMmTelFeatureAndListen(int slotId,
             IImsServiceFeatureCallback callback) {
         enforceModifyPermission();
-        return PhoneFactory.getImsResolver().getMmTelFeatureAndListen(slotId, callback);
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            return PhoneFactory.getImsResolver().getMmTelFeatureAndListen(slotId, callback);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     /**
@@ -2727,7 +3701,13 @@
      */
     public IImsRcsFeature getRcsFeatureAndListen(int slotId, IImsServiceFeatureCallback callback) {
         enforceModifyPermission();
-        return PhoneFactory.getImsResolver().getRcsFeatureAndListen(slotId, callback);
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            return PhoneFactory.getImsResolver().getRcsFeatureAndListen(slotId, callback);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     /**
@@ -2736,7 +3716,13 @@
      */
     public IImsRegistration getImsRegistration(int slotId, int feature) throws RemoteException {
         enforceModifyPermission();
-        return PhoneFactory.getImsResolver().getImsRegistration(slotId, feature);
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            return PhoneFactory.getImsResolver().getImsRegistration(slotId, feature);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     /**
@@ -2745,7 +3731,13 @@
      */
     public IImsConfig getImsConfig(int slotId, int feature) throws RemoteException {
         enforceModifyPermission();
-        return PhoneFactory.getImsResolver().getImsConfig(slotId, feature);
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            return PhoneFactory.getImsResolver().getImsConfig(slotId, feature);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     /**
@@ -2765,8 +3757,13 @@
                 (subIds != null ? subIds[0] : SubscriptionManager.INVALID_SUBSCRIPTION_ID),
                 "setImsService");
 
-        return PhoneFactory.getImsResolver().overrideImsServiceConfiguration(slotId,
-                isCarrierImsService, packageName);
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            return PhoneFactory.getImsResolver().overrideImsServiceConfiguration(slotId,
+                    isCarrierImsService, packageName);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     /**
@@ -2783,13 +3780,24 @@
                 (subIds != null ? subIds[0] : SubscriptionManager.INVALID_SUBSCRIPTION_ID),
                 "getImsService");
 
-        return PhoneFactory.getImsResolver().getImsServiceConfiguration(slotId,
-                isCarrierImsService);
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            return PhoneFactory.getImsResolver().getImsServiceConfiguration(slotId,
+                    isCarrierImsService);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     public void setImsRegistrationState(boolean registered) {
         enforceModifyPermission();
-        mPhone.setImsRegistrationState(registered);
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            getDefaultPhone().setImsRegistrationState(registered);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     /**
@@ -2800,26 +3808,53 @@
     public void setNetworkSelectionModeAutomatic(int subId) {
         TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
                 mApp, subId, "setNetworkSelectionModeAutomatic");
-        if (DBG) log("setNetworkSelectionModeAutomatic: subId " + subId);
-        sendRequest(CMD_SET_NETWORK_SELECTION_MODE_AUTOMATIC, null, subId);
+
+        if (!isActiveSubscription(subId)) {
+            return;
+        }
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            if (DBG) log("setNetworkSelectionModeAutomatic: subId " + subId);
+            sendRequest(CMD_SET_NETWORK_SELECTION_MODE_AUTOMATIC, null, subId);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
-    /**
-     * Set the network selection mode to manual with the selected carrier.
+   /**
+     * Ask the radio to connect to the input network and change selection mode to manual.
+     *
+     * @param subId the id of the subscription.
+     * @param operatorInfo the operator information, included the PLMN, long name and short name of
+     * the operator to attach to.
+     * @param persistSelection whether the selection will persist until reboot. If true, only allows
+     * attaching to the selected PLMN until reboot; otherwise, attach to the chosen PLMN and resume
+     * normal network selection next time.
+     * @return {@code true} on success; {@code true} on any failure.
      */
     @Override
-    public boolean setNetworkSelectionModeManual(int subId, String operatorNumeric,
-            boolean persistSelection) {
+    public boolean setNetworkSelectionModeManual(
+            int subId, OperatorInfo operatorInfo, boolean persistSelection) {
         TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
                 mApp, subId, "setNetworkSelectionModeManual");
-        OperatorInfo operator = new OperatorInfo(
-                /* operatorAlphaLong */ "",
-                /* operatorAlphaShort */ "",
-                operatorNumeric);
-        if (DBG) log("setNetworkSelectionModeManual: subId:" + subId + " operator:" + operator);
-        ManualNetworkSelectionArgument arg = new ManualNetworkSelectionArgument(operator,
-                persistSelection);
-        return (Boolean) sendRequest(CMD_SET_NETWORK_SELECTION_MODE_MANUAL, arg, subId);
+
+        if (!isActiveSubscription(subId)) {
+            return false;
+        }
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            ManualNetworkSelectionArgument arg = new ManualNetworkSelectionArgument(operatorInfo,
+                    persistSelection);
+            if (DBG) {
+                log("setNetworkSelectionModeManual: subId: " + subId
+                        + " operator: " + operatorInfo);
+            }
+            return (Boolean) sendRequest(CMD_SET_NETWORK_SELECTION_MODE_MANUAL, arg, subId);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     /**
@@ -2829,10 +3864,15 @@
     public CellNetworkScanResult getCellNetworkScanResults(int subId) {
         TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
                 mApp, subId, "getCellNetworkScanResults");
-        if (DBG) log("getCellNetworkScanResults: subId " + subId);
-        CellNetworkScanResult result = (CellNetworkScanResult) sendRequest(
-                CMD_PERFORM_NETWORK_SCAN, null, subId);
-        return result;
+
+        long identity = Binder.clearCallingIdentity();
+        try {
+            if (DBG) log("getCellNetworkScanResults: subId " + subId);
+            return (CellNetworkScanResult) sendRequest(
+                    CMD_PERFORM_NETWORK_SCAN, null, subId);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     /**
@@ -2849,8 +3889,14 @@
             IBinder binder) {
         TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
                 mApp, subId, "requestNetworkScan");
-        return mNetworkScanRequestTracker.startNetworkScan(
-                request, messenger, binder, getPhone(subId));
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            return mNetworkScanRequestTracker.startNetworkScan(
+                    request, messenger, binder, getPhone(subId));
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     /**
@@ -2863,7 +3909,13 @@
     public void stopNetworkScan(int subId, int scanId) {
         TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
                 mApp, subId, "stopNetworkScan");
-        mNetworkScanRequestTracker.stopNetworkScan(scanId);
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            mNetworkScanRequestTracker.stopNetworkScan(scanId);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     /**
@@ -2874,12 +3926,19 @@
      */
     @Override
     public int getCalculatedPreferredNetworkType(String callingPackage) {
-        if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
-                mApp, mPhone.getSubId(), callingPackage, "getCalculatedPreferredNetworkType")) {
+        final Phone defaultPhone = getDefaultPhone();
+        if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(mApp, defaultPhone.getSubId(),
+                callingPackage, "getCalculatedPreferredNetworkType")) {
             return RILConstants.PREFERRED_NETWORK_MODE;
         }
 
-        return PhoneFactory.calculatePreferredNetworkType(mPhone.getContext(), 0); // wink FIXME: need to get SubId from somewhere.
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            // FIXME: need to get SubId from somewhere.
+            return PhoneFactory.calculatePreferredNetworkType(defaultPhone.getContext(), 0);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     /**
@@ -2892,11 +3951,17 @@
     public int getPreferredNetworkType(int subId) {
         TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
                 mApp, subId, "getPreferredNetworkType");
-        if (DBG) log("getPreferredNetworkType");
-        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;
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            if (DBG) log("getPreferredNetworkType");
+            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;
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     /**
@@ -2910,19 +3975,26 @@
     public boolean setPreferredNetworkType(int subId, int networkType) {
         TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
                 mApp, subId, "setPreferredNetworkType");
-        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 + subId, networkType);
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            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(mApp.getContentResolver(),
+                        Settings.Global.PREFERRED_NETWORK_MODE + subId, networkType);
+            }
+            return success;
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
-        return success;
     }
 
     /**
      * Check TETHER_DUN_REQUIRED and TETHER_DUN_APN settings, net.tethering.noprovisioning
-     * SystemProperty, and config_tether_apndata to decide whether DUN APN is required for
+     * SystemProperty to decide whether DUN APN is required for
      * tethering.
      *
      * @return 0: Not required. 1: required. 2: Not set.
@@ -2931,14 +4003,20 @@
     @Override
     public int getTetherApnRequired() {
         enforceModifyPermission();
-        int dunRequired = Settings.Global.getInt(mPhone.getContext().getContentResolver(),
-                Settings.Global.TETHER_DUN_REQUIRED, 2);
-        // If not set, check net.tethering.noprovisioning, TETHER_DUN_APN setting and
-        // config_tether_apndata.
-        if (dunRequired == 2 && mPhone.hasMatchedTetherApnSetting()) {
-            dunRequired = 1;
+
+        final long identity = Binder.clearCallingIdentity();
+        final Phone defaultPhone = getDefaultPhone();
+        try {
+            int dunRequired = Settings.Global.getInt(defaultPhone.getContext().getContentResolver(),
+                    Settings.Global.TETHER_DUN_REQUIRED, 2);
+            // If not set, check net.tethering.noprovisioning, TETHER_DUN_APN setting
+            if (dunRequired == 2 && defaultPhone.hasMatchedTetherApnSetting()) {
+                dunRequired = 1;
+            }
+            return dunRequired;
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
-        return dunRequired;
     }
 
     /**
@@ -2951,14 +4029,20 @@
     public void setUserDataEnabled(int subId, boolean enable) {
         TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
                 mApp, subId, "setUserDataEnabled");
-        int phoneId = mSubscriptionController.getPhoneId(subId);
-        if (DBG) log("setUserDataEnabled: subId=" + subId + " phoneId=" + phoneId);
-        Phone phone = PhoneFactory.getPhone(phoneId);
-        if (phone != null) {
-            if (DBG) log("setUserDataEnabled: subId=" + subId + " enable=" + enable);
-            phone.setUserDataEnabled(enable);
-        } else {
-            loge("setUserDataEnabled: no phone for subId=" + subId);
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            int phoneId = mSubscriptionController.getPhoneId(subId);
+            if (DBG) log("setUserDataEnabled: subId=" + subId + " phoneId=" + phoneId);
+            Phone phone = PhoneFactory.getPhone(phoneId);
+            if (phone != null) {
+                if (DBG) log("setUserDataEnabled: subId=" + subId + " enable=" + enable);
+                phone.getDataEnabledSettings().setUserDataEnabled(enable);
+            } else {
+                loge("setUserDataEnabled: no phone found. Invalid subId=" + subId);
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
@@ -2996,16 +4080,22 @@
             TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
                     mApp, subId, "isUserDataEnabled");
         }
-        int phoneId = mSubscriptionController.getPhoneId(subId);
-        if (DBG) log("isUserDataEnabled: subId=" + subId + " phoneId=" + phoneId);
-        Phone phone = PhoneFactory.getPhone(phoneId);
-        if (phone != null) {
-            boolean retVal = phone.isUserDataEnabled();
-            if (DBG) log("isUserDataEnabled: subId=" + subId + " retVal=" + retVal);
-            return retVal;
-        } else {
-            if (DBG) loge("isUserDataEnabled: no phone subId=" + subId + " retVal=false");
-            return false;
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            int phoneId = mSubscriptionController.getPhoneId(subId);
+            if (DBG) log("isUserDataEnabled: subId=" + subId + " phoneId=" + phoneId);
+            Phone phone = PhoneFactory.getPhone(phoneId);
+            if (phone != null) {
+                boolean retVal = phone.isUserDataEnabled();
+                if (DBG) log("isUserDataEnabled: subId=" + subId + " retVal=" + retVal);
+                return retVal;
+            } else {
+                if (DBG) loge("isUserDataEnabled: no phone subId=" + subId + " retVal=false");
+                return false;
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
@@ -3028,16 +4118,22 @@
             TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
                     mApp, subId, "isDataEnabled");
         }
-        int phoneId = mSubscriptionController.getPhoneId(subId);
-        if (DBG) log("isDataEnabled: subId=" + subId + " phoneId=" + phoneId);
-        Phone phone = PhoneFactory.getPhone(phoneId);
-        if (phone != null) {
-            boolean retVal = phone.isDataEnabled();
-            if (DBG) log("isDataEnabled: subId=" + subId + " retVal=" + retVal);
-            return retVal;
-        } else {
-            if (DBG) loge("isDataEnabled: no phone subId=" + subId + " retVal=false");
-            return false;
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            int phoneId = mSubscriptionController.getPhoneId(subId);
+            if (DBG) log("isDataEnabled: subId=" + subId + " phoneId=" + phoneId);
+            Phone phone = PhoneFactory.getPhone(phoneId);
+            if (phone != null) {
+                boolean retVal = phone.getDataEnabledSettings().isDataEnabled();
+                if (DBG) log("isDataEnabled: subId=" + subId + " retVal=" + retVal);
+                return retVal;
+            } else {
+                if (DBG) loge("isDataEnabled: no phone subId=" + subId + " retVal=false");
+                return false;
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
@@ -3075,14 +4171,16 @@
 
     @Override
     public int checkCarrierPrivilegesForPackage(String pkgName) {
+        final Phone defaultPhone = getDefaultPhone();
         if (TextUtils.isEmpty(pkgName))
             return TelephonyManager.CARRIER_PRIVILEGE_STATUS_NO_ACCESS;
-        UiccCard card = UiccController.getInstance().getUiccCard(mPhone.getPhoneId());
+        UiccCard card = UiccController.getInstance().getUiccCard(defaultPhone.getPhoneId());
         if (card == null) {
             loge("checkCarrierPrivilegesForPackage: No UICC");
             return TelephonyManager.CARRIER_PRIVILEGE_STATUS_RULES_NOT_LOADED;
         }
-        return card.getCarrierPrivilegeStatus(mPhone.getContext().getPackageManager(), pkgName);
+        return card.getCarrierPrivilegeStatus(defaultPhone.getContext().getPackageManager(),
+                pkgName);
     }
 
     @Override
@@ -3097,8 +4195,7 @@
               continue;
             }
 
-            result = card.getCarrierPrivilegeStatus(
-                mPhone.getContext().getPackageManager(), pkgName);
+            result = card.getCarrierPrivilegeStatus(mApp.getPackageManager(), pkgName);
             if (result == TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS) {
                 break;
             }
@@ -3118,13 +4215,12 @@
             loge("getCarrierPackageNamesForIntent: No UICC");
             return null ;
         }
-        return card.getCarrierPackageNamesForIntent(
-                mPhone.getContext().getPackageManager(), intent);
+        return card.getCarrierPackageNamesForIntent(mApp.getPackageManager(), intent);
     }
 
     @Override
     public List<String> getPackagesWithCarrierPrivileges() {
-        PackageManager pm = mPhone.getContext().getPackageManager();
+        PackageManager pm = mApp.getPackageManager();
         List<String> privilegedPackages = new ArrayList<>();
         List<PackageInfo> packages = null;
         for (int i = 0; i < TelephonyManager.getDefault().getPhoneCount(); i++) {
@@ -3175,45 +4271,50 @@
         TelephonyPermissions.enforceCallingOrSelfCarrierPrivilege(
                 subId, "setLine1NumberForDisplayForSubscriber");
 
-        final String iccId = getIccId(subId);
-        final Phone phone = getPhone(subId);
-        if (phone == null) {
-            return false;
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            final String iccId = getIccId(subId);
+            final Phone phone = getPhone(subId);
+            if (phone == null) {
+                return false;
+            }
+            final String subscriberId = phone.getSubscriberId();
+
+            if (DBG_MERGE) {
+                Slog.d(LOG_TAG, "Setting line number for ICC=" + iccId + ", subscriberId="
+                        + subscriberId + " to " + number);
+            }
+
+            if (TextUtils.isEmpty(iccId)) {
+                return false;
+            }
+
+            final SharedPreferences.Editor editor = mTelephonySharedPreferences.edit();
+
+            final String alphaTagPrefKey = PREF_CARRIERS_ALPHATAG_PREFIX + iccId;
+            if (alphaTag == null) {
+                editor.remove(alphaTagPrefKey);
+            } else {
+                editor.putString(alphaTagPrefKey, alphaTag);
+            }
+
+            // Record both the line number and IMSI for this ICCID, since we need to
+            // track all merged IMSIs based on line number
+            final String numberPrefKey = PREF_CARRIERS_NUMBER_PREFIX + iccId;
+            final String subscriberPrefKey = PREF_CARRIERS_SUBSCRIBER_PREFIX + iccId;
+            if (number == null) {
+                editor.remove(numberPrefKey);
+                editor.remove(subscriberPrefKey);
+            } else {
+                editor.putString(numberPrefKey, number);
+                editor.putString(subscriberPrefKey, subscriberId);
+            }
+
+            editor.commit();
+            return true;
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
-        final String subscriberId = phone.getSubscriberId();
-
-        if (DBG_MERGE) {
-            Slog.d(LOG_TAG, "Setting line number for ICC=" + iccId + ", subscriberId="
-                    + subscriberId + " to " + number);
-        }
-
-        if (TextUtils.isEmpty(iccId)) {
-            return false;
-        }
-
-        final SharedPreferences.Editor editor = mTelephonySharedPreferences.edit();
-
-        final String alphaTagPrefKey = PREF_CARRIERS_ALPHATAG_PREFIX + iccId;
-        if (alphaTag == null) {
-            editor.remove(alphaTagPrefKey);
-        } else {
-            editor.putString(alphaTagPrefKey, alphaTag);
-        }
-
-        // Record both the line number and IMSI for this ICCID, since we need to
-        // track all merged IMSIs based on line number
-        final String numberPrefKey = PREF_CARRIERS_NUMBER_PREFIX + iccId;
-        final String subscriberPrefKey = PREF_CARRIERS_SUBSCRIBER_PREFIX + iccId;
-        if (number == null) {
-            editor.remove(numberPrefKey);
-            editor.remove(subscriberPrefKey);
-        } else {
-            editor.putString(numberPrefKey, number);
-            editor.putString(subscriberPrefKey, subscriberId);
-        }
-
-        editor.commit();
-        return true;
     }
 
     @Override
@@ -3225,17 +4326,22 @@
             return null;
         }
 
-        String iccId = getIccId(subId);
-        if (iccId != null) {
-            String numberPrefKey = PREF_CARRIERS_NUMBER_PREFIX + iccId;
-            if (DBG_MERGE) {
-                log("getLine1NumberForDisplay returning " +
-                        mTelephonySharedPreferences.getString(numberPrefKey, null));
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            String iccId = getIccId(subId);
+            if (iccId != null) {
+                String numberPrefKey = PREF_CARRIERS_NUMBER_PREFIX + iccId;
+                if (DBG_MERGE) {
+                    log("getLine1NumberForDisplay returning "
+                            + mTelephonySharedPreferences.getString(numberPrefKey, null));
+                }
+                return mTelephonySharedPreferences.getString(numberPrefKey, null);
             }
-            return mTelephonySharedPreferences.getString(numberPrefKey, null);
+            if (DBG_MERGE) log("getLine1NumberForDisplay returning null as iccId is null");
+            return null;
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
-        if (DBG_MERGE) log("getLine1NumberForDisplay returning null as iccId is null");
-        return null;
     }
 
     @Override
@@ -3245,12 +4351,17 @@
             return null;
         }
 
-        String iccId = getIccId(subId);
-        if (iccId != null) {
-            String alphaTagPrefKey = PREF_CARRIERS_ALPHATAG_PREFIX + iccId;
-            return mTelephonySharedPreferences.getString(alphaTagPrefKey, null);
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            String iccId = getIccId(subId);
+            if (iccId != null) {
+                String alphaTagPrefKey = PREF_CARRIERS_ALPHATAG_PREFIX + iccId;
+                return mTelephonySharedPreferences.getString(alphaTagPrefKey, null);
+            }
+            return null;
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
-        return null;
     }
 
     @Override
@@ -3262,80 +4373,91 @@
                 "getMergedSubscriberIds")) {
             return null;
         }
-        final Context context = mPhone.getContext();
-        final TelephonyManager tele = TelephonyManager.from(context);
-        final SubscriptionManager sub = SubscriptionManager.from(context);
 
-        // Figure out what subscribers are currently active
-        final ArraySet<String> activeSubscriberIds = new ArraySet<>();
-        // Clear calling identity, when calling TelephonyManager, because callerUid must be
-        // the process, where TelephonyManager was instantiated. Otherwise AppOps check will fail.
         final long identity  = Binder.clearCallingIdentity();
         try {
+            final Context context = mApp;
+            final TelephonyManager tele = TelephonyManager.from(context);
+            final SubscriptionManager sub = SubscriptionManager.from(context);
+
+            // Figure out what subscribers are currently active
+            final ArraySet<String> activeSubscriberIds = new ArraySet<>();
+            // Clear calling identity, when calling TelephonyManager, because callerUid must be
+            // the process, where TelephonyManager was instantiated.
+            // Otherwise AppOps check will fail.
+
             final int[] subIds = sub.getActiveSubscriptionIdList();
             for (int subId : subIds) {
                 activeSubscriberIds.add(tele.getSubscriberId(subId));
             }
+
+            // First pass, find a number override for an active subscriber
+            String mergeNumber = null;
+            final Map<String, ?> prefs = mTelephonySharedPreferences.getAll();
+            for (String key : prefs.keySet()) {
+                if (key.startsWith(PREF_CARRIERS_SUBSCRIBER_PREFIX)) {
+                    final String subscriberId = (String) prefs.get(key);
+                    if (activeSubscriberIds.contains(subscriberId)) {
+                        final String iccId = key.substring(
+                                PREF_CARRIERS_SUBSCRIBER_PREFIX.length());
+                        final String numberKey = PREF_CARRIERS_NUMBER_PREFIX + iccId;
+                        mergeNumber = (String) prefs.get(numberKey);
+                        if (DBG_MERGE) {
+                            Slog.d(LOG_TAG, "Found line number " + mergeNumber
+                                    + " for active subscriber " + subscriberId);
+                        }
+                        if (!TextUtils.isEmpty(mergeNumber)) {
+                            break;
+                        }
+                    }
+                }
+            }
+
+            // Shortcut when no active merged subscribers
+            if (TextUtils.isEmpty(mergeNumber)) {
+                return null;
+            }
+
+            // Second pass, find all subscribers under that line override
+            final ArraySet<String> result = new ArraySet<>();
+            for (String key : prefs.keySet()) {
+                if (key.startsWith(PREF_CARRIERS_NUMBER_PREFIX)) {
+                    final String number = (String) prefs.get(key);
+                    if (mergeNumber.equals(number)) {
+                        final String iccId = key.substring(PREF_CARRIERS_NUMBER_PREFIX.length());
+                        final String subscriberKey = PREF_CARRIERS_SUBSCRIBER_PREFIX + iccId;
+                        final String subscriberId = (String) prefs.get(subscriberKey);
+                        if (!TextUtils.isEmpty(subscriberId)) {
+                            result.add(subscriberId);
+                        }
+                    }
+                }
+            }
+
+            final String[] resultArray = result.toArray(new String[result.size()]);
+            Arrays.sort(resultArray);
+            if (DBG_MERGE) {
+                Slog.d(LOG_TAG,
+                        "Found subscribers " + Arrays.toString(resultArray) + " after merge");
+            }
+            return resultArray;
         } finally {
             Binder.restoreCallingIdentity(identity);
         }
-
-        // First pass, find a number override for an active subscriber
-        String mergeNumber = null;
-        final Map<String, ?> prefs = mTelephonySharedPreferences.getAll();
-        for (String key : prefs.keySet()) {
-            if (key.startsWith(PREF_CARRIERS_SUBSCRIBER_PREFIX)) {
-                final String subscriberId = (String) prefs.get(key);
-                if (activeSubscriberIds.contains(subscriberId)) {
-                    final String iccId = key.substring(PREF_CARRIERS_SUBSCRIBER_PREFIX.length());
-                    final String numberKey = PREF_CARRIERS_NUMBER_PREFIX + iccId;
-                    mergeNumber = (String) prefs.get(numberKey);
-                    if (DBG_MERGE) {
-                        Slog.d(LOG_TAG, "Found line number " + mergeNumber
-                                + " for active subscriber " + subscriberId);
-                    }
-                    if (!TextUtils.isEmpty(mergeNumber)) {
-                        break;
-                    }
-                }
-            }
-        }
-
-        // Shortcut when no active merged subscribers
-        if (TextUtils.isEmpty(mergeNumber)) {
-            return null;
-        }
-
-        // Second pass, find all subscribers under that line override
-        final ArraySet<String> result = new ArraySet<>();
-        for (String key : prefs.keySet()) {
-            if (key.startsWith(PREF_CARRIERS_NUMBER_PREFIX)) {
-                final String number = (String) prefs.get(key);
-                if (mergeNumber.equals(number)) {
-                    final String iccId = key.substring(PREF_CARRIERS_NUMBER_PREFIX.length());
-                    final String subscriberKey = PREF_CARRIERS_SUBSCRIBER_PREFIX + iccId;
-                    final String subscriberId = (String) prefs.get(subscriberKey);
-                    if (!TextUtils.isEmpty(subscriberId)) {
-                        result.add(subscriberId);
-                    }
-                }
-            }
-        }
-
-        final String[] resultArray = result.toArray(new String[result.size()]);
-        Arrays.sort(resultArray);
-        if (DBG_MERGE) {
-            Slog.d(LOG_TAG, "Found subscribers " + Arrays.toString(resultArray) + " after merge");
-        }
-        return resultArray;
     }
 
     @Override
     public boolean setOperatorBrandOverride(int subId, String brand) {
         TelephonyPermissions.enforceCallingOrSelfCarrierPrivilege(
                 subId, "setOperatorBrandOverride");
-        final Phone phone = getPhone(subId);
-        return phone == null ? false : phone.setOperatorBrandOverride(brand);
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            final Phone phone = getPhone(subId);
+            return phone == null ? false : phone.setOperatorBrandOverride(brand);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     @Override
@@ -3343,12 +4465,18 @@
             List<String> gsmNonRoamingList, List<String> cdmaRoamingList,
             List<String> cdmaNonRoamingList) {
         TelephonyPermissions.enforceCallingOrSelfCarrierPrivilege(subId, "setRoamingOverride");
-        final Phone phone = getPhone(subId);
-        if (phone == null) {
-            return false;
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            final Phone phone = getPhone(subId);
+            if (phone == null) {
+                return false;
+            }
+            return phone.setRoamingOverride(gsmRoamingList, gsmNonRoamingList, cdmaRoamingList,
+                    cdmaNonRoamingList);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
-        return phone.setRoamingOverride(gsmRoamingList, gsmNonRoamingList, cdmaRoamingList,
-                cdmaNonRoamingList);
     }
 
     @Override
@@ -3358,7 +4486,7 @@
 
         int returnValue = 0;
         try {
-            AsyncResult result = (AsyncResult)sendRequest(CMD_INVOKE_OEM_RIL_REQUEST_RAW, oemReq);
+            AsyncResult result = (AsyncResult) sendRequest(CMD_INVOKE_OEM_RIL_REQUEST_RAW, oemReq);
             if(result.exception == null) {
                 if (result.result != null) {
                     byte[] responseData = (byte[])(result.result);
@@ -3396,75 +4524,149 @@
     @Override
     public int getRadioAccessFamily(int phoneId, String callingPackage) {
         Phone phone = PhoneFactory.getPhone(phoneId);
+        int raf = RadioAccessFamily.RAF_UNKNOWN;
         if (phone == null) {
-            return RadioAccessFamily.RAF_UNKNOWN;
+            return raf;
         }
-        int subId = phone.getSubId();
-        if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
-                mApp, subId, callingPackage, "getRadioAccessFamily")) {
-            return RadioAccessFamily.RAF_UNKNOWN;
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            TelephonyPermissions
+                    .enforeceCallingOrSelfReadPrivilegedPhoneStatePermissionOrCarrierPrivilege(
+                            mApp, phone.getSubId(), "getRadioAccessFamily");
+            raf = ProxyController.getInstance().getRadioAccessFamily(phoneId);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
-
-        return ProxyController.getInstance().getRadioAccessFamily(phoneId);
+        return raf;
     }
 
     @Override
     public void enableVideoCalling(boolean enable) {
+        final Phone defaultPhone = getDefaultPhone();
         enforceModifyPermission();
-        ImsManager.getInstance(mPhone.getContext(), mPhone.getPhoneId()).setVtSetting(enable);
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            ImsManager.getInstance(defaultPhone.getContext(),
+                    defaultPhone.getPhoneId()).setVtSetting(enable);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     @Override
     public boolean isVideoCallingEnabled(String callingPackage) {
+        final Phone defaultPhone = getDefaultPhone();
         if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
-                mApp, mPhone.getSubId(), callingPackage, "isVideoCallingEnabled")) {
+                mApp, defaultPhone.getSubId(), 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
-        // which can support video calling.
-        ImsManager imsManager = ImsManager.getInstance(mPhone.getContext(), mPhone.getPhoneId());
-        return imsManager.isVtEnabledByPlatform()
-                && imsManager.isEnhanced4gLteModeSettingEnabledByUser()
-                && imsManager.isVtEnabledByUser();
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            // 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
+            // which can support video calling.
+            ImsManager imsManager =
+                    ImsManager.getInstance(defaultPhone.getContext(), defaultPhone.getPhoneId());
+            return imsManager.isVtEnabledByPlatform()
+                    && imsManager.isEnhanced4gLteModeSettingEnabledByUser()
+                    && imsManager.isVtEnabledByUser();
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     @Override
-    public boolean canChangeDtmfToneLength() {
-        return mApp.getCarrierConfig().getBoolean(CarrierConfigManager.KEY_DTMF_TYPE_ENABLED_BOOL);
+    public boolean canChangeDtmfToneLength(int subId, String callingPackage) {
+        if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
+                mApp, subId, callingPackage, "isVideoCallingEnabled")) {
+            return false;
+        }
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            CarrierConfigManager configManager =
+                    (CarrierConfigManager) mApp.getSystemService(Context.CARRIER_CONFIG_SERVICE);
+            return configManager.getConfigForSubId(subId)
+                    .getBoolean(CarrierConfigManager.KEY_DTMF_TYPE_ENABLED_BOOL);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     @Override
-    public boolean isWorldPhone() {
-        return mApp.getCarrierConfig().getBoolean(CarrierConfigManager.KEY_WORLD_PHONE_BOOL);
+    public boolean isWorldPhone(int subId, String callingPackage) {
+        if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
+                mApp, subId, callingPackage, "isVideoCallingEnabled")) {
+            return false;
+        }
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            CarrierConfigManager configManager =
+                    (CarrierConfigManager) mApp.getSystemService(Context.CARRIER_CONFIG_SERVICE);
+            return configManager.getConfigForSubId(subId)
+                    .getBoolean(CarrierConfigManager.KEY_WORLD_PHONE_BOOL);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     @Override
     public boolean isTtyModeSupported() {
-        TelecomManager telecomManager = TelecomManager.from(mPhone.getContext());
-        TelephonyManager telephonyManager =
-                (TelephonyManager) mPhone.getContext().getSystemService(Context.TELEPHONY_SERVICE);
+        TelecomManager telecomManager = TelecomManager.from(mApp);
         return telecomManager.isTtySupported();
     }
 
     @Override
     public boolean isHearingAidCompatibilitySupported() {
-        return mPhone.getContext().getResources().getBoolean(R.bool.hac_enabled);
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            return mApp.getResources().getBoolean(R.bool.hac_enabled);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
-    public boolean isRttSupported() {
-        boolean isCarrierSupported =
-                mApp.getCarrierConfig().getBoolean(CarrierConfigManager.KEY_RTT_SUPPORTED_BOOL);
-        boolean isDeviceSupported =
-                mPhone.getContext().getResources().getBoolean(R.bool.config_support_rtt);
-        return isCarrierSupported && isDeviceSupported;
+    /**
+     * Determines whether the device currently supports RTT (Real-time text). Based both on carrier
+     * support for the feature and device firmware support.
+     *
+     * @return {@code true} if the device and carrier both support RTT, {@code false} otherwise.
+     */
+    @Override
+    public boolean isRttSupported(int subscriptionId) {
+        final long identity = Binder.clearCallingIdentity();
+        final Phone phone = getPhone(subscriptionId);
+        if (phone == null) {
+            loge("isRttSupported: no Phone found. Invalid subId:" + subscriptionId);
+            return false;
+        }
+        try {
+            boolean isCarrierSupported = mApp.getCarrierConfigForSubId(subscriptionId).getBoolean(
+                    CarrierConfigManager.KEY_RTT_SUPPORTED_BOOL);
+            boolean isDeviceSupported =
+                    phone.getContext().getResources().getBoolean(R.bool.config_support_rtt);
+            return isCarrierSupported && isDeviceSupported;
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
-    public boolean isRttEnabled() {
-        return isRttSupported() && Settings.Secure.getInt(mPhone.getContext().getContentResolver(),
-                Settings.Secure.RTT_CALLING_MODE, 0) != 0;
+    /**
+     * Determines whether the user has turned on RTT. Only returns true if the device and carrier
+     * both also support RTT.
+     */
+    public boolean isRttEnabled(int subscriptionId) {
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            return isRttSupported(subscriptionId) && Settings.Secure.getInt(
+                    mApp.getContentResolver(), Settings.Secure.RTT_CALLING_MODE, 0) != 0;
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     /**
@@ -3485,7 +4687,13 @@
                 mApp, subId, callingPackage, "getDeviceId")) {
             return null;
         }
-        return phone.getDeviceId();
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            return phone.getDeviceId();
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     /**
@@ -3505,30 +4713,28 @@
 
     @Override
     public int getSubIdForPhoneAccount(PhoneAccount phoneAccount) {
-        return PhoneUtils.getSubIdForPhoneAccount(phoneAccount);
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            return PhoneUtils.getSubIdForPhoneAccount(phoneAccount);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     /**
      * @return the VoWiFi calling availability.
      */
     public boolean isWifiCallingAvailable(int subId) {
-        Phone phone = getPhone(subId);
-        if (phone != null) {
-            return phone.isWifiCallingEnabled();
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * @return the VoLTE availability.
-     */
-    public boolean isVolteAvailable(int subId) {
-        Phone phone = getPhone(subId);
-        if (phone != null) {
-            return phone.isVolteEnabled();
-        } else {
-            return false;
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            Phone phone = getPhone(subId);
+            if (phone != null) {
+                return phone.isWifiCallingEnabled();
+            } else {
+                return false;
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
@@ -3536,11 +4742,16 @@
      * @return the VT calling availability.
      */
     public boolean isVideoTelephonyAvailable(int subId) {
-        Phone phone = getPhone(subId);
-        if (phone != null) {
-            return phone.isVideoEnabled();
-        } else {
-            return false;
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            Phone phone = getPhone(subId);
+            if (phone != null) {
+                return phone.isVideoEnabled();
+            } else {
+                return false;
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
@@ -3549,11 +4760,16 @@
      * defined in {@link ImsRegistrationImplBase}.
      */
     public @ImsRegistrationImplBase.ImsRegistrationTech int getImsRegTechnologyForMmTel(int subId) {
-        Phone phone = getPhone(subId);
-        if (phone != null) {
-            return phone.getImsRegistrationTech();
-        } else {
-            return ImsRegistrationImplBase.REGISTRATION_TECH_NONE;
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            Phone phone = getPhone(subId);
+            if (phone != null) {
+                return phone.getImsRegistrationTech();
+            } else {
+                return ImsRegistrationImplBase.REGISTRATION_TECH_NONE;
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
@@ -3565,14 +4781,15 @@
         }
 
         final long identity = Binder.clearCallingIdentity();
+
         try {
             if (SubscriptionManager.isUsableSubIdValue(subId) && !mUserManager.hasUserRestriction(
                     UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS)) {
                 setUserDataEnabled(subId, getDefaultDataEnabled());
                 setNetworkSelectionModeAutomatic(subId);
                 setPreferredNetworkType(subId, getDefaultNetworkType(subId));
-                mPhone.setDataRoamingEnabled(getDefaultDataRoamingEnabled(subId));
-                CarrierInfoManager.deleteAllCarrierKeysForImsiEncryption(mPhone.getContext());
+                setDataRoamingEnabled(subId, getDefaultDataRoamingEnabled(subId));
+                CarrierInfoManager.deleteAllCarrierKeysForImsiEncryption(mApp);
             }
         } finally {
             Binder.restoreCallingIdentity(identity);
@@ -3581,83 +4798,79 @@
 
     @Override
     public String getLocaleFromDefaultSim() {
-        // We query all subscriptions instead of just the active ones, because
-        // this might be called early on in the provisioning flow when the
-        // subscriptions potentially aren't active yet.
-        final List<SubscriptionInfo> slist = getAllSubscriptionInfoList();
-        if (slist == null || slist.isEmpty()) {
-            return null;
-        }
-
-        // This function may be called very early, say, from the setup wizard, at
-        // which point we won't have a default subscription set. If that's the case
-        // we just choose the first, which will be valid in "most cases".
-        final int defaultSubId = getDefaultSubscription();
-        SubscriptionInfo info = null;
-        if (defaultSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
-            info = slist.get(0);
-        } else {
-            for (SubscriptionInfo item : slist) {
-                if (item.getSubscriptionId() == defaultSubId) {
-                    info = item;
-                    break;
-                }
-            }
-
-            if (info == null) {
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            // We query all subscriptions instead of just the active ones, because
+            // this might be called early on in the provisioning flow when the
+            // subscriptions potentially aren't active yet.
+            final List<SubscriptionInfo> slist = getAllSubscriptionInfoList();
+            if (slist == null || slist.isEmpty()) {
                 return null;
             }
-        }
 
-        // Try and fetch the locale from the carrier properties or from the SIM language
-        // preferences (EF-PL and EF-LI)...
-        final int mcc = info.getMcc();
-        final Phone defaultPhone = getPhone(info.getSubscriptionId());
-        String simLanguage = null;
-        if (defaultPhone != null) {
-            final Locale localeFromDefaultSim = defaultPhone.getLocaleFromSimAndCarrierPrefs();
-            if (localeFromDefaultSim != null) {
-                if (!localeFromDefaultSim.getCountry().isEmpty()) {
-                    if (DBG) log("Using locale from default SIM:" + localeFromDefaultSim);
-                    return localeFromDefaultSim.toLanguageTag();
-                } else {
-                    simLanguage = localeFromDefaultSim.getLanguage();
+            // This function may be called very early, say, from the setup wizard, at
+            // which point we won't have a default subscription set. If that's the case
+            // we just choose the first, which will be valid in "most cases".
+            final int defaultSubId = getDefaultSubscription();
+            SubscriptionInfo info = null;
+            if (defaultSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+                info = slist.get(0);
+            } else {
+                for (SubscriptionInfo item : slist) {
+                    if (item.getSubscriptionId() == defaultSubId) {
+                        info = item;
+                        break;
+                    }
+                }
+
+                if (info == null) {
+                    return null;
                 }
             }
-        }
 
-        // The SIM language preferences only store a language (e.g. fr = French), not an
-        // exact locale (e.g. fr_FR = French/France). So, if the locale returned from
-        // the SIM and carrier preferences does not include a country we add the country
-        // determined from the SIM MCC to provide an exact locale.
-        final Locale mccLocale = MccTable.getLocaleFromMcc(mPhone.getContext(), mcc, simLanguage);
-        if (mccLocale != null) {
-            if (DBG) log("No locale from default SIM, using mcc locale:" + mccLocale);
-            return mccLocale.toLanguageTag();
-        }
+            // Try and fetch the locale from the carrier properties or from the SIM language
+            // preferences (EF-PL and EF-LI)...
+            final int mcc = info.getMcc();
+            final Phone defaultPhone = getPhone(info.getSubscriptionId());
+            String simLanguage = null;
+            if (defaultPhone != null) {
+                final Locale localeFromDefaultSim = defaultPhone.getLocaleFromSimAndCarrierPrefs();
+                if (localeFromDefaultSim != null) {
+                    if (!localeFromDefaultSim.getCountry().isEmpty()) {
+                        if (DBG) log("Using locale from default SIM:" + localeFromDefaultSim);
+                        return localeFromDefaultSim.toLanguageTag();
+                    } else {
+                        simLanguage = localeFromDefaultSim.getLanguage();
+                    }
+                }
+            }
 
-        if (DBG) log("No locale found - returning null");
-        return null;
+            // The SIM language preferences only store a language (e.g. fr = French), not an
+            // exact locale (e.g. fr_FR = French/France). So, if the locale returned from
+            // the SIM and carrier preferences does not include a country we add the country
+            // determined from the SIM MCC to provide an exact locale.
+            final Locale mccLocale = MccTable.getLocaleFromMcc(mApp, mcc, simLanguage);
+            if (mccLocale != null) {
+                if (DBG) log("No locale from default SIM, using mcc locale:" + mccLocale);
+                return mccLocale.toLanguageTag();
+            }
+
+            if (DBG) log("No locale found - returning null");
+            return null;
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     private List<SubscriptionInfo> getAllSubscriptionInfoList() {
-        final long identity = Binder.clearCallingIdentity();
-        try {
-            return mSubscriptionController.getAllSubInfoList(
-                    mPhone.getContext().getOpPackageName());
-        } finally {
-            Binder.restoreCallingIdentity(identity);
-        }
+        return mSubscriptionController.getAllSubInfoList(mApp.getOpPackageName());
     }
 
-    private List<SubscriptionInfo> getActiveSubscriptionInfoList() {
-        final long identity = Binder.clearCallingIdentity();
-        try {
-            return mSubscriptionController.getActiveSubscriptionInfoList(
-                    mPhone.getContext().getOpPackageName());
-        } finally {
-            Binder.restoreCallingIdentity(identity);
-        }
+    /**
+     * NOTE: this method assumes permission checks are done and caller identity has been cleared.
+     */
+    private List<SubscriptionInfo> getActiveSubscriptionInfoListPrivileged() {
+        return mSubscriptionController.getActiveSubscriptionInfoList(mApp.getOpPackageName());
     }
 
     private final ModemActivityInfo mLastModemActivityInfo =
@@ -3674,37 +4887,45 @@
     @Override
     public void requestModemActivityInfo(ResultReceiver result) {
         enforceModifyPermission();
-        ModemActivityInfo ret = null;
-        synchronized (mLastModemActivityInfo) {
-            ModemActivityInfo info = (ModemActivityInfo) sendRequest(CMD_GET_MODEM_ACTIVITY_INFO,
-                    null);
-            if (isModemActivityInfoValid(info)) {
-                int[] mergedTxTimeMs = new int[ModemActivityInfo.TX_POWER_LEVELS];
-                for (int i = 0; i < mergedTxTimeMs.length; i++) {
-                    mergedTxTimeMs[i] =
-                            info.getTxTimeMillis()[i] + mLastModemActivityInfo.getTxTimeMillis()[i];
+        WorkSource workSource = getWorkSource(Binder.getCallingUid());
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            ModemActivityInfo ret = null;
+            synchronized (mLastModemActivityInfo) {
+                ModemActivityInfo info = (ModemActivityInfo) sendRequest(
+                        CMD_GET_MODEM_ACTIVITY_INFO,
+                        null, workSource);
+                if (isModemActivityInfoValid(info)) {
+                    int[] mergedTxTimeMs = new int[ModemActivityInfo.TX_POWER_LEVELS];
+                    for (int i = 0; i < mergedTxTimeMs.length; i++) {
+                        mergedTxTimeMs[i] =
+                                info.getTxTimeMillis()[i] + mLastModemActivityInfo.getTxTimeMillis()[i];
+                    }
+                    mLastModemActivityInfo.setTimestamp(info.getTimestamp());
+                    mLastModemActivityInfo.setSleepTimeMillis(
+                            info.getSleepTimeMillis() + mLastModemActivityInfo.getSleepTimeMillis());
+                    mLastModemActivityInfo.setIdleTimeMillis(
+                            info.getIdleTimeMillis() + mLastModemActivityInfo.getIdleTimeMillis());
+                    mLastModemActivityInfo.setTxTimeMillis(mergedTxTimeMs);
+                    mLastModemActivityInfo.setRxTimeMillis(
+                            info.getRxTimeMillis() + mLastModemActivityInfo.getRxTimeMillis());
+                    mLastModemActivityInfo.setEnergyUsed(
+                            info.getEnergyUsed() + mLastModemActivityInfo.getEnergyUsed());
                 }
-                mLastModemActivityInfo.setTimestamp(info.getTimestamp());
-                mLastModemActivityInfo.setSleepTimeMillis(
-                        info.getSleepTimeMillis() + mLastModemActivityInfo.getSleepTimeMillis());
-                mLastModemActivityInfo.setIdleTimeMillis(
-                        info.getIdleTimeMillis() + mLastModemActivityInfo.getIdleTimeMillis());
-                mLastModemActivityInfo.setTxTimeMillis(mergedTxTimeMs);
-                mLastModemActivityInfo.setRxTimeMillis(
-                        info.getRxTimeMillis() + mLastModemActivityInfo.getRxTimeMillis());
-                mLastModemActivityInfo.setEnergyUsed(
-                        info.getEnergyUsed() + mLastModemActivityInfo.getEnergyUsed());
+                ret = new ModemActivityInfo(mLastModemActivityInfo.getTimestamp(),
+                        mLastModemActivityInfo.getSleepTimeMillis(),
+                        mLastModemActivityInfo.getIdleTimeMillis(),
+                        mLastModemActivityInfo.getTxTimeMillis(),
+                        mLastModemActivityInfo.getRxTimeMillis(),
+                        mLastModemActivityInfo.getEnergyUsed());
             }
-            ret = new ModemActivityInfo(mLastModemActivityInfo.getTimestamp(),
-                    mLastModemActivityInfo.getSleepTimeMillis(),
-                    mLastModemActivityInfo.getIdleTimeMillis(),
-                    mLastModemActivityInfo.getTxTimeMillis(),
-                    mLastModemActivityInfo.getRxTimeMillis(),
-                    mLastModemActivityInfo.getEnergyUsed());
+            Bundle bundle = new Bundle();
+            bundle.putParcelable(TelephonyManager.MODEM_ACTIVITY_RESULT_KEY, ret);
+            result.send(0, bundle);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
-        Bundle bundle = new Bundle();
-        bundle.putParcelable(TelephonyManager.MODEM_ACTIVITY_RESULT_KEY, ret);
-        result.send(0, bundle);
     }
 
     // Checks that ModemActivityInfo is valid. Sleep time, Idle time, Rx time and Tx time should be
@@ -3732,18 +4953,22 @@
      */
     @Override
     public ServiceState getServiceStateForSubscriber(int subId, String callingPackage) {
-
         if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
                 mApp, subId, callingPackage, "getServiceStateForSubscriber")) {
             return null;
         }
 
-        final Phone phone = getPhone(subId);
-        if (phone == null) {
-            return null;
-        }
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            final Phone phone = getPhone(subId);
+            if (phone == null) {
+                return null;
+            }
 
-        return phone.getServiceState();
+            return phone.getServiceState();
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     /**
@@ -3756,12 +4981,17 @@
      */
     @Override
     public Uri getVoicemailRingtoneUri(PhoneAccountHandle accountHandle) {
-        Phone phone = PhoneUtils.getPhoneForPhoneAccountHandle(accountHandle);
-        if (phone == null) {
-            phone = mPhone;
-        }
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            Phone phone = PhoneUtils.getPhoneForPhoneAccountHandle(accountHandle);
+            if (phone == null) {
+                phone = getDefaultPhone();
+            }
 
-        return VoicemailNotificationSettingsUtil.getRingtoneUri(phone.getContext());
+            return VoicemailNotificationSettingsUtil.getRingtoneUri(phone.getContext());
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     /**
@@ -3778,18 +5008,25 @@
     @Override
     public void setVoicemailRingtoneUri(String callingPackage,
             PhoneAccountHandle phoneAccountHandle, Uri uri) {
+        final Phone defaultPhone = getDefaultPhone();
         mAppOps.checkPackage(Binder.getCallingUid(), callingPackage);
         if (!TextUtils.equals(callingPackage,
-                TelecomManager.from(mPhone.getContext()).getDefaultDialerPackage())) {
+                TelecomManager.from(defaultPhone.getContext()).getDefaultDialerPackage())) {
             TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
                     mApp, PhoneUtils.getSubIdForPhoneAccountHandle(phoneAccountHandle),
                     "setVoicemailRingtoneUri");
         }
-        Phone phone = PhoneUtils.getPhoneForPhoneAccountHandle(phoneAccountHandle);
-        if (phone == null){
-           phone = mPhone;
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            Phone phone = PhoneUtils.getPhoneForPhoneAccountHandle(phoneAccountHandle);
+            if (phone == null) {
+                phone = defaultPhone;
+            }
+            VoicemailNotificationSettingsUtil.setRingtoneUri(phone.getContext(), uri);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
-        VoicemailNotificationSettingsUtil.setRingtoneUri(phone.getContext(), uri);
     }
 
     /**
@@ -3801,12 +5038,17 @@
      */
     @Override
     public boolean isVoicemailVibrationEnabled(PhoneAccountHandle accountHandle) {
-        Phone phone = PhoneUtils.getPhoneForPhoneAccountHandle(accountHandle);
-        if (phone == null) {
-            phone = mPhone;
-        }
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            Phone phone = PhoneUtils.getPhoneForPhoneAccountHandle(accountHandle);
+            if (phone == null) {
+                phone = getDefaultPhone();
+            }
 
-        return VoicemailNotificationSettingsUtil.isVibrationEnabled(phone.getContext());
+            return VoicemailNotificationSettingsUtil.isVibrationEnabled(phone.getContext());
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     /**
@@ -3823,19 +5065,25 @@
     @Override
     public void setVoicemailVibrationEnabled(String callingPackage,
             PhoneAccountHandle phoneAccountHandle, boolean enabled) {
+        final Phone defaultPhone = getDefaultPhone();
         mAppOps.checkPackage(Binder.getCallingUid(), callingPackage);
         if (!TextUtils.equals(callingPackage,
-                TelecomManager.from(mPhone.getContext()).getDefaultDialerPackage())) {
+                TelecomManager.from(defaultPhone.getContext()).getDefaultDialerPackage())) {
             TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
                     mApp, PhoneUtils.getSubIdForPhoneAccountHandle(phoneAccountHandle),
                     "setVoicemailVibrationEnabled");
         }
 
-        Phone phone = PhoneUtils.getPhoneForPhoneAccountHandle(phoneAccountHandle);
-        if (phone == null){
-            phone = mPhone;
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            Phone phone = PhoneUtils.getPhoneForPhoneAccountHandle(phoneAccountHandle);
+            if (phone == null) {
+                phone = defaultPhone;
+            }
+            VoicemailNotificationSettingsUtil.setVibrationEnabled(phone.getContext(), enabled);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
-        VoicemailNotificationSettingsUtil.setVibrationEnabled(phone.getContext(), enabled);
     }
 
     /**
@@ -3843,9 +5091,9 @@
      *
      * @throws SecurityException if the caller does not have the required permission
      */
-    private void enforceReadPrivilegedPermission() {
+    private void enforceReadPrivilegedPermission(String message) {
         mApp.enforceCallingOrSelfPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
-                null);
+                message);
     }
 
     /**
@@ -3864,15 +5112,21 @@
      * @throws SecurityException if the caller is not the visual voicemail package.
      */
     private void enforceVisualVoicemailPackage(String callingPackage, int subId) {
-        ComponentName componentName =
-                RemoteVvmTaskManager.getRemotePackage(mPhone.getContext(), subId);
-        if(componentName == null) {
-            throw new SecurityException("Caller not current active visual voicemail package[null]");
-        }
-        String vvmPackage = componentName.getPackageName();
-        if (!callingPackage.equals(vvmPackage)) {
-            throw new SecurityException("Caller not current active visual voicemail package[" +
-                    vvmPackage + "]");
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            ComponentName componentName =
+                    RemoteVvmTaskManager.getRemotePackage(mApp, subId);
+            if (componentName == null) {
+                throw new SecurityException(
+                        "Caller not current active visual voicemail package[null]");
+            }
+            String vvmPackage = componentName.getPackageName();
+            if (!callingPackage.equals(vvmPackage)) {
+                throw new SecurityException("Caller not current active visual voicemail package["
+                        + vvmPackage + "]");
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
@@ -3885,19 +5139,25 @@
      */
     @Override
     public String getAidForAppType(int subId, int appType) {
-        enforceReadPrivilegedPermission();
+        enforceReadPrivilegedPermission("getAidForAppType");
         Phone phone = getPhone(subId);
-        if (phone == null) {
-            return null;
-        }
-        String aid = null;
+
+        final long identity = Binder.clearCallingIdentity();
         try {
-            aid = UiccController.getInstance().getUiccCard(phone.getPhoneId())
-                    .getApplicationByType(appType).getAid();
-        } catch (Exception e) {
-            Log.e(LOG_TAG, "Not getting aid. Exception ex=" + e);
+            if (phone == null) {
+                return null;
+            }
+            String aid = null;
+            try {
+                aid = UiccController.getInstance().getUiccCard(phone.getPhoneId())
+                        .getApplicationByType(appType).getAid();
+            } catch (Exception e) {
+                Log.e(LOG_TAG, "Not getting aid. Exception ex=" + e);
+            }
+            return aid;
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
-        return aid;
     }
 
     /**
@@ -3908,18 +5168,24 @@
      */
     @Override
     public String getEsn(int subId) {
-        enforceReadPrivilegedPermission();
+        enforceReadPrivilegedPermission("getEsn");
         Phone phone = getPhone(subId);
-        if (phone == null) {
-            return null;
-        }
-        String esn = null;
+
+        final long identity = Binder.clearCallingIdentity();
         try {
-            esn = phone.getEsn();
-        } catch (Exception e) {
-            Log.e(LOG_TAG, "Not getting ESN. Exception ex=" + e);
+            if (phone == null) {
+                return null;
+            }
+            String esn = null;
+            try {
+                esn = phone.getEsn();
+            } catch (Exception e) {
+                Log.e(LOG_TAG, "Not getting ESN. Exception ex=" + e);
+            }
+            return esn;
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
-        return esn;
     }
 
     /**
@@ -3930,18 +5196,24 @@
      */
     @Override
     public String getCdmaPrlVersion(int subId) {
-        enforceReadPrivilegedPermission();
+        enforceReadPrivilegedPermission("getCdmaPrlVersion");
         Phone phone = getPhone(subId);
-        if (phone == null) {
-            return null;
-        }
-        String cdmaPrlVersion = null;
+
+        final long identity = Binder.clearCallingIdentity();
         try {
-            cdmaPrlVersion = phone.getCdmaPrlVersion();
-        } catch (Exception e) {
-            Log.e(LOG_TAG, "Not getting PRLVersion", e);
+            if (phone == null) {
+                return null;
+            }
+            String cdmaPrlVersion = null;
+            try {
+                cdmaPrlVersion = phone.getCdmaPrlVersion();
+            } catch (Exception e) {
+                Log.e(LOG_TAG, "Not getting PRLVersion", e);
+            }
+            return cdmaPrlVersion;
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
-        return cdmaPrlVersion;
     }
 
     /**
@@ -3953,7 +5225,13 @@
     public List<TelephonyHistogram> getTelephonyHistograms() {
         TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
                 mApp, getDefaultSubscription(), "getTelephonyHistograms");
-        return RIL.getTelephonyRILTimingHistograms();
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            return RIL.getTelephonyRILTimingHistograms();
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     /**
@@ -3966,14 +5244,22 @@
     @Override
     public int setAllowedCarriers(int slotIndex, List<CarrierIdentifier> carriers) {
         enforceModifyPermission();
+        WorkSource workSource = getWorkSource(Binder.getCallingUid());
 
         if (carriers == null) {
             throw new NullPointerException("carriers cannot be null");
         }
 
-        int subId = SubscriptionManager.getSubId(slotIndex)[0];
-        int[] retVal = (int[]) sendRequest(CMD_SET_ALLOWED_CARRIERS, carriers, subId);
-        return retVal[0];
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            int[] subIds = SubscriptionManager.getSubId(slotIndex);
+            int subId = (subIds != null ? subIds[0] : SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+            int[] retVal = (int[]) sendRequest(CMD_SET_ALLOWED_CARRIERS, carriers, subId,
+                    workSource);
+            return retVal[0];
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     /**
@@ -3986,9 +5272,18 @@
      */
     @Override
     public List<CarrierIdentifier> getAllowedCarriers(int slotIndex) {
-        enforceReadPrivilegedPermission();
-        int subId = SubscriptionManager.getSubId(slotIndex)[0];
-        return (List<CarrierIdentifier>) sendRequest(CMD_GET_ALLOWED_CARRIERS, null, subId);
+        enforceReadPrivilegedPermission("getAllowedCarriers");
+        WorkSource workSource = getWorkSource(Binder.getCallingUid());
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            int[] subIds = SubscriptionManager.getSubId(slotIndex);
+            int subId = (subIds != null ? subIds[0] : SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+            return (List<CarrierIdentifier>) sendRequest(CMD_GET_ALLOWED_CARRIERS, null, subId,
+                    workSource);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     /**
@@ -4001,6 +5296,8 @@
     public void carrierActionSetMeteredApnsEnabled(int subId, boolean enabled) {
         enforceModifyPermission();
         final Phone phone = getPhone(subId);
+
+        final long identity = Binder.clearCallingIdentity();
         if (phone == null) {
             loge("carrierAction: SetMeteredApnsEnabled fails with invalid subId: " + subId);
             return;
@@ -4009,6 +5306,8 @@
             phone.carrierActionSetMeteredApnsEnabled(enabled);
         } catch (Exception e) {
             Log.e(LOG_TAG, "carrierAction: SetMeteredApnsEnabled fails. Exception ex=" + e);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
@@ -4022,6 +5321,8 @@
     public void carrierActionSetRadioEnabled(int subId, boolean enabled) {
         enforceModifyPermission();
         final Phone phone = getPhone(subId);
+
+        final long identity = Binder.clearCallingIdentity();
         if (phone == null) {
             loge("carrierAction: SetRadioEnabled fails with invalid sibId: " + subId);
             return;
@@ -4030,6 +5331,8 @@
             phone.carrierActionSetRadioEnabled(enabled);
         } catch (Exception e) {
             Log.e(LOG_TAG, "carrierAction: SetRadioEnabled fails. Exception ex=" + e);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
@@ -4046,6 +5349,8 @@
     public void carrierActionReportDefaultNetworkStatus(int subId, boolean report) {
         enforceModifyPermission();
         final Phone phone = getPhone(subId);
+
+        final long identity = Binder.clearCallingIdentity();
         if (phone == null) {
             loge("carrierAction: ReportDefaultNetworkStatus fails with invalid sibId: " + subId);
             return;
@@ -4054,6 +5359,8 @@
             phone.carrierActionReportDefaultNetworkStatus(report);
         } catch (Exception e) {
             Log.e(LOG_TAG, "carrierAction: ReportDefaultNetworkStatus fails. Exception ex=" + e);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
@@ -4083,7 +5390,7 @@
      */
     @Override
     protected void dump(FileDescriptor fd, PrintWriter writer, String[] args) {
-        if (mPhone.getContext().checkCallingOrSelfPermission(android.Manifest.permission.DUMP)
+        if (mApp.checkCallingOrSelfPermission(android.Manifest.permission.DUMP)
                 != PackageManager.PERMISSION_GRANTED) {
             writer.println("Permission Denial: can't dump Phone from pid="
                     + Binder.getCallingPid()
@@ -4092,7 +5399,7 @@
                     + android.Manifest.permission.DUMP);
             return;
         }
-        DumpsysHandler.dump(mPhone.getContext(), fd, writer, args);
+        DumpsysHandler.dump(mApp, fd, writer, args);
     }
 
     @Override
@@ -4114,14 +5421,19 @@
         mApp.enforceCallingOrSelfPermission(android.Manifest.permission.READ_NETWORK_USAGE_HISTORY,
                 null);
 
-        // NetworkStatsService keeps tracking the active network interface and identity. It
-        // records the delta with the corresponding network identity. We just return the total video
-        // call data usage snapshot since boot.
-        Phone phone = getPhone(subId);
-        if (phone != null) {
-            return phone.getVtDataUsage(perUidStats);
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            // NetworkStatsService keeps tracking the active network interface and identity. It
+            // records the delta with the corresponding network identity.
+            // We just return the total video call data usage snapshot since boot.
+            Phone phone = getPhone(subId);
+            if (phone != null) {
+                return phone.getVtDataUsage(perUidStats);
+            }
+            return null;
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
-        return null;
     }
 
     /**
@@ -4133,9 +5445,15 @@
     @Override
     public void setPolicyDataEnabled(boolean enabled, int subId) {
         enforceModifyPermission();
-        Phone phone = getPhone(subId);
-        if (phone != null) {
-            phone.setPolicyDataEnabled(enabled);
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            Phone phone = getPhone(subId);
+            if (phone != null) {
+                phone.getDataEnabledSettings().setPolicyDataEnabled(enabled);
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
@@ -4150,17 +5468,22 @@
                 mApp, subId, callingPackage, "getClientRequestStats")) {
             return null;
         }
-
         Phone phone = getPhone(subId);
-        if (phone != null) {
-            return phone.getClientRequestStats();
-        }
 
-        return null;
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            if (phone != null) {
+                return phone.getClientRequestStats();
+            }
+
+            return null;
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     private WorkSource getWorkSource(int uid) {
-        String packageName = mPhone.getContext().getPackageManager().getNameForUid(uid);
+        String packageName = mApp.getPackageManager().getNameForUid(uid);
         return new WorkSource(uid, packageName);
     }
 
@@ -4179,15 +5502,21 @@
         enforceModifyPermission();
         Phone phone = PhoneFactory.getPhone(slotIndex);
 
-        if (phone != null) {
-            phone.setSimPowerState(state);
+        WorkSource workSource = getWorkSource(Binder.getCallingUid());
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            if (phone != null) {
+                phone.setSimPowerState(state, workSource);
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
     private boolean isUssdApiAllowed(int subId) {
         CarrierConfigManager configManager =
-                (CarrierConfigManager) mPhone.getContext().getSystemService(
-                        Context.CARRIER_CONFIG_SERVICE);
+                (CarrierConfigManager) mApp.getSystemService(Context.CARRIER_CONFIG_SERVICE);
         if (configManager == null) {
             return false;
         }
@@ -4206,12 +5535,18 @@
      */
     @Override
     public boolean getEmergencyCallbackMode(int subId) {
-        enforceReadPrivilegedPermission();
+        enforceReadPrivilegedPermission("getEmergencyCallbackMode");
         final Phone phone = getPhone(subId);
-        if (phone != null) {
-            return phone.isInEcm();
-        } else {
-            return false;
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            if (phone != null) {
+                return phone.isInEcm();
+            } else {
+                return false;
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
     }
 
@@ -4224,73 +5559,216 @@
      */
     @Override
     public SignalStrength getSignalStrength(int subId) {
-        Phone p = getPhone(subId);
-        if (p == null) {
-            return null;
-        }
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            Phone p = getPhone(subId);
+            if (p == null) {
+                return null;
+            }
 
-        return p.getSignalStrength();
+            return p.getSignalStrength();
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
+    /**
+     * Get the current modem radio state for the given slot.
+     * @param slotIndex slot index.
+     * @param callingPackage the name of the package making the call.
+     * @return the current radio power state from the modem
+     */
+    @Override
+    public int getRadioPowerState(int slotIndex, String callingPackage) {
+        Phone phone = PhoneFactory.getPhone(slotIndex);
+        if (phone != null) {
+            if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
+                    mApp, phone.getSubId(), callingPackage, "getRadioPowerState")) {
+                return TelephonyManager.RADIO_POWER_UNAVAILABLE;
+            }
+
+            final long identity = Binder.clearCallingIdentity();
+            try {
+                return phone.getRadioPowerState();
+            } finally {
+                Binder.restoreCallingIdentity(identity);
+            }
+        }
+        return TelephonyManager.RADIO_POWER_UNAVAILABLE;
+    }
+
+    /**
+     * Checks if data roaming is enabled on the subscription with id {@code subId}.
+     *
+     * <p>Requires one of the following permissions:
+     * {@link android.Manifest.permission#ACCESS_NETWORK_STATE},
+     * {@link android.Manifest.permission#READ_PHONE_STATE} or that the calling app has carrier
+     * privileges.
+     *
+     * @param subId subscription id
+     * @return {@code true} if data roaming is enabled on this subscription, otherwise return
+     * {@code false}.
+     */
+    @Override
+    public boolean isDataRoamingEnabled(int subId) {
+        boolean isEnabled = false;
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            mApp.enforceCallingOrSelfPermission(android.Manifest.permission.ACCESS_NETWORK_STATE,
+                    null /* message */);
+            Phone phone = getPhone(subId);
+            isEnabled =  phone != null ? phone.getDataRoamingEnabled() : false;
+        } catch (Exception e) {
+            TelephonyPermissions.enforeceCallingOrSelfReadPhoneStatePermissionOrCarrierPrivilege(
+                    mApp, subId, "isDataRoamingEnabled");
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+        return isEnabled;
+    }
+
+
+    /**
+     * Enables/Disables the data roaming on the subscription with id {@code subId}.
+     *
+     * <p> Requires permission:
+     * {@link android.Manifest.permission#MODIFY_PHONE_STATE} or that the calling app has carrier
+     * privileges.
+     *
+     * @param subId subscription id
+     * @param isEnabled {@code true} means enable, {@code false} means disable.
+     */
+    @Override
+    public void setDataRoamingEnabled(int subId, boolean isEnabled) {
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
+                    mApp, subId, "setDataRoamingEnabled");
+
+            Phone phone = getPhone(subId);
+            if (phone != null) {
+                phone.setDataRoamingEnabled(isEnabled);
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
+    @Override
+    public boolean isManualNetworkSelectionAllowed(int subId) {
+        boolean isAllowed = true;
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            TelephonyPermissions.enforeceCallingOrSelfReadPhoneStatePermissionOrCarrierPrivilege(
+                    mApp, subId, "isManualNetworkSelectionAllowed");
+            Phone phone = getPhone(subId);
+            if (phone != null) {
+                isAllowed = phone.isCspPlmnEnabled();
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+        return isAllowed;
+    }
+
+    @Override
+    public UiccCardInfo[] getUiccCardsInfo() {
+        enforceReadPrivilegedPermission("getUiccCardsInfo");
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            ArrayList<UiccCardInfo> cards = UiccController.getInstance().getAllUiccCardInfos();
+            return cards.toArray(new UiccCardInfo[cards.size()]);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     @Override
     public UiccSlotInfo[] getUiccSlotsInfo() {
-        enforceReadPrivilegedPermission();
+        enforceReadPrivilegedPermission("getUiccSlotsInfo");
 
-        UiccSlot[] slots = UiccController.getInstance().getUiccSlots();
-        if (slots == null) {
-            Rlog.i(LOG_TAG, "slots is null.");
-            return null;
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            UiccSlot[] slots = UiccController.getInstance().getUiccSlots();
+            if (slots == null) {
+                Rlog.i(LOG_TAG, "slots is null.");
+                return null;
+            }
+
+            UiccSlotInfo[] infos = new UiccSlotInfo[slots.length];
+            for (int i = 0; i < slots.length; i++) {
+                UiccSlot slot = slots[i];
+                if (slot == null) {
+                    continue;
+                }
+
+                String cardId;
+                UiccCard card = slot.getUiccCard();
+                if (card != null) {
+                    cardId = card.getCardId();
+                } else {
+                    cardId = slot.getIccId();
+                }
+
+                int cardState = 0;
+                switch (slot.getCardState()) {
+                    case CARDSTATE_ABSENT:
+                        cardState = UiccSlotInfo.CARD_STATE_INFO_ABSENT;
+                        break;
+                    case CARDSTATE_PRESENT:
+                        cardState = UiccSlotInfo.CARD_STATE_INFO_PRESENT;
+                        break;
+                    case CARDSTATE_ERROR:
+                        cardState = UiccSlotInfo.CARD_STATE_INFO_ERROR;
+                        break;
+                    case CARDSTATE_RESTRICTED:
+                        cardState = UiccSlotInfo.CARD_STATE_INFO_RESTRICTED;
+                        break;
+                    default:
+                        break;
+
+                }
+
+                infos[i] = new UiccSlotInfo(
+                        slot.isActive(),
+                        slot.isEuicc(),
+                        cardId,
+                        cardState,
+                        slot.getPhoneId(),
+                        slot.isExtendedApduSupported());
+            }
+            return infos;
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
-
-        UiccSlotInfo[] infos = new UiccSlotInfo[slots.length];
-        for (int i = 0; i < slots.length; i++) {
-            UiccSlot slot = slots[i];
-            if (slot == null) {
-                continue;
-            }
-
-            String cardId;
-            UiccCard card = slot.getUiccCard();
-            if (card != null) {
-                cardId = card.getCardId();
-            } else {
-                cardId = slot.getIccId();
-            }
-
-            int cardState = 0;
-            switch (slot.getCardState()) {
-                case CARDSTATE_ABSENT:
-                    cardState = UiccSlotInfo.CARD_STATE_INFO_ABSENT;
-                    break;
-                case CARDSTATE_PRESENT:
-                    cardState = UiccSlotInfo.CARD_STATE_INFO_PRESENT;
-                    break;
-                case CARDSTATE_ERROR:
-                    cardState = UiccSlotInfo.CARD_STATE_INFO_ERROR;
-                    break;
-                case CARDSTATE_RESTRICTED:
-                    cardState = UiccSlotInfo.CARD_STATE_INFO_RESTRICTED;
-                    break;
-                default:
-                    break;
-
-            }
-
-            infos[i] = new UiccSlotInfo(
-                    slot.isActive(),
-                    slot.isEuicc(),
-                    cardId,
-                    cardState,
-                    slot.getPhoneId(),
-                    slot.isExtendedApduSupported());
-        }
-        return infos;
     }
 
     @Override
     public boolean switchSlots(int[] physicalSlots) {
         enforceModifyPermission();
-        return (Boolean) sendRequest(CMD_SWITCH_SLOTS, physicalSlots);
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            return (Boolean) sendRequest(CMD_SWITCH_SLOTS, physicalSlots);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
+    @Override
+    public int getCardIdForDefaultEuicc(int subId, String callingPackage) {
+        if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
+                mApp, subId, callingPackage, "getCardIdForDefaultEuicc")) {
+            return TelephonyManager.INVALID_CARD_ID;
+        }
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            return UiccController.getInstance().getCardIdForDefaultEuicc();
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     @Override
@@ -4302,7 +5780,12 @@
             return;
         }
 
-        phone.setRadioIndicationUpdateMode(filters, mode);
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            phone.setRadioIndicationUpdateMode(filters, mode);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     /**
@@ -4351,7 +5834,7 @@
      */
     private boolean getDefaultDataRoamingEnabled(int subId) {
         final CarrierConfigManager configMgr = (CarrierConfigManager)
-                mPhone.getContext().getSystemService(Context.CARRIER_CONFIG_SERVICE);
+                mApp.getSystemService(Context.CARRIER_CONFIG_SERVICE);
         boolean isDataRoamingEnabled = "true".equalsIgnoreCase(
                 SystemProperties.get(DEFAULT_DATA_ROAMING_PROPERTY_NAME, "false"));
         isDataRoamingEnabled |= configMgr.getConfigForSubId(subId).getBoolean(
@@ -4375,22 +5858,297 @@
     public void setCarrierTestOverride(int subId, String mccmnc, String imsi, String iccid, String
             gid1, String gid2, String plmn, String spn) {
         enforceModifyPermission();
-        final Phone phone = getPhone(subId);
-        if (phone == null) {
-            loge("setCarrierTestOverride fails with invalid subId: " + subId);
-            return;
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            final Phone phone = getPhone(subId);
+            if (phone == null) {
+                loge("setCarrierTestOverride fails with invalid subId: " + subId);
+                return;
+            }
+            phone.setCarrierTestOverride(mccmnc, imsi, iccid, gid1, gid2, plmn, spn);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
-        phone.setCarrierTestOverride(mccmnc, imsi, iccid, gid1, gid2, plmn, spn);
     }
 
     @Override
     public int getCarrierIdListVersion(int subId) {
-        enforceReadPrivilegedPermission();
-        final Phone phone = getPhone(subId);
-        if (phone == null) {
-            loge("getCarrierIdListVersion fails with invalid subId: " + subId);
-            return TelephonyManager.UNKNOWN_CARRIER_ID_LIST_VERSION;
+        enforceReadPrivilegedPermission("getCarrierIdListVersion");
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            final Phone phone = getPhone(subId);
+            if (phone == null) {
+                loge("getCarrierIdListVersion fails with invalid subId: " + subId);
+                return TelephonyManager.UNKNOWN_CARRIER_ID_LIST_VERSION;
+            }
+            return phone.getCarrierIdListVersion();
+        } finally {
+            Binder.restoreCallingIdentity(identity);
         }
-        return phone.getCarrierIdListVersion();
+    }
+
+    @Override
+    public int getNumberOfModemsWithSimultaneousDataConnections(int subId, String callingPackage) {
+        if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
+                mApp, subId, callingPackage, "getNumberOfModemsWithSimultaneousDataConnections")) {
+            return -1;
+        }
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            return mPhoneConfigurationManager.getNumberOfModemsWithSimultaneousDataConnections();
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
+    @Override
+    public int getCdmaRoamingMode(int subId) {
+        TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
+                mApp, subId, "getCdmaRoamingMode");
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            return (int) sendRequest(CMD_GET_CDMA_ROAMING_MODE, null /* argument */, subId);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
+    @Override
+    public boolean setCdmaRoamingMode(int subId, int mode) {
+        TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
+                mApp, subId, "setCdmaRoamingMode");
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            return (boolean) sendRequest(CMD_SET_CDMA_ROAMING_MODE, mode, subId);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
+    @Override
+    public boolean setCdmaSubscriptionMode(int subId, int mode) {
+        TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
+                mApp, subId, "setCdmaSubscriptionMode");
+
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            return (boolean) sendRequest(CMD_SET_CDMA_SUBSCRIPTION_MODE, mode, subId);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
+    private void ensureUserRunning(int userId) {
+        if (!mUserManager.isUserRunning(userId)) {
+            throw new IllegalStateException("User " + userId + " does not exist or not running");
+        }
+    }
+
+    /**
+     * Returns a list of SMS apps on a given user.
+     *
+     * Only the shell user (UID 2000 or 0) can call it.
+     * Target user must be running.
+     */
+    @Override
+    public String[] getSmsApps(int userId) {
+        TelephonyPermissions.enforceShellOnly(Binder.getCallingUid(), "getSmsApps");
+        ensureUserRunning(userId);
+
+        final Collection<SmsApplicationData> apps =
+                SmsApplication.getApplicationCollectionAsUser(mApp, userId);
+
+        String[] ret = new String[apps.size()];
+        int i = 0;
+        for (SmsApplicationData app : apps) {
+            ret[i++] = app.mPackageName;
+        }
+        return ret;
+    }
+
+    /**
+     * Returns the default SMS app package name on a given user.
+     *
+     * Only the shell user (UID 2000 or 0) can call it.
+     * Target user must be running.
+     */
+    @Override
+    public String getDefaultSmsApp(int userId) {
+        TelephonyPermissions.enforceShellOnly(Binder.getCallingUid(), "getDefaultSmsApp");
+        ensureUserRunning(userId);
+
+        final ComponentName cn = SmsApplication.getDefaultSmsApplicationAsUser(mApp,
+                /* updateIfNeeded= */ true, userId);
+        return cn == null ? null : cn.getPackageName();
+    }
+
+    /**
+     * Set a package as the default SMS app on a given user.
+     *
+     * Only the shell user (UID 2000 or 0) can call it.
+     * Target user must be running.
+     */
+    @Override
+    public void setDefaultSmsApp(int userId, String packageName) {
+        TelephonyPermissions.enforceShellOnly(Binder.getCallingUid(), "setDefaultSmsApp");
+        ensureUserRunning(userId);
+
+        boolean found = false;
+        for (String pkg : getSmsApps(userId)) {
+            if (TextUtils.equals(packageName, pkg)) {
+                found = true;
+                break;
+            }
+        }
+        if (!found) {
+            throw new IllegalArgumentException("Package " + packageName + " is not an SMS app");
+        }
+
+        SmsApplication.setDefaultApplicationAsUser(packageName, mApp, userId);
+    }
+
+    @Override
+    public Map<Integer, List<EmergencyNumber>> getCurrentEmergencyNumberList(
+            String callingPackage) {
+        if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
+                mApp, getDefaultSubscription(), callingPackage, "getCurrentEmergencyNumberList")) {
+            throw new SecurityException("Requires READ_PHONE_STATE permission.");
+        }
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            Map<Integer, List<EmergencyNumber>> emergencyNumberListInternal = new HashMap<>();
+            for (Phone phone: PhoneFactory.getPhones()) {
+                if (phone.getEmergencyNumberTracker() != null
+                        && phone.getEmergencyNumberTracker().getEmergencyNumberList() != null) {
+                    emergencyNumberListInternal.put(
+                            phone.getSubId(),
+                            phone.getEmergencyNumberTracker().getEmergencyNumberList());
+                }
+            }
+            return emergencyNumberListInternal;
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
+    @Override
+    public boolean isCurrentEmergencyNumber(String number, boolean exactMatch) {
+        final Phone defaultPhone = getDefaultPhone();
+        if (!exactMatch) {
+            TelephonyPermissions
+                    .enforeceCallingOrSelfReadPrivilegedPhoneStatePermissionOrCarrierPrivilege(
+                            mApp, defaultPhone.getSubId(), "isCurrentEmergencyNumber(Potential)");
+        }
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            for (Phone phone: PhoneFactory.getPhones()) {
+                if (phone.getEmergencyNumberTracker() != null
+                        && phone.getEmergencyNumberTracker() != null) {
+                    if (phone.getEmergencyNumberTracker().isEmergencyNumber(
+                            number, exactMatch)) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
+    private Map<Integer, List<EmergencyNumber>> getEmergencyNumberListInternal() {
+        Map<Integer, List<EmergencyNumber>> emergencyNumberListInternal = new HashMap<>();
+
+        for (Phone phone: PhoneFactory.getPhones()) {
+            if (phone.getEmergencyNumberTracker() != null
+                    && phone.getEmergencyNumberTracker().getEmergencyNumberList() != null) {
+                emergencyNumberListInternal.put(
+                        phone.getSubId(),
+                        phone.getEmergencyNumberTracker().getEmergencyNumberList());
+            }
+        }
+        return emergencyNumberListInternal;
+    }
+
+    private List<EmergencyNumber> getEmergencyNumberListFromEccList(int subscriptionId) {
+        SubscriptionManager sm = (SubscriptionManager) mApp.getSystemService(
+                Context.TELEPHONY_SUBSCRIPTION_SERVICE);
+        List<EmergencyNumber> emergencyNumberList = new ArrayList<>();
+        int slotId = sm.getSlotIndex(subscriptionId);
+
+        String ecclist = (slotId <= 0) ? "ril.ecclist" : ("ril.ecclist" + slotId);
+        String emergencyNumbers = SystemProperties.get(ecclist, "");
+        if (TextUtils.isEmpty(emergencyNumbers)) {
+            // then read-only ecclist property since old RIL only uses this
+            emergencyNumbers = SystemProperties.get("ro.ril.ecclist");
+        }
+        if (!TextUtils.isEmpty(emergencyNumbers)) {
+            // searches through the comma-separated list for a match,
+            // return true if one is found.
+            for (String emergencyNum : emergencyNumbers.split(",")) {
+                emergencyNumberList.add(new EmergencyNumber(emergencyNum, "", "",
+                        EmergencyNumber.EMERGENCY_SERVICE_CATEGORY_UNSPECIFIED, 0));
+            }
+        }
+        emergencyNumbers = ((slotId < 0) ? "112,911,000,08,110,118,119,999" : "112,911");
+        for (String emergencyNum : emergencyNumbers.split(",")) {
+            emergencyNumberList.add(new EmergencyNumber(emergencyNum, "", "",
+                    EmergencyNumber.EMERGENCY_SERVICE_CATEGORY_UNSPECIFIED, 0));
+        }
+        EmergencyNumber.mergeSameNumbersInEmergencyNumberList(emergencyNumberList);
+        return emergencyNumberList;
+    }
+
+    /**
+     * Get Emergency number list based on EccList. This util is used for solving backward
+     * compatibility if device does not support the 1.4 IRadioIndication HAL that reports
+     * emergency number list.
+     *
+     * @return Map including the key as the active subscription ID (Note: if there is no active
+     *         subscription, the key is {@link SubscriptionManager#getDefaultSubscriptionId})
+     *         and the value as the list of {@link EmergencyNumber}.
+     */
+    private Map<Integer, List<EmergencyNumber>> getEmergencyNumberListFromEccList() {
+        Map<Integer, List<EmergencyNumber>> results = new HashMap<>();
+        SubscriptionManager sm = (SubscriptionManager) mApp.getSystemService(
+                Context.TELEPHONY_SUBSCRIPTION_SERVICE);
+        int[] activeSubscriptionIds = sm.getActiveSubscriptionIdList();
+
+        if (activeSubscriptionIds.length == 0) {
+            int defaultSubscriptionId = getDefaultSubscription();
+            results.put(defaultSubscriptionId,
+                    getEmergencyNumberListFromEccList(defaultSubscriptionId));
+        } else {
+            for (int activeSubscriptionId : activeSubscriptionIds) {
+                results.put(activeSubscriptionId,
+                        getEmergencyNumberListFromEccList(activeSubscriptionId));
+            }
+        }
+        return results;
+    }
+
+    @Override
+    public List<String> getCertsFromCarrierPrivilegeAccessRules(int subId) {
+        enforceReadPrivilegedPermission("getCertsFromCarrierPrivilegeAccessRules");
+        Phone phone = getPhone(subId);
+        if (phone == null) {
+            return null;
+        }
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            UiccProfile profile = UiccController.getInstance()
+                    .getUiccProfileForPhone(phone.getPhoneId());
+            if (profile != null) {
+                return profile.getCertsFromCarrierPrivilegeAccessRules();
+            }
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+        return null;
     }
 }
diff --git a/src/com/android/phone/PhoneSearchIndexablesProvider.java b/src/com/android/phone/PhoneSearchIndexablesProvider.java
index ee79f92..339602d 100644
--- a/src/com/android/phone/PhoneSearchIndexablesProvider.java
+++ b/src/com/android/phone/PhoneSearchIndexablesProvider.java
@@ -36,11 +36,17 @@
 import android.provider.SearchIndexableResource;
 import android.provider.SearchIndexablesContract.RawData;
 import android.provider.SearchIndexablesProvider;
-import android.support.annotation.VisibleForTesting;
 import android.telephony.euicc.EuiccManager;
 
+import androidx.annotation.VisibleForTesting;
+
 public class PhoneSearchIndexablesProvider extends SearchIndexablesProvider {
     private static final String TAG = "PhoneSearchIndexablesProvider";
+
+    private static final String ESIM_LIST_PROFILE_KEY = "esim_list_profile";
+    private static final String ENHANCED_4G_LTE_KEY = "enhanced_4g_lte";
+    private static final String WIFI_CALLING_KEY = "wifi_calling_key";
+
     private UserManager mUserManager;
 
     private static SearchIndexableResource[] INDEXABLE_RES = new SearchIndexableResource[] {
@@ -112,10 +118,15 @@
                 }
             } else {
                 if (isEuiccSettingsHidden()) {
-                    cursor.addRow(createNonIndexableRow("esim_list_profile" /* key */));
+                    cursor.addRow(createNonIndexableRow(ESIM_LIST_PROFILE_KEY));
                 }
+
                 if (isEnhanced4gLteHidden()) {
-                    cursor.addRow(createNonIndexableRow("enhanced_4g_lte" /* key */));
+                    cursor.addRow(createNonIndexableRow(ENHANCED_4G_LTE_KEY));
+                }
+
+                if (isWifiCallingHidden()) {
+                    cursor.addRow(createNonIndexableRow(WIFI_CALLING_KEY));
                 }
             }
 
@@ -140,6 +151,10 @@
         return MobileNetworkSettings.hideEnhanced4gLteSettings(getContext());
     }
 
+    boolean isWifiCallingHidden() {
+        return !MobileNetworkSettings.isWifiCallingEnabled(getContext());
+    }
+
     private Object[] createNonIndexableRow(String key) {
         final Object[] ref = new Object[NON_INDEXABLES_KEYS_COLUMNS.length];
         ref[COLUMN_INDEX_NON_INDEXABLE_KEYS_KEY_VALUE] = key;
diff --git a/src/com/android/phone/PhoneUtils.java b/src/com/android/phone/PhoneUtils.java
index 31477e7..3306d4b 100644
--- a/src/com/android/phone/PhoneUtils.java
+++ b/src/com/android/phone/PhoneUtils.java
@@ -19,18 +19,13 @@
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.ProgressDialog;
-import android.bluetooth.IBluetoothHeadsetPhone;
 import android.content.ActivityNotFoundException;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.res.Configuration;
-import android.media.AudioManager;
 import android.net.Uri;
 import android.os.Handler;
 import android.os.Message;
-import android.os.RemoteException;
 import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.VideoProfile;
@@ -58,7 +53,6 @@
 import com.android.internal.telephony.PhoneConstants;
 import com.android.internal.telephony.PhoneFactory;
 import com.android.internal.telephony.TelephonyCapabilities;
-import com.android.internal.telephony.sip.SipPhone;
 import com.android.phone.CallGatewayManager.RawGatewayInfo;
 
 import java.util.Arrays;
@@ -75,46 +69,15 @@
     // Do not check in with VDBG = true, since that may write PII to the system log.
     private static final boolean VDBG = false;
 
-    /** Control stack trace for Audio Mode settings */
-    private static final boolean DBG_SETAUDIOMODE_STACK = false;
-
-    /** Identifier for the "Add Call" intent extra. */
-    static final String ADD_CALL_MODE_KEY = "add_call_mode";
-
     // Return codes from placeCall()
     public static final int CALL_STATUS_DIALED = 0;  // The number was successfully dialed
     public static final int CALL_STATUS_DIALED_MMI = 1;  // The specified number was an MMI code
     public static final int CALL_STATUS_FAILED = 2;  // The call failed
 
-    // State of the Phone's audio modes
-    // Each state can move to the other states, but within the state only certain
-    //  transitions for AudioManager.setMode() are allowed.
-    static final int AUDIO_IDLE = 0;  /** audio behaviour at phone idle */
-    static final int AUDIO_RINGING = 1;  /** audio behaviour while ringing */
-    static final int AUDIO_OFFHOOK = 2;  /** audio behaviour while in call. */
-
     // USSD string length for MMI operations
     static final int MIN_USSD_LEN = 1;
     static final int MAX_USSD_LEN = 160;
 
-    /** Speaker state, persisting between wired headset connection events */
-    private static boolean sIsSpeakerEnabled = false;
-
-    /** Static handler for the connection/mute tracking */
-    private static ConnectionHandler mConnectionHandler;
-
-    /** Phone state changed event*/
-    private static final int PHONE_STATE_CHANGED = -1;
-
-    /** check status then decide whether answerCall */
-    private static final int MSG_CHECK_STATUS_ANSWERCALL = 100;
-
-    /** poll phone DISCONNECTING status interval */
-    private static final int DISCONNECTING_POLLING_INTERVAL_MS = 200;
-
-    /** poll phone DISCONNECTING status times limit */
-    private static final int DISCONNECTING_POLLING_TIMES_LIMIT = 8;
-
     /** Define for not a special CNAP string */
     private static final int CNAP_SPECIAL_CASE_NO = -1;
 
@@ -125,15 +88,6 @@
      */
     private static final int THEME = com.android.internal.R.style.Theme_DeviceDefault_Dialog_Alert;
 
-    private static class FgRingCalls {
-        private Call fgCall;
-        private Call ringing;
-        public FgRingCalls(Call fg, Call ring) {
-            fgCall = fg;
-            ringing = ring;
-        }
-    }
-
     /** USSD information used to aggregate all USSD messages */
     private static AlertDialog sUssdDialog = null;
     private static StringBuilder sUssdMsg = new StringBuilder();
@@ -142,347 +96,11 @@
             new ComponentName("com.android.phone",
                     "com.android.services.telephony.TelephonyConnectionService");
 
-    /**
-     * Handler that tracks the connections and updates the value of the
-     * Mute settings for each connection as needed.
-     */
-    private static class ConnectionHandler extends Handler {
-        @Override
-        public void handleMessage(Message msg) {
-            switch (msg.what) {
-                case MSG_CHECK_STATUS_ANSWERCALL:
-                    FgRingCalls frC = (FgRingCalls) msg.obj;
-                    // wait for finishing disconnecting
-                    // before check the ringing call state
-                    if ((frC.fgCall != null) &&
-                        (frC.fgCall.getState() == Call.State.DISCONNECTING) &&
-                        (msg.arg1 < DISCONNECTING_POLLING_TIMES_LIMIT)) {
-                        Message retryMsg =
-                            mConnectionHandler.obtainMessage(MSG_CHECK_STATUS_ANSWERCALL);
-                        retryMsg.arg1 = 1 + msg.arg1;
-                        retryMsg.obj = msg.obj;
-                        mConnectionHandler.sendMessageDelayed(retryMsg,
-                            DISCONNECTING_POLLING_INTERVAL_MS);
-                    // since hangupActiveCall() also accepts the ringing call
-                    // check if the ringing call was already answered or not
-                    // only answer it when the call still is ringing
-                    } else if (frC.ringing.isRinging()) {
-                        if (msg.arg1 == DISCONNECTING_POLLING_TIMES_LIMIT) {
-                            Log.e(LOG_TAG, "DISCONNECTING time out");
-                        }
-                        answerCall(frC.ringing);
-                    }
-                    break;
-            }
-        }
-    }
-
-    /**
-     * Register the ConnectionHandler with the phone, to receive connection events
-     */
-    public static void initializeConnectionHandler(CallManager cm) {
-        if (mConnectionHandler == null) {
-            mConnectionHandler = new ConnectionHandler();
-        }
-
-        // pass over cm as user.obj
-        cm.registerForPreciseCallStateChanged(mConnectionHandler, PHONE_STATE_CHANGED, cm);
-
-    }
-
     /** This class is never instantiated. */
     private PhoneUtils() {
     }
 
     /**
-     * Answer the currently-ringing call.
-     *
-     * @return true if we answered the call, or false if there wasn't
-     *         actually a ringing incoming call, or some other error occurred.
-     *
-     * @see #answerAndEndHolding(CallManager, Call)
-     * @see #answerAndEndActive(CallManager, Call)
-     */
-    /* package */ static boolean answerCall(Call ringingCall) {
-        log("answerCall(" + ringingCall + ")...");
-        final PhoneGlobals app = PhoneGlobals.getInstance();
-        final CallNotifier notifier = app.notifier;
-
-        final Phone phone = ringingCall.getPhone();
-        final boolean phoneIsCdma = (phone.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA);
-        boolean answered = false;
-        IBluetoothHeadsetPhone btPhone = null;
-
-        if (phoneIsCdma) {
-            // Stop any signalInfo tone being played when a Call waiting gets answered
-            if (ringingCall.getState() == Call.State.WAITING) {
-                notifier.stopSignalInfoTone();
-            }
-        }
-
-        if (ringingCall != null && ringingCall.isRinging()) {
-            if (DBG) log("answerCall: call state = " + ringingCall.getState());
-            try {
-                if (phoneIsCdma) {
-                    if (app.cdmaPhoneCallState.getCurrentCallState()
-                            == CdmaPhoneCallState.PhoneCallState.IDLE) {
-                        // This is the FIRST incoming call being answered.
-                        // Set the Phone Call State to SINGLE_ACTIVE
-                        app.cdmaPhoneCallState.setCurrentCallState(
-                                CdmaPhoneCallState.PhoneCallState.SINGLE_ACTIVE);
-                    } else {
-                        // This is the CALL WAITING call being answered.
-                        // Set the Phone Call State to CONF_CALL
-                        app.cdmaPhoneCallState.setCurrentCallState(
-                                CdmaPhoneCallState.PhoneCallState.CONF_CALL);
-                        // Enable "Add Call" option after answering a Call Waiting as the user
-                        // should be allowed to add another call in case one of the parties
-                        // drops off
-                        app.cdmaPhoneCallState.setAddCallMenuStateAfterCallWaiting(true);
-                    }
-                }
-
-                final boolean isRealIncomingCall = isRealIncomingCall(ringingCall.getState());
-
-                //if (DBG) log("sPhone.acceptCall");
-                app.mCM.acceptCall(ringingCall);
-                answered = true;
-
-                setAudioMode();
-            } catch (CallStateException ex) {
-                Log.w(LOG_TAG, "answerCall: caught " + ex, ex);
-
-                if (phoneIsCdma) {
-                    // restore the cdmaPhoneCallState and btPhone.cdmaSetSecondCallState:
-                    app.cdmaPhoneCallState.setCurrentCallState(
-                            app.cdmaPhoneCallState.getPreviousCallState());
-                    if (btPhone != null) {
-                        try {
-                            btPhone.cdmaSetSecondCallState(false);
-                        } catch (RemoteException e) {
-                            Log.e(LOG_TAG, Log.getStackTraceString(new Throwable()));
-                        }
-                    }
-                }
-            }
-        }
-        return answered;
-    }
-
-    /**
-     * Hangs up all active calls.
-     */
-    static void hangupAllCalls(CallManager cm) {
-        final Call ringing = cm.getFirstActiveRingingCall();
-        final Call fg = cm.getActiveFgCall();
-        final Call bg = cm.getFirstActiveBgCall();
-
-        // We go in reverse order, BG->FG->RINGING because hanging up a ringing call or an active
-        // call can move a bg call to a fg call which would force us to loop over each call
-        // several times.  This ordering works best to ensure we dont have any more calls.
-        if (bg != null && !bg.isIdle()) {
-            hangup(bg);
-        }
-        if (fg != null && !fg.isIdle()) {
-            hangup(fg);
-        }
-        if (ringing != null && !ringing.isIdle()) {
-            hangupRingingCall(fg);
-        }
-    }
-
-    /**
-     * Smart "hang up" helper method which hangs up exactly one connection,
-     * based on the current Phone state, as follows:
-     * <ul>
-     * <li>If there's a ringing call, hang that up.
-     * <li>Else if there's a foreground call, hang that up.
-     * <li>Else if there's a background call, hang that up.
-     * <li>Otherwise do nothing.
-     * </ul>
-     * @return true if we successfully hung up, or false
-     *              if there were no active calls at all.
-     */
-    static boolean hangup(CallManager cm) {
-        boolean hungup = false;
-        Call ringing = cm.getFirstActiveRingingCall();
-        Call fg = cm.getActiveFgCall();
-        Call bg = cm.getFirstActiveBgCall();
-
-        if (!ringing.isIdle()) {
-            log("hangup(): hanging up ringing call");
-            hungup = hangupRingingCall(ringing);
-        } else if (!fg.isIdle()) {
-            log("hangup(): hanging up foreground call");
-            hungup = hangup(fg);
-        } else if (!bg.isIdle()) {
-            log("hangup(): hanging up background call");
-            hungup = hangup(bg);
-        } else {
-            // No call to hang up!  This is unlikely in normal usage,
-            // since the UI shouldn't be providing an "End call" button in
-            // the first place.  (But it *can* happen, rarely, if an
-            // active call happens to disconnect on its own right when the
-            // user is trying to hang up..)
-            log("hangup(): no active call to hang up");
-        }
-        if (DBG) log("==> hungup = " + hungup);
-
-        return hungup;
-    }
-
-    static boolean hangupRingingCall(Call ringing) {
-        if (DBG) log("hangup ringing call");
-        int phoneType = ringing.getPhone().getPhoneType();
-        Call.State state = ringing.getState();
-
-        if (state == Call.State.INCOMING) {
-            // Regular incoming call (with no other active calls)
-            log("hangupRingingCall(): regular incoming call: hangup()");
-            return hangup(ringing);
-        } else {
-            // Unexpected state: the ringing call isn't INCOMING or
-            // WAITING, so there's no reason to have called
-            // hangupRingingCall() in the first place.
-            // (Presumably the incoming call went away at the exact moment
-            // we got here, so just do nothing.)
-            Log.w(LOG_TAG, "hangupRingingCall: no INCOMING or WAITING call");
-            return false;
-        }
-    }
-
-    static boolean hangupActiveCall(Call foreground) {
-        if (DBG) log("hangup active call");
-        return hangup(foreground);
-    }
-
-    static boolean hangupHoldingCall(Call background) {
-        if (DBG) log("hangup holding call");
-        return hangup(background);
-    }
-
-    /**
-     * Used in CDMA phones to end the complete Call session
-     * @param phone the Phone object.
-     * @return true if *any* call was successfully hung up
-     */
-    static boolean hangupRingingAndActive(Phone phone) {
-        boolean hungUpRingingCall = false;
-        boolean hungUpFgCall = false;
-        Call ringingCall = phone.getRingingCall();
-        Call fgCall = phone.getForegroundCall();
-
-        // Hang up any Ringing Call
-        if (!ringingCall.isIdle()) {
-            log("hangupRingingAndActive: Hang up Ringing Call");
-            hungUpRingingCall = hangupRingingCall(ringingCall);
-        }
-
-        // Hang up any Active Call
-        if (!fgCall.isIdle()) {
-            log("hangupRingingAndActive: Hang up Foreground Call");
-            hungUpFgCall = hangupActiveCall(fgCall);
-        }
-
-        return hungUpRingingCall || hungUpFgCall;
-    }
-
-    /**
-     * Trivial wrapper around Call.hangup(), except that we return a
-     * boolean success code rather than throwing CallStateException on
-     * failure.
-     *
-     * @return true if the call was successfully hung up, or false
-     *         if the call wasn't actually active.
-     */
-    static boolean hangup(Call call) {
-        try {
-            CallManager cm = PhoneGlobals.getInstance().mCM;
-
-            if (call.getState() == Call.State.ACTIVE && cm.hasActiveBgCall()) {
-                // handle foreground call hangup while there is background call
-                log("- hangup(Call): hangupForegroundResumeBackground...");
-                cm.hangupForegroundResumeBackground(cm.getFirstActiveBgCall());
-            } else {
-                log("- hangup(Call): regular hangup()...");
-                call.hangup();
-            }
-            return true;
-        } catch (CallStateException ex) {
-            Log.e(LOG_TAG, "Call hangup: caught " + ex, ex);
-        }
-
-        return false;
-    }
-
-    /**
-     * Trivial wrapper around Connection.hangup(), except that we silently
-     * do nothing (rather than throwing CallStateException) if the
-     * connection wasn't actually active.
-     */
-    static void hangup(Connection c) {
-        try {
-            if (c != null) {
-                c.hangup();
-            }
-        } catch (CallStateException ex) {
-            Log.w(LOG_TAG, "Connection hangup: caught " + ex, ex);
-        }
-    }
-
-    static boolean answerAndEndHolding(CallManager cm, Call ringing) {
-        if (DBG) log("end holding & answer waiting: 1");
-        if (!hangupHoldingCall(cm.getFirstActiveBgCall())) {
-            Log.e(LOG_TAG, "end holding failed!");
-            return false;
-        }
-
-        if (DBG) log("end holding & answer waiting: 2");
-        return answerCall(ringing);
-
-    }
-
-    /**
-     * Answers the incoming call specified by "ringing", and ends the currently active phone call.
-     *
-     * This method is useful when's there's an incoming call which we cannot manage with the
-     * current call. e.g. when you are having a phone call with CDMA network and has received
-     * a SIP call, then we won't expect our telephony can manage those phone calls simultaneously.
-     * Note that some types of network may allow multiple phone calls at once; GSM allows to hold
-     * an ongoing phone call, so we don't need to end the active call. The caller of this method
-     * needs to check if the network allows multiple phone calls or not.
-     *
-     * @see #answerCall(Call)
-     * @see InCallScreen#internalAnswerCall()
-     */
-    /* package */ static boolean answerAndEndActive(CallManager cm, Call ringing) {
-        if (DBG) log("answerAndEndActive()...");
-
-        // Unlike the answerCall() method, we *don't* need to stop the
-        // ringer or change audio modes here since the user is already
-        // in-call, which means that the audio mode is already set
-        // correctly, and that we wouldn't have started the ringer in the
-        // first place.
-
-        // hanging up the active call also accepts the waiting call
-        // while active call and waiting call are from the same phone
-        // i.e. both from GSM phone
-        Call fgCall = cm.getActiveFgCall();
-        if (!hangupActiveCall(fgCall)) {
-            Log.w(LOG_TAG, "end active call failed!");
-            return false;
-        }
-
-        mConnectionHandler.removeMessages(MSG_CHECK_STATUS_ANSWERCALL);
-        Message msg = mConnectionHandler.obtainMessage(MSG_CHECK_STATUS_ANSWERCALL);
-        msg.arg1 = 1;
-        msg.obj = new FgRingCalls(fgCall, ringing);
-        mConnectionHandler.sendMessage(msg);
-
-        return true;
-    }
-
-    /**
      * For a CDMA phone, advance the call state upon making a new
      * outgoing call.
      *
@@ -585,10 +203,6 @@
             numberToDial = number;
         }
 
-        // Remember if the phone state was in IDLE state before this call.
-        // After calling CallManager#dial(), getState() will return different state.
-        final boolean initiallyIdle = app.mCM.getState() == PhoneConstants.State.IDLE;
-
         try {
             connection = app.mCM.dial(phone, numberToDial, VideoProfile.STATE_AUDIO_ONLY);
         } catch (CallStateException ex) {
@@ -609,11 +223,6 @@
         if (null == connection) {
             status = CALL_STATUS_FAILED;
         } else {
-            // Now that the call is successful, we can save the gateway info for the call
-            if (callGateway != null) {
-                callGateway.setGatewayInfoForConnection(connection, gatewayInfo);
-            }
-
             if (phoneType == PhoneConstants.PHONE_TYPE_CDMA) {
                 updateCdmaCallStateOnNewOutgoingCall(app, connection);
             }
@@ -644,8 +253,6 @@
             }
 
             startGetCallerInfo(context, connection, null, null, gatewayInfo);
-
-            setAudioMode();
         }
 
         return status;
@@ -677,96 +284,6 @@
     }
 
     /**
-     * Wrapper function to control when to send an empty Flash command to the network.
-     * Mainly needed for CDMA networks, such as scenarios when we need to send a blank flash
-     * to the network prior to placing a 3-way call for it to be successful.
-     */
-    static void sendEmptyFlash(Phone phone) {
-        if (phone.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA) {
-            Call fgCall = phone.getForegroundCall();
-            if (fgCall.getState() == Call.State.ACTIVE) {
-                // Send the empty flash
-                if (DBG) Log.d(LOG_TAG, "onReceive: (CDMA) sending empty flash to network");
-                switchHoldingAndActive(phone.getBackgroundCall());
-            }
-        }
-    }
-
-    static void swap() {
-        final PhoneGlobals mApp = PhoneGlobals.getInstance();
-        if (!okToSwapCalls(mApp.mCM)) {
-            // TODO: throw an error instead?
-            return;
-        }
-
-        // Swap the fg and bg calls.
-        // In the future we may provide some way for user to choose among
-        // multiple background calls, for now, always act on the first background call.
-        PhoneUtils.switchHoldingAndActive(mApp.mCM.getFirstActiveBgCall());
-    }
-
-    /**
-     * @param heldCall is the background call want to be swapped
-     */
-    static void switchHoldingAndActive(Call heldCall) {
-        log("switchHoldingAndActive()...");
-        try {
-            CallManager cm = PhoneGlobals.getInstance().mCM;
-            if (heldCall.isIdle()) {
-                // no heldCall, so it is to hold active call
-                cm.switchHoldingAndActive(cm.getFgPhone().getBackgroundCall());
-            } else {
-                // has particular heldCall, so to switch
-                cm.switchHoldingAndActive(heldCall);
-            }
-            setAudioMode(cm);
-        } catch (CallStateException ex) {
-            Log.w(LOG_TAG, "switchHoldingAndActive: caught " + ex, ex);
-        }
-    }
-
-    static void mergeCalls() {
-        mergeCalls(PhoneGlobals.getInstance().mCM);
-    }
-
-    static void mergeCalls(CallManager cm) {
-        int phoneType = cm.getFgPhone().getPhoneType();
-        if (phoneType == PhoneConstants.PHONE_TYPE_CDMA) {
-            log("mergeCalls(): CDMA...");
-            PhoneGlobals app = PhoneGlobals.getInstance();
-            if (app.cdmaPhoneCallState.getCurrentCallState()
-                    == CdmaPhoneCallState.PhoneCallState.THRWAY_ACTIVE) {
-                // Set the Phone Call State to conference
-                app.cdmaPhoneCallState.setCurrentCallState(
-                        CdmaPhoneCallState.PhoneCallState.CONF_CALL);
-
-                // Send flash cmd
-                // TODO: Need to change the call from switchHoldingAndActive to
-                // something meaningful as we are not actually trying to swap calls but
-                // instead are merging two calls by sending a Flash command.
-                log("- sending flash...");
-                switchHoldingAndActive(cm.getFirstActiveBgCall());
-            }
-        } else {
-            try {
-                log("mergeCalls(): calling cm.conference()...");
-                cm.conference(cm.getFirstActiveBgCall());
-            } catch (CallStateException ex) {
-                Log.w(LOG_TAG, "mergeCalls: caught " + ex, ex);
-            }
-        }
-    }
-
-    static void separateCall(Connection c) {
-        try {
-            if (DBG) log("separateCall: " + toLogSafePhoneNumber(c.getAddress()));
-            c.separate();
-        } catch (CallStateException ex) {
-            Log.w(LOG_TAG, "separateCall: caught " + ex, ex);
-        }
-    }
-
-    /**
      * Handle the MMIInitiate message and put up an alert that lets
      * the user cancel the operation, if applicable.
      *
@@ -1111,64 +628,6 @@
         return canceled;
     }
 
-    public static class VoiceMailNumberMissingException extends Exception {
-        VoiceMailNumberMissingException() {
-            super();
-        }
-
-        VoiceMailNumberMissingException(String msg) {
-            super(msg);
-        }
-    }
-
-    /**
-     * Gets the phone number to be called from an intent.  Requires a Context
-     * to access the contacts database, and a Phone to access the voicemail
-     * number.
-     *
-     * <p>If <code>phone</code> is <code>null</code>, the function will return
-     * <code>null</code> for <code>voicemail:</code> URIs;
-     * if <code>context</code> is <code>null</code>, the function will return
-     * <code>null</code> for person/phone URIs.</p>
-     *
-     * <p>If the intent contains a <code>sip:</code> URI, the returned
-     * "number" is actually the SIP address.
-     *
-     * @param context a context to use (or
-     * @param intent the intent
-     *
-     * @throws VoiceMailNumberMissingException if <code>intent</code> contains
-     *         a <code>voicemail:</code> URI, but <code>phone</code> does not
-     *         have a voicemail number set.
-     *
-     * @return the phone number (or SIP address) that would be called by the intent,
-     *         or <code>null</code> if the number cannot be found.
-     */
-    private static String getNumberFromIntent(Context context, Intent intent)
-            throws VoiceMailNumberMissingException {
-        Uri uri = intent.getData();
-        String scheme = uri.getScheme();
-
-        // The sip: scheme is simple: just treat the rest of the URI as a
-        // SIP address.
-        if (PhoneAccount.SCHEME_SIP.equals(scheme)) {
-            return uri.getSchemeSpecificPart();
-        }
-
-        // Otherwise, let PhoneNumberUtils.getNumberFromIntent() handle
-        // the other cases (i.e. tel: and voicemail: and contact: URIs.)
-
-        final String number = PhoneNumberUtils.getNumberFromIntent(intent, context);
-
-        // Check for a voicemail-dialing request.  If the voicemail number is
-        // empty, throw a VoiceMailNumberMissingException.
-        if (PhoneAccount.SCHEME_VOICEMAIL.equals(scheme) &&
-                (number == null || TextUtils.isEmpty(number)))
-            throw new VoiceMailNumberMissingException();
-
-        return number;
-    }
-
     /**
      * Returns the caller-id info corresponding to the specified Connection.
      * (This is just a simple wrapper around CallerInfo.getCallerInfo(): we
@@ -1239,32 +698,6 @@
     }
 
     /**
-     * Start a CallerInfo Query based on the earliest connection in the call.
-     */
-    static CallerInfoToken startGetCallerInfo(Context context, Call call,
-            CallerInfoAsyncQuery.OnQueryCompleteListener listener, Object cookie) {
-        Connection conn = null;
-        int phoneType = call.getPhone().getPhoneType();
-        if (phoneType == PhoneConstants.PHONE_TYPE_CDMA) {
-            conn = call.getLatestConnection();
-        } else if ((phoneType == PhoneConstants.PHONE_TYPE_GSM)
-                || (phoneType == PhoneConstants.PHONE_TYPE_SIP)
-                || (phoneType == PhoneConstants.PHONE_TYPE_IMS)
-                || (phoneType == PhoneConstants.PHONE_TYPE_THIRD_PARTY)) {
-            conn = call.getEarliestConnection();
-        } else {
-            throw new IllegalStateException("Unexpected phone type: " + phoneType);
-        }
-
-        return startGetCallerInfo(context, conn, listener, cookie);
-    }
-
-    static CallerInfoToken startGetCallerInfo(Context context, Connection c,
-            CallerInfoAsyncQuery.OnQueryCompleteListener listener, Object cookie) {
-        return startGetCallerInfo(context, c, listener, cookie, null);
-    }
-
-    /**
      * place a temporary callerinfo object in the hands of the caller and notify
      * caller when the actual query is done.
      */
@@ -1614,145 +1047,6 @@
         return compactName;
     }
 
-    /**
-     * Returns true if the specified Call is a "conference call", meaning
-     * that it owns more than one Connection object.  This information is
-     * used to trigger certain UI changes that appear when a conference
-     * call is active (like displaying the label "Conference call", and
-     * enabling the "Manage conference" UI.)
-     *
-     * Watch out: This method simply checks the number of Connections,
-     * *not* their states.  So if a Call has (for example) one ACTIVE
-     * connection and one DISCONNECTED connection, this method will return
-     * true (which is unintuitive, since the Call isn't *really* a
-     * conference call any more.)
-     *
-     * @return true if the specified call has more than one connection (in any state.)
-     */
-    static boolean isConferenceCall(Call call) {
-        // CDMA phones don't have the same concept of "conference call" as
-        // GSM phones do; there's no special "conference call" state of
-        // the UI or a "manage conference" function.  (Instead, when
-        // you're in a 3-way call, all we can do is display the "generic"
-        // state of the UI.)  So as far as the in-call UI is concerned,
-        // Conference corresponds to generic display.
-        final PhoneGlobals app = PhoneGlobals.getInstance();
-        int phoneType = call.getPhone().getPhoneType();
-        if (phoneType == PhoneConstants.PHONE_TYPE_CDMA) {
-            CdmaPhoneCallState.PhoneCallState state = app.cdmaPhoneCallState.getCurrentCallState();
-            if ((state == CdmaPhoneCallState.PhoneCallState.CONF_CALL)
-                    || ((state == CdmaPhoneCallState.PhoneCallState.THRWAY_ACTIVE)
-                    && !app.cdmaPhoneCallState.IsThreeWayCallOrigStateDialing())) {
-                return true;
-            }
-        } else {
-            List<Connection> connections = call.getConnections();
-            if (connections != null && connections.size() > 1) {
-                return true;
-            }
-        }
-        return false;
-
-        // TODO: We may still want to change the semantics of this method
-        // to say that a given call is only really a conference call if
-        // the number of ACTIVE connections, not the total number of
-        // connections, is greater than one.  (See warning comment in the
-        // javadoc above.)
-        // Here's an implementation of that:
-        //        if (connections == null) {
-        //            return false;
-        //        }
-        //        int numActiveConnections = 0;
-        //        for (Connection conn : connections) {
-        //            if (DBG) log("  - CONN: " + conn + ", state = " + conn.getState());
-        //            if (conn.getState() == Call.State.ACTIVE) numActiveConnections++;
-        //            if (numActiveConnections > 1) {
-        //                return true;
-        //            }
-        //        }
-        //        return false;
-    }
-
-    /**
-     * Launch the Dialer to start a new call.
-     * This is just a wrapper around the ACTION_DIAL intent.
-     */
-    /* package */ static boolean startNewCall(final CallManager cm) {
-        final PhoneGlobals app = PhoneGlobals.getInstance();
-
-        // Sanity-check that this is OK given the current state of the phone.
-        if (!okToAddCall(cm)) {
-            Log.w(LOG_TAG, "startNewCall: can't add a new call in the current state");
-            dumpCallManager();
-            return false;
-        }
-
-        Intent intent = new Intent(Intent.ACTION_DIAL);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-
-        // when we request the dialer come up, we also want to inform
-        // it that we're going through the "add call" option from the
-        // InCallScreen / PhoneUtils.
-        intent.putExtra(ADD_CALL_MODE_KEY, true);
-        try {
-            app.startActivity(intent);
-        } catch (ActivityNotFoundException e) {
-            // This is rather rare but possible.
-            // Note: this method is used even when the phone is encrypted. At that moment
-            // the system may not find any Activity which can accept this Intent.
-            Log.e(LOG_TAG, "Activity for adding calls isn't found.");
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Turns on/off speaker.
-     *
-     * @param context Context
-     * @param flag True when speaker should be on. False otherwise.
-     * @param store True when the settings should be stored in the device.
-     */
-    /* package */ static void turnOnSpeaker(Context context, boolean flag, boolean store) {
-        if (DBG) log("turnOnSpeaker(flag=" + flag + ", store=" + store + ")...");
-        final PhoneGlobals app = PhoneGlobals.getInstance();
-
-        AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        audioManager.setSpeakerphoneOn(flag);
-
-        // record the speaker-enable value
-        if (store) {
-            sIsSpeakerEnabled = flag;
-        }
-
-        // We also need to make a fresh call to PhoneApp.updateWakeState()
-        // any time the speaker state changes, since the screen timeout is
-        // sometimes different depending on whether or not the speaker is
-        // in use.
-        app.updateWakeState();
-
-        app.mCM.setEchoSuppressionEnabled();
-    }
-
-    /**
-     * Restore the speaker mode, called after a wired headset disconnect
-     * event.
-     */
-    static void restoreSpeakerMode(Context context) {
-        if (DBG) log("restoreSpeakerMode, restoring to: " + sIsSpeakerEnabled);
-
-        // change the mode if needed.
-        if (isSpeakerOn(context) != sIsSpeakerEnabled) {
-            turnOnSpeaker(context, sIsSpeakerEnabled, false);
-        }
-    }
-
-    static boolean isSpeakerOn(Context context) {
-        AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        return audioManager.isSpeakerphoneOn();
-    }
-
     static boolean isInEmergencyCall(CallManager cm) {
         Call fgCall = cm.getActiveFgCall();
         // isIdle includes checks for the DISCONNECTING/DISCONNECTED state.
@@ -1767,200 +1061,11 @@
         return false;
     }
 
-    /**
-     * Get the mute state of foreground phone, which has the current
-     * foreground call
-     */
-    static boolean getMute() {
-        return false;
-    }
-
-    /* package */ static void setAudioMode() {
-    }
-
-    /**
-     * Sets the audio mode per current phone state.
-     */
-    /* package */ static void setAudioMode(CallManager cm) {
-    }
-
-    /**
-     * Look for ANY connections on the phone that qualify as being
-     * disconnected.
-     *
-     * @return true if we find a connection that is disconnected over
-     * all the phone's call objects.
-     */
-    /* package */ static boolean hasDisconnectedConnections(Phone phone) {
-        return hasDisconnectedConnections(phone.getForegroundCall()) ||
-                hasDisconnectedConnections(phone.getBackgroundCall()) ||
-                hasDisconnectedConnections(phone.getRingingCall());
-    }
-
-    /**
-     * Iterate over all connections in a call to see if there are any
-     * that are not alive (disconnected or idle).
-     *
-     * @return true if we find a connection that is disconnected, and
-     * pending removal via
-     * {@link com.android.internal.telephony.Call#clearDisconnected()}.
-     */
-    private static final boolean hasDisconnectedConnections(Call call) {
-        // look through all connections for non-active ones.
-        for (Connection c : call.getConnections()) {
-            if (!c.isAlive()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     //
     // Misc UI policy helper functions
     //
 
     /**
-     * @return true if we're allowed to hold calls, given the current
-     * state of the Phone.
-     */
-    /* package */ static boolean okToHoldCall(CallManager cm) {
-        final Call fgCall = cm.getActiveFgCall();
-        final boolean hasHoldingCall = cm.hasActiveBgCall();
-        final Call.State fgCallState = fgCall.getState();
-
-        // The "Hold" control is disabled entirely if there's
-        // no way to either hold or unhold in the current state.
-        final boolean okToHold = (fgCallState == Call.State.ACTIVE) && !hasHoldingCall;
-        final boolean okToUnhold = cm.hasActiveBgCall() && (fgCallState == Call.State.IDLE);
-        final boolean canHold = okToHold || okToUnhold;
-
-        return canHold;
-    }
-
-    /**
-     * @return true if we support holding calls, given the current
-     * state of the Phone.
-     */
-    /* package */ static boolean okToSupportHold(CallManager cm) {
-        boolean supportsHold = false;
-
-        final Call fgCall = cm.getActiveFgCall();
-        final boolean hasHoldingCall = cm.hasActiveBgCall();
-        final Call.State fgCallState = fgCall.getState();
-
-        if (TelephonyCapabilities.supportsHoldAndUnhold(fgCall.getPhone())) {
-            // This phone has the concept of explicit "Hold" and "Unhold" actions.
-            supportsHold = true;
-        } else if (hasHoldingCall && (fgCallState == Call.State.IDLE)) {
-            // Even when foreground phone device doesn't support hold/unhold, phone devices
-            // for background holding calls may do.
-            final Call bgCall = cm.getFirstActiveBgCall();
-            if (bgCall != null &&
-                    TelephonyCapabilities.supportsHoldAndUnhold(bgCall.getPhone())) {
-                supportsHold = true;
-            }
-        }
-        return supportsHold;
-    }
-
-    /**
-     * @return true if we're allowed to swap calls, given the current
-     * state of the Phone.
-     */
-    /* package */ static boolean okToSwapCalls(CallManager cm) {
-        int phoneType = cm.getDefaultPhone().getPhoneType();
-        if (phoneType == PhoneConstants.PHONE_TYPE_CDMA) {
-            // CDMA: "Swap" is enabled only when the phone reaches a *generic*.
-            // state by either accepting a Call Waiting or by merging two calls
-            PhoneGlobals app = PhoneGlobals.getInstance();
-            return (app.cdmaPhoneCallState.getCurrentCallState()
-                    == CdmaPhoneCallState.PhoneCallState.CONF_CALL);
-        } else if ((phoneType == PhoneConstants.PHONE_TYPE_GSM)
-                || (phoneType == PhoneConstants.PHONE_TYPE_SIP)
-                || (phoneType == PhoneConstants.PHONE_TYPE_IMS)
-                || (phoneType == PhoneConstants.PHONE_TYPE_THIRD_PARTY)) {
-            // GSM: "Swap" is available if both lines are in use and there's no
-            // incoming call.  (Actually we need to verify that the active
-            // call really is in the ACTIVE state and the holding call really
-            // is in the HOLDING state, since you *can't* actually swap calls
-            // when the foreground call is DIALING or ALERTING.)
-            return !cm.hasActiveRingingCall()
-                    && (cm.getActiveFgCall().getState() == Call.State.ACTIVE)
-                    && (cm.getFirstActiveBgCall().getState() == Call.State.HOLDING);
-        } else {
-            throw new IllegalStateException("Unexpected phone type: " + phoneType);
-        }
-    }
-
-    /**
-     * @return true if we're allowed to merge calls, given the current
-     * state of the Phone.
-     */
-    /* package */ static boolean okToMergeCalls(CallManager cm) {
-        int phoneType = cm.getFgPhone().getPhoneType();
-        if (phoneType == PhoneConstants.PHONE_TYPE_CDMA) {
-            // CDMA: "Merge" is enabled only when the user is in a 3Way call.
-            PhoneGlobals app = PhoneGlobals.getInstance();
-            return ((app.cdmaPhoneCallState.getCurrentCallState()
-                    == CdmaPhoneCallState.PhoneCallState.THRWAY_ACTIVE)
-                    && !app.cdmaPhoneCallState.IsThreeWayCallOrigStateDialing());
-        } else {
-            // GSM: "Merge" is available if both lines are in use and there's no
-            // incoming call, *and* the current conference isn't already
-            // "full".
-            // TODO: shall move all okToMerge logic to CallManager
-            return !cm.hasActiveRingingCall() && cm.hasActiveFgCall()
-                    && cm.hasActiveBgCall()
-                    && cm.canConference(cm.getFirstActiveBgCall());
-        }
-    }
-
-    /**
-     * @return true if the UI should let you add a new call, given the current
-     * state of the Phone.
-     */
-    /* package */ static boolean okToAddCall(CallManager cm) {
-        Phone phone = cm.getActiveFgCall().getPhone();
-
-        // "Add call" is never allowed in emergency callback mode (ECM).
-        if (isPhoneInEcm(phone)) {
-            return false;
-        }
-
-        int phoneType = phone.getPhoneType();
-        final Call.State fgCallState = cm.getActiveFgCall().getState();
-        if (phoneType == PhoneConstants.PHONE_TYPE_CDMA) {
-           // CDMA: "Add call" button is only enabled when:
-           // - ForegroundCall is in ACTIVE state
-           // - After 30 seconds of user Ignoring/Missing a Call Waiting call.
-            PhoneGlobals app = PhoneGlobals.getInstance();
-            return ((fgCallState == Call.State.ACTIVE)
-                    && (app.cdmaPhoneCallState.getAddCallMenuStateAfterCallWaiting()));
-        } else if ((phoneType == PhoneConstants.PHONE_TYPE_GSM)
-                || (phoneType == PhoneConstants.PHONE_TYPE_SIP)
-                || (phoneType == PhoneConstants.PHONE_TYPE_IMS)
-                || (phoneType == PhoneConstants.PHONE_TYPE_THIRD_PARTY)) {
-            // GSM: "Add call" is available only if ALL of the following are true:
-            // - There's no incoming ringing call
-            // - There's < 2 lines in use
-            // - The foreground call is ACTIVE or IDLE or DISCONNECTED.
-            //   (We mainly need to make sure it *isn't* DIALING or ALERTING.)
-            final boolean hasRingingCall = cm.hasActiveRingingCall();
-            final boolean hasActiveCall = cm.hasActiveFgCall();
-            final boolean hasHoldingCall = cm.hasActiveBgCall();
-            final boolean allLinesTaken = hasActiveCall && hasHoldingCall;
-
-            return !hasRingingCall
-                    && !allLinesTaken
-                    && ((fgCallState == Call.State.ACTIVE)
-                        || (fgCallState == Call.State.IDLE)
-                        || (fgCallState == Call.State.DISCONNECTED));
-        } else {
-            throw new IllegalStateException("Unexpected phone type: " + phoneType);
-        }
-    }
-
-    /**
      * Based on the input CNAP number string,
      * @return _RESTRICTED or _UNKNOWN for all the special CNAP strings.
      * Otherwise, return CNAP_SPECIAL_CASE_NO.
@@ -2083,47 +1188,6 @@
     }
 
     /**
-     * Returns the most appropriate Phone object to handle a call
-     * to the specified number.
-     *
-     * @param cm the CallManager.
-     * @param scheme the scheme from the data URI that the number originally came from.
-     * @param number the phone number, or SIP address.
-     */
-    public static Phone pickPhoneBasedOnNumber(CallManager cm, String scheme, String number,
-            String primarySipUri, ComponentName thirdPartyCallComponent) {
-        if (DBG) {
-            log("pickPhoneBasedOnNumber: scheme " + scheme
-                    + ", number " + toLogSafePhoneNumber(number)
-                    + ", sipUri "
-                    + (primarySipUri != null ? Uri.parse(primarySipUri).toSafeString() : "null")
-                    + ", thirdPartyCallComponent: " + thirdPartyCallComponent);
-        }
-
-        if (primarySipUri != null) {
-            Phone phone = getSipPhoneFromUri(cm, primarySipUri);
-            if (phone != null) return phone;
-        }
-
-        return cm.getDefaultPhone();
-    }
-
-    public static Phone getSipPhoneFromUri(CallManager cm, String target) {
-        for (Phone phone : cm.getAllPhones()) {
-            if (phone.getPhoneType() == PhoneConstants.PHONE_TYPE_SIP) {
-                String sipUri = ((SipPhone) phone).getSipUri();
-                if (target.equals(sipUri)) {
-                    if (DBG) log("- pickPhoneBasedOnNumber:" +
-                            "found SipPhone! obj = " + phone + ", "
-                            + phone.getClass());
-                    return phone;
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
      * Returns true when the given call is in INCOMING state and there's no foreground phone call,
      * meaning the call is the first real incoming call the phone is having.
      */
@@ -2131,166 +1195,14 @@
         return (state == Call.State.INCOMING && !PhoneGlobals.getInstance().mCM.hasActiveFgCall());
     }
 
-    public static String getPresentationString(Context context, int presentation) {
-        String name = context.getString(R.string.unknown);
-        if (presentation == PhoneConstants.PRESENTATION_RESTRICTED) {
-            name = context.getString(R.string.private_num);
-        } else if (presentation == PhoneConstants.PRESENTATION_PAYPHONE) {
-            name = context.getString(R.string.payphone);
-        }
-        return name;
-    }
-
-    public static void sendViewNotificationAsync(Context context, Uri contactUri) {
-        if (DBG) Log.d(LOG_TAG, "Send view notification to Contacts (uri: " + contactUri + ")");
-        Intent intent = new Intent("com.android.contacts.VIEW_NOTIFICATION", contactUri);
-        intent.setClassName("com.android.contacts",
-                "com.android.contacts.ViewNotificationService");
-        context.startService(intent);
-    }
-
     //
     // General phone and call state debugging/testing code
     //
 
-    /* package */ static void dumpCallState(Phone phone) {
-        PhoneGlobals app = PhoneGlobals.getInstance();
-        Log.d(LOG_TAG, "dumpCallState():");
-        Log.d(LOG_TAG, "- Phone: " + phone + ", name = " + phone.getPhoneName()
-              + ", state = " + phone.getState());
-
-        StringBuilder b = new StringBuilder(128);
-
-        Call call = phone.getForegroundCall();
-        b.setLength(0);
-        b.append("  - FG call: ").append(call.getState());
-        b.append(" isAlive ").append(call.getState().isAlive());
-        b.append(" isRinging ").append(call.getState().isRinging());
-        b.append(" isDialing ").append(call.getState().isDialing());
-        b.append(" isIdle ").append(call.isIdle());
-        b.append(" hasConnections ").append(call.hasConnections());
-        Log.d(LOG_TAG, b.toString());
-
-        call = phone.getBackgroundCall();
-        b.setLength(0);
-        b.append("  - BG call: ").append(call.getState());
-        b.append(" isAlive ").append(call.getState().isAlive());
-        b.append(" isRinging ").append(call.getState().isRinging());
-        b.append(" isDialing ").append(call.getState().isDialing());
-        b.append(" isIdle ").append(call.isIdle());
-        b.append(" hasConnections ").append(call.hasConnections());
-        Log.d(LOG_TAG, b.toString());
-
-        call = phone.getRingingCall();
-        b.setLength(0);
-        b.append("  - RINGING call: ").append(call.getState());
-        b.append(" isAlive ").append(call.getState().isAlive());
-        b.append(" isRinging ").append(call.getState().isRinging());
-        b.append(" isDialing ").append(call.getState().isDialing());
-        b.append(" isIdle ").append(call.isIdle());
-        b.append(" hasConnections ").append(call.hasConnections());
-        Log.d(LOG_TAG, b.toString());
-
-
-        final boolean hasRingingCall = !phone.getRingingCall().isIdle();
-        final boolean hasActiveCall = !phone.getForegroundCall().isIdle();
-        final boolean hasHoldingCall = !phone.getBackgroundCall().isIdle();
-        final boolean allLinesTaken = hasActiveCall && hasHoldingCall;
-        b.setLength(0);
-        b.append("  - hasRingingCall ").append(hasRingingCall);
-        b.append(" hasActiveCall ").append(hasActiveCall);
-        b.append(" hasHoldingCall ").append(hasHoldingCall);
-        b.append(" allLinesTaken ").append(allLinesTaken);
-        Log.d(LOG_TAG, b.toString());
-
-        // On CDMA phones, dump out the CdmaPhoneCallState too:
-        if (phone.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA) {
-            if (app.cdmaPhoneCallState != null) {
-                Log.d(LOG_TAG, "  - CDMA call state: "
-                      + app.cdmaPhoneCallState.getCurrentCallState());
-            } else {
-                Log.d(LOG_TAG, "  - CDMA device, but null cdmaPhoneCallState!");
-            }
-        }
-    }
-
     private static void log(String msg) {
         Log.d(LOG_TAG, msg);
     }
 
-    static void dumpCallManager() {
-        Call call;
-        CallManager cm = PhoneGlobals.getInstance().mCM;
-        StringBuilder b = new StringBuilder(128);
-
-
-
-        Log.d(LOG_TAG, "############### dumpCallManager() ##############");
-        // TODO: Don't log "cm" itself, since CallManager.toString()
-        // already spews out almost all this same information.
-        // We should fix CallManager.toString() to be more minimal, and
-        // use an explicit dumpState() method for the verbose dump.
-        // Log.d(LOG_TAG, "CallManager: " + cm
-        //         + ", state = " + cm.getState());
-        Log.d(LOG_TAG, "CallManager: state = " + cm.getState());
-        b.setLength(0);
-        call = cm.getActiveFgCall();
-        b.append(" - FG call: ").append(cm.hasActiveFgCall()? "YES ": "NO ");
-        b.append(call);
-        b.append( "  State: ").append(cm.getActiveFgCallState());
-        b.append( "  Conn: ").append(cm.getFgCallConnections());
-        Log.d(LOG_TAG, b.toString());
-        b.setLength(0);
-        call = cm.getFirstActiveBgCall();
-        b.append(" - BG call: ").append(cm.hasActiveBgCall()? "YES ": "NO ");
-        b.append(call);
-        b.append( "  State: ").append(cm.getFirstActiveBgCall().getState());
-        b.append( "  Conn: ").append(cm.getBgCallConnections());
-        Log.d(LOG_TAG, b.toString());
-        b.setLength(0);
-        call = cm.getFirstActiveRingingCall();
-        b.append(" - RINGING call: ").append(cm.hasActiveRingingCall()? "YES ": "NO ");
-        b.append(call);
-        b.append( "  State: ").append(cm.getFirstActiveRingingCall().getState());
-        Log.d(LOG_TAG, b.toString());
-
-
-
-        for (Phone phone : CallManager.getInstance().getAllPhones()) {
-            if (phone != null) {
-                Log.d(LOG_TAG, "Phone: " + phone + ", name = " + phone.getPhoneName()
-                        + ", state = " + phone.getState());
-                b.setLength(0);
-                call = phone.getForegroundCall();
-                b.append(" - FG call: ").append(call);
-                b.append( "  State: ").append(call.getState());
-                b.append( "  Conn: ").append(call.hasConnections());
-                Log.d(LOG_TAG, b.toString());
-                b.setLength(0);
-                call = phone.getBackgroundCall();
-                b.append(" - BG call: ").append(call);
-                b.append( "  State: ").append(call.getState());
-                b.append( "  Conn: ").append(call.hasConnections());
-                Log.d(LOG_TAG, b.toString());b.setLength(0);
-                call = phone.getRingingCall();
-                b.append(" - RINGING call: ").append(call);
-                b.append( "  State: ").append(call.getState());
-                b.append( "  Conn: ").append(call.hasConnections());
-                Log.d(LOG_TAG, b.toString());
-            }
-        }
-
-        Log.d(LOG_TAG, "############## END dumpCallManager() ###############");
-    }
-
-    /**
-     * @return if the context is in landscape orientation.
-     */
-    public static boolean isLandscape(Context context) {
-        return context.getResources().getConfiguration().orientation
-                == Configuration.ORIENTATION_LANDSCAPE;
-    }
-
     public static PhoneAccountHandle makePstnPhoneAccountHandle(String id) {
         return makePstnPhoneAccountHandleWithPrefix(id, "", false);
     }
@@ -2341,7 +1253,6 @@
         return null;
     }
 
-
     /**
      * Determine if a given phone account corresponds to an active SIM
      *
diff --git a/src/com/android/phone/RoamingDialogFragment.java b/src/com/android/phone/RoamingDialogFragment.java
index 4d3bd47..384a120 100644
--- a/src/com/android/phone/RoamingDialogFragment.java
+++ b/src/com/android/phone/RoamingDialogFragment.java
@@ -27,14 +27,17 @@
 import android.os.PersistableBundle;
 import android.telephony.CarrierConfigManager;
 
-import com.android.internal.telephony.Phone;
-
 /**
  * A dialog fragment that asks the user if they are sure they want to turn on data roaming
  * to avoid accidental charges.
  */
 public class RoamingDialogFragment extends DialogFragment implements OnClickListener {
 
+    public static final String SUB_ID_KEY = "sub_id_key";
+
+    private CarrierConfigManager mCarrierConfigManager;
+    private int mSubId;
+
     /**
      * The interface we expect a host activity to implement.
      */
@@ -45,15 +48,13 @@
     // the host activity which implements the listening interface
     private RoamingDialogListener mListener;
 
-    private Phone mPhone;
-
-    public void setPhone(Phone phone) {
-        mPhone = phone;
-    }
-
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
+        Bundle args = getArguments();
+        mSubId = args.getInt(SUB_ID_KEY);
+        mCarrierConfigManager = new CarrierConfigManager(context);
+
         // Verify host activity implemented callback interface
         FragmentManager fragmentManager = getFragmentManager();
         Fragment fragment = fragmentManager.findFragmentById(R.id.network_setting_content);
@@ -69,13 +70,10 @@
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         int title = R.string.roaming_alert_title;
-        if (mPhone != null) {
-            PersistableBundle carrierConfig =
-                    PhoneGlobals.getInstance().getCarrierConfigForSubId(mPhone.getSubId());
-            if (carrierConfig != null && carrierConfig.getBoolean(
-                    CarrierConfigManager.KEY_CHECK_PRICING_WITH_CARRIER_FOR_DATA_ROAMING_BOOL)) {
-                title = R.string.roaming_check_price_warning;
-            }
+        PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(mSubId);
+        if (carrierConfig != null && carrierConfig.getBoolean(
+                CarrierConfigManager.KEY_CHECK_PRICING_WITH_CARRIER_FOR_DATA_ROAMING_BOOL)) {
+            title = R.string.roaming_check_price_warning;
         }
         builder.setMessage(getResources().getString(R.string.roaming_warning))
                 .setTitle(title)
diff --git a/src/com/android/phone/SimContacts.java b/src/com/android/phone/SimContacts.java
index f668917..4229482 100644
--- a/src/com/android/phone/SimContacts.java
+++ b/src/com/android/phone/SimContacts.java
@@ -41,7 +41,6 @@
 import android.provider.ContactsContract.Data;
 import android.provider.ContactsContract.RawContacts;
 import android.telecom.PhoneAccount;
-import android.telephony.SubscriptionManager;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.ContextMenu;
diff --git a/src/com/android/phone/SpecialCharSequenceMgr.java b/src/com/android/phone/SpecialCharSequenceMgr.java
index 3c02a30..5a5d488 100644
--- a/src/com/android/phone/SpecialCharSequenceMgr.java
+++ b/src/com/android/phone/SpecialCharSequenceMgr.java
@@ -19,19 +19,14 @@
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.ActivityNotFoundException;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.net.Uri;
 import android.provider.Settings;
-
-import com.android.internal.telephony.TelephonyIntents;
-import com.android.internal.telephony.Phone;
-
 import android.telephony.PhoneNumberUtils;
 import android.util.Log;
 import android.view.WindowManager;
 
+import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.TelephonyCapabilities;
 
 /**
diff --git a/src/com/android/phone/TelephonyDebugService.java b/src/com/android/phone/TelephonyDebugService.java
index fe17633..da66994 100644
--- a/src/com/android/phone/TelephonyDebugService.java
+++ b/src/com/android/phone/TelephonyDebugService.java
@@ -16,13 +16,13 @@
 
 package com.android.phone;
 
-import com.android.internal.telephony.DebugService;
-
 import android.app.Service;
 import android.content.Intent;
 import android.os.IBinder;
 import android.util.Log;
 
+import com.android.internal.telephony.DebugService;
+
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
 
diff --git a/src/com/android/phone/TelephonyShellCommand.java b/src/com/android/phone/TelephonyShellCommand.java
index 4acb46b..9250118 100644
--- a/src/com/android/phone/TelephonyShellCommand.java
+++ b/src/com/android/phone/TelephonyShellCommand.java
@@ -16,8 +16,11 @@
 
 package com.android.phone;
 
+import android.os.Binder;
+import android.os.Process;
 import android.os.RemoteException;
 import android.os.ShellCommand;
+import android.os.UserHandle;
 import android.telephony.SubscriptionManager;
 import android.util.Log;
 
@@ -39,11 +42,21 @@
     private static final int DEFAULT_PHONE_ID = 0;
 
     private static final String IMS_SUBCOMMAND = "ims";
+    private static final String SMS_SUBCOMMAND = "sms";
+    private static final String NUMBER_VERIFICATION_SUBCOMMAND = "numverify";
+
     private static final String IMS_SET_CARRIER_SERVICE = "set-ims-service";
     private static final String IMS_GET_CARRIER_SERVICE = "get-ims-service";
     private static final String IMS_ENABLE = "enable";
     private static final String IMS_DISABLE = "disable";
 
+    private static final String SMS_GET_APPS = "get-apps";
+    private static final String SMS_GET_DEFAULT_APP = "get-default-app";
+    private static final String SMS_SET_DEFAULT_APP = "set-default-app";
+
+    private static final String NUMBER_VERIFICATION_OVERRIDE_PACKAGE = "override-package";
+    private static final String NUMBER_VERIFICATION_FAKE_CALL = "fake-call";
+
     // Take advantage of existing methods that already contain permissions checks when possible.
     private final ITelephony mInterface;
 
@@ -61,6 +74,11 @@
             case IMS_SUBCOMMAND: {
                 return handleImsCommand();
             }
+            case SMS_SUBCOMMAND: {
+                return handleSmsCommand();
+            }
+            case NUMBER_VERIFICATION_SUBCOMMAND:
+                return handleNumberVerificationCommand();
             default: {
                 return handleDefaultCommands(cmd);
             }
@@ -75,7 +93,10 @@
         pw.println("    Print this help text.");
         pw.println("  ims");
         pw.println("    IMS Commands.");
+        pw.println("  sms");
+        pw.println("    SMS Commands.");
         onHelpIms();
+        onHelpSms();
     }
 
     private void onHelpIms() {
@@ -103,6 +124,29 @@
         pw.println("    slot if none is specified.");
     }
 
+    private void onHelpSms() {
+        PrintWriter pw = getOutPrintWriter();
+        pw.println("SMS Commands:");
+        pw.println("  sms get-apps [--user USER_ID]");
+        pw.println("    Print all SMS apps on a user.");
+        pw.println("  sms get-default-app [--user USER_ID]");
+        pw.println("    Get the default SMS app.");
+        pw.println("  sms set-default-app [--user USER_ID] PACKAGE_NAME");
+        pw.println("    Set PACKAGE_NAME as the default SMS app.");
+    }
+
+
+    private void onHelpNumberVerification() {
+        PrintWriter pw = getOutPrintWriter();
+        pw.println("Number verification commands");
+        pw.println("  numverify override-package PACKAGE_NAME;");
+        pw.println("    Set the authorized package for number verification.");
+        pw.println("    Leave the package name blank to reset.");
+        pw.println("  numverify fake-call NUMBER;");
+        pw.println("    Fake an incoming call from NUMBER. This is for testing. Output will be");
+        pw.println("    1 if the call would have been intercepted, 0 otherwise.");
+    }
+
     private int handleImsCommand() {
         String arg = getNextArg();
         if (arg == null) {
@@ -128,6 +172,33 @@
         return -1;
     }
 
+    private int handleNumberVerificationCommand() {
+        String arg = getNextArg();
+        if (arg == null) {
+            onHelpNumberVerification();
+            return 0;
+        }
+
+        if (!checkShellUid()) {
+            return -1;
+        }
+
+        switch (arg) {
+            case NUMBER_VERIFICATION_OVERRIDE_PACKAGE: {
+                NumberVerificationManager.overrideAuthorizedPackage(getNextArg());
+                return 0;
+            }
+            case NUMBER_VERIFICATION_FAKE_CALL: {
+                boolean val = NumberVerificationManager.getInstance()
+                        .checkIncomingCall(getNextArg());
+                getOutPrintWriter().println(val ? "1" : "0");
+                return 0;
+            }
+        }
+
+        return -1;
+    }
+
     // ims set-ims-service
     private int handleImsSetServiceCommand() {
         PrintWriter errPw = getErrPrintWriter();
@@ -296,4 +367,91 @@
         }
         return slotId;
     }
+
+    private int handleSmsCommand() {
+        String arg = getNextArg();
+        if (arg == null) {
+            onHelpSms();
+            return 0;
+        }
+
+        try {
+            switch (arg) {
+                case SMS_GET_APPS: {
+                    return handleSmsGetApps();
+                }
+                case SMS_GET_DEFAULT_APP: {
+                    return handleSmsGetDefaultApp();
+                }
+                case SMS_SET_DEFAULT_APP: {
+                    return handleSmsSetDefaultApp();
+                }
+                default:
+                    getErrPrintWriter().println("Unknown command " + arg);
+            }
+        } catch (RemoteException e) {
+            getErrPrintWriter().println("RemoteException: " + e.getMessage());
+        }
+
+        return -1;
+    }
+
+    private int maybeParseUserIdArg() {
+        int userId = UserHandle.USER_SYSTEM;
+        String opt;
+        while ((opt = getNextOption()) != null) {
+            switch (opt) {
+                case "--user": {
+                    try {
+                        userId = Integer.parseInt(getNextArgRequired());
+                    } catch (NumberFormatException e) {
+                        getErrPrintWriter().println("Invalid user ID for --user");
+                        return -1;
+                    }
+                    break;
+                }
+            }
+        }
+        return userId;
+    }
+
+    private int handleSmsGetApps() throws RemoteException {
+        final int userId = maybeParseUserIdArg();
+        if (userId < 0) {
+            return -1;
+        }
+
+        for (String packageName : mInterface.getSmsApps(userId)) {
+            getOutPrintWriter().println(packageName);
+        }
+        return 0;
+    }
+
+    private int handleSmsGetDefaultApp() throws RemoteException {
+        final int userId = maybeParseUserIdArg();
+        if (userId < 0) {
+            return -1;
+        }
+
+        getOutPrintWriter().println(mInterface.getDefaultSmsApp(userId));
+        return 0;
+    }
+
+    private int handleSmsSetDefaultApp() throws RemoteException {
+        final int userId = maybeParseUserIdArg();
+        if (userId < 0) {
+            return -1;
+        }
+
+        String packageName = getNextArgRequired();
+        mInterface.setDefaultSmsApp(userId, packageName);
+        getOutPrintWriter().println("SMS app set to " + mInterface.getDefaultSmsApp(userId));
+        return 0;
+    }
+
+    private boolean checkShellUid() {
+        // adb can run as root or as shell, depending on whether the device is rooted.
+        return Binder.getCallingUid() == Process.SHELL_UID
+                || Binder.getCallingUid() == Process.ROOT_UID;
+    }
 }
diff --git a/src/com/android/phone/ecc/CountryEccInfo.java b/src/com/android/phone/ecc/CountryEccInfo.java
index bc7ec84..969901d 100644
--- a/src/com/android/phone/ecc/CountryEccInfo.java
+++ b/src/com/android/phone/ecc/CountryEccInfo.java
@@ -16,8 +16,8 @@
 
 package com.android.phone.ecc;
 
-import android.annotation.NonNull;
-import android.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.Collection;
 
diff --git a/src/com/android/phone/ecc/EccInfo.java b/src/com/android/phone/ecc/EccInfo.java
index a219bae..fb41370 100644
--- a/src/com/android/phone/ecc/EccInfo.java
+++ b/src/com/android/phone/ecc/EccInfo.java
@@ -16,7 +16,7 @@
 
 package com.android.phone.ecc;
 
-import android.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.Collection;
 
diff --git a/src/com/android/phone/ecc/EccInfoHelper.java b/src/com/android/phone/ecc/EccInfoHelper.java
index 875442a..c471c4b 100644
--- a/src/com/android/phone/ecc/EccInfoHelper.java
+++ b/src/com/android/phone/ecc/EccInfoHelper.java
@@ -16,8 +16,6 @@
 
 package com.android.phone.ecc;
 
-import android.annotation.NonNull;
-import android.annotation.Nullable;
 import android.content.Context;
 import android.os.AsyncTask;
 import android.provider.Settings;
@@ -35,6 +33,9 @@
 import android.util.Log;
 import android.util.Pair;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.android.internal.telephony.MccTable;
 
 import java.io.IOException;
@@ -49,6 +50,32 @@
     private static final boolean DBG = false;
     private static final String LOG_TAG = "EccInfoHelper";
 
+    /**
+     * Check if current CountryEccInfo is available for current environment.
+     */
+    public static boolean isCountryEccInfoAvailable(Context context, String countryIso) {
+        CountryEccInfo countryEccInfo;
+        try {
+            countryEccInfo = IsoToEccProtobufRepository.getInstance()
+                    .getCountryEccInfo(context, countryIso);
+        } catch (IOException e) {
+            Log.e(LOG_TAG, "Failed to retrieve ECC: ", e);
+            return false;
+        }
+
+        if (countryEccInfo == null) {
+            return false;
+        }
+        for (EccInfo entry : countryEccInfo.getEccInfoList()) {
+            if (!PhoneNumberUtils.isEmergencyNumber(entry.getNumber())) {
+                // The CountryEccInfo is unavailable if any ecc number in the local table was
+                // declined.
+                return false;
+            }
+        }
+        return true;
+    }
+
     // country ISO to ECC list data source
     private IsoToEccRepository mEccRepo;
 
@@ -135,7 +162,8 @@
         }.execute();
     }
 
-    private @NonNull CountryEccInfo getDialableCountryEccInfo(CountryEccInfo countryEccInfo) {
+    @NonNull
+    private CountryEccInfo getDialableCountryEccInfo(CountryEccInfo countryEccInfo) {
         ArrayList<EccInfo> dialableECCList = new ArrayList<>();
         String dialableFallback = null;
 
@@ -154,7 +182,8 @@
         return new CountryEccInfo(dialableFallback, dialableECCList);
     }
 
-    private @Nullable String getCurrentCountryIso(@NonNull Context context) {
+    @Nullable
+    private String getCurrentCountryIso(@NonNull Context context) {
         // Do not detect country ISO if airplane mode is on
         int airplaneMode = Settings.System.getInt(context.getContentResolver(),
                 Settings.Global.AIRPLANE_MODE_ON, 0);
@@ -172,7 +201,7 @@
             // XXX: according to ServiceStateTracker's implementation, retrieve cell info in a
             // thread other than TelephonyManager's main thread.
             String mcc = getCurrentMccFromCellInfo(context);
-            iso = countryCodeForMcc(mcc);
+            iso = MccTable.countryCodeForMcc(mcc);
             if (DBG) {
                 Log.d(LOG_TAG, "Current mcc is " + Rlog.pii(LOG_TAG, mcc) + ", mapping to ISO: "
                         + Rlog.pii(LOG_TAG, iso));
@@ -181,18 +210,11 @@
         return iso;
     }
 
-    private String countryCodeForMcc(String mcc) {
-        try {
-            return MccTable.countryCodeForMcc(Integer.parseInt(mcc));
-        } catch (NumberFormatException ex) {
-            return "";
-        }
-    }
-
     // XXX: According to ServiceStateTracker implementation, to actually get current cell info,
     // this method must be called in a separate thread from ServiceStateTracker, which is the
     // main thread of Telephony service.
-    private @Nullable String getCurrentMccFromCellInfo(@NonNull Context context) {
+    @Nullable
+    private String getCurrentMccFromCellInfo(@NonNull Context context) {
         // retrieve mcc info from base station even no SIM present.
         TelephonyManager tm = (TelephonyManager) context.getSystemService(
                 Context.TELEPHONY_SERVICE);
diff --git a/src/com/android/phone/ecc/IsoToEccProtobufRepository.java b/src/com/android/phone/ecc/IsoToEccProtobufRepository.java
index d44de9a..7d9b4f0 100644
--- a/src/com/android/phone/ecc/IsoToEccProtobufRepository.java
+++ b/src/com/android/phone/ecc/IsoToEccProtobufRepository.java
@@ -16,14 +16,17 @@
 
 package com.android.phone.ecc;
 
-import android.annotation.NonNull;
-import android.annotation.Nullable;
 import android.content.Context;
 import android.os.SystemClock;
+import android.text.TextUtils;
 import android.util.ArrayMap;
 import android.util.ArraySet;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+
 import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -32,42 +35,59 @@
 import java.util.zip.GZIPInputStream;
 
 /**
- * Provide the mapping of country ISO to ECC. The data is stored in Protocol Buffers format,
- * compressed with GZIP and encoded to base64 string.
+ * Provides a mapping table from country ISO to ECC info. The data is stored in Protocol Buffers
+ * binary format, compressed with GZIP.
  */
 public class IsoToEccProtobufRepository implements IsoToEccRepository {
     private static final String LOG_TAG = "EccRepository";
 
-    private Map<String, CountryEccInfo> mEccTable = null;
+    private static IsoToEccProtobufRepository sInstance;
+
+    /**
+     * Returns the singleton instance of IsoToEccProtobufRepository
+     */
+    public static synchronized IsoToEccProtobufRepository getInstance() {
+        if (sInstance == null) {
+            sInstance = new IsoToEccProtobufRepository();
+        }
+        return sInstance;
+    }
+
+    private final Map<String, CountryEccInfo> mEccTable = new HashMap<>();
+
+    private IsoToEccProtobufRepository() {
+    }
 
     @Override
     @Nullable
-    public CountryEccInfo getCountryEccInfo(@NonNull Context context, @Nullable String iso)
+    public CountryEccInfo getCountryEccInfo(@NonNull Context context, String iso)
             throws IOException {
-        if (iso != null) {
-            iso = iso.toUpperCase();
-        } else {
+        if (TextUtils.isEmpty(iso)) {
             return null;
         }
 
-        if (mEccTable == null) {
-            mEccTable = initMappingTable(context);
+        synchronized (mEccTable) {
+            return mEccTable.get(iso.toUpperCase());
         }
-        return mEccTable.get(iso);
     }
 
-    private Map<String, CountryEccInfo> initMappingTable(@NonNull Context context)
-            throws IOException {
+    /**
+     * Loads the mapping table.
+     */
+    public void loadMappingTable(@NonNull Context context) {
         ProtobufEccData.AllInfo allEccData = null;
 
         long startTime = SystemClock.uptimeMillis();
-        allEccData = parseEccData(new BufferedInputStream(
-                context.getAssets().open("eccdata")));
+        try {
+            allEccData = parseEccData(new BufferedInputStream(
+                    context.getAssets().open("eccdata")));
+        } catch (IOException e) {
+            Log.e(LOG_TAG, "Failed to retrieve ECC: ", e);
+        }
         long endTime = SystemClock.uptimeMillis();
 
         if (allEccData == null) {
-            // Return an empty table.
-            return new HashMap<>();
+            return;
         }
 
         if (Log.isLoggable(LOG_TAG, Log.DEBUG)) {
@@ -76,17 +96,23 @@
                     + ", initialized = " + allEccData.isInitialized());
         }
 
-        // Convert to run-time data from Protobuf data.
-        Map<String, CountryEccInfo> table = new HashMap<>();
-        for (ProtobufEccData.CountryInfo countryData : allEccData.getCountriesList()) {
-            if (countryData.hasIsoCode()) {
-                CountryEccInfo countryInfo = loadCountryEccInfo(countryData);
-                if (countryInfo != null) {
-                    table.put(countryData.getIsoCode().toUpperCase(), countryInfo);
+        // Converts to run-time data from Protobuf data.
+        synchronized (mEccTable) {
+            mEccTable.clear();
+            for (ProtobufEccData.CountryInfo countryData : allEccData.getCountriesList()) {
+                if (countryData.hasIsoCode()) {
+                    CountryEccInfo countryInfo = loadCountryEccInfo(countryData);
+                    if (countryInfo != null) {
+                        mEccTable.put(countryData.getIsoCode().toUpperCase(), countryInfo);
+                    }
                 }
             }
         }
-        return table;
+    }
+
+    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    Map<String, CountryEccInfo> getEccTable() {
+        return mEccTable;
     }
 
     private ProtobufEccData.AllInfo parseEccData(InputStream input) throws IOException {
@@ -114,7 +140,7 @@
                     eccTypes.add(EccInfo.Type.FIRE);
                     break;
                 default:
-                    // Ignore unknown types.
+                    // Ignores unknown types.
             }
         }
 
@@ -135,7 +161,7 @@
             if (existentEccInfo == null) {
                 eccInfoMap.put(key, eccInfo);
             } else {
-                // Merge types of duplicated ecc info objects.
+                // Merges types of duplicated ECC info objects.
                 ArraySet<EccInfo.Type> eccTypes = new ArraySet<>(
                         eccInfo.getTypesCount() + existentEccInfo.getTypesCount());
                 for (EccInfo.Type type : eccInfo.getTypes()) {
diff --git a/src/com/android/phone/ecc/IsoToEccRepository.java b/src/com/android/phone/ecc/IsoToEccRepository.java
index fd5ac83..6d95af4 100644
--- a/src/com/android/phone/ecc/IsoToEccRepository.java
+++ b/src/com/android/phone/ecc/IsoToEccRepository.java
@@ -16,10 +16,11 @@
 
 package com.android.phone.ecc;
 
-import android.annotation.NonNull;
-import android.annotation.Nullable;
 import android.content.Context;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import java.io.IOException;
 
 /**
diff --git a/src/com/android/phone/otasp/OtaspActivationService.java b/src/com/android/phone/otasp/OtaspActivationService.java
index 158925a..7490880 100644
--- a/src/com/android/phone/otasp/OtaspActivationService.java
+++ b/src/com/android/phone/otasp/OtaspActivationService.java
@@ -15,6 +15,8 @@
  */
 package com.android.phone.otasp;
 
+import static com.android.phone.PhoneGlobals.getPhone;
+
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
@@ -26,13 +28,12 @@
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 
+import com.android.internal.telephony.GsmCdmaConnection;
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneConstants;
 import com.android.phone.PhoneGlobals;
 import com.android.phone.PhoneUtils;
 
-import static com.android.phone.PhoneGlobals.getPhone;
-
 /**
  * otasp activation service handles all logic related with OTASP call.
  * OTASP is a CDMA-specific feature: OTA or OTASP == Over The Air service provisioning
@@ -45,8 +46,10 @@
 public class OtaspActivationService extends Service {
     private static final String TAG = OtaspActivationService.class.getSimpleName();
     private static final boolean DBG = true;
-    /* non-interactive otasp number */
-    private static final String OTASP_NUMBER = "*22899";
+    /**
+     * non-interactive otasp number
+     */
+    private static final String OTASP_NUMBER = GsmCdmaConnection.OTASP_NUMBER;
 
     /**
      * Otasp call follows with SIM reloading which might triggers a retry loop on activation
diff --git a/src/com/android/phone/otasp/OtaspSimStateReceiver.java b/src/com/android/phone/otasp/OtaspSimStateReceiver.java
index 213aa9f..78f7baf 100644
--- a/src/com/android/phone/otasp/OtaspSimStateReceiver.java
+++ b/src/com/android/phone/otasp/OtaspSimStateReceiver.java
@@ -23,6 +23,7 @@
 import android.telephony.PhoneStateListener;
 import android.telephony.TelephonyManager;
 import android.util.Log;
+
 import com.android.internal.telephony.Phone;
 import com.android.phone.PhoneGlobals;
 
diff --git a/src/com/android/phone/settings/AccessibilitySettingsFragment.java b/src/com/android/phone/settings/AccessibilitySettingsFragment.java
index 57b6d8e..5c614d9 100644
--- a/src/com/android/phone/settings/AccessibilitySettingsFragment.java
+++ b/src/com/android/phone/settings/AccessibilitySettingsFragment.java
@@ -57,10 +57,17 @@
             if (DBG) Log.d(LOG_TAG, "PhoneStateListener.onCallStateChanged: state=" + state);
             Preference pref = getPreferenceScreen().findPreference(BUTTON_TTY_KEY);
             if (pref != null) {
-                final boolean isVolteTtySupported = ImsManager.isVolteEnabledByPlatform(mContext)
-                        && getVolteTtySupported();
-                pref.setEnabled((isVolteTtySupported && !isVideoCallOrConferenceInProgress()) ||
-                        (state == TelephonyManager.CALL_STATE_IDLE));
+                // Use TelephonyManager#getCallState instead of 'state' parameter because
+                // needs to check the current state of all phone calls to
+                // support multi sim configuration.
+                TelephonyManager telephonyManager =
+                        (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
+                final boolean isVolteTtySupported = getVolteTtySupported();
+                final boolean isVolteCurrentlyEnabled =
+                        ImsManager.isVolteEnabledByPlatform(mContext);
+                pref.setEnabled((isVolteTtySupported && isVolteCurrentlyEnabled &&
+                        !isVideoCallOrConferenceInProgress()) ||
+                        (telephonyManager.getCallState() == TelephonyManager.CALL_STATE_IDLE));
             }
         }
     };
@@ -102,7 +109,8 @@
             mButtonHac = null;
         }
 
-        if (PhoneGlobals.getInstance().phoneMgr.isRttSupported()) {
+        if (PhoneGlobals.getInstance().phoneMgr
+                .isRttSupported(SubscriptionManager.getDefaultVoiceSubscriptionId())) {
             // TODO: this is going to be a on/off switch for now. Ask UX about how to integrate
             // this settings with TTY
             boolean rttOn = Settings.Secure.getInt(
diff --git a/src/com/android/phone/settings/AccountSelectionPreference.java b/src/com/android/phone/settings/AccountSelectionPreference.java
index 58072d9..be4f3a0 100644
--- a/src/com/android/phone/settings/AccountSelectionPreference.java
+++ b/src/com/android/phone/settings/AccountSelectionPreference.java
@@ -16,14 +16,9 @@
 
 package com.android.phone.settings;
 
-import com.android.phone.R;
-
 import android.app.AlertDialog;
 import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.os.UserHandle;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.telecom.PhoneAccount;
@@ -32,6 +27,8 @@
 import android.text.TextUtils;
 import android.util.AttributeSet;
 
+import com.android.phone.R;
+
 import java.util.List;
 import java.util.Objects;
 
diff --git a/src/com/android/phone/settings/VoicemailProviderListPreference.java b/src/com/android/phone/settings/VoicemailProviderListPreference.java
index d9f1a55..b906ca9 100644
--- a/src/com/android/phone/settings/VoicemailProviderListPreference.java
+++ b/src/com/android/phone/settings/VoicemailProviderListPreference.java
@@ -18,13 +18,10 @@
 
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
-import android.database.Cursor;
 import android.preference.ListPreference;
-import android.preference.PreferenceManager;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Log;
diff --git a/src/com/android/phone/settings/VoicemailProviderSettingsUtil.java b/src/com/android/phone/settings/VoicemailProviderSettingsUtil.java
index 8187664..3ccd4a3 100644
--- a/src/com/android/phone/settings/VoicemailProviderSettingsUtil.java
+++ b/src/com/android/phone/settings/VoicemailProviderSettingsUtil.java
@@ -137,7 +137,7 @@
         prefs.edit()
                 .putString(key + VM_NUMBER_TAG, null)
                 .putInt(key + FWD_SETTINGS_TAG + FWD_SETTINGS_LENGTH_TAG, 0)
-                .commit();
+                .apply();
     }
 
     private static SharedPreferences getPrefs(Context context) {
diff --git a/src/com/android/phone/settings/VoicemailSettingsActivity.java b/src/com/android/phone/settings/VoicemailSettingsActivity.java
index 74b8e4e..e18dc93 100644
--- a/src/com/android/phone/settings/VoicemailSettingsActivity.java
+++ b/src/com/android/phone/settings/VoicemailSettingsActivity.java
@@ -29,7 +29,6 @@
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
-import android.preference.SwitchPreference;
 import android.provider.ContactsContract.CommonDataKinds;
 import android.provider.Settings;
 import android.telecom.PhoneAccountHandle;
@@ -568,12 +567,12 @@
     private boolean getBooleanCarrierConfig(String key) {
         PersistableBundle b = PhoneGlobals.getInstance()
                 .getCarrierConfigForSubId(mPhone.getSubId());
-        if (b != null) {
-            return b.getBoolean(key);
-        } else {
-            // Return static default defined in CarrierConfigManager.
-            return CarrierConfigManager.getDefaultConfig().getBoolean(key);
+
+        if (b == null) {
+            b = PhoneGlobals.getInstance().getCarrierConfig();
         }
+
+        return b.getBoolean(key);
     }
 
 
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-af/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-af/strings.xml
index af45ba8..d03dc7a 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-af/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-af/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Bystandoproep"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Voorspel en voeg \'n landskode by wanneer jy bel terwyl jy oorsee reis"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-am/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-am/strings.xml
index 51d79e1..68641f2 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-am/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-am/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"የታገዘ መደወያ"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"ወደ ውጭ አገር በመጓዝ ላይ እያሉ በሚደውሉ ጊዜ የአገር ኮድን ይተንብዩና ያክሉ"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-ar/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-ar/strings.xml
index 09453a7..aecb69f 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-ar/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-ar/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"الطلب المساعد"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"توقُع رمز البلد وإضافته عند إجراء مكالمة أثناء السفر خارج البلاد"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-az/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-az/strings.xml
index 669c69c..65e3ec3 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-az/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-az/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Dəstəkli nömrə yığımı"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Xaricə səyahət edərkən ölkə kodunu bildirin və ya əlavə edin"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-b+sr+Latn/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-b+sr+Latn/strings.xml
index 2452950..62a2557 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-b+sr+Latn/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-b+sr+Latn/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Potpomognuto biranje"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Predvidi i dodaj pozivni broj za zemlju kad upućujem pozive iz inostranstva"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-be/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-be/strings.xml
index 96f3cdc..bc4a7c0 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-be/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-be/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Памочнік набору"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Прадказваць і дадаваць код краіны, калі вы робіце выклік падчас падарожжа за мяжой"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-bg/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-bg/strings.xml
index 70d1677..9e86d98 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-bg/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-bg/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Подпомогнато набиране"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Предвиждане и добавяне на код на държавата, когато пътувате в чужбина"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-bn/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-bn/strings.xml
index 5b2d52f..96e0253 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-bn/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-bn/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"সহায়তা যুক্ত ডায়ালিং"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"বিদেশে থেকে কল করলে দেশের কোড অনুমান করে সেটি যোগ করুন"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-bs/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-bs/strings.xml
index d0af41b..67a1dde 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-bs/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-bs/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Potpomognuto biranje"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Predviđanje i dodavanje pozivnog broja zemlje prilikom pozivanja iz inostranstva"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-ca/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-ca/strings.xml
index abc663a..e2bc551 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-ca/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-ca/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Marcatge assistit"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Predigues i afegeix un codi de país en les trucades des de l\'estranger"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-cs/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-cs/strings.xml
index 643aaee..2fc61bc 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-cs/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-cs/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Asistované vytáčení"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Při volání v zahraničí odhadnout a přidat předvolbu země"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-da/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-da/strings.xml
index 0712eee..bfaebb7 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-da/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-da/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Assisteret opkald"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Forudsig og tilføj en landekode, når du foretager et opkald, mens du er udenlands"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-de/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-de/strings.xml
index 21746b4..76ebe3f 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-de/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-de/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Unterstützung für Nummerneingabe"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Hiermit wird eine Landesvorwahl vorgeschlagen und bei deinen Anrufen hinzugefügt, wenn du im Ausland unterwegs bist"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-el/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-el/strings.xml
index 720f672..bbd8c63 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-el/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-el/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Υποβοηθούμενη κλήση"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Προβλέψτε και προσθέστε έναν κωδικό χώρας όταν καλείτε ενόσω ταξιδεύετε στο εξωτερικό"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-en-rAU/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-en-rAU/strings.xml
index adbcf5f..aecf931 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-en-rAU/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-en-rAU/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Assisted dialling"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Predict and add a country code when you call while travelling abroad"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-en-rCA/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-en-rCA/strings.xml
index adbcf5f..aecf931 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-en-rCA/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-en-rCA/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Assisted dialling"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Predict and add a country code when you call while travelling abroad"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-en-rGB/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-en-rGB/strings.xml
index adbcf5f..aecf931 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-en-rGB/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-en-rGB/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Assisted dialling"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Predict and add a country code when you call while travelling abroad"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-en-rIN/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-en-rIN/strings.xml
index adbcf5f..aecf931 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-en-rIN/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-en-rIN/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Assisted dialling"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Predict and add a country code when you call while travelling abroad"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-en-rXC/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-en-rXC/strings.xml
index 6709101..51f73ab 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-en-rXC/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-en-rXC/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‏‏‎‎‏‎‎‏‎‏‏‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‏‏‎‏‎‎‎‏‎‎‏‎‎‏‎‎‏‎Assisted dialing‎‏‎‎‏‎"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‏‏‎‏‎‏‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‎‏‎‏‎‎‏‏‎‎‎‏‎‏‎‎‏‎‎‎‏‎‎‎‏‎‏‏‎‎‏‏‏‎‏‏‏‎Predict and add a country code when you call while traveling abroad‎‏‎‎‏‎"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-es-rUS/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-es-rUS/strings.xml
index 1303b95..1ce18d8 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-es-rUS/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-es-rUS/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Marcado asistido"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Predecir el código del país y agregarlo cuando se realicen llamadas desde el exterior"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-es/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-es/strings.xml
index db01a9b..759ae97 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-es/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-es/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Marcación asistida"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Predecir y añadir un código de país al llamar desde el extranjero"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-et/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-et/strings.xml
index 1fb1f3c..34743b7 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-et/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-et/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Abistatud helistamine"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Määra ja lisa välismaal reisimise ajal helistades"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-eu/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-eu/strings.xml
index e2489ba..84e5d4e 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-eu/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-eu/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Lagundutako markatzea"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Iragarri eta gehitu herrialde-kodea atzerritik deitzean"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-fa/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-fa/strings.xml
index ac5743d..c04b1e1 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-fa/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-fa/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"شماره‌گیری کمکی"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"پیش‌بینی و افزودن کد کشور وقتی در سفر خارجی تماس برقرار می‌کنید"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-fi/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-fi/strings.xml
index c7b56cb..c473f19 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-fi/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-fi/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Avustettu soittaminen"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Etsi ja lisää maakoodi ulkomailta soitettavia puheluita varten"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-fr-rCA/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-fr-rCA/strings.xml
index e97951b..9bc48ad 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-fr-rCA/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-fr-rCA/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Numérotation assistée"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Prédire et ajouter un code de pays lorsque vous faites un appel lors d\'un voyage à l\'étranger"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-fr/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-fr/strings.xml
index c863baf..a38adf2 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-fr/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-fr/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Numérotation assistée"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Depuis l\'étranger, détecter le pays de destination de l\'appel et ajouter l\'indicatif correspondant"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-gl/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-gl/strings.xml
index 5378b2f..6411af9 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-gl/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-gl/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Marcación asistida"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Cando chamas desde o estranxeiro, detecta o país ao que estás chamando e engade o seu prefixo"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-gu/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-gu/strings.xml
index d062a70..007bdec 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-gu/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-gu/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"સહાયિત ડાયલિંગ"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"વિદેશમાં મુસાફરી કરતી વખતે જ્યારે તમે કૉલ કરો, ત્યારે દેશના કોડનું અનુમાન લગાવીને તેને ઉમેરો"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-hi/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-hi/strings.xml
index 127a7f7..8eabc0c 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-hi/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-hi/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"सहायक डायलिंग"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"विदेश यात्रा के दौरान कॉल करते समय पूर्वानुमान की मदद से देश कोड जोड़ें"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-hr/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-hr/strings.xml
index 46f14f1..7ceaf24 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-hr/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-hr/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Potpomognuto biranje"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Predvidite i dodajte pozivni broj zemlje kada putujete u inozemstvo."</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-hu/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-hu/strings.xml
index 0253604..a19d316 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-hu/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-hu/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Támogatott tárcsázás"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Országhívószámok előrejelzése és hozzáadása külföldről indított híváskor"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-hy/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-hy/strings.xml
index 5ed7979..46fb7f2 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-hy/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-hy/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Օգնություն համարհավաքման ժամանակ"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Արտասահմանում գտնվելու ժամանակ զանգելիս երկրի կոդի կանխագուշակում և ավելացում"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-in/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-in/strings.xml
index b8a9840..d357a2c 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-in/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-in/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Panggilan Berbantu"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Prediksi dan tambahkan kode negara saat menelepon dari luar negeri"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-is/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-is/strings.xml
index 2d5bb15..f2e8247 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-is/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-is/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Aðstoð við hringingar"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Bæta réttum landskóða við hringd símtöl þegar þú ferðast erlendis"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-it/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-it/strings.xml
index 40c4760..f4fe19f 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-it/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-it/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Composizione assistita"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Prevedi e aggiungi il prefisso internazionale quando effettui chiamate mentre ti trovi all\'estero"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-iw/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-iw/strings.xml
index e130fc7..ff2e7fd 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-iw/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-iw/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"עזרה בחיוג"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"חיזוי והוספה של קידומת החיוג למדינה כשמתקשרים מחו\"ל"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-ja/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-ja/strings.xml
index 413dfec..ee93bad 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-ja/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-ja/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"ダイヤル アシスト"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"渡航先から通話を発信する際に、国コードの候補を自動的に追加"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-ka/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-ka/strings.xml
index 285cf44..3c804ce 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-ka/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-ka/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"დახმარება ნომრის აკრეფაში"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"ქვეყნის კოდის პროგნოზირება და დამატება საზღვარგარეთ მგზავრობის დროს დარეკვისას"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-kk/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-kk/strings.xml
index 461137f..73c5545 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-kk/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-kk/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Көмекпен теру"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Шетелге сапар барысында қоңырау шалу үшін ел кодын анықтау және қосу"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-km/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-km/strings.xml
index c035fbd..367f712 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-km/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-km/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"ការហៅទូរសព្ទ​ដោយ​មាន​ជំនួយ"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"ទស្សន៍ទាយ និង​បញ្ចូល​កូដ​ប្រទេស នៅពេល​អ្នក​ហៅ​ទូរសព្ទ ពេល​ធ្វើ​ដំណើរ​ក្រៅ​ប្រទេស"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-kn/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-kn/strings.xml
index dc06c16..7e18769 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-kn/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-kn/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"ಸಹಾಯಕ ಡಯಲಿಂಗ್"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"ವಿದೇಶಕ್ಕೆ ಪ್ರಯಾಣಿಸುವ ಸಂದರ್ಭದಲ್ಲಿ ಕರೆ ಮಾಡುವಾಗ ದೇಶದ ಕೋಡ್ ಅನ್ನು ಅಂದಾಜಿಸಿ ಮತ್ತು ಅದನ್ನು ಸೇರಿಸಿ"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-ko/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-ko/strings.xml
index 305d2b5..c7587db 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-ko/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-ko/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"전화번호 도우미"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"해외여행 중 전화를 걸면 국가 코드를 예측하여 추가"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-ky/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-ky/strings.xml
index 8a4840e..5ecc7e6 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-ky/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-ky/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Жардам берилген терүү"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Чет өлкөдө саякаттап жүрүп, бирөөгө чалканда өлкө кодун алдын ала айтып, кошот"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-lo/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-lo/strings.xml
index a6eb778..3083bf1 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-lo/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-lo/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"ກ່ອງຂໍ້ຄວາມແບບຊ່ວຍເຫຼືອ"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"ຄາດເດົາ ແລະ ເພີ່ມລະຫັດປະເທດເມື່ອທ່ານໂທໃນລະຫວ່າງເດີນທາງຢູ່ຕ່າງປະເທດ"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-lt/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-lt/strings.xml
index d55b5ec..e9123aa 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-lt/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-lt/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Pagalbinis numerio rinkimas"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Numatyti ir pridėti šalies kodą, kai skambinama keliaujant užsienyje"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-lv/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-lv/strings.xml
index 634c2d6..6e1eb87 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-lv/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-lv/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Numura sastādīšanas palīdzība"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Prognozēt un pievienot valsts kodu, kad jūs zvanāt, atrodoties ārzemēs"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-mk/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-mk/strings.xml
index 3c4d6b4..4638cdb 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-mk/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-mk/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Бирање со помош"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Предвиди и додај код на земја кога повикувам додека патувам во странство"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-ml/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-ml/strings.xml
index f810dd8..6253c15 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-ml/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-ml/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"അസിസ്‌റ്റഡ് ഡയലിംഗ്"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"വിദേശ യാത്രക്കിടയിൽ കോൾ ചെയ്യുമ്പോൾ രാജ്യത്തിന്റെ കോഡ് കണ്ടെത്തി നൽകുക"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-mn/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-mn/strings.xml
index a723ff6..7af3d2d 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-mn/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-mn/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Тусламжтай залгах"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Таныг гадаад оронд аялж байх үед урьдчилан таамаглаж улсын кодыг нэмнэ"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-mr/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-mr/strings.xml
index c8269f4..a58e97b 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-mr/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-mr/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"साहाय्यक डायलिंग"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"परदेशात प्रवास करत असताना, एखाद्या देशाच्या कोडचा अंदाज लावा आणि तो जोडा"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-ms/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-ms/strings.xml
index 3d2d169..b7fd6ee 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-ms/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-ms/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Pendailan berbantu"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Ramalkan dan tambahkan kod negara apabila anda membuat panggilan semasa melancong ke luar negara"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-my/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-my/strings.xml
index f28d54b..b55cc4e 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-my/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-my/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"အထောက်အကူပြု ဖုန်းခေါ်ဆိုခြင်း"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"ပြည်ပခရီးသွားနေစဉ် ဖုန်းခေါ်ဆိုပါက နိုင်ငံကုဒ်ကို ခန့်မှန်းပြီး ထည့်ရန်"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-nb/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-nb/strings.xml
index 45a981e..cd4c265 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-nb/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-nb/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Hjelp med å slå numre"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Forutsi og legg til landkode når du ringer mens du er utenlands"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-ne/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-ne/strings.xml
index a2cc899..f8661f9 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-ne/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-ne/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"सहायताप्राप्त डायल गर्ने सुविधा"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"विदेश यात्राको बेला कल गर्दा पूर्वानुमान सुविधाको प्रयोग गरी कुनै देशको कोड थप्नुहोस्"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-nl/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-nl/strings.xml
index 0a4b1ea..a24f893 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-nl/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-nl/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Ondersteund bellen"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Een landcode voorspellen en toevoegen wanneer je belt terwijl je in het buitenland bent"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-pa/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-pa/strings.xml
index 5cfd6e8..f8dba6e 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-pa/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-pa/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"ਸਹਾਇਕ ਡਾਇਲਿੰਗ"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"ਵਿਦੇਸ਼ ਯਾਤਰਾ ਦੌਰਾਨ ਕਾਲ ਕਰਨ ਸਮੇਂ ਅੰਦਾਜ਼ਾ ਲਗਾਓ ਅਤੇ ਇੱਕ ਦੇਸ਼ ਕੋਡ ਸ਼ਾਮਲ ਕਰੋ"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-pl/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-pl/strings.xml
index 276e405..b192191 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-pl/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-pl/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Asystent wybierania numeru"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Przewiduj i dodawaj kod kraju, gdy dzwonisz podczas pobytu za granicą"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-pt-rPT/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-pt-rPT/strings.xml
index c163d5a..6f233de 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-pt-rPT/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-pt-rPT/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Marcação assistida"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Prever e adicionar um código de país ao efetuar uma chamada durante uma viagem ao estrangeiro"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-pt/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-pt/strings.xml
index 65f0041..71a8b0b 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-pt/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-pt/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Discagem assistida"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Prever e adicionar um código de país nas chamadas feitas no exterior"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-ro/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-ro/strings.xml
index 0e1e395..36de962 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-ro/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-ro/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Apelare asistată"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Sugerați și adăugați un prefix de țară când apelați din străinătate"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-ru/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-ru/strings.xml
index 04f8c13..e89f722 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-ru/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-ru/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Набор номера с подсказками"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Подсказывать и добавлять код страны при совершении звонков в поездках за границу"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-si/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-si/strings.xml
index 4d8c7cf..f5169e2 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-si/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-si/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"සහායක ඇමතීම"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"ඔබ පිටරට සංචාරය කරන අතරතුර ඇමතීමේදී රටේ කේතය පුරෝකථනය කරන්න සහ එක් කරන්න"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-sk/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-sk/strings.xml
index 9ce564b..6ed9e34 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-sk/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-sk/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Asistované vytáčanie"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Pri volaní v zahraničí odhadnúť a pridať predvoľbu krajiny"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-sl/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-sl/strings.xml
index b47e893..72e1296 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-sl/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-sl/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Klicanje s pomočjo"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Predvidi in dodaj kodo države pri klicih med potovanjem v tujini"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-sq/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-sq/strings.xml
index 1b5216d..044a552 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-sq/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-sq/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Telefonimi i ndihmuar"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Parashiko dhe shto një kod shteti kur telefonon gjatë udhëtimeve jashtë shtetit"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-sr/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-sr/strings.xml
index a94ae1d..101337e 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-sr/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-sr/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Потпомогнуто бирање"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Предвиди и додај позивни број за земљу кад упућујем позиве из иностранства"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-sv/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-sv/strings.xml
index 5658198..4863d94 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-sv/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-sv/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Assisterad uppringning"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Föreslå och lägg till landskod när du ringer utomlands"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-sw/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-sw/strings.xml
index 5d35627..9f9c036 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-sw/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-sw/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Upigaji simu unaosaidiwa"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Tabiri na uongeze nambari ya nchi wakati unapiga simu ukiwa unasafiri nje ya nchi"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-ta/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-ta/strings.xml
index a274319..e0fdda1 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-ta/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-ta/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"அழைப்பை மேற்கொள்வதற்கான உதவி"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"வெளிநாட்டிற்குப் பயணிக்கும் போது, பிறரை அழைத்தால் அந்த நாட்டின் தேசக் குறியீட்டைக் கணித்து, சேர்"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-te/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-te/strings.xml
index 716a33e..fe110f4 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-te/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-te/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"సహాయక డయలింగ్"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"మీరు విదేశాల్లో ప్రయాణిస్తున్నప్పుడు కాల్ చేసేటప్పుడు దేశం కోడ్‌ని ఊహించి, జోడించండి"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-th/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-th/strings.xml
index e0bc91d..18121a1 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-th/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-th/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"ระบบช่วยโทรออก"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"คาดเดาและเพิ่มรหัสประเทศให้เมื่อคุณโทรศัพท์ขณะอยู่ต่างประเทศ"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-tl/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-tl/strings.xml
index a6781c2..00c2726 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-tl/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-tl/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Tinutulungan na pag-dial"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Hulaan at magdagdag ng code ng bansa kapag tumatawag ka habang naglalakbay sa ibang bansa"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-tr/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-tr/strings.xml
index daa9dbe..737cc61 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-tr/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-tr/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Yardımlı arama"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Yurt dışı seyahatiniz sırasında telefon ederken ülke kodu tahmin edilip eklenir"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-uk/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-uk/strings.xml
index 3b112fa..f0ea120 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-uk/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-uk/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Помічник набору"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Передбачення й додавання коду країни, коли ви телефонуєте з-за кордону"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-ur/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-ur/strings.xml
index fe1724a..ee302fa 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-ur/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-ur/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"معاون ڈائلنگ"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"بیرون ملک سفر کرتے وقت جب آپ کال کریں تو ملکی کوڈ کی پیشنگوئی کریں اور شامل کریں"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-uz/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-uz/strings.xml
index cfa42ce..0d4fe2f 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-uz/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-uz/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Bildirgi asosida raqam terish"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Chet elda chaqiruvlarni amalga oshirishda mamlakat kodi avtomatik aniqlansin va kiritilsin"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-vi/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-vi/strings.xml
index ce54c37..d7b6966 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-vi/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-vi/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Quay số được hỗ trợ"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Dự đoán và thêm mã quốc gia khi bạn gọi trong khi đi du lịch nước ngoài"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-zh-rCN/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-zh-rCN/strings.xml
index b113adf..8abae34 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-zh-rCN/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-zh-rCN/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"辅助拨号"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"当您在国外的旅途中拨打电话时，预测并添加国家/地区代码"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-zh-rHK/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-zh-rHK/strings.xml
index e89bffe..744e957 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-zh-rHK/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-zh-rHK/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"輔助撥號"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"在國外撥打電話時預測並新增國家/地區代碼"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-zh-rTW/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-zh-rTW/strings.xml
index 343dfe5..f89fe9c 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-zh-rTW/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-zh-rTW/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"輔助撥號"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"從其他國家/地區打電話時，自動預測並新增國家/地區代碼"</string>
diff --git a/src/com/android/phone/settings/assisteddialing/res/values-zu/strings.xml b/src/com/android/phone/settings/assisteddialing/res/values-zu/strings.xml
index 2b20315..4ce9729 100644
--- a/src/com/android/phone/settings/assisteddialing/res/values-zu/strings.xml
+++ b/src/com/android/phone/settings/assisteddialing/res/values-zu/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License
    -->
 
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
+<resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="assisted_dialing_setting_title" msgid="3397624434500805193">"Ukushaya okusizwayo"</string>
     <string name="assisted_dialing_setting_summary" msgid="2121165095086134903">"Qagela futhi ungeze ikhodi yezwe uma ushaya ngenkathi uya ngaphesheya"</string>
diff --git a/src/com/android/phone/settings/fdn/DeleteFdnContactScreen.java b/src/com/android/phone/settings/fdn/DeleteFdnContactScreen.java
index fa32a25..92baa97 100644
--- a/src/com/android/phone/settings/fdn/DeleteFdnContactScreen.java
+++ b/src/com/android/phone/settings/fdn/DeleteFdnContactScreen.java
@@ -16,6 +16,9 @@
 
 package com.android.phone.settings.fdn;
 
+import static android.view.Window.PROGRESS_VISIBILITY_OFF;
+import static android.view.Window.PROGRESS_VISIBILITY_ON;
+
 import android.app.Activity;
 import android.content.AsyncQueryHandler;
 import android.content.ContentResolver;
@@ -33,9 +36,6 @@
 import com.android.phone.R;
 import com.android.phone.SubscriptionInfoHelper;
 
-import static android.view.Window.PROGRESS_VISIBILITY_OFF;
-import static android.view.Window.PROGRESS_VISIBILITY_ON;
-
 /**
  * Activity to let the user delete an FDN contact.
  */
diff --git a/src/com/android/phone/settings/fdn/EditFdnContactScreen.java b/src/com/android/phone/settings/fdn/EditFdnContactScreen.java
index 921e947..c358e27 100644
--- a/src/com/android/phone/settings/fdn/EditFdnContactScreen.java
+++ b/src/com/android/phone/settings/fdn/EditFdnContactScreen.java
@@ -29,8 +29,6 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
-import android.provider.Contacts.PeopleColumns;
-import android.provider.Contacts.PhonesColumns;
 import android.provider.ContactsContract.CommonDataKinds;
 import android.telephony.PhoneNumberUtils;
 import android.text.Editable;
@@ -50,10 +48,10 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.android.internal.telephony.PhoneFactory;
 import com.android.phone.PhoneGlobals;
 import com.android.phone.R;
 import com.android.phone.SubscriptionInfoHelper;
-import com.android.internal.telephony.PhoneFactory;
 
 /**
  * Activity to let the user add or edit an FDN contact.
diff --git a/src/com/android/phone/settings/fdn/EditPinPreference.java b/src/com/android/phone/settings/fdn/EditPinPreference.java
index 42fc418..9596f39 100644
--- a/src/com/android/phone/settings/fdn/EditPinPreference.java
+++ b/src/com/android/phone/settings/fdn/EditPinPreference.java
@@ -20,16 +20,11 @@
 import android.content.Context;
 import android.preference.EditTextPreference;
 import android.text.InputType;
-import android.text.method.DigitsKeyListener;
-import android.text.method.PasswordTransformationMethod;
 import android.util.AttributeSet;
 import android.view.View;
-import android.widget.EditText;
 
 import com.android.phone.R;
 
-import java.util.Map;
-
 /**
  * Class similar to the com.android.settings.EditPinPreference
  * class, with a couple of modifications, including a different layout
diff --git a/src/com/android/phone/settings/fdn/FdnList.java b/src/com/android/phone/settings/fdn/FdnList.java
index 61a8299..c2ecbc6 100644
--- a/src/com/android/phone/settings/fdn/FdnList.java
+++ b/src/com/android/phone/settings/fdn/FdnList.java
@@ -33,7 +33,6 @@
 import android.view.View;
 import android.widget.ListView;
 import android.widget.PopupMenu;
-import android.widget.PopupMenu.OnMenuItemClickListener;
 
 import com.android.phone.ADNList;
 import com.android.phone.PhoneGlobals;
diff --git a/src/com/android/phone/settings/fdn/FdnSetting.java b/src/com/android/phone/settings/fdn/FdnSetting.java
index c76f91d..8b5afa4 100644
--- a/src/com/android/phone/settings/fdn/FdnSetting.java
+++ b/src/com/android/phone/settings/fdn/FdnSetting.java
@@ -23,9 +23,9 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.util.Log;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
+import android.util.Log;
 import android.view.MenuItem;
 import android.view.WindowManager;
 import android.widget.Toast;
diff --git a/src/com/android/phone/vvm/PhoneAccountHandleConverter.java b/src/com/android/phone/vvm/PhoneAccountHandleConverter.java
index cb05215..7e9d74b 100644
--- a/src/com/android/phone/vvm/PhoneAccountHandleConverter.java
+++ b/src/com/android/phone/vvm/PhoneAccountHandleConverter.java
@@ -19,10 +19,10 @@
 import android.annotation.Nullable;
 import android.telecom.PhoneAccountHandle;
 import android.telephony.SubscriptionManager;
+
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneFactory;
 import com.android.phone.PhoneUtils;
-import com.android.phone.vvm.VvmLog;
 
 /**
  * Utility to convert between PhoneAccountHandle and subId, which is a common operation in OMTP
diff --git a/src/com/android/phone/vvm/RemoteVvmTaskManager.java b/src/com/android/phone/vvm/RemoteVvmTaskManager.java
index 98cb959..50ac669 100644
--- a/src/com/android/phone/vvm/RemoteVvmTaskManager.java
+++ b/src/com/android/phone/vvm/RemoteVvmTaskManager.java
@@ -161,8 +161,7 @@
                 continue;
             }
             bindIntent.setPackage(packageName);
-            ResolveInfo info = context.getPackageManager()
-                    .resolveService(bindIntent, PackageManager.MATCH_ALL);
+            ResolveInfo info = context.getPackageManager().resolveService(bindIntent, 0);
             if (info == null) {
                 continue;
             }
diff --git a/src/com/android/phone/vvm/VisualVoicemailSmsFilterConfig.java b/src/com/android/phone/vvm/VisualVoicemailSmsFilterConfig.java
index ecd1f0f..75e50af 100644
--- a/src/com/android/phone/vvm/VisualVoicemailSmsFilterConfig.java
+++ b/src/com/android/phone/vvm/VisualVoicemailSmsFilterConfig.java
@@ -23,8 +23,6 @@
 import android.telephony.VisualVoicemailSmsFilterSettings;
 import android.util.ArraySet;
 
-import com.android.phone.vvm.RemoteVvmTaskManager;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
diff --git a/src/com/android/services/telephony/CdmaConferenceController.java b/src/com/android/services/telephony/CdmaConferenceController.java
index 846df61..5d987f7 100644
--- a/src/com/android/services/telephony/CdmaConferenceController.java
+++ b/src/com/android/services/telephony/CdmaConferenceController.java
@@ -16,13 +16,13 @@
 
 package com.android.services.telephony;
 
-import com.android.phone.PhoneUtils;
-
 import android.os.Handler;
 import android.telecom.Connection;
 import android.telecom.DisconnectCause;
 import android.telecom.PhoneAccountHandle;
 
+import com.android.phone.PhoneUtils;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -211,6 +211,7 @@
             // 4) Add the conference to the connection service if it is new.
             if (isNewlyCreated) {
                 Log.d(this, "Adding the conference call");
+                mConference.updateCallRadioTechAfterCreation();
                 mConnectionService.addConference(mConference);
             }
         } else if (conferenceConnections.isEmpty()) {
diff --git a/src/com/android/services/telephony/CdmaConnection.java b/src/com/android/services/telephony/CdmaConnection.java
index ffa9dbc..ca842b1 100644
--- a/src/com/android/services/telephony/CdmaConnection.java
+++ b/src/com/android/services/telephony/CdmaConnection.java
@@ -18,7 +18,6 @@
 
 import android.os.Handler;
 import android.os.Message;
-
 import android.provider.Settings;
 import android.telephony.DisconnectCause;
 import android.telephony.PhoneNumberUtils;
@@ -26,8 +25,8 @@
 import com.android.internal.telephony.Call;
 import com.android.internal.telephony.CallStateException;
 import com.android.internal.telephony.Connection;
-import com.android.internal.telephony.imsphone.ImsPhoneConnection;
 import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.imsphone.ImsPhoneConnection;
 import com.android.phone.settings.SettingsConstants;
 
 import java.util.LinkedList;
@@ -40,6 +39,7 @@
 
     private static final int MSG_CALL_WAITING_MISSED = 1;
     private static final int MSG_DTMF_SEND_CONFIRMATION = 2;
+    private static final int MSG_CDMA_LINE_CONTROL_INFO_REC = 3;
     private static final int TIMEOUT_CALL_WAITING_MILLIS = 20 * 1000;
 
     private final Handler mHandler = new Handler() {
@@ -54,6 +54,9 @@
                 case MSG_DTMF_SEND_CONFIRMATION:
                     handleBurstDtmfConfirmation();
                     break;
+                case MSG_CDMA_LINE_CONTROL_INFO_REC:
+                    handleCdmaConnectionTimeReset();
+                    break;
                 default:
                     break;
             }
@@ -72,6 +75,7 @@
     // Indicates that the DTMF confirmation from telephony is pending.
     private boolean mDtmfBurstConfirmationPending = false;
     private boolean mIsCallWaiting;
+    private boolean mIsConnectionTimeReset = false;
 
     CdmaConnection(
             Connection connection,
@@ -224,7 +228,8 @@
             } catch (CallStateException e) {
                 Log.e(this, e, "Failed to hangup call waiting call");
             }
-            setDisconnected(DisconnectCauseUtil.toTelecomDisconnectCause(telephonyDisconnectCause));
+            setDisconnected(DisconnectCauseUtil.toTelecomDisconnectCause(telephonyDisconnectCause,
+                    null, getPhone().getPhoneId()));
         }
     }
 
@@ -298,4 +303,33 @@
         mAllowMute = true;
         super.handleExitedEcmMode();
     }
+
+    private void handleCdmaConnectionTimeReset() {
+        boolean isImsCall = getOriginalConnection() instanceof ImsPhoneConnection;
+        if (!isImsCall && !mIsConnectionTimeReset && mIsOutgoing
+                && getOriginalConnection() != null
+                && getOriginalConnection().getState() == Call.State.ACTIVE
+                && getOriginalConnection().getDurationMillis() > 0) {
+            mIsConnectionTimeReset = true;
+            getOriginalConnection().resetConnectionTime();
+            resetConnectionTime();
+        }
+    }
+
+    @Override
+    void setOriginalConnection(com.android.internal.telephony.Connection originalConnection) {
+        super.setOriginalConnection(originalConnection);
+        if (getPhone() != null) {
+            getPhone().registerForLineControlInfo(mHandler, MSG_CDMA_LINE_CONTROL_INFO_REC, null);
+        }
+    }
+
+    @Override
+    protected void close() {
+        mIsConnectionTimeReset = false;
+        if (getPhone() != null) {
+            getPhone().unregisterForLineControlInfo(mHandler);
+        }
+        super.close();
+    }
 }
diff --git a/src/com/android/services/telephony/ConferenceParticipantConnection.java b/src/com/android/services/telephony/ConferenceParticipantConnection.java
index 19dda54..82baa92 100644
--- a/src/com/android/services/telephony/ConferenceParticipantConnection.java
+++ b/src/com/android/services/telephony/ConferenceParticipantConnection.java
@@ -16,19 +16,19 @@
 
 package com.android.services.telephony;
 
-import com.android.internal.annotations.VisibleForTesting;
-import com.android.internal.telephony.Phone;
-import com.android.internal.telephony.PhoneConstants;
-
 import android.net.Uri;
-import android.telecom.Connection;
 import android.telecom.ConferenceParticipant;
+import android.telecom.Connection;
 import android.telecom.DisconnectCause;
 import android.telecom.PhoneAccount;
 import android.telephony.PhoneNumberUtils;
 import android.telephony.SubscriptionInfo;
 import android.text.TextUtils;
 
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.PhoneConstants;
+
 /**
  * Represents a participant in a conference call.
  */
@@ -74,6 +74,7 @@
             address = getParticipantAddress(participant.getHandle(), countryIso);
         }
         setAddress(address, presentation);
+        setVideoState(parentConnection.getVideoState());
         setCallerDisplayName(participant.getDisplayName(), presentation);
 
         mUserEntity = participant.getHandle();
diff --git a/src/com/android/services/telephony/DisconnectCauseUtil.java b/src/com/android/services/telephony/DisconnectCauseUtil.java
index f725c49..a92dea7 100644
--- a/src/com/android/services/telephony/DisconnectCauseUtil.java
+++ b/src/com/android/services/telephony/DisconnectCauseUtil.java
@@ -19,6 +19,7 @@
 import android.content.Context;
 import android.media.ToneGenerator;
 import android.telecom.DisconnectCause;
+import android.telephony.SubscriptionManager;
 
 import com.android.internal.telephony.CallFailCause;
 import com.android.phone.ImsUtil;
@@ -63,13 +64,44 @@
     */
     public static DisconnectCause toTelecomDisconnectCause(
             int telephonyDisconnectCause, int telephonyPerciseDisconnectCause, String reason) {
+        return toTelecomDisconnectCause(telephonyDisconnectCause, telephonyPerciseDisconnectCause,
+                reason, SubscriptionManager.getDefaultVoicePhoneId());
+    }
+
+    /**
+     * Converts from a disconnect code in {@link android.telephony.DisconnectCause} into a more
+     * generic {@link android.telecom.DisconnectCause}.object, possibly populated with a localized
+     * message and tone for Slot.
+     *
+     * @param telephonyDisconnectCause The code for the reason for the disconnect.
+     * @param phoneId To support localized message based on phoneId
+     */
+    public static DisconnectCause toTelecomDisconnectCause(int telephonyDisconnectCause,
+            String reason, int phoneId) {
+        return toTelecomDisconnectCause(telephonyDisconnectCause, CallFailCause.NOT_VALID,
+                reason, phoneId);
+    }
+
+   /**
+    * Converts from a disconnect code in {@link android.telephony.DisconnectCause} into a more
+    * generic {@link android.telecom.DisconnectCause}.object, possibly populated with a localized
+    * message and tone for Slot.
+    *
+    * @param telephonyDisconnectCause The code for the reason for the disconnect.
+    * @param telephonyPerciseDisconnectCause The code for the percise reason for the disconnect.
+    * @param reason Description of the reason for the disconnect, not intended for the user to see..
+    * @param phoneId To support localized message based on phoneId
+    */
+    public static DisconnectCause toTelecomDisconnectCause(
+            int telephonyDisconnectCause, int telephonyPerciseDisconnectCause, String reason,
+            int phoneId) {
         Context context = PhoneGlobals.getInstance();
         return new DisconnectCause(
                 toTelecomDisconnectCauseCode(telephonyDisconnectCause),
                 toTelecomDisconnectCauseLabel(context, telephonyDisconnectCause,
                         telephonyPerciseDisconnectCause),
-                toTelecomDisconnectCauseDescription(context, telephonyDisconnectCause),
-                toTelecomDisconnectReason(context,telephonyDisconnectCause, reason),
+                toTelecomDisconnectCauseDescription(context, telephonyDisconnectCause, phoneId),
+                toTelecomDisconnectReason(context,telephonyDisconnectCause, reason, phoneId),
                 toTelecomDisconnectCauseTone(telephonyDisconnectCause));
     }
 
@@ -137,6 +169,11 @@
             case android.telephony.DisconnectCause.SERVER_ERROR:
             case android.telephony.DisconnectCause.SERVER_UNREACHABLE:
             case android.telephony.DisconnectCause.TIMED_OUT:
+            case android.telephony.DisconnectCause.ALREADY_DIALING:
+            case android.telephony.DisconnectCause.CANT_CALL_WHILE_RINGING:
+            case android.telephony.DisconnectCause.CALLING_DISABLED:
+            case android.telephony.DisconnectCause.TOO_MANY_ONGOING_CALLS:
+            case android.telephony.DisconnectCause.OTASP_PROVISIONING_IN_PROCESS:
             case android.telephony.DisconnectCause.UNOBTAINABLE_NUMBER:
             case android.telephony.DisconnectCause.VOICEMAIL_NUMBER_MISSING:
             case android.telephony.DisconnectCause.DIAL_MODIFIED_TO_USSD:
@@ -274,6 +311,10 @@
                 resourceId = R.string.callFailed_unobtainable_number;
                 break;
 
+            case android.telephony.DisconnectCause.VOICEMAIL_NUMBER_MISSING:
+                resourceId = R.string.incall_error_missing_voicemail_number;
+                break;
+
             case android.telephony.DisconnectCause.CALL_PULLED:
                 resourceId = R.string.callEnded_pulled;
                 break;
@@ -289,11 +330,24 @@
             case android.telephony.DisconnectCause.DATA_LIMIT_REACHED:
                 resourceId = R.string.callFailed_data_limit_reached;
                 break;
-
+            case android.telephony.DisconnectCause.ALREADY_DIALING:
+                resourceId = R.string.callFailed_already_dialing;
+                break;
+            case android.telephony.DisconnectCause.CANT_CALL_WHILE_RINGING:
+                resourceId = R.string.callFailed_already_ringing;
+                break;
+            case android.telephony.DisconnectCause.CALLING_DISABLED:
+                resourceId = R.string.callFailed_calling_disabled;
+                break;
+            case android.telephony.DisconnectCause.TOO_MANY_ONGOING_CALLS:
+                resourceId = R.string.callFailed_too_many_calls;
+                break;
             case android.telephony.DisconnectCause.IMS_SIP_ALTERNATE_EMERGENCY_CALL:
                 resourceId = R.string.incall_error_power_off;
                 break;
-
+            case android.telephony.DisconnectCause.OTASP_PROVISIONING_IN_PROCESS:
+                resourceId = R.string.callFailed_otasp_provisioning_in_process;
+                break;
             default:
                 break;
         }
@@ -488,7 +542,7 @@
      * Returns a description of the disconnect cause to be shown to the user.
      */
     private static CharSequence toTelecomDisconnectCauseDescription(
-            Context context, int telephonyDisconnectCause) {
+            Context context, int telephonyDisconnectCause, int phoneId) {
         if (context == null ) {
             return "";
         }
@@ -565,11 +619,11 @@
                 // TODO: Offer the option to turn the radio on, and automatically retry the call
                 // once network registration is complete.
 
-                if (ImsUtil.shouldPromoteWfc(context)) {
+                if (ImsUtil.shouldPromoteWfc(context, phoneId)) {
                     resourceId = R.string.incall_error_promote_wfc;
-                } else if (ImsUtil.isWfcModeWifiOnly(context)) {
+                } else if (ImsUtil.isWfcModeWifiOnly(context, phoneId)) {
                     resourceId = R.string.incall_error_wfc_only_no_wireless_network;
-                } else if (ImsUtil.isWfcEnabled(context)) {
+                } else if (ImsUtil.isWfcEnabled(context, phoneId)) {
                     resourceId = R.string.incall_error_power_off_wfc;
                 } else {
                     resourceId = R.string.incall_error_power_off;
@@ -597,11 +651,11 @@
 
             case android.telephony.DisconnectCause.OUT_OF_SERVICE:
                 // No network connection.
-                if (ImsUtil.shouldPromoteWfc(context)) {
+                if (ImsUtil.shouldPromoteWfc(context, phoneId)) {
                     resourceId = R.string.incall_error_promote_wfc;
-                } else if (ImsUtil.isWfcModeWifiOnly(context)) {
+                } else if (ImsUtil.isWfcModeWifiOnly(context, phoneId)) {
                     resourceId = R.string.incall_error_wfc_only_no_wireless_network;
-                } else if (ImsUtil.isWfcEnabled(context)) {
+                } else if (ImsUtil.isWfcEnabled(context, phoneId)) {
                     resourceId = R.string.incall_error_out_of_service_wfc;
                 } else {
                     resourceId = R.string.incall_error_out_of_service;
@@ -616,8 +670,6 @@
                 break;
 
             case android.telephony.DisconnectCause.VOICEMAIL_NUMBER_MISSING:
-                // TODO: Need to bring up the "Missing Voicemail Number" dialog, which
-                // will ultimately take us to the Call Settings.
                 resourceId = R.string.incall_error_missing_voicemail_number;
                 break;
 
@@ -657,11 +709,24 @@
             case android.telephony.DisconnectCause.WIFI_LOST:
                 resourceId = R.string.callFailed_wifi_lost;
                 break;
-
+            case android.telephony.DisconnectCause.ALREADY_DIALING:
+                resourceId = R.string.callFailed_already_dialing;
+                break;
+            case android.telephony.DisconnectCause.CANT_CALL_WHILE_RINGING:
+                resourceId = R.string.callFailed_already_ringing;
+                break;
+            case android.telephony.DisconnectCause.CALLING_DISABLED:
+                resourceId = R.string.callFailed_calling_disabled;
+                break;
+            case android.telephony.DisconnectCause.TOO_MANY_ONGOING_CALLS:
+                resourceId = R.string.callFailed_too_many_calls;
+                break;
             case android.telephony.DisconnectCause.IMS_SIP_ALTERNATE_EMERGENCY_CALL:
                 resourceId = R.string.incall_error_power_off;
                 break;
-
+            case android.telephony.DisconnectCause.OTASP_PROVISIONING_IN_PROCESS:
+                resourceId = R.string.callFailed_otasp_provisioning_in_process;
+                break;
             default:
                 break;
         }
@@ -679,7 +744,7 @@
      * @return The disconnect reason.
      */
     private static String toTelecomDisconnectReason(Context context, int telephonyDisconnectCause,
-            String reason) {
+            String reason, int phoneId) {
 
         if (context == null) {
             return "";
@@ -691,7 +756,7 @@
                 // intentional fall-through
             case android.telephony.DisconnectCause.OUT_OF_SERVICE:
                 // No network connection.
-                if (ImsUtil.shouldPromoteWfc(context)) {
+                if (ImsUtil.shouldPromoteWfc(context, phoneId)) {
                     return android.telecom.DisconnectCause.REASON_WIFI_ON_BUT_WFC_OFF;
                 }
                 break;
diff --git a/src/com/android/services/telephony/ImsConference.java b/src/com/android/services/telephony/ImsConference.java
index c62a7f1..5722834 100644
--- a/src/com/android/services/telephony/ImsConference.java
+++ b/src/com/android/services/telephony/ImsConference.java
@@ -640,6 +640,7 @@
 
         setState(mConferenceHost.getState());
         updateStatusHints();
+        putExtras(mConferenceHost.getExtras());
     }
 
     /**
@@ -692,6 +693,7 @@
                     Log.i(this, "handleConferenceParticipantsUpdate: updateState, participant = %s",
                             participant);
                     connection.updateState(participant.getState());
+                    connection.setVideoState(parent.getVideoState());
                 }
             }
 
@@ -704,6 +706,7 @@
                                     newParticipant.getHandle(),
                                     newParticipant.getEndpoint()));
                     connection.updateState(newParticipant.getState());
+                    connection.setVideoState(parent.getVideoState());
                 }
             }
 
@@ -777,7 +780,8 @@
 
         participant.removeConnectionListener(mParticipantListener);
         synchronized(mUpdateSyncRoot) {
-            mConferenceParticipantConnections.remove(participant.getUserEntity());
+            mConferenceParticipantConnections.remove(new Pair<>(participant.getUserEntity(),
+                    participant.getEndpoint()));
         }
         mTelephonyConnectionService.removeConnection(participant);
     }
@@ -951,8 +955,14 @@
                 if (mConferenceHost == null) {
                     disconnectCause = new DisconnectCause(DisconnectCause.CANCELED);
                 } else {
-                    disconnectCause = DisconnectCauseUtil.toTelecomDisconnectCause(
-                            mConferenceHost.getOriginalConnection().getDisconnectCause());
+                    if (mConferenceHost.getPhone() != null) {
+                        disconnectCause = DisconnectCauseUtil.toTelecomDisconnectCause(
+                                mConferenceHost.getOriginalConnection().getDisconnectCause(),
+                                null, mConferenceHost.getPhone().getPhoneId());
+                    } else {
+                        disconnectCause = DisconnectCauseUtil.toTelecomDisconnectCause(
+                                mConferenceHost.getOriginalConnection().getDisconnectCause());
+                    }
                 }
                 setDisconnected(disconnectCause);
                 disconnectConferenceParticipants();
diff --git a/src/com/android/services/telephony/ImsConferenceController.java b/src/com/android/services/telephony/ImsConferenceController.java
index 4bae058..971dd7b 100644
--- a/src/com/android/services/telephony/ImsConferenceController.java
+++ b/src/com/android/services/telephony/ImsConferenceController.java
@@ -389,5 +389,8 @@
                         android.telephony.DisconnectCause.IMS_MERGED_SUCCESSFULLY)));
         connection.destroy();
         mImsConferences.add(conference);
+        // If one of the participants failed to join the conference, recalculate will set the
+        // conferenceable connections for the conference to show merge calls option.
+        recalculateConferenceable();
     }
 }
diff --git a/src/com/android/services/telephony/PstnIncomingCallNotifier.java b/src/com/android/services/telephony/PstnIncomingCallNotifier.java
index 4dfaf44..223616f 100644
--- a/src/com/android/services/telephony/PstnIncomingCallNotifier.java
+++ b/src/com/android/services/telephony/PstnIncomingCallNotifier.java
@@ -37,6 +37,7 @@
 import com.android.internal.telephony.imsphone.ImsExternalCallTracker;
 import com.android.internal.telephony.imsphone.ImsExternalConnection;
 import com.android.internal.telephony.imsphone.ImsPhoneConnection;
+import com.android.phone.NumberVerificationManager;
 import com.android.phone.PhoneUtils;
 
 import com.google.common.base.Preconditions;
@@ -126,6 +127,19 @@
         Connection connection = (Connection) asyncResult.result;
         if (connection != null) {
             Call call = connection.getCall();
+            // Check if we have a pending number verification request.
+            if (connection.getAddress() != null) {
+                if (NumberVerificationManager.getInstance()
+                        .checkIncomingCall(connection.getAddress())) {
+                    // Disconnect the call if it matches
+                    try {
+                        connection.hangup();
+                    } catch (CallStateException e) {
+                        Log.e(this, e, "Error hanging up potential number verification call");
+                    }
+                    return;
+                }
+            }
 
             // Final verification of the ringing state before sending the intent to Telecom.
             if (call != null && call.getState().isRinging()) {
diff --git a/src/com/android/services/telephony/PstnPhoneCapabilitiesNotifier.java b/src/com/android/services/telephony/PstnPhoneCapabilitiesNotifier.java
index e557919..b9cbf6e 100644
--- a/src/com/android/services/telephony/PstnPhoneCapabilitiesNotifier.java
+++ b/src/com/android/services/telephony/PstnPhoneCapabilitiesNotifier.java
@@ -19,13 +19,9 @@
 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.util.Preconditions;
-import com.android.phone.PhoneUtils;
 
 /**
  * Listens to phone's capabilities changed event and notifies Telecomm. One instance of these exists
diff --git a/src/com/android/services/telephony/RadioOnHelper.java b/src/com/android/services/telephony/RadioOnHelper.java
index daa7665..cd08289 100644
--- a/src/com/android/services/telephony/RadioOnHelper.java
+++ b/src/com/android/services/telephony/RadioOnHelper.java
@@ -26,7 +26,6 @@
 import com.android.internal.telephony.PhoneFactory;
 
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
 
 /**
diff --git a/src/com/android/services/telephony/TelecomAccountRegistry.java b/src/com/android/services/telephony/TelecomAccountRegistry.java
index 642af85..228eed1 100644
--- a/src/com/android/services/telephony/TelecomAccountRegistry.java
+++ b/src/com/android/services/telephony/TelecomAccountRegistry.java
@@ -46,6 +46,9 @@
 import android.telephony.SubscriptionManager;
 import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener;
 import android.telephony.TelephonyManager;
+import android.telephony.ims.ImsMmTelManager;
+import android.telephony.ims.feature.MmTelFeature;
+import android.telephony.ims.stub.ImsRegistrationImplBase;
 import android.text.TextUtils;
 
 import com.android.ims.ImsManager;
@@ -64,7 +67,7 @@
  * Owns all data we have registered with Telecom including handling dynamic addition and
  * removal of SIMs and SIP accounts.
  */
-final class TelecomAccountRegistry {
+public final class TelecomAccountRegistry {
     private static final boolean DBG = false; /* STOP SHIP if true */
 
     // This icon is the one that is used when the Slot ID that we have for a particular SIM
@@ -78,7 +81,10 @@
         private final PstnIncomingCallNotifier mIncomingCallNotifier;
         private final PstnPhoneCapabilitiesNotifier mPhoneCapabilitiesNotifier;
         private boolean mIsEmergency;
-        private boolean mIsDummy;
+        private boolean mIsRttCapable;
+        private MmTelFeature.MmTelCapabilities mMmTelCapabilities;
+        private ImsMmTelManager.CapabilityCallback mMmtelCapabilityCallback;
+        private final boolean mIsDummy;
         private boolean mIsVideoCapable;
         private boolean mIsVideoPresenceSupported;
         private boolean mIsVideoPauseSupported;
@@ -99,11 +105,53 @@
             mIncomingCallNotifier = new PstnIncomingCallNotifier((Phone) mPhone);
             mPhoneCapabilitiesNotifier = new PstnPhoneCapabilitiesNotifier((Phone) mPhone,
                     this);
+
+            if (!mIsDummy) {
+                ImsMmTelManager manager;
+                try {
+                    manager = ImsMmTelManager.createForSubscriptionId(mContext, getSubId());
+                } catch (IllegalArgumentException e) {
+                    Log.i(this, "Not registering Mmtel listener because the subid is invalid");
+                    return;
+                }
+
+                boolean isImsVoiceCapable = manager.isCapable(
+                        ImsRegistrationImplBase.REGISTRATION_TECH_LTE,
+                        MmTelFeature.MmTelCapabilities.CAPABILITY_TYPE_VOICE)
+                        || manager.isCapable(ImsRegistrationImplBase.REGISTRATION_TECH_IWLAN,
+                        MmTelFeature.MmTelCapabilities.CAPABILITY_TYPE_VOICE);
+
+                if (!isImsVoiceCapable) {
+                    Log.i(this, "Not registering MmTel listener because"
+                            + " voice over IMS isn't supported");
+                    return;
+                }
+
+                mMmtelCapabilityCallback =
+                        new ImsMmTelManager.CapabilityCallback() {
+                            @Override
+                            public void onCapabilitiesStatusChanged(
+                                    MmTelFeature.MmTelCapabilities capabilities) {
+                                mMmTelCapabilities = capabilities;
+                                updateRttCapability();
+                            }
+                        };
+                manager.registerMmTelCapabilityCallback(mContext.getMainExecutor(),
+                                mMmtelCapabilityCallback);
+            }
         }
 
         void teardown() {
             mIncomingCallNotifier.teardown();
             mPhoneCapabilitiesNotifier.teardown();
+            if (mMmtelCapabilityCallback != null) {
+                try {
+                    ImsMmTelManager.createForSubscriptionId(mContext, getSubId())
+                            .unregisterMmTelCapabilityCallback(mMmtelCapabilityCallback);
+                } catch (IllegalArgumentException e) {
+                    // TODO (breadley): Tearing down may fail if the sim has been removed.
+                }
+            }
         }
 
         /**
@@ -260,8 +308,10 @@
                 extras.putBoolean(PhoneAccount.EXTRA_PLAY_CALL_RECORDING_TONE, true);
             }
 
-            if (PhoneGlobals.getInstance().phoneMgr.isRttEnabled()) {
+            if (PhoneGlobals.getInstance().phoneMgr.isRttEnabled(subId)
+                    && isImsVoiceAvailable()) {
                 capabilities |= PhoneAccount.CAPABILITY_RTT;
+                mIsRttCapable = true;
             }
 
             extras.putBoolean(PhoneAccount.EXTRA_SUPPORTS_VIDEO_CALLING_FALLBACK,
@@ -525,9 +575,21 @@
         }
 
         public void updateRttCapability() {
-            boolean isRttEnabled = PhoneGlobals.getInstance().phoneMgr.isRttEnabled();
-            boolean oldRttEnabled = mAccount.hasCapabilities(PhoneAccount.CAPABILITY_RTT);
-            if (isRttEnabled != oldRttEnabled) {
+            // In the rare case that mMmTelCapabilities hasn't been set yet, try fetching it
+            // directly.
+            boolean hasVoiceAvailability;
+            if (mMmTelCapabilities != null) {
+                hasVoiceAvailability = mMmTelCapabilities.isCapable(
+                        MmTelFeature.MmTelCapabilities.CAPABILITY_TYPE_VOICE);
+            } else {
+                hasVoiceAvailability = isImsVoiceAvailable();
+            }
+
+            boolean isRttSupported = PhoneGlobals.getInstance().phoneMgr
+                    .isRttEnabled(mPhone.getSubId());
+
+            boolean isRttEnabled = hasVoiceAvailability && isRttSupported;
+            if (isRttEnabled != mIsRttCapable) {
                 mAccount = registerPstnPhoneAccount(mIsEmergency, mIsDummy);
             }
         }
@@ -590,6 +652,20 @@
         public boolean isShowPreciseFailedCause() {
             return mIsShowPreciseFailedCause;
         }
+
+        private boolean isImsVoiceAvailable() {
+            if (mMmTelCapabilities != null) {
+                return mMmTelCapabilities.isCapable(
+                        MmTelFeature.MmTelCapabilities.CAPABILITY_TYPE_VOICE);
+            }
+
+            ImsMmTelManager manager = ImsMmTelManager.createForSubscriptionId(
+                    mContext, getSubId());
+            return manager.isAvailable(ImsRegistrationImplBase.REGISTRATION_TECH_LTE,
+                    MmTelFeature.MmTelCapabilities.CAPABILITY_TYPE_VOICE)
+                    || manager.isAvailable(ImsRegistrationImplBase.REGISTRATION_TECH_IWLAN,
+                    MmTelFeature.MmTelCapabilities.CAPABILITY_TYPE_VOICE);
+        }
     }
 
     private OnSubscriptionsChangedListener mOnSubscriptionsChangedListener =
@@ -659,7 +735,10 @@
         mSubscriptionManager = SubscriptionManager.from(context);
     }
 
-    static synchronized final TelecomAccountRegistry getInstance(Context context) {
+    /**
+     * Get the singleton instance.
+     */
+    public static synchronized TelecomAccountRegistry getInstance(Context context) {
         if (sInstance == null && context != null) {
             sInstance = new TelecomAccountRegistry(context);
         }
@@ -828,7 +907,7 @@
     /**
      * Sets up all the phone accounts for SIMs on first boot.
      */
-    void setupOnBoot() {
+    public void setupOnBoot() {
         // TODO: When this object "finishes" we should unregister by invoking
         // SubscriptionManager.getInstance(mContext).unregister(mOnSubscriptionsChangedListener);
         // This is not strictly necessary because it will be unregistered if the
diff --git a/src/com/android/services/telephony/TelephonyConferenceController.java b/src/com/android/services/telephony/TelephonyConferenceController.java
index acb41f6..e9eef46 100644
--- a/src/com/android/services/telephony/TelephonyConferenceController.java
+++ b/src/com/android/services/telephony/TelephonyConferenceController.java
@@ -16,26 +16,22 @@
 
 package com.android.services.telephony;
 
+import android.telecom.Conference;
+import android.telecom.Connection;
+import android.telecom.DisconnectCause;
+import android.telecom.PhoneAccountHandle;
+
+import com.android.internal.telephony.Call;
+import com.android.phone.PhoneUtils;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import android.net.Uri;
-import android.telecom.Conference;
-import android.telecom.ConferenceParticipant;
-import android.telecom.Conferenceable;
-import android.telecom.Connection;
-import android.telecom.DisconnectCause;
-import android.telecom.PhoneAccountHandle;
-import com.android.phone.PhoneUtils;
-
-import com.android.internal.telephony.Call;
-
 /**
  * Maintains a list of all the known TelephonyConnections connections and controls GSM and
  * default IMS conference call behavior. This functionality is characterized by the support of
@@ -268,6 +264,7 @@
                                 mTelephonyConference, connection);
                         mTelephonyConference.addConnection(connection);
                     }
+                    mTelephonyConference.updateCallRadioTechAfterCreation();
                     mConnectionService.addConference(mTelephonyConference);
                 } else {
                     Log.d(this, "Trigger recalculate later");
diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index db4cc10..8f46ecf 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -36,6 +36,7 @@
 import android.telephony.CarrierConfigManager;
 import android.telephony.DisconnectCause;
 import android.telephony.PhoneNumberUtils;
+import android.telephony.ServiceState;
 import android.telephony.TelephonyManager;
 import android.telephony.ims.ImsCallProfile;
 import android.text.TextUtils;
@@ -96,6 +97,7 @@
     private static final int MSG_CDMA_VOICE_PRIVACY_ON = 15;
     private static final int MSG_CDMA_VOICE_PRIVACY_OFF = 16;
     private static final int MSG_HANGUP = 17;
+    private static final int MSG_SET_CALL_RADIO_TECH = 18;
 
     private final Handler mHandler = new Handler(Looper.getMainLooper()) {
         @Override
@@ -240,6 +242,31 @@
                     int cause = (int) msg.obj;
                     hangup(cause);
                     break;
+
+                case MSG_SET_CALL_RADIO_TECH:
+                    int vrat = (int) msg.obj;
+                    // Check whether Wi-Fi call tech is changed, it means call radio tech is:
+                    //  a) changed from IWLAN to other value, or
+                    //  b) changed from other value to IWLAN.
+                    //
+                    // In other word, below conditions are all met:
+                    // 1) {@link #getCallRadioTech} is different from new vrat
+                    // 2) Current call radio technology indicates Wi-Fi call, i.e. {@link #isWifi}
+                    //    is true, or new vrat indicates Wi-Fi call.
+                    boolean isWifiTechChange = getCallRadioTech() != vrat
+                            && (isWifi() || vrat == ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN);
+
+                    // Step 1) Updates call radio tech firstly, so that afterwards Wi-Fi related
+                    // update actions are taken correctly.
+                    setCallRadioTech(vrat);
+
+                    // Step 2) Handles Wi-Fi call tech change.
+                    if (isWifiTechChange) {
+                        updateConnectionProperties();
+                        updateStatusHints();
+                        refreshDisableAddCall();
+                    }
+                    break;
             }
         }
     };
@@ -421,14 +448,14 @@
         }
 
         /**
-         * Used by {@link com.android.internal.telephony.Connection} to report a change in whether
-         * the call is being made over a wifi network.
+         * Used by {@link com.android.internal.telephony.Connection} to report a change for
+         * the call radio technology.
          *
-         * @param isWifi True if call is made over wifi.
+         * @param vrat the RIL Voice Radio Technology used for current connection.
          */
         @Override
-        public void onWifiChanged(boolean isWifi) {
-            setWifi(isWifi);
+        public void onCallRadioTechChanged(@ServiceState.RilRadioTechnology int vrat) {
+            mHandler.obtainMessage(MSG_SET_CALL_RADIO_TECH, vrat).sendToTarget();
         }
 
         /**
@@ -575,6 +602,11 @@
                 com.android.internal.telephony.Connection newConnection) {
             setOriginalConnection(newConnection);
         }
+
+        @Override
+        public void onIsNetworkEmergencyCallChanged(boolean isEmergencyCall) {
+            setIsNetworkIdentifiedEmergencyCall(isEmergencyCall);
+        }
     };
 
     protected com.android.internal.telephony.Connection mOriginalConnection;
@@ -599,13 +631,6 @@
     private int mOriginalConnectionCapabilities;
 
     /**
-     * Determines if the {@link TelephonyConnection} is using wifi.
-     * This is used when {@link TelephonyConnection#updateConnectionProperties()} is called to
-     * indicate whether a call has the {@link Connection#PROPERTY_WIFI} property.
-     */
-    private boolean mIsWifi;
-
-    /**
      * Determines the audio quality is high for the {@link TelephonyConnection}.
      * This is used when {@link TelephonyConnection#updateConnectionProperties}} is called to
      * indicate whether a call has the {@link Connection#PROPERTY_HIGH_DEF_AUDIO} property.
@@ -620,6 +645,15 @@
     private boolean mTreatAsEmergencyCall;
 
     /**
+     * Indicates whether the network has identified this call as an emergency call.  Where
+     * {@link #mTreatAsEmergencyCall} is based on comparing dialed numbers to a list of known
+     * emergency numbers, this property is based on whether the network itself has identified the
+     * call as an emergency call (which can be the case for an incoming call from emergency
+     * services).
+     */
+    private boolean mIsNetworkIdentifiedEmergencyCall;
+
+    /**
      * For video calls, indicates whether the outgoing video for the call can be paused using
      * the {@link android.telecom.VideoProfile#STATE_PAUSED} VideoState.
      */
@@ -661,6 +695,11 @@
     private boolean mIsHoldable;
 
     /**
+     * Indicates whether TTY is enabled; used to determine whether a call is VT capable.
+     */
+    private boolean mIsTtyEnabled;
+
+    /**
      * Indicates whether this call is using assisted dialing.
      */
     private boolean mIsUsingAssistedDialing;
@@ -853,7 +892,7 @@
             if (originalConnection.isRttEnabledForCall()) {
                 originalConnection.setCurrentRttTextStream(textStream);
             } else {
-                originalConnection.sendRttModifyRequest(textStream);
+                originalConnection.startRtt(textStream);
             }
         } else {
             Log.w(this, "onStartRtt - not in IMS, so RTT cannot be enabled.");
@@ -862,7 +901,16 @@
 
     @Override
     public void onStopRtt() {
-        Log.i(this, "Stopping RTT currently not supported. Doing nothing.");
+        if (isImsConnection()) {
+            ImsPhoneConnection originalConnection = (ImsPhoneConnection) mOriginalConnection;
+            if (originalConnection.isRttEnabledForCall()) {
+                originalConnection.stopRtt();
+            } else {
+                Log.w(this, "onStopRtt - not in RTT call, ignoring");
+            }
+        } else {
+            Log.w(this, "onStopRtt - not in IMS, ignoring");
+        }
     }
 
     @Override
@@ -883,6 +931,13 @@
             Log.v(this, "Holding active call");
             try {
                 Phone phone = mOriginalConnection.getCall().getPhone();
+
+                // New behavior for IMS -- don't use the clunky switchHoldingAndActive logic.
+                if (phone.getPhoneType() == PhoneConstants.PHONE_TYPE_IMS) {
+                    ImsPhone imsPhone = (ImsPhone) phone;
+                    imsPhone.holdActiveCall();
+                    return;
+                }
                 Call ringingCall = phone.getRingingCall();
 
                 // Although the method says switchHoldingAndActive, it eventually calls a RIL method
@@ -912,6 +967,13 @@
         Log.v(this, "performUnhold");
         if (Call.State.HOLDING == mConnectionState) {
             try {
+                Phone phone = mOriginalConnection.getCall().getPhone();
+                // New behavior for IMS -- don't use the clunky switchHoldingAndActive logic.
+                if (phone.getPhoneType() == PhoneConstants.PHONE_TYPE_IMS) {
+                    ImsPhone imsPhone = (ImsPhone) phone;
+                    imsPhone.unholdHeldCall();
+                    return;
+                }
                 // Here's the deal--Telephony hold/unhold is weird because whenever there exists
                 // more than one call, one of them must always be active. In other words, if you
                 // have an active call and holding call, and you put the active call on hold, it
@@ -1016,7 +1078,7 @@
 
         newProperties = changeBitmask(newProperties, PROPERTY_HIGH_DEF_AUDIO,
                 hasHighDefAudioProperty());
-        newProperties = changeBitmask(newProperties, PROPERTY_WIFI, mIsWifi);
+        newProperties = changeBitmask(newProperties, PROPERTY_WIFI, isWifi());
         newProperties = changeBitmask(newProperties, PROPERTY_IS_EXTERNAL_CALL,
                 isExternalConnection());
         newProperties = changeBitmask(newProperties, PROPERTY_HAS_CDMA_VOICE_PRIVACY,
@@ -1024,6 +1086,8 @@
         newProperties = changeBitmask(newProperties, PROPERTY_ASSISTED_DIALING_USED,
                 mIsUsingAssistedDialing);
         newProperties = changeBitmask(newProperties, PROPERTY_IS_RTT, isRtt());
+        newProperties = changeBitmask(newProperties, PROPERTY_NETWORK_IDENTIFIED_EMERGENCY_CALL,
+                isNetworkIdentifiedEmergencyCall());
 
         if (getConnectionProperties() != newProperties) {
             setConnectionProperties(newProperties);
@@ -1034,7 +1098,13 @@
         updateConnectionCapabilities();
         updateConnectionProperties();
         if (mOriginalConnection != null) {
-            Uri address = getAddressFromNumber(mOriginalConnection.getAddress());
+            Uri address;
+            if (isShowingOriginalDialString()
+                    && mOriginalConnection.getOrigDialString() != null) {
+                address = getAddressFromNumber(mOriginalConnection.getOrigDialString());
+            } else {
+                address = getAddressFromNumber(mOriginalConnection.getAddress());
+            }
             int presentation = mOriginalConnection.getNumberPresentation();
             if (!Objects.equals(address, getAddress()) ||
                     presentation != getAddressPresentation()) {
@@ -1069,6 +1139,15 @@
 
     void setOriginalConnection(com.android.internal.telephony.Connection originalConnection) {
         Log.v(this, "new TelephonyConnection, originalConnection: " + originalConnection);
+        if (mOriginalConnection != null && originalConnection != null
+               && !originalConnection.isIncoming()
+               && originalConnection.getOrigDialString() == null
+               && isShowingOriginalDialString()) {
+            Log.i(this, "new original dial string is null, convert to: "
+                   +  mOriginalConnection.getOrigDialString());
+            originalConnection.setConverted(mOriginalConnection.getOrigDialString());
+        }
+
         clearOriginalConnection();
         mOriginalConnectionExtras.clear();
         mOriginalConnection = originalConnection;
@@ -1088,12 +1167,14 @@
         // Set video state and capabilities
         setVideoState(mOriginalConnection.getVideoState());
         setOriginalConnectionCapabilities(mOriginalConnection.getConnectionCapabilities());
-        setWifi(mOriginalConnection.isWifi());
+        setIsNetworkIdentifiedEmergencyCall(mOriginalConnection.isNetworkIdentifiedEmergencyCall());
         setAudioModeIsVoip(mOriginalConnection.getAudioModeIsVoip());
         setVideoProvider(mOriginalConnection.getVideoProvider());
         setAudioQuality(mOriginalConnection.getAudioQuality());
         setTechnologyTypeExtra();
 
+        setCallRadioTech(mOriginalConnection.getCallRadioTech());
+
         // Post update of extras to the handler; extras are updated via the handler to ensure thread
         // safety. The Extras Bundle is cloned in case the original extras are modified while they
         // are being added to mOriginalConnectionExtras in updateExtras.
@@ -1205,12 +1286,12 @@
                 wasVideoCall = call.wasVideoCall();
             }
 
-            isVowifiEnabled = ImsUtil.isWfcEnabled(phone.getContext());
+            isVowifiEnabled = ImsUtil.isWfcEnabled(phone.getContext(), phone.getPhoneId());
         }
 
         if (isCurrentVideoCall) {
             return true;
-        } else if (wasVideoCall && mIsWifi && !isVowifiEnabled) {
+        } else if (wasVideoCall && isWifi() && !isVowifiEnabled) {
             return true;
         }
         return false;
@@ -1245,7 +1326,7 @@
             return false;
         }
 
-        if (mIsWifi && !canWifiCallsBeHdAudio) {
+        if (isWifi() && !canWifiCallsBeHdAudio) {
             return false;
         }
 
@@ -1582,7 +1663,8 @@
                         setDisconnected(DisconnectCauseUtil.toTelecomDisconnectCause(
                                 mOriginalConnection.getDisconnectCause(),
                                 preciseDisconnectCause,
-                                mOriginalConnection.getVendorDisconnectCause()));
+                                mOriginalConnection.getVendorDisconnectCause(),
+                                getPhone().getPhoneId()));
                         close();
                     }
                     break;
@@ -1675,7 +1757,7 @@
         setActive();
     }
 
-    private void close() {
+    protected void close() {
         Log.v(this, "close");
         clearOriginalConnection();
         destroy();
@@ -1794,28 +1876,40 @@
         capabilities = changeBitmask(capabilities, CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL,
                 can(mOriginalConnectionCapabilities, Capability.SUPPORTS_VT_REMOTE_BIDIRECTIONAL));
 
+        boolean isLocalVideoSupported = can(mOriginalConnectionCapabilities,
+                Capability.SUPPORTS_VT_LOCAL_BIDIRECTIONAL) && !mIsTtyEnabled;
         capabilities = changeBitmask(capabilities, CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL,
-                can(mOriginalConnectionCapabilities, Capability.SUPPORTS_VT_LOCAL_BIDIRECTIONAL));
+                isLocalVideoSupported);
 
         return capabilities;
     }
 
     /**
-     * Sets whether the call is using wifi. Used when rebuilding the capabilities to set or unset
-     * the {@link Connection#PROPERTY_WIFI} property.
-     */
-    public void setWifi(boolean isWifi) {
-        mIsWifi = isWifi;
-        updateConnectionProperties();
-        updateStatusHints();
-        refreshDisableAddCall();
-    }
-
-    /**
      * Whether the call is using wifi.
      */
     boolean isWifi() {
-        return mIsWifi;
+        return getCallRadioTech() == ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN;
+    }
+
+    /**
+     * Sets whether this call has been identified by the network as an emergency call.
+     * @param isNetworkIdentifiedEmergencyCall {@code true} if the network has identified this call
+     * as an emergency call, {@code false} otherwise.
+     */
+    public void setIsNetworkIdentifiedEmergencyCall(boolean isNetworkIdentifiedEmergencyCall) {
+        Log.d(this, "setIsNetworkIdentifiedEmergencyCall; callId=%s, "
+                + "isNetworkIdentifiedEmergencyCall=%b", getTelecomCallId(),
+                isNetworkIdentifiedEmergencyCall);
+        mIsNetworkIdentifiedEmergencyCall = isNetworkIdentifiedEmergencyCall;
+        updateConnectionProperties();
+    }
+
+    /**
+     * @return {@code true} if the network has identified this call as an emergency call,
+     * {@code false} otherwise.
+     */
+    public boolean isNetworkIdentifiedEmergencyCall() {
+        return mIsNetworkIdentifiedEmergencyCall;
     }
 
     /**
@@ -1923,6 +2017,15 @@
     }
 
     /**
+     * Sets whether TTY is enabled or not.
+     * @param isTtyEnabled
+     */
+    public void setTtyEnabled(boolean isTtyEnabled) {
+        mIsTtyEnabled = isTtyEnabled;
+        updateConnectionCapabilities();
+    }
+
+    /**
      * Whether the original connection is an IMS connection.
      * @return {@code True} if the original connection is an IMS connection, {@code false}
      *     otherwise.
@@ -1995,9 +2098,8 @@
     }
 
     private void updateStatusHints() {
-        boolean isIncoming = isValidRingingCall();
-        if (mIsWifi && (isIncoming || getState() == STATE_ACTIVE)) {
-            int labelId = isIncoming
+        if (isWifi() && getPhone() != null) {
+            int labelId = isValidRingingCall()
                     ? R.string.status_hint_label_incoming_wifi_call
                     : R.string.status_hint_label_wifi_call;
 
@@ -2103,7 +2205,7 @@
         boolean isVoWifiEnabled = false;
         if (isIms) {
             ImsPhone imsPhone = (ImsPhone) phone;
-            isVoWifiEnabled = ImsUtil.isWfcEnabled(phone.getContext());
+            isVoWifiEnabled = ImsUtil.isWfcEnabled(phone.getContext(), phone.getPhoneId());
         }
         PhoneAccountHandle phoneAccountHandle = isIms ? PhoneUtils
                 .makePstnPhoneAccountHandle(phone.getDefaultPhone())
@@ -2167,6 +2269,21 @@
         return Collections.unmodifiableMap(result);
     }
 
+    private boolean isShowingOriginalDialString() {
+        boolean showOrigDialString = false;
+        Phone phone = getPhone();
+        if (phone != null && (phone.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA)
+                && !mOriginalConnection.isIncoming()) {
+            PersistableBundle pb = getCarrierConfig();
+            if (pb != null) {
+                showOrigDialString = pb.getBoolean(CarrierConfigManager
+                        .KEY_CONFIG_SHOW_ORIG_DIAL_STRING_FOR_CDMA_BOOL);
+                Log.d(this, "showOrigDialString: " + showOrigDialString);
+            }
+        }
+        return showOrigDialString;
+    }
+
     /**
      * Creates a string representation of this {@link TelephonyConnection}.  Primarily intended for
      * use in log statements.
diff --git a/src/com/android/services/telephony/TelephonyConnectionService.java b/src/com/android/services/telephony/TelephonyConnectionService.java
index decd6ed..8ae7b8a 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -17,9 +17,11 @@
 package com.android.services.telephony;
 
 import android.content.ActivityNotFoundException;
+import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.Settings;
@@ -119,6 +121,23 @@
         }
     };
 
+    private final BroadcastReceiver mTtyBroadcastReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            Log.v(this, "onReceive, action: %s", action);
+            if (action.equals(TelecomManager.ACTION_TTY_PREFERRED_MODE_CHANGED)) {
+                int newPreferredTtyMode = intent.getIntExtra(
+                        TelecomManager.EXTRA_TTY_PREFERRED_MODE, TelecomManager.TTY_MODE_OFF);
+
+                boolean isTtyNowEnabled = newPreferredTtyMode != TelecomManager.TTY_MODE_OFF;
+                if (isTtyNowEnabled != mIsTtyEnabled) {
+                    handleTtyModeChange(isTtyNowEnabled);
+                }
+            }
+        }
+    };
+
     private final TelephonyConferenceController mTelephonyConferenceController =
             new TelephonyConferenceController(mTelephonyConnectionServiceProxy);
     private final CdmaConferenceController mCdmaConferenceController =
@@ -131,6 +150,7 @@
     private RadioOnHelper mRadioOnHelper;
     private EmergencyTonePlayer mEmergencyTonePlayer;
     private HoldTracker mHoldTracker;
+    private boolean mIsTtyEnabled;
 
     // Contains one TelephonyConnection that has placed a call and a memory of which Phones it has
     // already tried to connect with. There should be only one TelephonyConnection trying to place a
@@ -263,6 +283,17 @@
         mEmergencyTonePlayer = new EmergencyTonePlayer(this);
         TelecomAccountRegistry.getInstance(this).setTelephonyConnectionService(this);
         mHoldTracker = new HoldTracker();
+        mIsTtyEnabled = isTtyModeEnabled(getApplicationContext());
+
+        IntentFilter intentFilter = new IntentFilter(
+                TelecomManager.ACTION_TTY_PREFERRED_MODE_CHANGED);
+        registerReceiver(mTtyBroadcastReceiver, intentFilter);
+    }
+
+    @Override
+    public boolean onUnbind(Intent intent) {
+        unregisterReceiver(mTtyBroadcastReceiver);
+        return super.onUnbind(intent);
     }
 
     @Override
@@ -299,7 +330,8 @@
                 return Connection.createFailedConnection(
                         DisconnectCauseUtil.toTelecomDisconnectCause(
                                 android.telephony.DisconnectCause.VOICEMAIL_NUMBER_MISSING,
-                                "Voicemail scheme provided but no voicemail number set."));
+                                "Voicemail scheme provided but no voicemail number set.",
+                                phone.getPhoneId()));
             }
 
             // Convert voicemail: to tel:
@@ -340,7 +372,8 @@
                             DisconnectCauseUtil.toTelecomDisconnectCause(
                                     android.telephony.DisconnectCause
                                             .CDMA_ALREADY_ACTIVATED,
-                                    "Tried to dial *228"));
+                                    "Tried to dial *228",
+                                    phone.getPhoneId()));
                 }
             }
         }
@@ -400,7 +433,7 @@
                         // been powered on and isn't in the UNAVAILABLE state, even if it is
                         // reporting the OUT_OF_SERVICE state.
                         return (phone.getState() == PhoneConstants.State.OFFHOOK)
-                            || phone.getServiceStateTracker().isRadioOn();
+                            || phone.getServiceState().getState() != ServiceState.STATE_POWER_OFF;
                     } else {
                         // It is not an emergency number, so wait until we are in service and ready
                         // to make calls. This can happen when we power down the radio on bluetooth
@@ -485,12 +518,14 @@
                 // Notify Telecom of the new Connection type.
                 // TODO: Switch out the underlying connection instead of creating a new
                 // one and causing UI Jank.
-                addExistingConnection(PhoneUtils.makePstnPhoneAccountHandle(phone), repConnection);
+                addExistingConnection(PhoneUtils.makePstnPhoneAccountHandleWithPrefix(
+                        phone, "", isEmergencyNumber), repConnection);
                 // Remove the old connection from Telecom after.
                 originalConnection.setDisconnected(
                         DisconnectCauseUtil.toTelecomDisconnectCause(
                                 android.telephony.DisconnectCause.OUTGOING_CANCELED,
-                                "Reconnecting outgoing Emergency Call."));
+                                "Reconnecting outgoing Emergency Call.",
+                                phone.getPhoneId()));
                 originalConnection.destroy();
             } else {
                 placeOutgoingConnection((TelephonyConnection) originalConnection, phone, request);
@@ -588,8 +623,8 @@
                 return Connection.createFailedConnection(
                         DisconnectCauseUtil.toTelecomDisconnectCause(
                                 android.telephony.DisconnectCause.CDMA_NOT_EMERGENCY,
-                                "Cannot make non-emergency call in ECM mode."
-                        ));
+                                "Cannot make non-emergency call in ECM mode.",
+                                phone.getPhoneId()));
             }
         }
 
@@ -606,7 +641,8 @@
                         return Connection.createFailedConnection(
                                 DisconnectCauseUtil.toTelecomDisconnectCause(
                                         android.telephony.DisconnectCause.OUT_OF_SERVICE,
-                                        "ServiceState.STATE_OUT_OF_SERVICE"));
+                                        "ServiceState.STATE_OUT_OF_SERVICE",
+                                        phone.getPhoneId()));
                     }
                 case ServiceState.STATE_POWER_OFF:
                     // Don't disconnect if radio is power off because the device is on Bluetooth.
@@ -616,21 +652,25 @@
                     return Connection.createFailedConnection(
                             DisconnectCauseUtil.toTelecomDisconnectCause(
                                     android.telephony.DisconnectCause.POWER_OFF,
-                                    "ServiceState.STATE_POWER_OFF"));
+                                    "ServiceState.STATE_POWER_OFF",
+                                    phone.getPhoneId()));
                 default:
                     Log.d(this, "onCreateOutgoingConnection, unknown service state: %d", state);
                     return Connection.createFailedConnection(
                             DisconnectCauseUtil.toTelecomDisconnectCause(
                                     android.telephony.DisconnectCause.OUTGOING_FAILURE,
-                                    "Unknown service state " + state));
+                                    "Unknown service state " + state,
+                                    phone.getPhoneId()));
             }
         }
 
         final Context context = getApplicationContext();
-        if (VideoProfile.isVideo(request.getVideoState()) && isTtyModeEnabled(context) &&
-                !isEmergencyNumber) {
+        final boolean isTtyModeEnabled = isTtyModeEnabled(context);
+        if (VideoProfile.isVideo(request.getVideoState()) && isTtyModeEnabled
+                && !isEmergencyNumber) {
             return Connection.createFailedConnection(DisconnectCauseUtil.toTelecomDisconnectCause(
-                    android.telephony.DisconnectCause.VIDEO_CALL_NOT_ALLOWED_WHILE_TTY_ENABLED));
+                    android.telephony.DisconnectCause.VIDEO_CALL_NOT_ALLOWED_WHILE_TTY_ENABLED,
+                    null, phone.getPhoneId()));
         }
 
         // Check for additional limits on CDMA phones.
@@ -644,7 +684,8 @@
             return Connection.createFailedConnection(
                     DisconnectCauseUtil.toTelecomDisconnectCause(
                             android.telephony.DisconnectCause.DIALED_CALL_FORWARDING_WHILE_ROAMING,
-                            "Call forwarding while roaming"));
+                            "Call forwarding while roaming",
+                            phone.getPhoneId()));
         }
 
 
@@ -655,13 +696,14 @@
             return Connection.createFailedConnection(
                     DisconnectCauseUtil.toTelecomDisconnectCause(
                             android.telephony.DisconnectCause.OUTGOING_FAILURE,
-                            "Invalid phone type"));
+                            "Invalid phone type",
+                            phone.getPhoneId()));
         }
         connection.setAddress(handle, PhoneConstants.PRESENTATION_ALLOWED);
         connection.setInitializing();
         connection.setVideoState(request.getVideoState());
         connection.setRttTextStream(request.getRttTextStream());
-
+        connection.setTtyEnabled(isTtyModeEnabled);
         return connection;
     }
 
@@ -694,7 +736,8 @@
             return Connection.createFailedConnection(
                     DisconnectCauseUtil.toTelecomDisconnectCause(
                             android.telephony.DisconnectCause.INCOMING_MISSED,
-                            "Found no ringing call"));
+                            "Found no ringing call",
+                            phone.getPhoneId()));
         }
 
         com.android.internal.telephony.Connection originalConnection =
@@ -995,7 +1038,9 @@
         }
 
         Queue<Phone> cachedPhones = mEmergencyRetryCache.second;
-        Phone phoneUsed = c.getPhone();
+        // Need to refer default phone considering ImsPhone because
+        // cachedPhones is a list that contains default phones.
+        Phone phoneUsed = c.getPhone().getDefaultPhone();
         if (phoneUsed == null) {
             return;
         }
@@ -1076,13 +1121,31 @@
         } catch (CallStateException e) {
             Log.e(this, e, "placeOutgoingConnection, phone.dial exception: " + e);
             int cause = android.telephony.DisconnectCause.OUTGOING_FAILURE;
-            if (e.getError() == CallStateException.ERROR_OUT_OF_SERVICE) {
-                cause = android.telephony.DisconnectCause.OUT_OF_SERVICE;
-            } else if (e.getError() == CallStateException.ERROR_POWER_OFF) {
-                cause = android.telephony.DisconnectCause.POWER_OFF;
+            switch (e.getError()) {
+                case CallStateException.ERROR_OUT_OF_SERVICE:
+                    cause = android.telephony.DisconnectCause.OUT_OF_SERVICE;
+                    break;
+                case CallStateException.ERROR_POWER_OFF:
+                    cause = android.telephony.DisconnectCause.POWER_OFF;
+                    break;
+                case CallStateException.ERROR_ALREADY_DIALING:
+                    cause = android.telephony.DisconnectCause.ALREADY_DIALING;
+                    break;
+                case CallStateException.ERROR_CALL_RINGING:
+                    cause = android.telephony.DisconnectCause.CANT_CALL_WHILE_RINGING;
+                    break;
+                case CallStateException.ERROR_CALLING_DISABLED:
+                    cause = android.telephony.DisconnectCause.CALLING_DISABLED;
+                    break;
+                case CallStateException.ERROR_TOO_MANY_CALLS:
+                    cause = android.telephony.DisconnectCause.TOO_MANY_ONGOING_CALLS;
+                    break;
+                case CallStateException.ERROR_OTASP_PROVISIONING_IN_PROCESS:
+                    cause = android.telephony.DisconnectCause.OTASP_PROVISIONING_IN_PROCESS;
+                    break;
             }
             connection.setDisconnected(DisconnectCauseUtil.toTelecomDisconnectCause(
-                    cause, e.getMessage()));
+                    cause, e.getMessage(), phone.getPhoneId()));
             connection.clearOriginalConnection();
             connection.destroy();
             return;
@@ -1106,7 +1169,7 @@
             }
             Log.d(this, "placeOutgoingConnection, phone.dial returned null");
             connection.setDisconnected(DisconnectCauseUtil.toTelecomDisconnectCause(
-                    telephonyDisconnectCause, "Connection is null"));
+                    telephonyDisconnectCause, "Connection is null", phone.getPhoneId()));
             connection.clearOriginalConnection();
             connection.destroy();
         } else {
@@ -1443,4 +1506,15 @@
             }
         }
     }
+
+    private void handleTtyModeChange(boolean isTtyEnabled) {
+        Log.i(this, "handleTtyModeChange; isTtyEnabled=%b", isTtyEnabled);
+        mIsTtyEnabled = isTtyEnabled;
+        for (Connection connection : getAllConnections()) {
+            if (connection instanceof TelephonyConnection) {
+                TelephonyConnection telephonyConnection = (TelephonyConnection) connection;
+                telephonyConnection.setTtyEnabled(isTtyEnabled);
+            }
+        }
+    }
 }
diff --git a/src/com/android/services/telephony/TelephonyGlobals.java b/src/com/android/services/telephony/TelephonyGlobals.java
deleted file mode 100644
index 02ef639..0000000
--- a/src/com/android/services/telephony/TelephonyGlobals.java
+++ /dev/null
@@ -1,70 +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.services.telephony;
-
-import android.content.Context;
-
-import com.android.internal.telephony.Phone;
-import com.android.internal.telephony.PhoneFactory;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Singleton entry point for the telephony-services app. Initializes ongoing systems relating to
- * PSTN calls. This is started when the device starts and will be restarted automatically
- * if it goes away for any reason (e.g., crashes).
- * This is separate from the actual Application class because we only support one instance of this
- * app - running as the default user. {@link com.android.phone.PhoneApp} determines whether or not
- * we are running as the default user and if we are, then initializes and runs this class's
- * {@link #onCreate}.
- */
-public class TelephonyGlobals {
-    private static TelephonyGlobals sInstance;
-
-    /** The application context. */
-    private final Context mContext;
-
-    // For supporting MSIM phone, change Phone and TtyManager as 1 to 1
-    private List<TtyManager> mTtyManagers = new ArrayList<>();
-
-    /**
-     * Persists the specified parameters.
-     *
-     * @param context The application context.
-     */
-    public TelephonyGlobals(Context context) {
-        mContext = context.getApplicationContext();
-    }
-
-    public static synchronized TelephonyGlobals getInstance(Context context) {
-        if (sInstance == null) {
-            sInstance = new TelephonyGlobals(context);
-        }
-        return sInstance;
-    }
-
-    public void onCreate() {
-        // Make this work with Multi-SIM devices
-        Phone[] phones = PhoneFactory.getPhones();
-        for (Phone phone : phones) {
-            mTtyManagers.add(new TtyManager(mContext, phone));
-        }
-
-        TelecomAccountRegistry.getInstance(mContext).setupOnBoot();
-    }
-}
diff --git a/src/com/android/services/telephony/TtyManager.java b/src/com/android/services/telephony/TtyManager.java
deleted file mode 100644
index 3389ce8..0000000
--- a/src/com/android/services/telephony/TtyManager.java
+++ /dev/null
@@ -1,153 +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.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.provider.Settings;
-import android.telecom.TelecomManager;
-
-import com.android.internal.telephony.Phone;
-
-final class TtyManager {
-    private final static int MSG_SET_TTY_MODE_RESPONSE = 1;
-    private final static int MSG_GET_TTY_MODE_RESPONSE = 2;
-
-    private final TtyBroadcastReceiver mReceiver = new TtyBroadcastReceiver();
-    private final Phone mPhone;
-    private int mTtyMode;
-    private int mUiTtyMode = -1;
-
-    private final Handler mHandler = new Handler() {
-        @Override
-        public void handleMessage(Message msg) {
-            switch (msg.what) {
-                case MSG_SET_TTY_MODE_RESPONSE: {
-                    Log.v(TtyManager.this, "got setTtyMode response");
-                    AsyncResult ar = (AsyncResult) msg.obj;
-                    if (ar.exception != null) {
-                        Log.d(TtyManager.this, "setTTYMode exception: %s", ar.exception);
-                    }
-                    mPhone.queryTTYMode(obtainMessage(MSG_GET_TTY_MODE_RESPONSE));
-                    break;
-                }
-                case MSG_GET_TTY_MODE_RESPONSE: {
-                    Log.v(TtyManager.this, "got queryTTYMode response");
-                    AsyncResult ar = (AsyncResult) msg.obj;
-                    if (ar.exception != null) {
-                        Log.d(TtyManager.this, "queryTTYMode exception: %s", ar.exception);
-                    } else {
-                        int ttyMode = phoneModeToTelecomMode(((int[]) ar.result)[0]);
-                        if (ttyMode != mTtyMode) {
-                            Log.d(TtyManager.this, "setting TTY mode failed, attempted %d, got: %d",
-                                    mTtyMode, ttyMode);
-                        } else {
-                            Log.d(TtyManager.this, "setting TTY mode to %d succeeded", ttyMode);
-                        }
-                    }
-                    break;
-                }
-            }
-        }
-    };
-
-    TtyManager(Context context, Phone phone) {
-        mPhone = phone;
-
-        IntentFilter intentFilter = new IntentFilter(
-                TelecomManager.ACTION_CURRENT_TTY_MODE_CHANGED);
-        intentFilter.addAction(TelecomManager.ACTION_TTY_PREFERRED_MODE_CHANGED);
-        context.registerReceiver(mReceiver, intentFilter);
-
-        int ttyMode = TelecomManager.TTY_MODE_OFF;
-        TelecomManager telecomManager = TelecomManager.from(context);
-        if (telecomManager != null) {
-            ttyMode = telecomManager.getCurrentTtyMode();
-        }
-        updateTtyMode(ttyMode);
-        //Get preferred TTY mode from data base as UI Tty mode is always user preferred Tty mode.
-        ttyMode = Settings.Secure.getInt(context.getContentResolver(),
-                Settings.Secure.PREFERRED_TTY_MODE, TelecomManager.TTY_MODE_OFF);
-        updateUiTtyMode(ttyMode);
-    }
-
-    private void updateTtyMode(int ttyMode) {
-        Log.v(this, "updateTtyMode %d -> %d", mTtyMode, ttyMode);
-        mTtyMode = ttyMode;
-        mPhone.setTTYMode(telecomModeToPhoneMode(ttyMode),
-                mHandler.obtainMessage(MSG_SET_TTY_MODE_RESPONSE));
-    }
-
-    private void updateUiTtyMode(int ttyMode) {
-        Log.i(this, "updateUiTtyMode %d -> %d", mUiTtyMode, ttyMode);
-        if(mUiTtyMode != ttyMode) {
-            mUiTtyMode = ttyMode;
-            mPhone.setUiTTYMode(telecomModeToPhoneMode(ttyMode), null);
-        } else {
-           Log.i(this, "ui tty mode didnt change");
-        }
-    }
-
-    private final class TtyBroadcastReceiver extends BroadcastReceiver {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            String action = intent.getAction();
-            Log.v(TtyManager.this, "onReceive, action: %s", action);
-            if (action.equals(TelecomManager.ACTION_CURRENT_TTY_MODE_CHANGED)) {
-                int ttyMode = intent.getIntExtra(
-                        TelecomManager.EXTRA_CURRENT_TTY_MODE, TelecomManager.TTY_MODE_OFF);
-                updateTtyMode(ttyMode);
-            } else if (action.equals(TelecomManager.ACTION_TTY_PREFERRED_MODE_CHANGED)) {
-                int newPreferredTtyMode = intent.getIntExtra(
-                        TelecomManager.EXTRA_TTY_PREFERRED_MODE, TelecomManager.TTY_MODE_OFF);
-                updateUiTtyMode(newPreferredTtyMode);
-            }
-        }
-    }
-
-    private static int telecomModeToPhoneMode(int telecomMode) {
-        switch (telecomMode) {
-            // AT command only has 0 and 1, so mapping VCO
-            // and HCO to FULL
-            case TelecomManager.TTY_MODE_FULL:
-            case TelecomManager.TTY_MODE_VCO:
-            case TelecomManager.TTY_MODE_HCO:
-                return Phone.TTY_MODE_FULL;
-            default:
-                return Phone.TTY_MODE_OFF;
-        }
-    }
-
-    private static int phoneModeToTelecomMode(int phoneMode) {
-        switch (phoneMode) {
-            case Phone.TTY_MODE_FULL:
-                return TelecomManager.TTY_MODE_FULL;
-            case Phone.TTY_MODE_VCO:
-                return TelecomManager.TTY_MODE_VCO;
-            case Phone.TTY_MODE_HCO:
-                return TelecomManager.TTY_MODE_HCO;
-            case Phone.TTY_MODE_OFF:
-            default:
-                return TelecomManager.TTY_MODE_OFF;
-        }
-    }
-}
diff --git a/testapps/EmbmsServiceTestApp/src/com/android/phone/testapps/embmsmw/EmbmsSampleDownloadService.java b/testapps/EmbmsServiceTestApp/src/com/android/phone/testapps/embmsmw/EmbmsSampleDownloadService.java
index 6ddebb8..3d83a4c 100644
--- a/testapps/EmbmsServiceTestApp/src/com/android/phone/testapps/embmsmw/EmbmsSampleDownloadService.java
+++ b/testapps/EmbmsServiceTestApp/src/com/android/phone/testapps/embmsmw/EmbmsSampleDownloadService.java
@@ -271,7 +271,8 @@
     }
 
     private void sendFdRequest(DownloadRequest request, FrontendAppIdentifier appKey) {
-        int numFds = getNumFdsNeededForRequest(request);
+        // Request twice as many as needed to exercise the post-download cleanup mechanism
+        int numFds = getNumFdsNeededForRequest(request) * 2;
         // Compose the FILE_DESCRIPTOR_REQUEST_INTENT
         Intent requestIntent = new Intent(VendorUtils.ACTION_FILE_DESCRIPTOR_REQUEST);
         requestIntent.putExtra(VendorUtils.EXTRA_SERVICE_ID, request.getFileServiceId());
@@ -309,8 +310,8 @@
                 .getFileServiceInfoForId(request.getFileServiceId())
                 .getFiles();
 
-        if (tempFiles.size() != filesToDownload.size()) {
-            Log.w(LOG_TAG, "Different numbers of temp files and files to download...");
+        if (tempFiles.size() != filesToDownload.size() * 2) {
+            Log.w(LOG_TAG, "Incorrect numbers of temp files and files to download...");
         }
 
         if (!mActiveDownloadRequests.containsKey(appKey)) {
@@ -320,28 +321,29 @@
 
         // Go through the files one-by-one and send them to the frontend app with a delay between
         // each one.
-        for (int i = 0; i < tempFiles.size(); i++) {
-            if (i >= filesToDownload.size()) {
+        for (int i = 0; i < tempFiles.size(); i += 2) {
+            if (i >= filesToDownload.size() * 2) {
                 break;
             }
             UriPathPair tempFile = tempFiles.get(i);
+            UriPathPair extraTempFile = tempFiles.get(i + 1);
             addTempFileInUse(appKey, request.getFileServiceId(),
                     tempFile.getFilePathUri());
-            FileInfo fileToDownload = filesToDownload.get(i);
+            FileInfo fileToDownload = filesToDownload.get(i / 2);
             mHandler.postDelayed(() -> {
                 if (mActiveDownloadRequests.get(appKey) == null ||
                         !mActiveDownloadRequests.get(appKey).contains(request)) {
                     return;
                 }
-                downloadSingleFile(appKey, request, tempFile, fileToDownload);
+                downloadSingleFile(appKey, request, tempFile, extraTempFile, fileToDownload);
                 removeTempFileInUse(appKey, request.getFileServiceId(),
                         tempFile.getFilePathUri());
-            }, FILE_SEPARATION_DELAY * i * mDownloadDelayFactor);
+            }, FILE_SEPARATION_DELAY * i * mDownloadDelayFactor / 2);
         }
     }
 
     private void downloadSingleFile(FrontendAppIdentifier appKey, DownloadRequest request,
-            UriPathPair tempFile, FileInfo fileToDownload) {
+            UriPathPair tempFile, UriPathPair extraTempFile, FileInfo fileToDownload) {
         int result = MbmsDownloadSession.RESULT_SUCCESSFUL;
         // Test Callback
         DownloadStatusListener statusListener = mDownloadStatusCallbacks.get(request);
@@ -393,9 +395,10 @@
         downloadResultIntent.putExtra(MbmsDownloadSession.EXTRA_MBMS_FILE_INFO, fileToDownload);
         downloadResultIntent.putExtra(VendorUtils.EXTRA_TEMP_FILE_ROOT,
                 mAppTempFileRoots.get(appKey));
-        ArrayList<Uri> tempFileList = new ArrayList<>(1);
+        ArrayList<Uri> tempFileList = new ArrayList<>(2);
         tempFileList.add(tempFile.getFilePathUri());
-        downloadResultIntent.getExtras().putParcelableArrayList(
+        tempFileList.add(extraTempFile.getFilePathUri());
+        downloadResultIntent.putParcelableArrayListExtra(
                 VendorUtils.EXTRA_TEMP_LIST, tempFileList);
         downloadResultIntent.putExtra(MbmsDownloadSession.EXTRA_MBMS_DOWNLOAD_RESULT, result);
         downloadResultIntent.setComponent(mAppReceivers.get(appKey));
diff --git a/testapps/EmbmsTestDownloadApp/res/layout/activity_main.xml b/testapps/EmbmsTestDownloadApp/res/layout/activity_main.xml
index 1aea6a5..8bbc806 100644
--- a/testapps/EmbmsTestDownloadApp/res/layout/activity_main.xml
+++ b/testapps/EmbmsTestDownloadApp/res/layout/activity_main.xml
@@ -51,85 +51,93 @@
                 android:layout_column="0"
                 android:text="@string/bind_button" />
             <Button
-                android:id="@+id/set_temp_root_button"
+                android:id="@+id/set_temp_root_button_internal"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_row="0"
                 android:layout_column="1"
-                android:text="@string/set_temp_root_button" />
+                android:text="@string/set_temp_root_button_internal" />
+            <Button
+                android:id="@+id/set_temp_root_button_external"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_row="1"
+                android:layout_column="0"
+                android:text="@string/set_temp_root_button_external" />
             <Button
                 android:id="@+id/get_file_services_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_row="1"
-                android:layout_column="0"
+                android:layout_column="1"
                 android:text="@string/get_file_services_button" />
             <Button
                 android:id="@+id/request_dl_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_row="1"
-                android:layout_column="1"
+                android:layout_row="2"
+                android:layout_column="0"
                 android:text="@string/request_dl_button" />
             <Button
                 android:id="@+id/request_cleanup_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_row="2"
-                android:layout_column="0"
+                android:layout_column="1"
                 android:text="@string/request_cleanup_button" />
             <Button
                 android:id="@+id/request_spurious_temp_files_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_row="2"
-                android:layout_column="1"
+                android:layout_row="3"
+                android:layout_column="0"
                 android:text="@string/request_spurious_temp_files_button" />
             <Button
                 android:id="@+id/delay_download_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_row="3"
+                android:layout_row="4"
                 android:layout_column="0"
                 android:text="@string/delay_download_button" />
-            <NumberPicker
+            <EditText
                 android:id="@+id/delay_factor"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_row="3"
+                android:inputType="number"
+                android:layout_row="4"
                 android:layout_column="1"/>
             <Button
                 android:id="@+id/cancel_download_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_row="4"
+                android:layout_row="5"
                 android:layout_column="0"
                 android:text="@string/cancel_download_button" />
             <Button
+                android:id="@+id/register_all_callback_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_row="5"
+                android:layout_column="1"
+                android:text="@string/register_all_callback_button" />
+            <Button
                 android:id="@+id/register_state_callback_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_row="5"
+                android:layout_row="6"
                 android:layout_column="0"
                 android:text="@string/register_state_callback_button" />
             <Button
                 android:id="@+id/register_progress_callback_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_row="5"
+                android:layout_row="6"
                 android:layout_column="1"
                 android:text="@string/register_progress_callback_button" />
-            <Button
-                android:id="@+id/register_all_callback_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_row="6"
-                android:layout_column="0"
-                android:text="@string/register_all_callback_button" />
 
             <Spinner
                 android:id="@+id/active_downloads"
-                android:layout_row="7"
+                android:layout_row="8"
                 android:layout_column="1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"/>
diff --git a/testapps/EmbmsTestDownloadApp/res/values/donottranslate_strings.xml b/testapps/EmbmsTestDownloadApp/res/values/donottranslate_strings.xml
index b032b26..d1ee79e 100644
--- a/testapps/EmbmsTestDownloadApp/res/values/donottranslate_strings.xml
+++ b/testapps/EmbmsTestDownloadApp/res/values/donottranslate_strings.xml
@@ -19,7 +19,8 @@
     <string name="bind_button">Bind</string>
     <string name="request_dl_button">Request DL</string>
     <string name="get_file_services_button">Fetch file services</string>
-    <string name="set_temp_root_button">Set temp file root</string>
+    <string name="set_temp_root_button_internal">Set tmp root (int)</string>
+    <string name="set_temp_root_button_external">Set tmp root (ext)</string>
     <string name="request_cleanup_button">Cleanup</string>
     <string name="request_spurious_temp_files_button">Request more temp files</string>
     <string name="delay_download_button">Delay download</string>
diff --git a/testapps/EmbmsTestDownloadApp/src/com/android/phone/testapps/embmsdownload/EmbmsTestDownloadApp.java b/testapps/EmbmsTestDownloadApp/src/com/android/phone/testapps/embmsdownload/EmbmsTestDownloadApp.java
index f77b4ac..78fa34f 100644
--- a/testapps/EmbmsTestDownloadApp/src/com/android/phone/testapps/embmsdownload/EmbmsTestDownloadApp.java
+++ b/testapps/EmbmsTestDownloadApp/src/com/android/phone/testapps/embmsdownload/EmbmsTestDownloadApp.java
@@ -38,8 +38,8 @@
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
+import android.widget.EditText;
 import android.widget.ImageView;
-import android.widget.NumberPicker;
 import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -184,6 +184,7 @@
     private FileServiceInfoAdapter mFileServiceInfoAdapter;
     private DownloadRequestAdapter mDownloadRequestAdapter;
     private ImageAdapter mImageAdapter;
+    private boolean mIsTempDirExternal = false;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -208,12 +209,26 @@
             mDownloadManager = MbmsDownloadSession.create(this, mHandler::post, mCallback);
         });
 
-        Button setTempFileRootButton = (Button) findViewById(R.id.set_temp_root_button);
-        setTempFileRootButton.setOnClickListener((view) -> {
+        Button setTempFileRootButtonExternal =
+                (Button) findViewById(R.id.set_temp_root_button_external);
+        setTempFileRootButtonExternal.setOnClickListener((view) -> {
+            File downloadDir = new File(EmbmsTestDownloadApp.this.getExternalFilesDir(null),
+                    CUSTOM_EMBMS_TEMP_FILE_LOCATION);
+            downloadDir.mkdirs();
+            mDownloadManager.setTempFileRootDirectory(downloadDir);
+            mIsTempDirExternal = true;
+            Toast.makeText(EmbmsTestDownloadApp.this,
+                    "temp file root set to " + downloadDir, Toast.LENGTH_SHORT).show();
+        });
+
+        Button setTempFileRootButtonInternal =
+                (Button) findViewById(R.id.set_temp_root_button_internal);
+        setTempFileRootButtonInternal.setOnClickListener((view) -> {
             File downloadDir = new File(EmbmsTestDownloadApp.this.getFilesDir(),
                     CUSTOM_EMBMS_TEMP_FILE_LOCATION);
             downloadDir.mkdirs();
             mDownloadManager.setTempFileRootDirectory(downloadDir);
+            mIsTempDirExternal = false;
             Toast.makeText(EmbmsTestDownloadApp.this,
                     "temp file root set to " + downloadDir, Toast.LENGTH_SHORT).show();
         });
@@ -254,14 +269,13 @@
                 SideChannel.requestSpuriousTempFiles(EmbmsTestDownloadApp.this,
                         (FileServiceInfo) serviceSelector.getSelectedItem()));
 
-        NumberPicker downloadDelayPicker = (NumberPicker) findViewById(R.id.delay_factor);
-        downloadDelayPicker.setMinValue(1);
-        downloadDelayPicker.setMaxValue(50);
+        EditText downloadDelay = findViewById(R.id.delay_factor);
+        downloadDelay.setText(String.valueOf(5));
 
         Button delayDownloadButton = (Button) findViewById(R.id.delay_download_button);
         delayDownloadButton.setOnClickListener((view) ->
                 SideChannel.delayDownloads(EmbmsTestDownloadApp.this,
-                        downloadDelayPicker.getValue()));
+                        Integer.valueOf(downloadDelay.getText().toString())));
 
         final Spinner downloadRequestSpinner = (Spinner) findViewById(R.id.active_downloads);
         downloadRequestSpinner.setAdapter(mDownloadRequestAdapter);
@@ -413,7 +427,7 @@
         if (info.getServiceId().contains("2")) {
             sourceUriBuilder.path("/*");
         } else {
-            sourceUriBuilder.path("/image.png");
+            sourceUriBuilder.path("/sunAndTree.png");
         }
 
         Intent completionIntent = new Intent(DOWNLOAD_DONE_ACTION);
@@ -432,14 +446,15 @@
 
     private Uri getDestination(String serviceId) {
         File dest;
+        File baseDir = mIsTempDirExternal ? getExternalFilesDir(null) : getFilesDir();
         try {
             if (serviceId.contains("2")) {
-                dest = new File(getFilesDir().getCanonicalFile(), "images/animals/");
+                dest = new File(baseDir.getCanonicalFile(), "images/animals/");
                 if (!dest.exists()) {
                     dest.mkdirs();
                 }
             } else {
-                dest = new File(getFilesDir().getCanonicalFile(), "images/");
+                dest = new File(baseDir.getCanonicalFile(), "images/");
                 if (!dest.exists()) {
                     dest.mkdirs();
                 }
diff --git a/testapps/ImsTestService/AndroidManifest.xml b/testapps/ImsTestService/AndroidManifest.xml
index f47210e..7662a42 100644
--- a/testapps/ImsTestService/AndroidManifest.xml
+++ b/testapps/ImsTestService/AndroidManifest.xml
@@ -18,6 +18,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           coreApp="true"
           package="com.android.phone.testapps.imstestapp">
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
     <application
         android:label="ImsTestService"
         android:directBootAware="true">
diff --git a/testapps/ImsTestService/res/layout/activity_calling.xml b/testapps/ImsTestService/res/layout/activity_calling.xml
index c1d6993..626f6dc 100644
--- a/testapps/ImsTestService/res/layout/activity_calling.xml
+++ b/testapps/ImsTestService/res/layout/activity_calling.xml
@@ -17,7 +17,7 @@
 
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:paddingLeft="4dp">
@@ -73,5 +73,22 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content" android:text=""/>
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height= "1dp"
+        android:paddingRight="4dp"
+        android:background="?android:attr/listDivider" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textStyle="bold"
+        android:text="Capability Changed Events:"/>
+
+    <ListView
+        android:id="@+id/cap_cb_list"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
 
 </LinearLayout>
\ No newline at end of file
diff --git a/testapps/ImsTestService/res/layout/activity_config.xml b/testapps/ImsTestService/res/layout/activity_config.xml
index 636bc2d..560fe8d 100644
--- a/testapps/ImsTestService/res/layout/activity_config.xml
+++ b/testapps/ImsTestService/res/layout/activity_config.xml
@@ -17,7 +17,7 @@
 
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:paddingLeft="4dp">
diff --git a/testapps/ImsTestService/res/layout/activity_registration.xml b/testapps/ImsTestService/res/layout/activity_registration.xml
index 2e381eb..cb6c10e 100644
--- a/testapps/ImsTestService/res/layout/activity_registration.xml
+++ b/testapps/ImsTestService/res/layout/activity_registration.xml
@@ -75,4 +75,21 @@
         android:layout_height="wrap_content"
         android:text="@string/reg_changefailed_button"
         android:id="@+id/reg_changefailed_button"/>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height= "1dp"
+        android:paddingRight="4dp"
+        android:background="?android:attr/listDivider" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textStyle="bold"
+        android:text="Registration Callback Listener Events:"/>
+
+    <ListView
+        android:id="@+id/reg_cb_list"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/testapps/ImsTestService/src/com/android/phone/testapps/imstestapp/ImsCallingActivity.java b/testapps/ImsTestService/src/com/android/phone/testapps/imstestapp/ImsCallingActivity.java
index 58e08cc..fea2bf8 100644
--- a/testapps/ImsTestService/src/com/android/phone/testapps/imstestapp/ImsCallingActivity.java
+++ b/testapps/ImsTestService/src/com/android/phone/testapps/imstestapp/ImsCallingActivity.java
@@ -17,17 +17,103 @@
 package com.android.phone.testapps.imstestapp;
 
 import android.app.Activity;
+import android.content.Context;
 import android.os.Bundle;
+import android.telephony.SubscriptionManager;
+import android.telephony.ims.ImsMmTelManager;
 import android.telephony.ims.feature.MmTelFeature;
 import android.telephony.ims.stub.ImsRegistrationImplBase;
+import android.util.Log;
 import android.util.SparseArray;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.CheckBox;
+import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import java.util.ArrayList;
+import java.util.Objects;
+
 public class ImsCallingActivity extends Activity {
 
+    private static final String PREFIX_ITEM = "Capability Event: ";
+    private static final String PREFIX_VALUE = "Value: ";
+
+    private static class CapItem {
+        public String key;
+        public String value;
+
+        CapItem(String key, String value) {
+            this.key = key;
+            this.value = value;
+        }
+
+        CapItem(String key, int value) {
+            this.key = key;
+            this.value = String.valueOf(value);
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            CapItem regItem = (CapItem) o;
+            return Objects.equals(key, regItem.key)
+                    && Objects.equals(value, regItem.value);
+        }
+
+        @Override
+        public int hashCode() {
+
+            return Objects.hash(key, value);
+        }
+    }
+
+    private static class CapItemAdapter extends ArrayAdapter<CapItem> {
+        CapItemAdapter(Context context, ArrayList<CapItem> regItems) {
+            super(context, 0, regItems);
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            CapItem capItem = getItem(position);
+
+            if (convertView == null) {
+                convertView = LayoutInflater.from(getContext()).inflate(R.layout.config_item,
+                        parent, false);
+            }
+
+            TextView textItem = (TextView) convertView.findViewById(R.id.configItem);
+            TextView textValue = (TextView) convertView.findViewById(R.id.configValue);
+
+            textItem.setText(PREFIX_ITEM + capItem.key);
+            textValue.setText(PREFIX_VALUE + capItem.value);
+
+            return convertView;
+        }
+    }
+
+    private final ImsMmTelManager.CapabilityCallback mCapabilityCallback =
+            new ImsMmTelManager.CapabilityCallback() {
+
+        @Override
+        public void onCapabilitiesStatusChanged(
+                MmTelFeature.MmTelCapabilities capabilities) {
+            Log.i("ImsCallingActivity" , "onCapabilitiesStatusChanged:" + capabilities);
+            mCapabilityEvents.add(new CapItem("cap changed: ", capabilities.toString()));
+            notifyDataChanged();
+
+        }
+
+        private void notifyDataChanged() {
+            mCapabiltyEventAdapter.notifyDataSetChanged();
+        }
+    };
+
     //Capabilities available by service
     private CheckBox mCapVoiceAvailBox;
     private CheckBox mCapVideoAvailBox;
@@ -36,6 +122,12 @@
 
     private TextView mCapEnabledText;
 
+    private ArrayList<CapItem> mCapabilityEvents = new ArrayList<>();
+    private CapItemAdapter mCapabiltyEventAdapter;
+    private ListView mListView;
+
+    private ImsMmTelManager mImsManager;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -65,6 +157,25 @@
     protected void onResume() {
         super.onResume();
         mmTelCapabilityChanged();
+
+        mCapabiltyEventAdapter = new CapItemAdapter(this, mCapabilityEvents);
+        mListView = (ListView) findViewById(R.id.cap_cb_list);
+        mListView.setAdapter(mCapabiltyEventAdapter);
+        try {
+            mImsManager = ImsMmTelManager.createForSubscriptionId(this,
+                    SubscriptionManager.getDefaultVoiceSubscriptionId());
+            Log.i("ImsCallingActivity", "onResume");
+            mImsManager.registerMmTelCapabilityCallback(getMainExecutor(), mCapabilityCallback);
+        } catch (IllegalArgumentException e) {
+            Log.w("ImsCallingActivity", "illegal subscription ID.");
+        }
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        mImsManager.unregisterMmTelCapabilityCallback(mCapabilityCallback);
+        mImsManager = null;
     }
 
     private void mmTelCapabilityChanged() {
diff --git a/testapps/ImsTestService/src/com/android/phone/testapps/imstestapp/ImsRegistrationActivity.java b/testapps/ImsTestService/src/com/android/phone/testapps/imstestapp/ImsRegistrationActivity.java
index 7e27371..3317ff1 100644
--- a/testapps/ImsTestService/src/com/android/phone/testapps/imstestapp/ImsRegistrationActivity.java
+++ b/testapps/ImsTestService/src/com/android/phone/testapps/imstestapp/ImsRegistrationActivity.java
@@ -17,22 +17,128 @@
 package com.android.phone.testapps.imstestapp;
 
 import android.app.Activity;
+import android.content.Context;
 import android.os.Bundle;
+import android.telephony.SubscriptionManager;
+import android.telephony.ims.ImsMmTelManager;
+import android.telephony.ims.ImsReasonInfo;
 import android.telephony.ims.stub.ImsRegistrationImplBase;
 import android.util.ArrayMap;
+import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.ListView;
 import android.widget.Spinner;
+import android.widget.TextView;
 import android.widget.Toast;
-import android.telephony.ims.ImsReasonInfo;
 
+import java.util.ArrayList;
 import java.util.Map;
+import java.util.Objects;
 
 public class ImsRegistrationActivity extends Activity {
 
+    private static final String PREFIX_ITEM = "Registration Event: ";
+    private static final String PREFIX_VALUE = "Value: ";
+
+
+    private static class RegItem {
+        public String key;
+        public String value;
+
+        RegItem(String key, int value) {
+            this.key = key;
+            this.value = String.valueOf(value);
+        }
+
+        RegItem(String key, String value) {
+            this.key = key;
+            this.value = value;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            RegItem regItem = (RegItem) o;
+            return Objects.equals(key, regItem.key)
+                    && Objects.equals(value, regItem.value);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(key, value);
+        }
+    }
+
+    private static class RegItemAdapter extends ArrayAdapter<RegItem> {
+        RegItemAdapter(Context context, ArrayList<RegItem> regItems) {
+            super(context, 0, regItems);
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            RegItem regItem = getItem(position);
+
+            if (convertView == null) {
+                convertView = LayoutInflater.from(getContext()).inflate(R.layout.config_item,
+                        parent, false);
+            }
+
+            TextView textItem = (TextView) convertView.findViewById(R.id.configItem);
+            TextView textValue = (TextView) convertView.findViewById(R.id.configValue);
+
+            textItem.setText(PREFIX_ITEM + regItem.key);
+            textValue.setText(PREFIX_VALUE + regItem.value);
+
+            return convertView;
+        }
+    }
+
+
+    private final ImsMmTelManager.RegistrationCallback mRegistrationCallback =
+            new ImsMmTelManager.RegistrationCallback() {
+
+        @Override
+        public void onRegistered(int imsRadioTech) {
+            Log.i("ImsRegistrationActivity", "onRegistered: " + imsRadioTech);
+            mRegItems.add(new RegItem("Registered", REG_TECH_STRING.get(imsRadioTech)));
+            triggerAdapterChange();
+        }
+
+        @Override
+        public void onRegistering(int imsRadioTech) {
+            Log.i("ImsRegistrationActivity", "onRegistering: " + imsRadioTech);
+            mRegItems.add(new RegItem("Registering", REG_TECH_STRING.get(imsRadioTech)));
+            triggerAdapterChange();
+        }
+
+        @Override
+        public void onDeregistered(ImsReasonInfo info) {
+            Log.i("ImsRegistrationActivity", "onDeregistered: " + info);
+            mRegItems.add(new RegItem("Deregistered", info.toString()));
+            triggerAdapterChange();
+        }
+
+        @Override
+        public void onTechnologyChangeFailed(int imsRadioTech, ImsReasonInfo info) {
+            mRegItems.add(new RegItem("TechnologyChangeFailed", REG_TECH_STRING.get(imsRadioTech)
+                    + " reason: " + info));
+            triggerAdapterChange();
+        }
+
+        private void triggerAdapterChange() {
+            mRegItemAdapter.notifyDataSetChanged();
+        }
+    };
+
+
+
     private int mSelectedRegTech = ImsRegistrationImplBase.REGISTRATION_TECH_LTE;
 
     private static final Map<String, Integer> REG_TECH = new ArrayMap<>(2);
@@ -40,15 +146,43 @@
         REG_TECH.put("LTE", ImsRegistrationImplBase.REGISTRATION_TECH_LTE);
         REG_TECH.put("IWLAN", ImsRegistrationImplBase.REGISTRATION_TECH_IWLAN);
     }
+    private static final Map<Integer, String> REG_TECH_STRING = new ArrayMap<>(2);
+    static {
+        REG_TECH_STRING.put(ImsRegistrationImplBase.REGISTRATION_TECH_NONE, "NONE");
+        REG_TECH_STRING.put(ImsRegistrationImplBase.REGISTRATION_TECH_LTE, "LTE");
+        REG_TECH_STRING.put(ImsRegistrationImplBase.REGISTRATION_TECH_IWLAN, "IWLAN");
+    }
+
+
+
+    private ArrayList<RegItem> mRegItems = new ArrayList<>();
+    RegItemAdapter mRegItemAdapter;
+    ListView mListView;
 
     private View mDeregisteredReason;
     private View mRegChangeFailedReason;
+    private ImsMmTelManager mImsManager;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         setContentView(R.layout.activity_registration);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        mRegItemAdapter = new RegItemAdapter(this, mRegItems);
+        mListView = (ListView) findViewById(R.id.reg_cb_list);
+        mListView.setAdapter(mRegItemAdapter);
+        try {
+            mImsManager = ImsMmTelManager.createForSubscriptionId(this,
+                    SubscriptionManager.getDefaultVoiceSubscriptionId());
+            mImsManager.registerImsRegistrationCallback(getMainExecutor(), mRegistrationCallback);
+        } catch (IllegalArgumentException e) {
+            Log.w("ImsCallingActivity", "illegal subscription ID.");
+        }
 
         //Set up registration tech spinner
         Spinner regTechDropDown = findViewById(R.id.reg_tech_selector);
@@ -82,6 +216,13 @@
         mRegChangeFailedReason = findViewById(R.id.regchangefail_imsreasoninfo);
     }
 
+    @Override
+    protected void onPause() {
+        super.onPause();
+        mImsManager.unregisterImsRegistrationCallback(mRegistrationCallback);
+        mImsManager = null;
+    }
+
     private void onRegisteredClicked() {
         if (!isFrameworkConnected()) {
             return;
diff --git a/testapps/TelephonyManagerTestApp/Android.mk b/testapps/TelephonyManagerTestApp/Android.mk
new file mode 100644
index 0000000..290b261
--- /dev/null
+++ b/testapps/TelephonyManagerTestApp/Android.mk
@@ -0,0 +1,19 @@
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+src_dirs := src
+res_dirs := res
+
+LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
+LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs))
+
+LOCAL_JAVACFLAGS := -parameters
+
+LOCAL_PACKAGE_NAME := TelephonyManagerTestApp
+LOCAL_PRIVATE_PLATFORM_APIS := true
+
+LOCAL_CERTIFICATE := platform
+LOCAL_MODULE_TAGS := tests
+
+include $(BUILD_PACKAGE)
diff --git a/testapps/TelephonyManagerTestApp/AndroidManifest.xml b/testapps/TelephonyManagerTestApp/AndroidManifest.xml
new file mode 100644
index 0000000..044d0b2
--- /dev/null
+++ b/testapps/TelephonyManagerTestApp/AndroidManifest.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.android.phone.testapps.telephonymanagertestapp">
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+    <uses-permission android:name="android.permission.MODIFY_PHONE_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.READ_SMS"/>
+    <uses-permission android:name="android.permission.SEND_SMS"/>
+    <uses-permission android:name="android.permission.READ_PHONE_NUMBERS"/>
+    <uses-permission android:name="android.permission.CALL_PRIVILEGED"/>
+    <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+
+    android.Manifest.permission.ACCESS_FINE_LOCATION
+    <application android:label="TelephonyManagerTestApp">
+        <activity
+            android:name=".TelephonyManagerTestApp"
+            android:label="TelephonyManagerTestApp">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.SEARCH" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <meta-data
+                android:name="android.app.searchable"
+                android:resource="@xml/searchable">
+            </meta-data>
+        </activity>
+
+        <activity
+            android:name=".CallingMethodActivity"
+            android:label="CallingMethodActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
+
diff --git a/testapps/TelephonyManagerTestApp/res/layout/abstract_method_view.xml b/testapps/TelephonyManagerTestApp/res/layout/abstract_method_view.xml
new file mode 100644
index 0000000..fe5e0e4
--- /dev/null
+++ b/testapps/TelephonyManagerTestApp/res/layout/abstract_method_view.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+    <TextView
+        android:id="@+id/tags"
+        android:layout_width="fill_parent"
+        android:layout_height="20dip"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        android:ellipsize="marquee"
+        android:maxLines="1"
+        android:textSize="12sp" />
+
+    <TextView
+        android:id="@+id/method_name"
+        android:layout_width="fill_parent"
+        android:layout_height="30dip"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        android:ellipsize="marquee"
+        android:maxLines="2"
+        android:textSize="20sp" />
+
+    <TextView
+        android:id="@+id/parameters"
+        android:layout_width="fill_parent"
+        android:layout_height="match_parent"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textSize="12sp" />
+
+</LinearLayout>
diff --git a/testapps/TelephonyManagerTestApp/res/layout/activity_main.xml b/testapps/TelephonyManagerTestApp/res/layout/activity_main.xml
new file mode 100644
index 0000000..af655db
--- /dev/null
+++ b/testapps/TelephonyManagerTestApp/res/layout/activity_main.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2017 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <ListView
+        android:id="@android:id/list"
+        android:layout_height="match_parent"
+        android:layout_width="match_parent">
+    </ListView>
+</LinearLayout>
diff --git a/testapps/TelephonyManagerTestApp/res/layout/calling_method.xml b/testapps/TelephonyManagerTestApp/res/layout/calling_method.xml
new file mode 100644
index 0000000..5145a63
--- /dev/null
+++ b/testapps/TelephonyManagerTestApp/res/layout/calling_method.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                  android:orientation="horizontal"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content">
+        <TextView
+            android:id="@+id/sub_id"
+            android:text="subId: "
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxLines="1"
+            android:textSize="20sp" />
+
+        <EditText
+            android:id="@+id/sub_id_value"
+            android:text="-1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxLines="1"
+            android:textSize="20sp" />
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/tags"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        android:ellipsize="marquee"
+        android:maxLines="1"
+        android:textSize="15sp" />
+
+    <TextView
+        android:id="@+id/method_name"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:ellipsize="marquee"
+        android:textSize="30sp" />
+
+    <LinearLayout
+        android:id="@+id/method_params"
+        android:orientation="vertical"
+        android:layout_height="wrap_content"
+        android:layout_width="fill_parent">
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/go_button"
+        android:title="Go"
+        android:text="Go!"
+        android:layout_width="80dip"
+        android:layout_height="50dip">
+    </Button>
+
+
+    <ScrollView
+        android:id="@+id/return_value_wrapper"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:scrollbars="vertical"
+        android:fillViewport="true">
+        <TextView
+            android:id="@+id/return_value"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:ellipsize="marquee"
+            android:textSize="15sp" />
+    </ScrollView>
+</LinearLayout>
diff --git a/testapps/TelephonyManagerTestApp/res/layout/parameter_field.xml b/testapps/TelephonyManagerTestApp/res/layout/parameter_field.xml
new file mode 100644
index 0000000..6bb40fd
--- /dev/null
+++ b/testapps/TelephonyManagerTestApp/res/layout/parameter_field.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="horizontal"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+    <TextView
+        android:id="@+id/field_name"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:maxLines="1"
+        android:textSize="15sp" />
+
+    <!--android:ellipsize="marquee"-->
+    <!--android:layout_alignParentBottom="true"-->
+    <!--android:layout_alignParentRight="true"-->
+
+    <EditText
+        android:id="@+id/field_value"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:maxLines="1"
+        android:textSize="15sp" />
+</LinearLayout>
diff --git a/testapps/TelephonyManagerTestApp/res/menu/search_input.xml b/testapps/TelephonyManagerTestApp/res/menu/search_input.xml
new file mode 100644
index 0000000..261a049
--- /dev/null
+++ b/testapps/TelephonyManagerTestApp/res/menu/search_input.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/search_input"
+        android:title="Search"
+        android:actionViewClass="android.widget.SearchView"
+        android:showAsAction="collapseActionView|ifRoom"
+        android:imeOptions="actionSearch">
+    </item>
+</menu>
diff --git a/testapps/TelephonyManagerTestApp/res/xml/searchable.xml b/testapps/TelephonyManagerTestApp/res/xml/searchable.xml
new file mode 100644
index 0000000..05cf491
--- /dev/null
+++ b/testapps/TelephonyManagerTestApp/res/xml/searchable.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<searchable xmlns:android="http://schemas.android.com/apk/res/android"
+    android:label=".TelephonyManagerTestApp"
+    android:hint="Search...">
+</searchable>
\ No newline at end of file
diff --git a/testapps/TelephonyManagerTestApp/src/com/android/phone/testapps/telephonymanagertestapp/CallingMethodActivity.java b/testapps/TelephonyManagerTestApp/src/com/android/phone/testapps/telephonymanagertestapp/CallingMethodActivity.java
new file mode 100644
index 0000000..4bf8220
--- /dev/null
+++ b/testapps/TelephonyManagerTestApp/src/com/android/phone/testapps/telephonymanagertestapp/CallingMethodActivity.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.testapps.telephonymanagertestapp;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.telephony.TelephonyManager;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+
+/**
+ * Activity to call a specific method of TelephonyManager.
+ */
+public class CallingMethodActivity extends Activity {
+    private Class[] mParameterTypes;
+    private Object[] mParameterValues;
+    EditText[] mEditTexts;
+    private Button mGoButton;
+    private Method mMethod;
+    private TextView mReturnValue;
+    private EditText mSubIdField;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.calling_method);
+
+        if (TelephonyManagerTestApp.sCurrentMethod == null) {
+            finish();
+            return;
+        }
+
+        mMethod = TelephonyManagerTestApp.sCurrentMethod;
+
+        mGoButton = findViewById(R.id.go_button);
+        mReturnValue = findViewById(R.id.return_value);
+        mSubIdField = findViewById(R.id.sub_id_value);
+
+        mParameterTypes = mMethod.getParameterTypes();
+        mParameterValues = new Object[mParameterTypes.length];
+        mEditTexts = new EditText[mParameterTypes.length];
+        populateParamList();
+
+        String tags = Modifier.toString(mMethod.getModifiers()) + ' '
+                + TelephonyManagerTestApp.getShortTypeName(mMethod.getReturnType().toString());
+        ((TextView) findViewById(R.id.tags)).setText(tags);
+        ((TextView) findViewById(R.id.method_name)).setText(mMethod.getName());
+
+        mGoButton.setOnClickListener((View v) -> executeCallMethod());
+        mReturnValue.setText("Return value: ");
+    }
+
+    private void executeCallMethod() {
+        try {
+            int subId = Integer.parseInt(mSubIdField.getText().toString());
+
+            for (int i = 0; i < mParameterTypes.length; i++) {
+                String text = mEditTexts[i].getText().toString();
+                if (mParameterTypes[i] == int.class) {
+                    mParameterValues[i] = Integer.parseInt(text);
+                } else if (mParameterTypes[i] == boolean.class) {
+                    mParameterValues[i] = Boolean.parseBoolean(text);
+                } else if (mParameterTypes[i] == long.class) {
+                    mParameterValues[i] = Long.parseLong(text);
+                } else if (mParameterTypes[i] == String.class) {
+                    mParameterValues[i] = text;
+                } else {
+                    mParameterValues[i] =
+                            ParameterParser.get(this).executeParser(mParameterTypes[i], text);
+                }
+            }
+            Log.d(TelephonyManagerTestApp.TAG, "Invoking method " + mMethod.getName());
+
+            mMethod.setAccessible(true);
+            if (!mMethod.getReturnType().equals(Void.TYPE)) {
+                Object result = mMethod.invoke(new TelephonyManager(this, subId), mParameterValues);
+                if (result instanceof String) {
+                    if (((String) result).isEmpty()) {
+                        result = "empty string";
+                    }
+                }
+                Log.d(TelephonyManagerTestApp.TAG, "result is " + result);
+                mReturnValue.setText("Return value: " + result);
+            } else {
+                mMethod.invoke(new TelephonyManager(this, subId), mParameterValues);
+                mReturnValue.setText("Return value: successfully returned");
+            }
+
+        } catch (Exception exception) {
+            Log.d(TelephonyManagerTestApp.TAG, "Exception: " + exception);
+            StringWriter s = new StringWriter();
+            PrintWriter stack = new PrintWriter(s);
+            exception.printStackTrace(stack);
+            mReturnValue.setText("Exception " + exception.getMessage() + "\n" + s.toString());
+        }
+    }
+
+    private void populateParamList() {
+        for (int i = 0; i < mParameterTypes.length; i++) {
+            View view = getLayoutInflater().inflate(R.layout.parameter_field, null);
+            Class aClass = mParameterTypes[i];
+            ((TextView) view.findViewById(R.id.field_name)).setText(
+                    TelephonyManagerTestApp.getShortTypeName(aClass.toString()) + ": ");
+            mEditTexts[i] = view.findViewById(R.id.field_value);
+            ((LinearLayout) findViewById(R.id.method_params)).addView(view);
+        }
+    }
+}
diff --git a/testapps/TelephonyManagerTestApp/src/com/android/phone/testapps/telephonymanagertestapp/ParameterParser.java b/testapps/TelephonyManagerTestApp/src/com/android/phone/testapps/telephonymanagertestapp/ParameterParser.java
new file mode 100644
index 0000000..097c90a
--- /dev/null
+++ b/testapps/TelephonyManagerTestApp/src/com/android/phone/testapps/telephonymanagertestapp/ParameterParser.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.testapps.telephonymanagertestapp;
+
+import android.content.Context;
+import android.telephony.NumberVerificationCallback;
+import android.telephony.PhoneNumberRange;
+import android.widget.Toast;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.Executor;
+import java.util.function.Function;
+
+class ParameterParser {
+    private static ParameterParser sInstance;
+
+    static ParameterParser get(Context context) {
+        if (sInstance == null) {
+            sInstance = new ParameterParser(context);
+        }
+        return sInstance;
+    }
+
+    private final Context mContext;
+    private final Map<Class, Function<String, Object>> mParsers =
+            new HashMap<Class, Function<String, Object>>() {{
+                put(PhoneNumberRange.class, ParameterParser::parsePhoneNumberRange);
+                put(Executor.class, s -> parseExecutor(s));
+                put(NumberVerificationCallback.class, s -> parseNumberVerificationCallback(s));
+            }};
+
+    private ParameterParser(Context context) {
+        mContext = context;
+    }
+
+    Object executeParser(Class type, String input) {
+        return mParsers.getOrDefault(type, s -> null).apply(input);
+    }
+
+    private static PhoneNumberRange parsePhoneNumberRange(String input) {
+        String[] parts = input.split(" ");
+        if (parts.length != 4) {
+            return null;
+        }
+        return new PhoneNumberRange(parts[0], parts[1], parts[2], parts[3]);
+    }
+
+    private Executor parseExecutor(String input) {
+        return mContext.getMainExecutor();
+    }
+
+    private NumberVerificationCallback parseNumberVerificationCallback(String input) {
+        return new NumberVerificationCallback() {
+            @Override
+            public void onCallReceived(String phoneNumber) {
+                Toast.makeText(mContext, "Received verification " + phoneNumber,
+                        Toast.LENGTH_SHORT).show();
+            }
+
+            @Override
+            public void onVerificationFailed(int reason) {
+                Toast.makeText(mContext, "Verification failed " + reason,
+                        Toast.LENGTH_SHORT).show();
+            }
+        };
+    }
+}
diff --git a/testapps/TelephonyManagerTestApp/src/com/android/phone/testapps/telephonymanagertestapp/TelephonyManagerTestApp.java b/testapps/TelephonyManagerTestApp/src/com/android/phone/testapps/telephonymanagertestapp/TelephonyManagerTestApp.java
new file mode 100644
index 0000000..760c3bd
--- /dev/null
+++ b/testapps/TelephonyManagerTestApp/src/com/android/phone/testapps/telephonymanagertestapp/TelephonyManagerTestApp.java
@@ -0,0 +1,198 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.testapps.telephonymanagertestapp;
+
+import android.app.ListActivity;
+import android.app.SearchManager;
+import android.content.Intent;
+import android.os.Bundle;
+import android.telephony.TelephonyManager;
+import android.view.Menu;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ListView;
+import android.widget.SearchView;
+import android.widget.TextView;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.Parameter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Main activity.
+ * Activity to choose which method to call.
+ */
+public class TelephonyManagerTestApp extends ListActivity implements
+        SearchView.OnQueryTextListener {
+    public static String TAG = "TMTestApp";
+
+    private List<Method> mMethods = new ArrayList<>();
+    private List<Method> mFilteredMethods = new ArrayList<>();
+    static Method sCurrentMethod;
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        // Initialize search view
+        getMenuInflater().inflate(R.menu.search_input, menu);
+        SearchView searchView = (SearchView) menu.findItem(R.id.search_input).getActionView();
+        SearchManager searchManager = (SearchManager) getSystemService(SEARCH_SERVICE);
+        searchView.setSearchableInfo(searchManager.getSearchableInfo(getComponentName()));
+        searchView.setOnQueryTextListener(this);
+        searchView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {
+            @Override
+            public void onViewDetachedFromWindow(View arg0) {
+                mFilteredMethods.clear();
+                mFilteredMethods.addAll(mMethods);
+                ((ListViewAdapter) mAdapter).notifyDataSetChanged();
+            }
+
+            @Override
+            public void onViewAttachedToWindow(View arg0) {
+            }
+        });
+        return true;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        try {
+            Class c = TelephonyManager.class;
+            mMethods = Arrays.asList(c.getDeclaredMethods());
+            mFilteredMethods.addAll(mMethods);
+            mAdapter = new ListViewAdapter();
+            setListAdapter(mAdapter);
+        } catch (Throwable e) {
+            System.err.println(e);
+            finish();
+        }
+    }
+
+    private class ListViewAdapter extends BaseAdapter {
+        @Override
+        public int getCount() {
+            return mFilteredMethods.size();
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup container) {
+            if (mFilteredMethods.size() <= position) {
+                return null;
+            }
+
+            if (convertView == null) {
+                convertView = getLayoutInflater().inflate(
+                        R.layout.abstract_method_view, container, false);
+            }
+
+            Method method = mFilteredMethods.get(position);
+            String tags = Modifier.toString(method.getModifiers()) + ' '
+                    + getShortTypeName(method.getReturnType().toString());
+            String parameters = getParameters(method.getParameterTypes(), method.getParameters());
+            String methodName = (parameters == null) ? (method.getName() + "()") : method.getName();
+
+            ((TextView) convertView.findViewById(R.id.tags)).setText(tags);
+            ((TextView) convertView.findViewById(R.id.method_name)).setText(methodName);
+            ((TextView) convertView.findViewById(R.id.parameters)).setText(parameters);
+            return convertView;
+        }
+
+        @Override
+        public Object getItem(int position) {
+            if (mFilteredMethods.size() <= position) {
+                return null;
+            }
+
+            return mFilteredMethods.get(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+    }
+
+    @Override
+    public void onListItemClick(ListView l, View v, int position, long id) {
+        sCurrentMethod = mFilteredMethods.get(position);
+        Intent intent = new Intent(this, CallingMethodActivity.class);
+
+        startActivity(intent);
+    }
+
+    @Override
+    public boolean onQueryTextSubmit(String query) {
+        filterMethods(query);
+        return true;
+    }
+
+    @Override
+    public boolean onQueryTextChange(String newText) {
+        return false;
+    }
+
+    private void filterMethods(String text) {
+        mFilteredMethods.clear();
+
+        if (text == null || text.isEmpty()) {
+            mFilteredMethods.addAll(mMethods);
+        } else {
+            for (Method method : mMethods) {
+                if (method.getName().toLowerCase().contains(text.toLowerCase())) {
+                    mFilteredMethods.add(method);
+                }
+            }
+        }
+
+        ((ListViewAdapter) mAdapter).notifyDataSetChanged();
+
+    }
+
+    private String getParameters(Class<?>[] types, Parameter[] parameters) {
+        if (types == null || types.length == 0) {
+            return null;
+        }
+
+        StringBuilder sb = new StringBuilder();
+        sb.append('(');
+        for (int j = 0; j < types.length; j++) {
+            String typeName = getShortTypeName(types[j].getTypeName());
+            sb.append(typeName);
+            if (j < (types.length - 1)) {
+                sb.append(", ");
+            }
+        }
+        sb.append(')');
+
+        return sb.toString();
+    }
+
+    static String getShortTypeName(String typeName) {
+        if (typeName == null) {
+            return null;
+        }
+
+        String[] parts = typeName.split("[. ]");
+        return parts[parts.length - 1];
+    }
+}
diff --git a/testapps/TelephonyRegistryTestApp/AndroidManifest.xml b/testapps/TelephonyRegistryTestApp/AndroidManifest.xml
index 5f19509..708ea66 100644
--- a/testapps/TelephonyRegistryTestApp/AndroidManifest.xml
+++ b/testapps/TelephonyRegistryTestApp/AndroidManifest.xml
@@ -18,6 +18,7 @@
           package="com.android.phone.testapps.telephonyregistry">
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+    <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
     <application android:label="TelephonyRegistryTestApp">
         <activity
             android:name=".TelephonyRegistryTestApp"
diff --git a/testapps/TelephonyRegistryTestApp/src/com/android/phone/testapps/telephonyregistry/TelephonyRegistryTestApp.java b/testapps/TelephonyRegistryTestApp/src/com/android/phone/testapps/telephonyregistry/TelephonyRegistryTestApp.java
index e423619..74cafcd 100644
--- a/testapps/TelephonyRegistryTestApp/src/com/android/phone/testapps/telephonyregistry/TelephonyRegistryTestApp.java
+++ b/testapps/TelephonyRegistryTestApp/src/com/android/phone/testapps/telephonyregistry/TelephonyRegistryTestApp.java
@@ -21,7 +21,6 @@
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.os.Bundle;
-import android.provider.Telephony;
 import android.telephony.CellInfo;
 import android.telephony.CellLocation;
 import android.telephony.PhoneStateListener;
@@ -55,7 +54,7 @@
         put(PhoneStateListener.LISTEN_PRECISE_CALL_STATE, "PRECISE_CALL_STATE");
         put(PhoneStateListener.LISTEN_PRECISE_DATA_CONNECTION_STATE,
                 "PRECISE_DATA_CONNECTION_STATE");
-        put(PhoneStateListener.LISTEN_VOLTE_STATE, "VOLTE_STATE");
+        put(PhoneStateListener.LISTEN_SRVCC_STATE_CHANGED, "SRVCC_STATE");
         put(PhoneStateListener.LISTEN_CARRIER_NETWORK_CHANGE, "CARRIER_NETWORK_CHANGE");
         put(PhoneStateListener.LISTEN_VOICE_ACTIVATION_STATE, "VOICE_ACTIVATION_STATE");
         put(PhoneStateListener.LISTEN_DATA_ACTIVATION_STATE, "DATA_ACTIVATION_STATE");
@@ -72,6 +71,11 @@
             notify("onCellInfoChanged", cellInfo);
         }
 
+        @Override
+        public void onSrvccStateChanged(int srvccState) {
+            notify("onSrvccStateChanged", srvccState);
+        }
+
         private void notify(String method, Object data) {
             Notification.Builder builder = new Notification.Builder(TelephonyRegistryTestApp.this,
                     NOTIFICATION_CHANNEL);
diff --git a/tests/src/com/android/phone/CallFeaturesSettingTest.java b/tests/src/com/android/phone/CallFeaturesSettingTest.java
new file mode 100644
index 0000000..816642a
--- /dev/null
+++ b/tests/src/com/android/phone/CallFeaturesSettingTest.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.assertion.ViewAssertions.doesNotExist;
+import static android.support.test.espresso.assertion.ViewAssertions.matches;
+import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static android.support.test.espresso.matcher.ViewMatchers.withText;
+
+import static org.mockito.Mockito.when;
+
+import android.support.test.filters.FlakyTest;
+import android.support.test.rule.ActivityTestRule;
+
+import com.android.internal.telephony.IccCard;
+import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.PhoneConstants;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.lang.reflect.Field;
+
+public class CallFeaturesSettingTest {
+    @Mock
+    Phone mMockPhone;
+    @Mock
+    IccCard mMockIccCard;
+    @Rule
+    public ActivityTestRule<CallFeaturesSetting> mRule =
+            new ActivityTestRule<>(CallFeaturesSetting.class);
+    private CallFeaturesSetting mActivity;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mActivity = mRule.getActivity();
+    }
+
+    @FlakyTest
+    @Test
+    public void onResume_fdnIsAvailable_shouldShowFdnMenu() throws NoSuchFieldException,
+            IllegalAccessException {
+        when(mMockPhone.getPhoneType()).thenReturn(PhoneConstants.PHONE_TYPE_GSM);
+        when(mMockPhone.getIccCard()).thenReturn(mMockIccCard);
+        when(mMockIccCard.getIccFdnAvailable()).thenReturn(true);
+        getField("mPhone").set(mActivity, mMockPhone);
+
+        mActivity.onResume();
+
+        // Check the FDN menu is displayed.
+        onView(withText(R.string.fdn)).check(matches(isDisplayed()));
+    }
+
+    @FlakyTest
+    @Test
+    public void onResume_iccCardIsNull_shouldNotShowFdnMenu() throws NoSuchFieldException,
+            IllegalAccessException {
+        when(mMockPhone.getPhoneType()).thenReturn(PhoneConstants.PHONE_TYPE_GSM);
+        when(mMockPhone.getIccCard()).thenReturn(null);
+        getField("mPhone").set(mActivity, mMockPhone);
+
+        mActivity.onResume();
+
+        // Check the FDN menu is not displayed.
+        onView(withText(R.string.fdn)).check(doesNotExist());
+    }
+
+    @FlakyTest
+    @Test
+    public void onResume_fdnIsNotAvailable_shouldNotShowFdnMenu() throws NoSuchFieldException,
+            IllegalAccessException {
+        when(mMockPhone.getPhoneType()).thenReturn(PhoneConstants.PHONE_TYPE_GSM);
+        when(mMockPhone.getIccCard()).thenReturn(mMockIccCard);
+        when(mMockIccCard.getIccFdnAvailable()).thenReturn(false);
+        getField("mPhone").set(mActivity, mMockPhone);
+
+        mActivity.onResume();
+
+        // Check the FDN menu is not displayed.
+        onView(withText(R.string.fdn)).check(doesNotExist());
+    }
+
+    private Field getField(String fieldName) throws NoSuchFieldException {
+        Field field = mActivity.getClass().getDeclaredField(fieldName);
+        field.setAccessible(true);
+        return field;
+    }
+}
diff --git a/tests/src/com/android/phone/CdmaOptionsTest.java b/tests/src/com/android/phone/CdmaOptionsTest.java
index 446f2c5..c0c6317 100644
--- a/tests/src/com/android/phone/CdmaOptionsTest.java
+++ b/tests/src/com/android/phone/CdmaOptionsTest.java
@@ -15,53 +15,40 @@
  */
 package com.android.phone;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.when;
+import static com.google.common.truth.Truth.assertThat;
 
-import android.content.Context;
 import android.os.PersistableBundle;
-import android.support.test.InstrumentationRegistry;
 import android.support.test.runner.AndroidJUnit4;
 import android.telephony.CarrierConfigManager;
 
-import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneConstants;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
 
 @RunWith(AndroidJUnit4.class)
 public class CdmaOptionsTest {
-    @Mock
-    private Phone mMockPhone;
-
-    private CdmaOptions mCdmaOptions;
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = InstrumentationRegistry.getContext();
-        mCdmaOptions = new CdmaOptions(mMockPhone);
+    @Test
+    public void shouldAddApnExpandPreference_doesNotExpandOnGsm() {
+        PersistableBundle bundle = new PersistableBundle();
+        bundle.putBoolean(CarrierConfigManager.KEY_SHOW_APN_SETTING_CDMA_BOOL, true);
+        assertThat(CdmaOptions.shouldAddApnExpandPreference(PhoneConstants.PHONE_TYPE_GSM, bundle))
+                .isFalse();
     }
 
     @Test
-    public void shouldAddApnExpandPreference_doesNotExpandOnGsm() {
-        when(mMockPhone.getPhoneType()).thenReturn(PhoneConstants.PHONE_TYPE_GSM);
+    public void shouldAddApnExpandPreference_showExpandOnCdma() {
         PersistableBundle bundle = new PersistableBundle();
         bundle.putBoolean(CarrierConfigManager.KEY_SHOW_APN_SETTING_CDMA_BOOL, true);
-        assertFalse(mCdmaOptions.shouldAddApnExpandPreference(bundle));
+        assertThat(CdmaOptions.shouldAddApnExpandPreference(PhoneConstants.PHONE_TYPE_CDMA, bundle))
+                .isTrue();
+    }
 
-        when(mMockPhone.getPhoneType()).thenReturn(PhoneConstants.PHONE_TYPE_CDMA);
+    @Test
+    public void shouldAddApnExpandPreference_doesNotExpandOnCdmaIfCarrierConfigDisabled() {
+        PersistableBundle bundle = new PersistableBundle();
         bundle.putBoolean(CarrierConfigManager.KEY_SHOW_APN_SETTING_CDMA_BOOL, false);
-        assertFalse(mCdmaOptions.shouldAddApnExpandPreference(bundle));
-
-        when(mMockPhone.getPhoneType()).thenReturn(PhoneConstants.PHONE_TYPE_CDMA);
-        bundle.putBoolean(CarrierConfigManager.KEY_SHOW_APN_SETTING_CDMA_BOOL, true);
-        assertTrue(mCdmaOptions.shouldAddApnExpandPreference(bundle));
+        assertThat(CdmaOptions.shouldAddApnExpandPreference(PhoneConstants.PHONE_TYPE_CDMA, bundle))
+                .isFalse();
     }
 }
diff --git a/tests/src/com/android/phone/NumberVerificationManagerTest.java b/tests/src/com/android/phone/NumberVerificationManagerTest.java
new file mode 100644
index 0000000..d476ba5
--- /dev/null
+++ b/tests/src/com/android/phone/NumberVerificationManagerTest.java
@@ -0,0 +1,174 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 junit.framework.TestCase.assertFalse;
+
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.telephony.NumberVerificationCallback;
+import android.telephony.PhoneNumberRange;
+import android.telephony.ServiceState;
+
+import com.android.internal.telephony.Call;
+import com.android.internal.telephony.INumberVerificationCallback;
+import com.android.internal.telephony.Phone;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(JUnit4.class)
+public class NumberVerificationManagerTest {
+    private static final PhoneNumberRange SAMPLE_RANGE =
+            new PhoneNumberRange("1", "650555", "0000", "8999");
+    private static final long DEFAULT_VERIFICATION_TIMEOUT = 100;
+    @Mock private Phone mPhone1;
+    @Mock private Phone mPhone2;
+    @Mock private Call mRingingCall;
+    @Mock private Call mForegroundCall;
+    @Mock private Call mBackgroundCall;
+    @Mock private INumberVerificationCallback mCallback;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        ServiceState ss = mock(ServiceState.class);
+        when(ss.getVoiceRegState()).thenReturn(ServiceState.STATE_IN_SERVICE);
+        when(mPhone1.getServiceState()).thenReturn(ss);
+        when(mPhone1.getForegroundCall()).thenReturn(mForegroundCall);
+        when(mPhone1.getRingingCall()).thenReturn(mRingingCall);
+        when(mPhone1.getBackgroundCall()).thenReturn(mBackgroundCall);
+        when(mPhone2.getServiceState()).thenReturn(ss);
+        when(mPhone2.getForegroundCall()).thenReturn(mForegroundCall);
+        when(mPhone2.getRingingCall()).thenReturn(mRingingCall);
+        when(mPhone2.getBackgroundCall()).thenReturn(mBackgroundCall);
+
+        when(mForegroundCall.getState()).thenReturn(Call.State.IDLE);
+        when(mRingingCall.getState()).thenReturn(Call.State.IDLE);
+        when(mBackgroundCall.getState()).thenReturn(Call.State.IDLE);
+    }
+
+    @Test
+    public void testConcurrentRequestFailure() throws Exception {
+        NumberVerificationManager manager =
+                new NumberVerificationManager(() -> new Phone[]{mPhone1});
+        manager.requestVerification(SAMPLE_RANGE, mCallback, DEFAULT_VERIFICATION_TIMEOUT);
+        manager.requestVerification(SAMPLE_RANGE, mCallback, DEFAULT_VERIFICATION_TIMEOUT);
+        verify(mCallback, times(1)).onVerificationFailed(
+                NumberVerificationCallback.REASON_CONCURRENT_REQUESTS);
+    }
+
+    @Test
+    public void testEcbmFailure() throws Exception {
+        NumberVerificationManager manager =
+                new NumberVerificationManager(() -> new Phone[]{mPhone1});
+        when(mPhone1.isInEcm()).thenReturn(true);
+
+        manager.requestVerification(SAMPLE_RANGE, mCallback, DEFAULT_VERIFICATION_TIMEOUT);
+        verify(mCallback, times(1)).onVerificationFailed(
+                NumberVerificationCallback.REASON_IN_ECBM);
+    }
+
+    @Test
+    public void testEmergencyCallFailure() throws Exception {
+        NumberVerificationManager manager =
+                new NumberVerificationManager(() -> new Phone[]{mPhone1});
+        when(mPhone1.isInEmergencyCall()).thenReturn(true);
+
+        manager.requestVerification(SAMPLE_RANGE, mCallback, DEFAULT_VERIFICATION_TIMEOUT);
+        verify(mCallback, times(1)).onVerificationFailed(
+                NumberVerificationCallback.REASON_IN_EMERGENCY_CALL);
+    }
+
+    @Test
+    public void testNoPhoneInServiceFailure() throws Exception {
+        ServiceState ss = mock(ServiceState.class);
+        when(ss.getVoiceRegState()).thenReturn(ServiceState.STATE_POWER_OFF);
+        when(mPhone1.getServiceState()).thenReturn(ss);
+        when(mPhone2.getServiceState()).thenReturn(ss);
+        NumberVerificationManager manager =
+                new NumberVerificationManager(() -> new Phone[]{mPhone1, mPhone2});
+
+        manager.requestVerification(SAMPLE_RANGE, mCallback, DEFAULT_VERIFICATION_TIMEOUT);
+        verify(mCallback, times(1)).onVerificationFailed(
+                NumberVerificationCallback.REASON_NETWORK_NOT_AVAILABLE);
+    }
+
+    @Test
+    public void testAllLinesFullFailure() throws Exception {
+        NumberVerificationManager manager =
+                new NumberVerificationManager(() -> new Phone[]{mPhone1, mPhone2});
+        when(mRingingCall.getState()).thenReturn(Call.State.ALERTING);
+
+        manager.requestVerification(SAMPLE_RANGE, mCallback, DEFAULT_VERIFICATION_TIMEOUT);
+        verify(mCallback, times(1)).onVerificationFailed(
+                NumberVerificationCallback.REASON_TOO_MANY_CALLS);
+    }
+
+    private void verifyDefaultRangeMatching(NumberVerificationManager manager) throws Exception {
+        String testNumber = "6505550000";
+        assertTrue(manager.checkIncomingCall(testNumber));
+        verify(mCallback).onCallReceived(testNumber);
+    }
+
+    @Test
+    public void testVerificationWorksWithOnePhoneInService() throws Exception {
+        ServiceState ss = mock(ServiceState.class);
+        when(ss.getVoiceRegState()).thenReturn(ServiceState.STATE_POWER_OFF);
+        when(mPhone1.getServiceState()).thenReturn(ss);
+        NumberVerificationManager manager =
+                new NumberVerificationManager(() -> new Phone[]{mPhone1, mPhone2});
+
+        manager.requestVerification(SAMPLE_RANGE, mCallback, DEFAULT_VERIFICATION_TIMEOUT);
+        verify(mCallback, never()).onVerificationFailed(anyInt());
+        verifyDefaultRangeMatching(manager);
+    }
+
+    @Test
+    public void testVerificationWorksWithOnePhoneFull() throws Exception {
+        Call fakeCall = mock(Call.class);
+        when(fakeCall.getState()).thenReturn(Call.State.ACTIVE);
+        when(mPhone1.getForegroundCall()).thenReturn(fakeCall);
+        when(mPhone1.getRingingCall()).thenReturn(fakeCall);
+        when(mPhone1.getBackgroundCall()).thenReturn(fakeCall);
+        NumberVerificationManager manager =
+                new NumberVerificationManager(() -> new Phone[]{mPhone1, mPhone2});
+
+        manager.requestVerification(SAMPLE_RANGE, mCallback, DEFAULT_VERIFICATION_TIMEOUT);
+        verify(mCallback, never()).onVerificationFailed(anyInt());
+        verifyDefaultRangeMatching(manager);
+    }
+
+    @Test
+    public void testDoubleVerificationFailure() throws Exception {
+        NumberVerificationManager manager =
+                new NumberVerificationManager(() -> new Phone[]{mPhone1, mPhone2});
+        manager.requestVerification(SAMPLE_RANGE, mCallback, DEFAULT_VERIFICATION_TIMEOUT);
+        verifyDefaultRangeMatching(manager);
+        assertFalse(manager.checkIncomingCall("this doesn't even matter"));
+    }
+}
diff --git a/tests/src/com/android/phone/PhoneSearchIndexablesProviderTest.java b/tests/src/com/android/phone/PhoneSearchIndexablesProviderTest.java
index 6b7f825..34e3937 100644
--- a/tests/src/com/android/phone/PhoneSearchIndexablesProviderTest.java
+++ b/tests/src/com/android/phone/PhoneSearchIndexablesProviderTest.java
@@ -51,6 +51,7 @@
     private class PhoneSearchIndexablesTestProvider extends PhoneSearchIndexablesProvider {
         private boolean mIsEuiccSettingsHidden = false;
         private boolean mIsEnhanced4gLteHidden = false;
+        private boolean mIsWifiCallingHidden = false;
 
         @Override boolean isEuiccSettingsHidden() {
             return mIsEuiccSettingsHidden;
@@ -60,6 +61,10 @@
             return mIsEnhanced4gLteHidden;
         }
 
+        @Override boolean isWifiCallingHidden() {
+            return mIsWifiCallingHidden;
+        }
+
         public void setIsEuiccSettingsHidden(boolean isEuiccSettingsHidden) {
             mIsEuiccSettingsHidden = isEuiccSettingsHidden;
         }
@@ -67,6 +72,10 @@
         public void setIsEnhanced4gLteHidden(boolean isEnhanced4gLteHidden) {
             mIsEnhanced4gLteHidden = isEnhanced4gLteHidden;
         }
+
+        public void setIsWifiCallingHidden(boolean isWifiCallingHidden) {
+            mIsWifiCallingHidden = isWifiCallingHidden;
+        }
     }
 
     @Before
@@ -115,25 +124,31 @@
         mProvider.setIsEnhanced4gLteHidden(false /* isEnhanced4gLteHidden */);
         mProvider.setIsEuiccSettingsHidden(false /* isEuiccSettingsHiden */);
         when(mUserManager.isAdminUser()).thenReturn(false);
-        Cursor cursor1 = mProvider.queryNonIndexableKeys(
+        Cursor cursor;
+        cursor = mProvider.queryNonIndexableKeys(
                 SearchIndexablesContract.NON_INDEXABLES_KEYS_COLUMNS);
-        assertThat(cursor1.getColumnNames()).isEqualTo(
+        assertThat(cursor.getColumnNames()).isEqualTo(
                 SearchIndexablesContract.NON_INDEXABLES_KEYS_COLUMNS);
-        assertThat(cursor1.getCount()).isEqualTo(16);
+        assertThat(cursor.getCount()).isEqualTo(16);
 
         when(mUserManager.isAdminUser()).thenReturn(true);
-        Cursor cursor2 = mProvider
+        cursor = mProvider
                 .queryNonIndexableKeys(SearchIndexablesContract.NON_INDEXABLES_KEYS_COLUMNS);
-        assertThat(cursor2.getCount()).isEqualTo(3);
+        assertThat(cursor.getCount()).isEqualTo(3);
 
         mProvider.setIsEuiccSettingsHidden(true /* isEuiccSettingsHidden */);
-        Cursor cursor3 = mProvider
+        cursor = mProvider
                 .queryNonIndexableKeys(SearchIndexablesContract.NON_INDEXABLES_KEYS_COLUMNS);
-        assertThat(cursor3.getCount()).isEqualTo(4);
+        assertThat(cursor.getCount()).isEqualTo(4);
 
         mProvider.setIsEnhanced4gLteHidden(true /* isEnhanced4gLteHidden */);
-        Cursor cursor4 = mProvider
+        cursor = mProvider
                 .queryNonIndexableKeys(SearchIndexablesContract.NON_INDEXABLES_KEYS_COLUMNS);
-        assertThat(cursor4.getCount()).isEqualTo(5);
+        assertThat(cursor.getCount()).isEqualTo(5);
+
+        mProvider.setIsWifiCallingHidden(true /* isWifiCallingHidden */);
+        cursor = mProvider
+                .queryNonIndexableKeys(SearchIndexablesContract.NON_INDEXABLES_KEYS_COLUMNS);
+        assertThat(cursor.getCount()).isEqualTo(6);
     }
 }
diff --git a/tests/src/com/android/phone/ecc/IsoToEccProtobufRepositoryTest.java b/tests/src/com/android/phone/ecc/IsoToEccProtobufRepositoryTest.java
new file mode 100644
index 0000000..f6e5ba2
--- /dev/null
+++ b/tests/src/com/android/phone/ecc/IsoToEccProtobufRepositoryTest.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.ecc;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.Log;
+
+import com.android.TelephonyTestBase;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.HashSet;
+import java.util.Map;
+
+/**
+ * Unit tests for IsoToEccProtobufRepository.
+ */
+
+@RunWith(AndroidJUnit4.class)
+public class IsoToEccProtobufRepositoryTest extends TelephonyTestBase {
+    private static final String LOG_TAG = "IsoToEccProtobufRepositoryTest";
+
+    @Test
+    public void testEccDataContent() {
+        IsoToEccProtobufRepository repository = IsoToEccProtobufRepository.getInstance();
+        repository.loadMappingTable(InstrumentationRegistry.getTargetContext());
+        Map<String, CountryEccInfo> eccTable = repository.getEccTable();
+        HashSet loadedIsos = new HashSet(300);
+        HashSet loadedNumbers = new HashSet(5);
+
+        assertThat(eccTable).isNotEmpty();
+        for (Map.Entry<String, CountryEccInfo> entry : eccTable.entrySet()) {
+            String countryIso = entry.getKey();
+            CountryEccInfo countryEccInfo = entry.getValue();
+            EccInfo[] eccInfoList = countryEccInfo.getEccInfoList();
+            if (eccInfoList.length > 0) {
+                Log.i(LOG_TAG, "Verifying country " + countryIso + " with "
+                        + eccInfoList.length + " ecc(s)");
+            } else {
+                Log.w(LOG_TAG, "Verifying country " + countryIso + " with no ecc");
+            }
+
+            assertThat(countryIso).isNotEmpty();
+            assertThat(countryIso).isEqualTo(countryIso.toUpperCase().trim());
+            assertThat(loadedIsos.contains(countryIso)).isFalse();
+            loadedIsos.add(countryIso);
+
+            assertThat(countryEccInfo.getFallbackEcc()).isNotEmpty();
+
+            if (eccInfoList.length != 0) {
+                loadedNumbers.clear();
+                for (EccInfo eccInfo : eccInfoList) {
+                    String eccNumber = eccInfo.getNumber();
+                    assertThat(eccNumber).isNotEmpty();
+                    assertThat(eccNumber).isEqualTo(eccNumber.trim());
+                    assertThat(eccInfo.getTypes()).isNotEmpty();
+                    assertThat(loadedNumbers.contains(eccNumber)).isFalse();
+                    loadedNumbers.add(eccNumber);
+                }
+            }
+        }
+    }
+}
diff --git a/tests/src/com/android/services/telephony/TelephonyConnectionServiceTest.java b/tests/src/com/android/services/telephony/TelephonyConnectionServiceTest.java
index 3bd2716..a18adb8 100644
--- a/tests/src/com/android/services/telephony/TelephonyConnectionServiceTest.java
+++ b/tests/src/com/android/services/telephony/TelephonyConnectionServiceTest.java
@@ -21,7 +21,6 @@
 import static junit.framework.Assert.fail;
 
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
@@ -817,6 +816,7 @@
         testServiceState.setEmergencyOnly(isEmergencyOnly);
         when(phone.getServiceState()).thenReturn(testServiceState);
         when(phone.getPhoneId()).thenReturn(phoneId);
+        when(phone.getDefaultPhone()).thenReturn(phone);
         return phone;
     }
 
diff --git a/tests/src/com/android/services/telephony/TestTelephonyConnection.java b/tests/src/com/android/services/telephony/TestTelephonyConnection.java
index 9040257..39e4579 100644
--- a/tests/src/com/android/services/telephony/TestTelephonyConnection.java
+++ b/tests/src/com/android/services/telephony/TestTelephonyConnection.java
@@ -74,6 +74,7 @@
                 any(Connection.PostDialListener.class));
         when(mMockPhone.getRingingCall()).thenReturn(mMockCall);
         when(mMockPhone.getContext()).thenReturn(null);
+        when(mMockPhone.getDefaultPhone()).thenReturn(mMockPhone);
         when(mMockCall.getState()).thenReturn(Call.State.ACTIVE);
         when(mMockCall.getPhone()).thenReturn(mMockPhone);
     }
@@ -107,6 +108,11 @@
         mLastConnectionEventExtras.add(extras);
     }
 
+    @Override
+    void clearOriginalConnection() {
+        // Do nothing since the original connection is mock object
+    }
+
     public int getNotifyPhoneAccountChangedCount() {
         return mNotifyPhoneAccountChangedCount;
     }