Merge "Add phone ID into UiccSlotInfo."

commit: 32dc8bf292ca653edbd598209571a04c4284b1aa [log] [tgz]
author: TreeHugger Robot <treehugger-gerrit@google.com> Wed Feb 07 23:31:37 2018 +0000
committer: Android (Google) Code Review <android-gerrit@google.com> Wed Feb 07 23:31:37 2018 +0000
tree: ad3c319bed7ff3188061f6080453cfd06722f4cf
parent: b9bd52cab83f4ac934fb1e17d57f320f613dd239 [diff]
parent: 795c588594b0a38f4dd9fe2e5a3f6a37e607b7e6 [diff]
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a20e4da..155cd41 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml

@@ -155,6 +155,7 @@
     <!-- BIND_CARRIER_MESSAGING_SERVICE has been deprecated in favor of BIND_CARRIER_SERVICES. -->
     <uses-permission android:name="android.permission.BIND_CARRIER_MESSAGING_SERVICE" />
     <uses-permission android:name="com.android.permission.BIND_EUICC_SERVICE" />
+    <uses-permission android:name="com.android.permission.BIND_TELEPHONY_NETWORK_SERVICE" />
     <uses-permission android:name="com.android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS" />
     <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
     <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
@@ -180,6 +181,7 @@
     <uses-permission android:name="android.permission.UPDATE_DEVICE_STATS" />
     <uses-permission android:name="android.permission.MANAGE_NETWORK_POLICY" />
     <uses-permission android:name="android.permission.READ_NETWORK_USAGE_HISTORY" />
+    <uses-permission android:name="android.permission.BIND_TELEPHONY_DATA_SERVICE" />
 
     <application android:name="PhoneApp"
             android:persistent="true"
@@ -384,6 +386,15 @@
             </intent-filter>
         </activity>
 
+        <activity android:name="GsmUmtsCallBarringOptions"
+                android:label="@string/labelCallBarring"
+                android:configChanges="orientation|screenSize|keyboardHidden"
+                android:theme="@style/CallSettingsWithoutDividerTheme">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
+
         <activity android:name="GsmUmtsAdditionalCallOptions"
                 android:label="@string/labelGSMMore"
                 android:configChanges="orientation|screenSize|keyboardHidden"
@@ -667,5 +678,17 @@
         <service
             android:name="com.android.phone.vvm.RemoteVvmTaskManager"
             android:exported="false"/>
+        <service android:name="com.android.internal.telephony.CellularNetworkService"
+            android:permission="android.permission.BIND_TELEPHONY_NETWORK_SERVICE" >
+            <intent-filter>
+                <action android:name="android.telephony.NetworkService" />
+            </intent-filter>
+        </service>
+        <service android:name="com.android.internal.telephony.dataconnection.CellularDataService"
+            android:permission="android.permission.BIND_TELEPHONY_DATA_SERVICE" >
+            <intent-filter>
+                <action android:name="android.telephony.data.DataService" />
+            </intent-filter>
+        </service>
     </application>
 </manifest>

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 1ed40fc..986375e 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml

@@ -246,7 +246,7 @@
     <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="783429609643157743">"አገልግሎት አቅራቢ፣ esim፣ ሲም፣ euicc"</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>
@@ -420,7 +420,7 @@
     <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="8602417141715473998">"FDN ቁጥሩ ባዶ ስለሆነ ወይም ከ20 አኃዞች ስለሚበልጥ አልዘመነም።"</string>
+    <string name="fdn_invalid_number" msgid="2062898833049589309">"FDN አልተደገፈም ነበር ምክንያቱም ቁጥሩ ከ20 አኃዞች ያንሳል።"</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN አልዘመነም። ፒን2 ትክክል አልነበረም፣ ወይም የስልክ ቁጥሩ ተቀባይነት አላገኘም።"</string>
     <string name="fdn_failed" msgid="540018079008319747">"FDN ክወና አልተሳካም!"</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"ከSIM ካርድ ላይ በማንበብ ላይ..."</string>
@@ -687,4 +687,70 @@
     <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>
+    <!-- no translation found for labelCallBarring (3452870940716226978) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_enabled (6804489690436703488) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_disabled (5900772179198857783) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc (1199843944333106035) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_enabled (8112118391869380361) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_disabled (7806697133004697974) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic (3162154267825211826) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_enabled (2634377543147258105) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_disabled (5817895648306183464) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr (8951699885885742076) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_enabled (2519630715322138317) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_disabled (5831267468931377699) -->
+    <skip />
+    <!-- no translation found for call_barring_baic (5272726081458339912) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_enabled (2457134916223203380) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_disabled (6945604947500275636) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr (5728784220691481693) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_enabled (6533336994391716127) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_disabled (6746329853943256566) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all (5269788384941003415) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_description (4972365443287257704) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_success (8014685598632000936) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd (6887420609726284232) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description (5505087790260233953) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description_disabled (7630770327645349957) -->
+    <skip />
+    <!-- no translation found for call_barring_pwd_not_match (6716711689350314525) -->
+    <skip />
+    <!-- no translation found for call_barring_right_pwd_number (2902966502520410446) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_success (3278310763742760321) -->
+    <skip />
+    <!-- no translation found for call_barring_old_pwd (6080515987320238522) -->
+    <skip />
+    <!-- no translation found for call_barring_new_pwd (7048532299150269547) -->
+    <skip />
+    <!-- no translation found for call_barring_confirm_pwd (1947167278466285411) -->
+    <skip />
+    <!-- no translation found for messageCallBarring (2412123220272136055) -->
+    <skip />
+    <!-- no translation found for call_barring_settings (80766145008623645) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_no_password (920902774366557311) -->
+    <skip />
 </resources>

diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 7b60a43..9516639 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml

@@ -246,7 +246,7 @@
     <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>
-    <string name="keywords_carrier_settings_euicc" msgid="783429609643157743">"operator, esim, sim, euicc"</string>
+    <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"operator, esim, sim, euicc, operatoru dəyişin, operator əlavə edin"</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">"Mobil data"</string>
     <string name="mobile_data_settings_summary" msgid="5087255915840576895">"Mobil şəbəkədən istifadə edərək dataya daxil olun"</string>
@@ -420,7 +420,7 @@
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Sabit yığım nömrəsi silinir…"</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Sabit yığım nömrəsi silindi."</string>
     <string name="pin2_invalid" msgid="5470854099230755944">"Yanlış PIN daxil etdiyiniz üçün FDN güncəlləşdirilmədi."</string>
-    <string name="fdn_invalid_number" msgid="8602417141715473998">"Nömrə boş olduğundan və ya 20 rəqəmi keçdiyindən FDN yenilənmədi."</string>
+    <string name="fdn_invalid_number" msgid="2062898833049589309">"Nömrə 20 rəqəmi keçdiyindən FDN yenilənmədi."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN güncəlləşdirilmədi. PIN2 yanlış idi və ya telefon nömrəsi rədd edildi."</string>
     <string name="fdn_failed" msgid="540018079008319747">"FDN əməliyyatı aılnmadı."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"SIM kart oxunur ..."</string>
@@ -687,4 +687,70 @@
     <string name="clh_callFailed_recovery_on_timer_expiry_txt" msgid="3680765722923600294">"Taymer başa çatdıqdan sonra bərpa"</string>
     <string name="clh_callFailed_protocol_Error_unspecified_txt" msgid="8294907817156524790">"Protokol xətası, təyin edilməyib"</string>
     <string name="clh_callFailed_interworking_unspecified_txt" msgid="8838850798491763729">"Qarşılıqlı iş, təyin edilməyib"</string>
+    <!-- no translation found for labelCallBarring (3452870940716226978) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_enabled (6804489690436703488) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_disabled (5900772179198857783) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc (1199843944333106035) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_enabled (8112118391869380361) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_disabled (7806697133004697974) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic (3162154267825211826) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_enabled (2634377543147258105) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_disabled (5817895648306183464) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr (8951699885885742076) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_enabled (2519630715322138317) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_disabled (5831267468931377699) -->
+    <skip />
+    <!-- no translation found for call_barring_baic (5272726081458339912) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_enabled (2457134916223203380) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_disabled (6945604947500275636) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr (5728784220691481693) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_enabled (6533336994391716127) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_disabled (6746329853943256566) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all (5269788384941003415) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_description (4972365443287257704) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_success (8014685598632000936) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd (6887420609726284232) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description (5505087790260233953) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description_disabled (7630770327645349957) -->
+    <skip />
+    <!-- no translation found for call_barring_pwd_not_match (6716711689350314525) -->
+    <skip />
+    <!-- no translation found for call_barring_right_pwd_number (2902966502520410446) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_success (3278310763742760321) -->
+    <skip />
+    <!-- no translation found for call_barring_old_pwd (6080515987320238522) -->
+    <skip />
+    <!-- no translation found for call_barring_new_pwd (7048532299150269547) -->
+    <skip />
+    <!-- no translation found for call_barring_confirm_pwd (1947167278466285411) -->
+    <skip />
+    <!-- no translation found for messageCallBarring (2412123220272136055) -->
+    <skip />
+    <!-- no translation found for call_barring_settings (80766145008623645) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_no_password (920902774366557311) -->
+    <skip />
 </resources>

diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 3848ecc..2a4fe5c 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml

@@ -246,7 +246,7 @@
     <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>
-    <string name="keywords_carrier_settings_euicc" msgid="783429609643157743">"mobilni operater, esim, sim, euicc"</string>
+    <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"mobilni operater, esim, sim, euicc, promeni mobilnog operatera, dodaj 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">"Koristi podatke preko mobilne mreže"</string>
@@ -420,7 +420,7 @@
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Brisanje broja za fiksno biranje…"</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Izbrisan je broj za fiksno biranje."</string>
     <string name="pin2_invalid" msgid="5470854099230755944">"Broj za fiksno biranje nije ažuriran jer ste uneli netačan PIN kôd."</string>
-    <string name="fdn_invalid_number" msgid="8602417141715473998">"Broj za fiksno biranje nije ažuriran jer je prazan ili ima više od 20 cifara."</string>
+    <string name="fdn_invalid_number" msgid="2062898833049589309">"Broj za fiksno biranje nije ažuriran jer ima više od 20 cifara."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN nije ažuriran. PIN2 je netačan ili je broj telefona odbačen."</string>
     <string name="fdn_failed" msgid="540018079008319747">"Radnja sa brojem za fiksno biranje nije uspela."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Čita se sa SIM kartice…"</string>
@@ -689,4 +689,70 @@
     <string name="clh_callFailed_recovery_on_timer_expiry_txt" msgid="3680765722923600294">"Oporavak po isteku tajmera"</string>
     <string name="clh_callFailed_protocol_Error_unspecified_txt" msgid="8294907817156524790">"Greška protokola, neodređeno"</string>
     <string name="clh_callFailed_interworking_unspecified_txt" msgid="8838850798491763729">"Intervorking, neodređeno"</string>
+    <!-- no translation found for labelCallBarring (3452870940716226978) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_enabled (6804489690436703488) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_disabled (5900772179198857783) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc (1199843944333106035) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_enabled (8112118391869380361) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_disabled (7806697133004697974) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic (3162154267825211826) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_enabled (2634377543147258105) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_disabled (5817895648306183464) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr (8951699885885742076) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_enabled (2519630715322138317) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_disabled (5831267468931377699) -->
+    <skip />
+    <!-- no translation found for call_barring_baic (5272726081458339912) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_enabled (2457134916223203380) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_disabled (6945604947500275636) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr (5728784220691481693) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_enabled (6533336994391716127) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_disabled (6746329853943256566) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all (5269788384941003415) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_description (4972365443287257704) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_success (8014685598632000936) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd (6887420609726284232) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description (5505087790260233953) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description_disabled (7630770327645349957) -->
+    <skip />
+    <!-- no translation found for call_barring_pwd_not_match (6716711689350314525) -->
+    <skip />
+    <!-- no translation found for call_barring_right_pwd_number (2902966502520410446) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_success (3278310763742760321) -->
+    <skip />
+    <!-- no translation found for call_barring_old_pwd (6080515987320238522) -->
+    <skip />
+    <!-- no translation found for call_barring_new_pwd (7048532299150269547) -->
+    <skip />
+    <!-- no translation found for call_barring_confirm_pwd (1947167278466285411) -->
+    <skip />
+    <!-- no translation found for messageCallBarring (2412123220272136055) -->
+    <skip />
+    <!-- no translation found for call_barring_settings (80766145008623645) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_no_password (920902774366557311) -->
+    <skip />
 </resources>

diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 22dec71..9d077da 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml

@@ -246,7 +246,7 @@
     <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="783429609643157743">"оператор, esim, sim, euicc"</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>
@@ -420,7 +420,7 @@
     <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="8602417141715473998">"FDN не бе актуализиран, защото номерът е празен или надвишава 20 цифри."</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>
@@ -687,4 +687,70 @@
     <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>
+    <!-- no translation found for labelCallBarring (3452870940716226978) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_enabled (6804489690436703488) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_disabled (5900772179198857783) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc (1199843944333106035) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_enabled (8112118391869380361) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_disabled (7806697133004697974) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic (3162154267825211826) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_enabled (2634377543147258105) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_disabled (5817895648306183464) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr (8951699885885742076) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_enabled (2519630715322138317) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_disabled (5831267468931377699) -->
+    <skip />
+    <!-- no translation found for call_barring_baic (5272726081458339912) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_enabled (2457134916223203380) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_disabled (6945604947500275636) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr (5728784220691481693) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_enabled (6533336994391716127) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_disabled (6746329853943256566) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all (5269788384941003415) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_description (4972365443287257704) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_success (8014685598632000936) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd (6887420609726284232) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description (5505087790260233953) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description_disabled (7630770327645349957) -->
+    <skip />
+    <!-- no translation found for call_barring_pwd_not_match (6716711689350314525) -->
+    <skip />
+    <!-- no translation found for call_barring_right_pwd_number (2902966502520410446) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_success (3278310763742760321) -->
+    <skip />
+    <!-- no translation found for call_barring_old_pwd (6080515987320238522) -->
+    <skip />
+    <!-- no translation found for call_barring_new_pwd (7048532299150269547) -->
+    <skip />
+    <!-- no translation found for call_barring_confirm_pwd (1947167278466285411) -->
+    <skip />
+    <!-- no translation found for messageCallBarring (2412123220272136055) -->
+    <skip />
+    <!-- no translation found for call_barring_settings (80766145008623645) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_no_password (920902774366557311) -->
+    <skip />
 </resources>

diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 3e55dda..7669d10 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml

@@ -246,7 +246,7 @@
     <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>
-    <string name="keywords_carrier_settings_euicc" msgid="783429609643157743">"mobilni operater, esim, sim, euicc"</string>
+    <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"mobilni operater, esim, sim, euicc, promijeni mobilnog operatera, dodaj 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">"Prijenos podataka na mobilnoj mreži"</string>
     <string name="mobile_data_settings_summary" msgid="5087255915840576895">"Pristup prijenosu podataka mobilnom mrežom"</string>
@@ -420,7 +420,7 @@
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Brisanje broja fiksnog biranja u toku…"</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Broj fiksnog biranja je izbrisan."</string>
     <string name="pin2_invalid" msgid="5470854099230755944">"FDN nije ažuriran jer ste upisali netačan PIN."</string>
-    <string name="fdn_invalid_number" msgid="8602417141715473998">"FDN nije ažuriran jer je broj prazan ili ima više od 20 cifara."</string>
+    <string name="fdn_invalid_number" msgid="2062898833049589309">"FDN nije ažuriran jer broj ima više od 20 cifara."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN nije ažuriran. PIN2 je netačan ili je broj telefona odbijen."</string>
     <string name="fdn_failed" msgid="540018079008319747">"FDN operacija nije uspjela."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Čitanje sa SIM kartice u toku…"</string>
@@ -689,4 +689,70 @@
     <string name="clh_callFailed_recovery_on_timer_expiry_txt" msgid="3680765722923600294">"Oporavak po isteku vremena"</string>
     <string name="clh_callFailed_protocol_Error_unspecified_txt" msgid="8294907817156524790">"Greška u protokolu, neodređeno"</string>
     <string name="clh_callFailed_interworking_unspecified_txt" msgid="8838850798491763729">"Uzajamni rad, neodređeno"</string>
+    <!-- no translation found for labelCallBarring (3452870940716226978) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_enabled (6804489690436703488) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_disabled (5900772179198857783) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc (1199843944333106035) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_enabled (8112118391869380361) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_disabled (7806697133004697974) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic (3162154267825211826) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_enabled (2634377543147258105) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_disabled (5817895648306183464) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr (8951699885885742076) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_enabled (2519630715322138317) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_disabled (5831267468931377699) -->
+    <skip />
+    <!-- no translation found for call_barring_baic (5272726081458339912) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_enabled (2457134916223203380) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_disabled (6945604947500275636) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr (5728784220691481693) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_enabled (6533336994391716127) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_disabled (6746329853943256566) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all (5269788384941003415) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_description (4972365443287257704) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_success (8014685598632000936) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd (6887420609726284232) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description (5505087790260233953) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description_disabled (7630770327645349957) -->
+    <skip />
+    <!-- no translation found for call_barring_pwd_not_match (6716711689350314525) -->
+    <skip />
+    <!-- no translation found for call_barring_right_pwd_number (2902966502520410446) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_success (3278310763742760321) -->
+    <skip />
+    <!-- no translation found for call_barring_old_pwd (6080515987320238522) -->
+    <skip />
+    <!-- no translation found for call_barring_new_pwd (7048532299150269547) -->
+    <skip />
+    <!-- no translation found for call_barring_confirm_pwd (1947167278466285411) -->
+    <skip />
+    <!-- no translation found for messageCallBarring (2412123220272136055) -->
+    <skip />
+    <!-- no translation found for call_barring_settings (80766145008623645) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_no_password (920902774366557311) -->
+    <skip />
 </resources>

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index f84e167..f3babbb 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml

@@ -246,7 +246,7 @@
     <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="783429609643157743">"operador, esim, sim, euicc"</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 una xarxa mòbil"</string>
@@ -420,7 +420,7 @@
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"S\'està suprimint el número de marcatge fix..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Número de marcatge fix suprimit."</string>
     <string name="pin2_invalid" msgid="5470854099230755944">"FDN no s\'ha actualitzat ja que has escrit un PIN incorrecte."</string>
-    <string name="fdn_invalid_number" msgid="8602417141715473998">"FDN no s\'ha actualitzat perquè el número és buit o conté més de 20 dígits."</string>
+    <string name="fdn_invalid_number" msgid="2062898833049589309">"FDN no s\'ha actualitzat perquè el número conté més de 20 dígits."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"El número FDN no s\'ha actualitzat. El PIN2 no és correcte o bé s\'ha rebutjat el número de telèfon."</string>
     <string name="fdn_failed" msgid="540018079008319747">"Hi ha hagut un problema en l\'operació FDN."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Lectura de la targeta SIM..."</string>
@@ -687,4 +687,70 @@
     <string name="clh_callFailed_recovery_on_timer_expiry_txt" msgid="3680765722923600294">"Recuperació quan finalitzi el temporitzador"</string>
     <string name="clh_callFailed_protocol_Error_unspecified_txt" msgid="8294907817156524790">"Error de protocol, sense especificar"</string>
     <string name="clh_callFailed_interworking_unspecified_txt" msgid="8838850798491763729">"Treball en col·laboració, sense especificar"</string>
+    <!-- no translation found for labelCallBarring (3452870940716226978) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_enabled (6804489690436703488) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_disabled (5900772179198857783) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc (1199843944333106035) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_enabled (8112118391869380361) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_disabled (7806697133004697974) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic (3162154267825211826) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_enabled (2634377543147258105) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_disabled (5817895648306183464) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr (8951699885885742076) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_enabled (2519630715322138317) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_disabled (5831267468931377699) -->
+    <skip />
+    <!-- no translation found for call_barring_baic (5272726081458339912) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_enabled (2457134916223203380) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_disabled (6945604947500275636) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr (5728784220691481693) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_enabled (6533336994391716127) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_disabled (6746329853943256566) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all (5269788384941003415) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_description (4972365443287257704) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_success (8014685598632000936) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd (6887420609726284232) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description (5505087790260233953) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description_disabled (7630770327645349957) -->
+    <skip />
+    <!-- no translation found for call_barring_pwd_not_match (6716711689350314525) -->
+    <skip />
+    <!-- no translation found for call_barring_right_pwd_number (2902966502520410446) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_success (3278310763742760321) -->
+    <skip />
+    <!-- no translation found for call_barring_old_pwd (6080515987320238522) -->
+    <skip />
+    <!-- no translation found for call_barring_new_pwd (7048532299150269547) -->
+    <skip />
+    <!-- no translation found for call_barring_confirm_pwd (1947167278466285411) -->
+    <skip />
+    <!-- no translation found for messageCallBarring (2412123220272136055) -->
+    <skip />
+    <!-- no translation found for call_barring_settings (80766145008623645) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_no_password (920902774366557311) -->
+    <skip />
 </resources>

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 134c137..fd17cd8 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml

@@ -246,7 +246,7 @@
     <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>
-    <string name="keywords_carrier_settings_euicc" msgid="783429609643157743">"operátor, esim, sim, euicc"</string>
+    <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"operátor, esim, sim, euicc, přepnout operátora, přidat operátora"</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">"Mobilní data"</string>
     <string name="mobile_data_settings_summary" msgid="5087255915840576895">"Přistupovat k datům přes mobilní síť"</string>
@@ -420,7 +420,7 @@
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Mazání povoleného telefonního čísla..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Povolené telefonní číslo bylo smazáno."</string>
     <string name="pin2_invalid" msgid="5470854099230755944">"Funkce Povolená tel. čísla nebyla aktualizována, protože jste zadali chybný kód PIN."</string>
-    <string name="fdn_invalid_number" msgid="8602417141715473998">"Funkce Povolená telefonní čísla nebyla aktualizována, protože číslo je prázdné nebo obsahuje více než 20 číslic."</string>
+    <string name="fdn_invalid_number" msgid="2062898833049589309">"Funkce Povolená telefonní čísla nebyla aktualizována, protože číslo má více než 20 číslic."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Povolená tel. čísla (FDN) nebyla aktualizována. Kód PIN2 byl nesprávný nebo bylo telefonní číslo odmítnuto."</string>
     <string name="fdn_failed" msgid="540018079008319747">"Operace s čísly FDN se nezdařila."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Čtení ze SIM karty..."</string>
@@ -691,4 +691,70 @@
     <string name="clh_callFailed_recovery_on_timer_expiry_txt" msgid="3680765722923600294">"Obnovování po uplynutí časového limitu"</string>
     <string name="clh_callFailed_protocol_Error_unspecified_txt" msgid="8294907817156524790">"Chyba protokolu, nespecifikováno"</string>
     <string name="clh_callFailed_interworking_unspecified_txt" msgid="8838850798491763729">"Propojení, nespecifikováno"</string>
+    <!-- no translation found for labelCallBarring (3452870940716226978) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_enabled (6804489690436703488) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_disabled (5900772179198857783) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc (1199843944333106035) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_enabled (8112118391869380361) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_disabled (7806697133004697974) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic (3162154267825211826) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_enabled (2634377543147258105) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_disabled (5817895648306183464) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr (8951699885885742076) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_enabled (2519630715322138317) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_disabled (5831267468931377699) -->
+    <skip />
+    <!-- no translation found for call_barring_baic (5272726081458339912) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_enabled (2457134916223203380) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_disabled (6945604947500275636) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr (5728784220691481693) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_enabled (6533336994391716127) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_disabled (6746329853943256566) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all (5269788384941003415) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_description (4972365443287257704) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_success (8014685598632000936) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd (6887420609726284232) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description (5505087790260233953) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description_disabled (7630770327645349957) -->
+    <skip />
+    <!-- no translation found for call_barring_pwd_not_match (6716711689350314525) -->
+    <skip />
+    <!-- no translation found for call_barring_right_pwd_number (2902966502520410446) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_success (3278310763742760321) -->
+    <skip />
+    <!-- no translation found for call_barring_old_pwd (6080515987320238522) -->
+    <skip />
+    <!-- no translation found for call_barring_new_pwd (7048532299150269547) -->
+    <skip />
+    <!-- no translation found for call_barring_confirm_pwd (1947167278466285411) -->
+    <skip />
+    <!-- no translation found for messageCallBarring (2412123220272136055) -->
+    <skip />
+    <!-- no translation found for call_barring_settings (80766145008623645) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_no_password (920902774366557311) -->
+    <skip />
 </resources>

diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 0620603..179f8f7 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml

@@ -246,7 +246,7 @@
     <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="783429609643157743">"εταιρεία κινητής τηλεφωνίας, esim, sim, euicc"</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>
@@ -420,7 +420,7 @@
     <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="8602417141715473998">"Το FDN δεν ενημερώθηκε, επειδή ο αριθμός είναι κενός ή ξεπερνάει τα 20 ψηφία."</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>
@@ -687,4 +687,70 @@
     <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>
+    <!-- no translation found for labelCallBarring (3452870940716226978) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_enabled (6804489690436703488) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_disabled (5900772179198857783) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc (1199843944333106035) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_enabled (8112118391869380361) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_disabled (7806697133004697974) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic (3162154267825211826) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_enabled (2634377543147258105) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_disabled (5817895648306183464) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr (8951699885885742076) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_enabled (2519630715322138317) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_disabled (5831267468931377699) -->
+    <skip />
+    <!-- no translation found for call_barring_baic (5272726081458339912) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_enabled (2457134916223203380) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_disabled (6945604947500275636) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr (5728784220691481693) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_enabled (6533336994391716127) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_disabled (6746329853943256566) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all (5269788384941003415) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_description (4972365443287257704) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_success (8014685598632000936) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd (6887420609726284232) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description (5505087790260233953) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description_disabled (7630770327645349957) -->
+    <skip />
+    <!-- no translation found for call_barring_pwd_not_match (6716711689350314525) -->
+    <skip />
+    <!-- no translation found for call_barring_right_pwd_number (2902966502520410446) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_success (3278310763742760321) -->
+    <skip />
+    <!-- no translation found for call_barring_old_pwd (6080515987320238522) -->
+    <skip />
+    <!-- no translation found for call_barring_new_pwd (7048532299150269547) -->
+    <skip />
+    <!-- no translation found for call_barring_confirm_pwd (1947167278466285411) -->
+    <skip />
+    <!-- no translation found for messageCallBarring (2412123220272136055) -->
+    <skip />
+    <!-- no translation found for call_barring_settings (80766145008623645) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_no_password (920902774366557311) -->
+    <skip />
 </resources>

diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 176772d..d1034fa 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml

@@ -246,7 +246,7 @@
     <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>
-    <string name="keywords_carrier_settings_euicc" msgid="783429609643157743">"carrier, esim, sim, euicc"</string>
+    <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"operator, esim, sim, euicc, switch operators, add 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">"Mobile data"</string>
     <string name="mobile_data_settings_summary" msgid="5087255915840576895">"Access data using mobile network"</string>
@@ -420,7 +420,7 @@
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Deleting fixed dialling number…"</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Fixed dialling number deleted."</string>
     <string name="pin2_invalid" msgid="5470854099230755944">"FDN wasn\'t updated because you typed an incorrect PIN."</string>
-    <string name="fdn_invalid_number" msgid="8602417141715473998">"FDN wasn\'t updated because the number is empty or exceeds 20 digits."</string>
+    <string name="fdn_invalid_number" msgid="2062898833049589309">"FDN wasn\'t updated because the number exceeds 20 digits."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN wasn\'t updated. The PIN2 was incorrect or the phone number was rejected."</string>
     <string name="fdn_failed" msgid="540018079008319747">"FDN operation failed."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Reading from SIM card…"</string>
@@ -687,4 +687,70 @@
     <string name="clh_callFailed_recovery_on_timer_expiry_txt" msgid="3680765722923600294">"Recovery on timer expiry"</string>
     <string name="clh_callFailed_protocol_Error_unspecified_txt" msgid="8294907817156524790">"Protocol error, unspecified"</string>
     <string name="clh_callFailed_interworking_unspecified_txt" msgid="8838850798491763729">"Interworking, unspecified"</string>
+    <!-- no translation found for labelCallBarring (3452870940716226978) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_enabled (6804489690436703488) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_disabled (5900772179198857783) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc (1199843944333106035) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_enabled (8112118391869380361) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_disabled (7806697133004697974) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic (3162154267825211826) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_enabled (2634377543147258105) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_disabled (5817895648306183464) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr (8951699885885742076) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_enabled (2519630715322138317) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_disabled (5831267468931377699) -->
+    <skip />
+    <!-- no translation found for call_barring_baic (5272726081458339912) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_enabled (2457134916223203380) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_disabled (6945604947500275636) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr (5728784220691481693) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_enabled (6533336994391716127) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_disabled (6746329853943256566) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all (5269788384941003415) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_description (4972365443287257704) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_success (8014685598632000936) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd (6887420609726284232) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description (5505087790260233953) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description_disabled (7630770327645349957) -->
+    <skip />
+    <!-- no translation found for call_barring_pwd_not_match (6716711689350314525) -->
+    <skip />
+    <!-- no translation found for call_barring_right_pwd_number (2902966502520410446) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_success (3278310763742760321) -->
+    <skip />
+    <!-- no translation found for call_barring_old_pwd (6080515987320238522) -->
+    <skip />
+    <!-- no translation found for call_barring_new_pwd (7048532299150269547) -->
+    <skip />
+    <!-- no translation found for call_barring_confirm_pwd (1947167278466285411) -->
+    <skip />
+    <!-- no translation found for messageCallBarring (2412123220272136055) -->
+    <skip />
+    <!-- no translation found for call_barring_settings (80766145008623645) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_no_password (920902774366557311) -->
+    <skip />
 </resources>

diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 176772d..d1034fa 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml

@@ -246,7 +246,7 @@
     <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>
-    <string name="keywords_carrier_settings_euicc" msgid="783429609643157743">"carrier, esim, sim, euicc"</string>
+    <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"operator, esim, sim, euicc, switch operators, add 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">"Mobile data"</string>
     <string name="mobile_data_settings_summary" msgid="5087255915840576895">"Access data using mobile network"</string>
@@ -420,7 +420,7 @@
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Deleting fixed dialling number…"</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Fixed dialling number deleted."</string>
     <string name="pin2_invalid" msgid="5470854099230755944">"FDN wasn\'t updated because you typed an incorrect PIN."</string>
-    <string name="fdn_invalid_number" msgid="8602417141715473998">"FDN wasn\'t updated because the number is empty or exceeds 20 digits."</string>
+    <string name="fdn_invalid_number" msgid="2062898833049589309">"FDN wasn\'t updated because the number exceeds 20 digits."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN wasn\'t updated. The PIN2 was incorrect or the phone number was rejected."</string>
     <string name="fdn_failed" msgid="540018079008319747">"FDN operation failed."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Reading from SIM card…"</string>
@@ -687,4 +687,70 @@
     <string name="clh_callFailed_recovery_on_timer_expiry_txt" msgid="3680765722923600294">"Recovery on timer expiry"</string>
     <string name="clh_callFailed_protocol_Error_unspecified_txt" msgid="8294907817156524790">"Protocol error, unspecified"</string>
     <string name="clh_callFailed_interworking_unspecified_txt" msgid="8838850798491763729">"Interworking, unspecified"</string>
+    <!-- no translation found for labelCallBarring (3452870940716226978) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_enabled (6804489690436703488) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_disabled (5900772179198857783) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc (1199843944333106035) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_enabled (8112118391869380361) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_disabled (7806697133004697974) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic (3162154267825211826) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_enabled (2634377543147258105) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_disabled (5817895648306183464) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr (8951699885885742076) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_enabled (2519630715322138317) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_disabled (5831267468931377699) -->
+    <skip />
+    <!-- no translation found for call_barring_baic (5272726081458339912) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_enabled (2457134916223203380) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_disabled (6945604947500275636) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr (5728784220691481693) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_enabled (6533336994391716127) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_disabled (6746329853943256566) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all (5269788384941003415) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_description (4972365443287257704) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_success (8014685598632000936) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd (6887420609726284232) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description (5505087790260233953) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description_disabled (7630770327645349957) -->
+    <skip />
+    <!-- no translation found for call_barring_pwd_not_match (6716711689350314525) -->
+    <skip />
+    <!-- no translation found for call_barring_right_pwd_number (2902966502520410446) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_success (3278310763742760321) -->
+    <skip />
+    <!-- no translation found for call_barring_old_pwd (6080515987320238522) -->
+    <skip />
+    <!-- no translation found for call_barring_new_pwd (7048532299150269547) -->
+    <skip />
+    <!-- no translation found for call_barring_confirm_pwd (1947167278466285411) -->
+    <skip />
+    <!-- no translation found for messageCallBarring (2412123220272136055) -->
+    <skip />
+    <!-- no translation found for call_barring_settings (80766145008623645) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_no_password (920902774366557311) -->
+    <skip />
 </resources>

diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 176772d..d1034fa 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml

@@ -246,7 +246,7 @@
     <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>
-    <string name="keywords_carrier_settings_euicc" msgid="783429609643157743">"carrier, esim, sim, euicc"</string>
+    <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"operator, esim, sim, euicc, switch operators, add 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">"Mobile data"</string>
     <string name="mobile_data_settings_summary" msgid="5087255915840576895">"Access data using mobile network"</string>
@@ -420,7 +420,7 @@
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Deleting fixed dialling number…"</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Fixed dialling number deleted."</string>
     <string name="pin2_invalid" msgid="5470854099230755944">"FDN wasn\'t updated because you typed an incorrect PIN."</string>
-    <string name="fdn_invalid_number" msgid="8602417141715473998">"FDN wasn\'t updated because the number is empty or exceeds 20 digits."</string>
+    <string name="fdn_invalid_number" msgid="2062898833049589309">"FDN wasn\'t updated because the number exceeds 20 digits."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN wasn\'t updated. The PIN2 was incorrect or the phone number was rejected."</string>
     <string name="fdn_failed" msgid="540018079008319747">"FDN operation failed."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Reading from SIM card…"</string>
@@ -687,4 +687,70 @@
     <string name="clh_callFailed_recovery_on_timer_expiry_txt" msgid="3680765722923600294">"Recovery on timer expiry"</string>
     <string name="clh_callFailed_protocol_Error_unspecified_txt" msgid="8294907817156524790">"Protocol error, unspecified"</string>
     <string name="clh_callFailed_interworking_unspecified_txt" msgid="8838850798491763729">"Interworking, unspecified"</string>
+    <!-- no translation found for labelCallBarring (3452870940716226978) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_enabled (6804489690436703488) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_disabled (5900772179198857783) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc (1199843944333106035) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_enabled (8112118391869380361) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_disabled (7806697133004697974) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic (3162154267825211826) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_enabled (2634377543147258105) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_disabled (5817895648306183464) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr (8951699885885742076) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_enabled (2519630715322138317) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_disabled (5831267468931377699) -->
+    <skip />
+    <!-- no translation found for call_barring_baic (5272726081458339912) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_enabled (2457134916223203380) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_disabled (6945604947500275636) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr (5728784220691481693) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_enabled (6533336994391716127) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_disabled (6746329853943256566) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all (5269788384941003415) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_description (4972365443287257704) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_success (8014685598632000936) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd (6887420609726284232) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description (5505087790260233953) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description_disabled (7630770327645349957) -->
+    <skip />
+    <!-- no translation found for call_barring_pwd_not_match (6716711689350314525) -->
+    <skip />
+    <!-- no translation found for call_barring_right_pwd_number (2902966502520410446) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_success (3278310763742760321) -->
+    <skip />
+    <!-- no translation found for call_barring_old_pwd (6080515987320238522) -->
+    <skip />
+    <!-- no translation found for call_barring_new_pwd (7048532299150269547) -->
+    <skip />
+    <!-- no translation found for call_barring_confirm_pwd (1947167278466285411) -->
+    <skip />
+    <!-- no translation found for messageCallBarring (2412123220272136055) -->
+    <skip />
+    <!-- no translation found for call_barring_settings (80766145008623645) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_no_password (920902774366557311) -->
+    <skip />
 </resources>

diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 176772d..d1034fa 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml

@@ -246,7 +246,7 @@
     <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>
-    <string name="keywords_carrier_settings_euicc" msgid="783429609643157743">"carrier, esim, sim, euicc"</string>
+    <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"operator, esim, sim, euicc, switch operators, add 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">"Mobile data"</string>
     <string name="mobile_data_settings_summary" msgid="5087255915840576895">"Access data using mobile network"</string>
@@ -420,7 +420,7 @@
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Deleting fixed dialling number…"</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Fixed dialling number deleted."</string>
     <string name="pin2_invalid" msgid="5470854099230755944">"FDN wasn\'t updated because you typed an incorrect PIN."</string>
-    <string name="fdn_invalid_number" msgid="8602417141715473998">"FDN wasn\'t updated because the number is empty or exceeds 20 digits."</string>
+    <string name="fdn_invalid_number" msgid="2062898833049589309">"FDN wasn\'t updated because the number exceeds 20 digits."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN wasn\'t updated. The PIN2 was incorrect or the phone number was rejected."</string>
     <string name="fdn_failed" msgid="540018079008319747">"FDN operation failed."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Reading from SIM card…"</string>
@@ -687,4 +687,70 @@
     <string name="clh_callFailed_recovery_on_timer_expiry_txt" msgid="3680765722923600294">"Recovery on timer expiry"</string>
     <string name="clh_callFailed_protocol_Error_unspecified_txt" msgid="8294907817156524790">"Protocol error, unspecified"</string>
     <string name="clh_callFailed_interworking_unspecified_txt" msgid="8838850798491763729">"Interworking, unspecified"</string>
+    <!-- no translation found for labelCallBarring (3452870940716226978) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_enabled (6804489690436703488) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_disabled (5900772179198857783) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc (1199843944333106035) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_enabled (8112118391869380361) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_disabled (7806697133004697974) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic (3162154267825211826) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_enabled (2634377543147258105) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_disabled (5817895648306183464) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr (8951699885885742076) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_enabled (2519630715322138317) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_disabled (5831267468931377699) -->
+    <skip />
+    <!-- no translation found for call_barring_baic (5272726081458339912) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_enabled (2457134916223203380) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_disabled (6945604947500275636) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr (5728784220691481693) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_enabled (6533336994391716127) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_disabled (6746329853943256566) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all (5269788384941003415) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_description (4972365443287257704) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_success (8014685598632000936) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd (6887420609726284232) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description (5505087790260233953) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description_disabled (7630770327645349957) -->
+    <skip />
+    <!-- no translation found for call_barring_pwd_not_match (6716711689350314525) -->
+    <skip />
+    <!-- no translation found for call_barring_right_pwd_number (2902966502520410446) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_success (3278310763742760321) -->
+    <skip />
+    <!-- no translation found for call_barring_old_pwd (6080515987320238522) -->
+    <skip />
+    <!-- no translation found for call_barring_new_pwd (7048532299150269547) -->
+    <skip />
+    <!-- no translation found for call_barring_confirm_pwd (1947167278466285411) -->
+    <skip />
+    <!-- no translation found for messageCallBarring (2412123220272136055) -->
+    <skip />
+    <!-- no translation found for call_barring_settings (80766145008623645) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_no_password (920902774366557311) -->
+    <skip />
 </resources>

diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 589370d..a3773f4 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml

@@ -246,7 +246,7 @@
     <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>
-    <string name="keywords_carrier_settings_euicc" msgid="783429609643157743">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‎‏‎‏‎‏‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‎‎‎‏‎‏‎‎‎‏‎‎‎‏‎‏‎‏‎‎‏‏‎‏‏‎‏‎‏‎‎‎‏‏‏‎‏‏‏‏‎carrier, esim, sim, euicc‎‏‎‎‏‎"</string>
+    <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‏‏‏‎‎‎‏‏‏‏‎‏‏‎‏‏‎‎‏‏‎‏‏‏‏‎‎‏‎‏‎‏‏‎‎‎‎‎‏‎‎‏‎‏‎‎‏‏‏‎‏‏‎‏‎carrier, esim, sim, euicc, switch carriers, add carrier‎‏‎‎‏‎"</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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‏‎‏‏‏‏‏‏‎‎‏‎‎‏‎‏‎‎‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‏‎‏‎‏‎Mobile data‎‏‎‎‏‎"</string>
     <string name="mobile_data_settings_summary" msgid="5087255915840576895">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‏‏‎‎‏‏‎‎‏‎‎‎‎‎‏‎‎‏‏‎‏‎‏‎‏‎‎‎‏‎‎‏‎‏‏‏‎‏‎‎‏‏‏‎‏‎‏‏‏‏‏‏‏‎Access data using mobile network‎‏‎‎‏‎"</string>
@@ -420,7 +420,7 @@
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‏‎‏‏‎‎‏‏‏‎‏‎‎‏‏‏‏‎‎‏‏‎‎‏‎‏‎‎‎‎‎‎‏‎‏‎‏‎‎‏‏‎‏‏‏‏‎‎‏‎‎‎‎‏‎Deleting fixed dialing number…‎‏‎‎‏‎"</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‏‎‎‎‏‎‏‏‎‎‎‎‏‎‏‏‏‎‏‏‎‏‏‎‏‏‎‏‎‎‎‎‎‎‏‎‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎Fixed dialing number deleted.‎‏‎‎‏‎"</string>
     <string name="pin2_invalid" msgid="5470854099230755944">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‎‎‎‎‎‏‏‎‏‎‎‎‏‎‏‎‎‎‎‏‎‏‎‏‎‎‎‏‏‏‎‎‎‏‏‎‎‎‏‏‎‏‎‎‎‎FDN wasn\'t updated because you typed an incorrect PIN.‎‏‎‎‏‎"</string>
-    <string name="fdn_invalid_number" msgid="8602417141715473998">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‎‏‏‎‎‏‏‎‏‎‎‎‎‎‎‎‏‎‏‎‏‏‎‏‎‏‏‏‎‏‎‎‏‎‏‏‎‎‏‎‎‏‏‏‎‎FDN wasn\'t updated because the number is empty or exceeds 20 digits.‎‏‎‎‏‎"</string>
+    <string name="fdn_invalid_number" msgid="2062898833049589309">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‏‏‎‎‏‎‏‎‎‎‎‎‏‏‏‎‎‎‏‏‏‎‎‎‏‏‏‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‏‎‎‎‏‎‏‏‎‎‎‏‏‏‏‎‏‎FDN wasn\'t updated because the number exceeds 20 digits.‎‏‎‎‏‎"</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‎‏‏‏‎‏‏‎‎‏‏‏‎‎‏‎‎‏‏‏‏‏‎‎‎‎‏‎‏‎‏‎‏‏‎‎‎‏‎‎‎‏‎‎‎‏‎‎‎‎‏‏‎‏‎FDN wasn\'t updated. The PIN2 was incorrect, or the phone number was rejected.‎‏‎‎‏‎"</string>
     <string name="fdn_failed" msgid="540018079008319747">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‏‎‎‎‎‏‏‏‏‎‎‏‎‏‎‎‏‏‏‎‏‎‏‏‏‎‎‏‎‏‎‎‎‏‏‎‏‎‎‏‎‎‎‎‎‎‏‏‎FDN operation failed.‎‏‎‎‏‎"</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‏‏‏‎‎‏‏‏‎‎‎‎‏‎‏‎‏‏‎‎‏‎‎‏‎‏‎‏‎‏‎‎‏‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‏‎Reading from SIM card…‎‏‎‎‏‎"</string>
@@ -687,4 +687,70 @@
     <string name="clh_callFailed_recovery_on_timer_expiry_txt" msgid="3680765722923600294">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‎‎‏‏‎‎‎‏‎‏‎‎‏‎‏‏‎‏‎‎‏‏‏‎‏‏‎‎‎‏‏‎‏‎‎‎‎‏‎‎‏‎‏‏‏‎‎‎‏‎‎‏‏‎‏‎‎‏‏‎‎Recovery on timer expiry‎‏‎‎‏‎"</string>
     <string name="clh_callFailed_protocol_Error_unspecified_txt" msgid="8294907817156524790">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‏‏‎‏‎‏‏‎‏‏‏‎‏‎‏‏‎‏‏‎‎‎‎‏‏‏‏‎‎‎‏‏‏‎‎‏‏‎‏‏‏‎‏‎‏‏‏‏‎‏‏‎‎Protocol error, unspecified‎‏‎‎‏‎"</string>
     <string name="clh_callFailed_interworking_unspecified_txt" msgid="8838850798491763729">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‎‎‏‏‏‏‎‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‎‏‎‏‏‎‎‎‏‏‏‏‎‎‎‎‏‎‎‎‎‎‏‎‎‎‏‎Interworking, unspecified‎‏‎‎‏‎"</string>
+    <!-- no translation found for labelCallBarring (3452870940716226978) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_enabled (6804489690436703488) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_disabled (5900772179198857783) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc (1199843944333106035) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_enabled (8112118391869380361) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_disabled (7806697133004697974) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic (3162154267825211826) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_enabled (2634377543147258105) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_disabled (5817895648306183464) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr (8951699885885742076) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_enabled (2519630715322138317) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_disabled (5831267468931377699) -->
+    <skip />
+    <!-- no translation found for call_barring_baic (5272726081458339912) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_enabled (2457134916223203380) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_disabled (6945604947500275636) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr (5728784220691481693) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_enabled (6533336994391716127) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_disabled (6746329853943256566) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all (5269788384941003415) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_description (4972365443287257704) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_success (8014685598632000936) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd (6887420609726284232) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description (5505087790260233953) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description_disabled (7630770327645349957) -->
+    <skip />
+    <!-- no translation found for call_barring_pwd_not_match (6716711689350314525) -->
+    <skip />
+    <!-- no translation found for call_barring_right_pwd_number (2902966502520410446) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_success (3278310763742760321) -->
+    <skip />
+    <!-- no translation found for call_barring_old_pwd (6080515987320238522) -->
+    <skip />
+    <!-- no translation found for call_barring_new_pwd (7048532299150269547) -->
+    <skip />
+    <!-- no translation found for call_barring_confirm_pwd (1947167278466285411) -->
+    <skip />
+    <!-- no translation found for messageCallBarring (2412123220272136055) -->
+    <skip />
+    <!-- no translation found for call_barring_settings (80766145008623645) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_no_password (920902774366557311) -->
+    <skip />
 </resources>

diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index f379c24..b3d01bb 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml

@@ -246,7 +246,7 @@
     <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="783429609643157743">"operaator, esim, sim, euicc"</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">"Juurdepääs andmetele mobiilsidevõrgu abil"</string>
@@ -420,7 +420,7 @@
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Fikseeritud valimisnumbri kustutamine…"</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Fikseeritud valimisnumber kustutatud."</string>
     <string name="pin2_invalid" msgid="5470854099230755944">"FDN-i ei värskendatud, sest sisestasite vale PIN-koodi."</string>
-    <string name="fdn_invalid_number" msgid="8602417141715473998">"FDN-i ei värskendatud, sest numbrikoht on tühi või number ületab 20 kohta."</string>
+    <string name="fdn_invalid_number" msgid="2062898833049589309">"FDN-i ei värskendatud, sest number ületab 20 kohta."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN-i ei värskendatud. PIN2 oli vale või lükati telefoninumber tagasi."</string>
     <string name="fdn_failed" msgid="540018079008319747">"FDN-i toiming ebaõnnestus."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"SIM-kaardilt lugemine ..."</string>
@@ -687,4 +687,70 @@
     <string name="clh_callFailed_recovery_on_timer_expiry_txt" msgid="3680765722923600294">"Taimeri aegumise taastamine"</string>
     <string name="clh_callFailed_protocol_Error_unspecified_txt" msgid="8294907817156524790">"Protokolli viga, määramata"</string>
     <string name="clh_callFailed_interworking_unspecified_txt" msgid="8838850798491763729">"Omavaheline töö, määramata"</string>
+    <!-- no translation found for labelCallBarring (3452870940716226978) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_enabled (6804489690436703488) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_disabled (5900772179198857783) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc (1199843944333106035) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_enabled (8112118391869380361) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_disabled (7806697133004697974) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic (3162154267825211826) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_enabled (2634377543147258105) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_disabled (5817895648306183464) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr (8951699885885742076) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_enabled (2519630715322138317) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_disabled (5831267468931377699) -->
+    <skip />
+    <!-- no translation found for call_barring_baic (5272726081458339912) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_enabled (2457134916223203380) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_disabled (6945604947500275636) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr (5728784220691481693) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_enabled (6533336994391716127) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_disabled (6746329853943256566) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all (5269788384941003415) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_description (4972365443287257704) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_success (8014685598632000936) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd (6887420609726284232) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description (5505087790260233953) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description_disabled (7630770327645349957) -->
+    <skip />
+    <!-- no translation found for call_barring_pwd_not_match (6716711689350314525) -->
+    <skip />
+    <!-- no translation found for call_barring_right_pwd_number (2902966502520410446) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_success (3278310763742760321) -->
+    <skip />
+    <!-- no translation found for call_barring_old_pwd (6080515987320238522) -->
+    <skip />
+    <!-- no translation found for call_barring_new_pwd (7048532299150269547) -->
+    <skip />
+    <!-- no translation found for call_barring_confirm_pwd (1947167278466285411) -->
+    <skip />
+    <!-- no translation found for messageCallBarring (2412123220272136055) -->
+    <skip />
+    <!-- no translation found for call_barring_settings (80766145008623645) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_no_password (920902774366557311) -->
+    <skip />
 </resources>

diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 0b52eaf..2371188 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml

@@ -246,7 +246,7 @@
     <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>
-    <string name="keywords_carrier_settings_euicc" msgid="783429609643157743">"operadorea, esim, esim txartela, sim, sim txartela, euicc, euicc txartela"</string>
+    <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"operadorea, esim, esim txartela, sim, sim txartela, euicc, euicc txartela, aldatu operadoreak, aldatu operadorez, aldatu operadorea, gehitu operadorea, gehitu operadoreak"</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">"Datu mugikorrak"</string>
     <string name="mobile_data_settings_summary" msgid="5087255915840576895">"Atzitu datuak datu-konexioaren bidez"</string>
@@ -426,7 +426,7 @@
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Markatze finkoko zenbakia ezabatzen…"</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Markatze finkoko zenbakia ezabatu da."</string>
     <string name="pin2_invalid" msgid="5470854099230755944">"Ez da FDN eguneratu PIN kode okerra idatzi duzulako."</string>
-    <string name="fdn_invalid_number" msgid="8602417141715473998">"MFZa ez da eguneratu zenbakia hutsik dagoelako edo 20 digitu baino gehiago dituelako."</string>
+    <string name="fdn_invalid_number" msgid="2062898833049589309">"Ez da eguneratu FDNa, 20 digitu baino gehiago dituelako."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Ez da FDN eguneratu. PIN2 kodea ez da zuzena edo telefono-zenbakia baztertu da."</string>
     <string name="fdn_failed" msgid="540018079008319747">"FDN eragiketak huts egin du."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"SIM txarteletik irakurtzen…"</string>
@@ -693,4 +693,70 @@
     <string name="clh_callFailed_recovery_on_timer_expiry_txt" msgid="3680765722923600294">"Berreskuratze-prozesua iraungi da"</string>
     <string name="clh_callFailed_protocol_Error_unspecified_txt" msgid="8294907817156524790">"Protokoloaren errorea, zehaztugabea"</string>
     <string name="clh_callFailed_interworking_unspecified_txt" msgid="8838850798491763729">"Elkarlanean, zehaztugabea"</string>
+    <!-- no translation found for labelCallBarring (3452870940716226978) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_enabled (6804489690436703488) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_disabled (5900772179198857783) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc (1199843944333106035) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_enabled (8112118391869380361) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_disabled (7806697133004697974) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic (3162154267825211826) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_enabled (2634377543147258105) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_disabled (5817895648306183464) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr (8951699885885742076) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_enabled (2519630715322138317) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_disabled (5831267468931377699) -->
+    <skip />
+    <!-- no translation found for call_barring_baic (5272726081458339912) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_enabled (2457134916223203380) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_disabled (6945604947500275636) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr (5728784220691481693) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_enabled (6533336994391716127) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_disabled (6746329853943256566) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all (5269788384941003415) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_description (4972365443287257704) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_success (8014685598632000936) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd (6887420609726284232) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description (5505087790260233953) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description_disabled (7630770327645349957) -->
+    <skip />
+    <!-- no translation found for call_barring_pwd_not_match (6716711689350314525) -->
+    <skip />
+    <!-- no translation found for call_barring_right_pwd_number (2902966502520410446) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_success (3278310763742760321) -->
+    <skip />
+    <!-- no translation found for call_barring_old_pwd (6080515987320238522) -->
+    <skip />
+    <!-- no translation found for call_barring_new_pwd (7048532299150269547) -->
+    <skip />
+    <!-- no translation found for call_barring_confirm_pwd (1947167278466285411) -->
+    <skip />
+    <!-- no translation found for messageCallBarring (2412123220272136055) -->
+    <skip />
+    <!-- no translation found for call_barring_settings (80766145008623645) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_no_password (920902774366557311) -->
+    <skip />
 </resources>

diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 5732f77..7adaf67 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml

@@ -246,7 +246,7 @@
     <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>
-    <string name="keywords_carrier_settings_euicc" msgid="783429609643157743">"operaattori, eSIM, SIM, eUICC"</string>
+    <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"operaattori, esim, sim, euicc, vaihda operaattoria, lisää operaattori"</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">"Mobiilidata"</string>
     <string name="mobile_data_settings_summary" msgid="5087255915840576895">"Käytä dataa mobiiliverkon kautta."</string>
@@ -424,7 +424,7 @@
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Poistetaan sallittua numeroa…"</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Sallittu numero poistettu."</string>
     <string name="pin2_invalid" msgid="5470854099230755944">"Sallittuja numeroita ei päivitetty, koska annoit väärän PIN-koodin."</string>
-    <string name="fdn_invalid_number" msgid="8602417141715473998">"Sallittuja numeroita ei päivitetty, sillä numero on tyhjä tai siinä on yli 20 merkkiä."</string>
+    <string name="fdn_invalid_number" msgid="2062898833049589309">"Sallittuja numeroita ei päivitetty, koska numerossa oli yli 20 merkkiä."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN-numeroa ei päivitetty. PIN2 on virheellinen tai puhelinnumero hylättiin."</string>
     <string name="fdn_failed" msgid="540018079008319747">"FDN-toiminto epäonnistui."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Luetaan SIM-korttia…"</string>
@@ -691,4 +691,70 @@
     <string name="clh_callFailed_recovery_on_timer_expiry_txt" msgid="3680765722923600294">"Palauttaminen ajastetusta vanhenemisesta"</string>
     <string name="clh_callFailed_protocol_Error_unspecified_txt" msgid="8294907817156524790">"Protokollavirhe, määrittelemätön"</string>
     <string name="clh_callFailed_interworking_unspecified_txt" msgid="8838850798491763729">"Yhteydessä, määrittelemätön"</string>
+    <!-- no translation found for labelCallBarring (3452870940716226978) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_enabled (6804489690436703488) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_disabled (5900772179198857783) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc (1199843944333106035) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_enabled (8112118391869380361) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_disabled (7806697133004697974) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic (3162154267825211826) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_enabled (2634377543147258105) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_disabled (5817895648306183464) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr (8951699885885742076) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_enabled (2519630715322138317) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_disabled (5831267468931377699) -->
+    <skip />
+    <!-- no translation found for call_barring_baic (5272726081458339912) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_enabled (2457134916223203380) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_disabled (6945604947500275636) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr (5728784220691481693) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_enabled (6533336994391716127) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_disabled (6746329853943256566) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all (5269788384941003415) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_description (4972365443287257704) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_success (8014685598632000936) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd (6887420609726284232) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description (5505087790260233953) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description_disabled (7630770327645349957) -->
+    <skip />
+    <!-- no translation found for call_barring_pwd_not_match (6716711689350314525) -->
+    <skip />
+    <!-- no translation found for call_barring_right_pwd_number (2902966502520410446) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_success (3278310763742760321) -->
+    <skip />
+    <!-- no translation found for call_barring_old_pwd (6080515987320238522) -->
+    <skip />
+    <!-- no translation found for call_barring_new_pwd (7048532299150269547) -->
+    <skip />
+    <!-- no translation found for call_barring_confirm_pwd (1947167278466285411) -->
+    <skip />
+    <!-- no translation found for messageCallBarring (2412123220272136055) -->
+    <skip />
+    <!-- no translation found for call_barring_settings (80766145008623645) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_no_password (920902774366557311) -->
+    <skip />
 </resources>

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 1d143ae..4b693cb 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml

@@ -246,7 +246,7 @@
     <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>
-    <string name="keywords_carrier_settings_euicc" msgid="783429609643157743">"opérateur, eSIM, SIM, eUICC"</string>
+    <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"opérateur, esim, sim, euicc, changer d\'opérateur, ajouter un opérateur"</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">"Données mobiles"</string>
     <string name="mobile_data_settings_summary" msgid="5087255915840576895">"Accéder aux données via le réseau mobile"</string>
@@ -420,7 +420,7 @@
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Suppression du numéro autorisé…"</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Numéro autorisé supprimé"</string>
     <string name="pin2_invalid" msgid="5470854099230755944">"Le numéro autorisé n\'a pas été mis à jour, car vous avez saisi un code PIN incorrect."</string>
-    <string name="fdn_invalid_number" msgid="8602417141715473998">"Le numéro autorisé n\'a pas été mis à jour, car il n\'a pas été renseigné ou comporte plus de 20 chiffres."</string>
+    <string name="fdn_invalid_number" msgid="2062898833049589309">"Le numéro autorisé n\'a pas été mis à jour, car il comporte plus de 20 chiffres."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Le numéro autorisé n\'a pas été mis à jour. Soit le code PIN2 est incorrect, soit le numéro de téléphone a été rejeté."</string>
     <string name="fdn_failed" msgid="540018079008319747">"Échec de l\'opération liée aux numéros autorisés."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Lecture de la carte SIM…"</string>
@@ -687,4 +687,70 @@
     <string name="clh_callFailed_recovery_on_timer_expiry_txt" msgid="3680765722923600294">"Récupération à la fin du décompte"</string>
     <string name="clh_callFailed_protocol_Error_unspecified_txt" msgid="8294907817156524790">"Erreur de protocole, non spécifiée"</string>
     <string name="clh_callFailed_interworking_unspecified_txt" msgid="8838850798491763729">"Interworking, non spécifié"</string>
+    <!-- no translation found for labelCallBarring (3452870940716226978) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_enabled (6804489690436703488) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_disabled (5900772179198857783) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc (1199843944333106035) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_enabled (8112118391869380361) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_disabled (7806697133004697974) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic (3162154267825211826) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_enabled (2634377543147258105) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_disabled (5817895648306183464) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr (8951699885885742076) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_enabled (2519630715322138317) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_disabled (5831267468931377699) -->
+    <skip />
+    <!-- no translation found for call_barring_baic (5272726081458339912) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_enabled (2457134916223203380) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_disabled (6945604947500275636) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr (5728784220691481693) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_enabled (6533336994391716127) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_disabled (6746329853943256566) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all (5269788384941003415) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_description (4972365443287257704) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_success (8014685598632000936) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd (6887420609726284232) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description (5505087790260233953) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description_disabled (7630770327645349957) -->
+    <skip />
+    <!-- no translation found for call_barring_pwd_not_match (6716711689350314525) -->
+    <skip />
+    <!-- no translation found for call_barring_right_pwd_number (2902966502520410446) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_success (3278310763742760321) -->
+    <skip />
+    <!-- no translation found for call_barring_old_pwd (6080515987320238522) -->
+    <skip />
+    <!-- no translation found for call_barring_new_pwd (7048532299150269547) -->
+    <skip />
+    <!-- no translation found for call_barring_confirm_pwd (1947167278466285411) -->
+    <skip />
+    <!-- no translation found for messageCallBarring (2412123220272136055) -->
+    <skip />
+    <!-- no translation found for call_barring_settings (80766145008623645) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_no_password (920902774366557311) -->
+    <skip />
 </resources>

diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 1ebb810..aac0967 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml

@@ -246,7 +246,7 @@
     <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="783429609643157743">"वाहक, esim, sim, euicc"</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>
@@ -420,7 +420,7 @@
     <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="8602417141715473998">"FDN अपडेट नहीं हुआ क्योंकि संख्या खाली है या उसमें 20 से ज़्यादा अंक हैं."</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">"सिम कार्ड से पढ़ रहा है…"</string>
@@ -687,4 +687,70 @@
     <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>
+    <!-- no translation found for labelCallBarring (3452870940716226978) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_enabled (6804489690436703488) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_disabled (5900772179198857783) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc (1199843944333106035) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_enabled (8112118391869380361) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_disabled (7806697133004697974) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic (3162154267825211826) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_enabled (2634377543147258105) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_disabled (5817895648306183464) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr (8951699885885742076) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_enabled (2519630715322138317) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_disabled (5831267468931377699) -->
+    <skip />
+    <!-- no translation found for call_barring_baic (5272726081458339912) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_enabled (2457134916223203380) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_disabled (6945604947500275636) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr (5728784220691481693) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_enabled (6533336994391716127) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_disabled (6746329853943256566) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all (5269788384941003415) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_description (4972365443287257704) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_success (8014685598632000936) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd (6887420609726284232) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description (5505087790260233953) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description_disabled (7630770327645349957) -->
+    <skip />
+    <!-- no translation found for call_barring_pwd_not_match (6716711689350314525) -->
+    <skip />
+    <!-- no translation found for call_barring_right_pwd_number (2902966502520410446) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_success (3278310763742760321) -->
+    <skip />
+    <!-- no translation found for call_barring_old_pwd (6080515987320238522) -->
+    <skip />
+    <!-- no translation found for call_barring_new_pwd (7048532299150269547) -->
+    <skip />
+    <!-- no translation found for call_barring_confirm_pwd (1947167278466285411) -->
+    <skip />
+    <!-- no translation found for messageCallBarring (2412123220272136055) -->
+    <skip />
+    <!-- no translation found for call_barring_settings (80766145008623645) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_no_password (920902774366557311) -->
+    <skip />
 </resources>

diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 5620374..09ae11c 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml

@@ -246,7 +246,7 @@
     <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>
-    <string name="keywords_carrier_settings_euicc" msgid="783429609643157743">"símafyrirtæki, esim, sim, euicc"</string>
+    <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"símafyrirtæki, símkerfi, esim, sim, euicc, skipta milli símkerfa, bæta við símkerfi"</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">"Farsímagögn"</string>
     <string name="mobile_data_settings_summary" msgid="5087255915840576895">"Aðgangur að gögnum um farsímakerfi"</string>
@@ -420,7 +420,7 @@
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Eyða föstu númeravali…"</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Föstu númeravali eytt."</string>
     <string name="pin2_invalid" msgid="5470854099230755944">"Fast númeraval var ekki uppfært því að þú slóst inn rangt PIN-númer."</string>
-    <string name="fdn_invalid_number" msgid="8602417141715473998">"Fast númeraval var ekki uppfært því að númerið er autt eða er lengra en 20 tölustafir."</string>
+    <string name="fdn_invalid_number" msgid="2062898833049589309">"Fast númeraval var ekki uppfært vegna þess að númerið er lengra en 20 tölustafir."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Fast númeraval var ekki uppfært. PIN2-númerið var rangt eða símanúmerinu var hafnað."</string>
     <string name="fdn_failed" msgid="540018079008319747">"Aðgerð fasts númeravals mistókst."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Les af SIM-korti…"</string>
@@ -687,4 +687,70 @@
     <string name="clh_callFailed_recovery_on_timer_expiry_txt" msgid="3680765722923600294">"Endurheimt við lok tímamælingar"</string>
     <string name="clh_callFailed_protocol_Error_unspecified_txt" msgid="8294907817156524790">"Villa í samskiptareglu, ótilgreind"</string>
     <string name="clh_callFailed_interworking_unspecified_txt" msgid="8838850798491763729">"Samvirkni, ótilgreint"</string>
+    <!-- no translation found for labelCallBarring (3452870940716226978) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_enabled (6804489690436703488) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_disabled (5900772179198857783) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc (1199843944333106035) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_enabled (8112118391869380361) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_disabled (7806697133004697974) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic (3162154267825211826) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_enabled (2634377543147258105) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_disabled (5817895648306183464) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr (8951699885885742076) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_enabled (2519630715322138317) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_disabled (5831267468931377699) -->
+    <skip />
+    <!-- no translation found for call_barring_baic (5272726081458339912) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_enabled (2457134916223203380) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_disabled (6945604947500275636) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr (5728784220691481693) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_enabled (6533336994391716127) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_disabled (6746329853943256566) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all (5269788384941003415) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_description (4972365443287257704) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_success (8014685598632000936) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd (6887420609726284232) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description (5505087790260233953) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description_disabled (7630770327645349957) -->
+    <skip />
+    <!-- no translation found for call_barring_pwd_not_match (6716711689350314525) -->
+    <skip />
+    <!-- no translation found for call_barring_right_pwd_number (2902966502520410446) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_success (3278310763742760321) -->
+    <skip />
+    <!-- no translation found for call_barring_old_pwd (6080515987320238522) -->
+    <skip />
+    <!-- no translation found for call_barring_new_pwd (7048532299150269547) -->
+    <skip />
+    <!-- no translation found for call_barring_confirm_pwd (1947167278466285411) -->
+    <skip />
+    <!-- no translation found for messageCallBarring (2412123220272136055) -->
+    <skip />
+    <!-- no translation found for call_barring_settings (80766145008623645) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_no_password (920902774366557311) -->
+    <skip />
 </resources>

diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 5998302..88ef0a7 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml

@@ -246,7 +246,7 @@
     <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="783429609643157743">"携帯通信会社、esim、sim、euicc"</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>
@@ -420,7 +420,8 @@
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"発信番号制限を削除しています..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"発信番号制限を削除しました。"</string>
     <string name="pin2_invalid" msgid="5470854099230755944">"発信番号制限は更新されませんでした。入力したPINは正しくありません。"</string>
-    <string name="fdn_invalid_number" msgid="8602417141715473998">"電話番号が空白になっているか、20 桁を超えているため、FDN を更新できませんでした。"</string>
+    <!-- no translation found for fdn_invalid_number (2062898833049589309) -->
+    <skip />
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"発信番号制限は更新されませんでした。PIN2が正しくないか、電話番号が拒否されました。"</string>
     <string name="fdn_failed" msgid="540018079008319747">"発信番号制限操作に失敗しました。"</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"SIMカードから読み取り中..."</string>
@@ -687,4 +688,70 @@
     <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>
+    <!-- no translation found for labelCallBarring (3452870940716226978) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_enabled (6804489690436703488) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_disabled (5900772179198857783) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc (1199843944333106035) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_enabled (8112118391869380361) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_disabled (7806697133004697974) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic (3162154267825211826) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_enabled (2634377543147258105) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_disabled (5817895648306183464) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr (8951699885885742076) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_enabled (2519630715322138317) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_disabled (5831267468931377699) -->
+    <skip />
+    <!-- no translation found for call_barring_baic (5272726081458339912) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_enabled (2457134916223203380) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_disabled (6945604947500275636) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr (5728784220691481693) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_enabled (6533336994391716127) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_disabled (6746329853943256566) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all (5269788384941003415) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_description (4972365443287257704) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_success (8014685598632000936) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd (6887420609726284232) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description (5505087790260233953) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description_disabled (7630770327645349957) -->
+    <skip />
+    <!-- no translation found for call_barring_pwd_not_match (6716711689350314525) -->
+    <skip />
+    <!-- no translation found for call_barring_right_pwd_number (2902966502520410446) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_success (3278310763742760321) -->
+    <skip />
+    <!-- no translation found for call_barring_old_pwd (6080515987320238522) -->
+    <skip />
+    <!-- no translation found for call_barring_new_pwd (7048532299150269547) -->
+    <skip />
+    <!-- no translation found for call_barring_confirm_pwd (1947167278466285411) -->
+    <skip />
+    <!-- no translation found for messageCallBarring (2412123220272136055) -->
+    <skip />
+    <!-- no translation found for call_barring_settings (80766145008623645) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_no_password (920902774366557311) -->
+    <skip />
 </resources>

diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 2010d2b..74010a7 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml

@@ -246,7 +246,7 @@
     <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="783429609643157743">"이동통신사, eSIM, SIM, eUICC"</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>
@@ -420,7 +420,7 @@
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"발신 허용 번호를 삭제하는 중..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"발신 허용 번호가 삭제되었습니다."</string>
     <string name="pin2_invalid" msgid="5470854099230755944">"잘못된 PIN을 입력하여 FDN 업데이트 안됨"</string>
-    <string name="fdn_invalid_number" msgid="8602417141715473998">"숫자가 비어있거나 20자리를 초과하여 FDN을 업데이트하지 못했습니다."</string>
+    <string name="fdn_invalid_number" msgid="2062898833049589309">"숫자가 20자리를 초과하여 FDN을 업데이트하지 못했습니다."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN이 업데이트되지 않았습니다. PIN2가 잘못되었거나 전화번호가 거부되었습니다."</string>
     <string name="fdn_failed" msgid="540018079008319747">"FDN 작업이 실패했습니다."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"SIM 카드에서 읽는 중..."</string>
@@ -687,4 +687,70 @@
     <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>
+    <!-- no translation found for labelCallBarring (3452870940716226978) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_enabled (6804489690436703488) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_disabled (5900772179198857783) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc (1199843944333106035) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_enabled (8112118391869380361) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_disabled (7806697133004697974) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic (3162154267825211826) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_enabled (2634377543147258105) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_disabled (5817895648306183464) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr (8951699885885742076) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_enabled (2519630715322138317) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_disabled (5831267468931377699) -->
+    <skip />
+    <!-- no translation found for call_barring_baic (5272726081458339912) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_enabled (2457134916223203380) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_disabled (6945604947500275636) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr (5728784220691481693) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_enabled (6533336994391716127) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_disabled (6746329853943256566) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all (5269788384941003415) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_description (4972365443287257704) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_success (8014685598632000936) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd (6887420609726284232) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description (5505087790260233953) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description_disabled (7630770327645349957) -->
+    <skip />
+    <!-- no translation found for call_barring_pwd_not_match (6716711689350314525) -->
+    <skip />
+    <!-- no translation found for call_barring_right_pwd_number (2902966502520410446) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_success (3278310763742760321) -->
+    <skip />
+    <!-- no translation found for call_barring_old_pwd (6080515987320238522) -->
+    <skip />
+    <!-- no translation found for call_barring_new_pwd (7048532299150269547) -->
+    <skip />
+    <!-- no translation found for call_barring_confirm_pwd (1947167278466285411) -->
+    <skip />
+    <!-- no translation found for messageCallBarring (2412123220272136055) -->
+    <skip />
+    <!-- no translation found for call_barring_settings (80766145008623645) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_no_password (920902774366557311) -->
+    <skip />
 </resources>

diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 723993b..9f12458 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml

@@ -246,7 +246,7 @@
     <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>
-    <string name="keywords_carrier_settings_euicc" msgid="783429609643157743">"operatorius, esim kortelė, sim kortelė, euicc kortelė"</string>
+    <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"operatorius, „eSIM“ kortelė, SIM kortelė, „eUICC“ kortelė, perjungti operatorius, pridėti operatorių"</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">"Mobiliojo ryšio duomenys"</string>
     <string name="mobile_data_settings_summary" msgid="5087255915840576895">"Prieiga prie duomenų naudojant mobiliojo ryšio tinklą"</string>
@@ -420,7 +420,7 @@
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Trinamas fiksuoto rinkimo numeris..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Ištrintas fiksuoto rinkimo numeris."</string>
     <string name="pin2_invalid" msgid="5470854099230755944">"FDN neatnaujintas, nes įvedėte neteisingą PIN kodą."</string>
-    <string name="fdn_invalid_number" msgid="8602417141715473998">"FDN neatnaujintas, nes numeris nenurodytas arba viršija 20 skaitmenų apribojimą."</string>
+    <string name="fdn_invalid_number" msgid="2062898833049589309">"FDN neatnaujintas, nes numeris viršija 20 skaitmenų apribojimą."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN nebuvo atnaujintas. Įvestas PIN2 kodas buvo netinkamas arba telefono numeris buvo atmestas."</string>
     <string name="fdn_failed" msgid="540018079008319747">"Nepavyko atlikti FDN operacijos."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Skaitoma iš SIM kortelės..."</string>
@@ -691,4 +691,70 @@
     <string name="clh_callFailed_recovery_on_timer_expiry_txt" msgid="3680765722923600294">"Laikmačio galiojimo pabaigos atkūrimas"</string>
     <string name="clh_callFailed_protocol_Error_unspecified_txt" msgid="8294907817156524790">"Protokolo klaida, nenurodyta"</string>
     <string name="clh_callFailed_interworking_unspecified_txt" msgid="8838850798491763729">"Ryšiai, nenurodyta"</string>
+    <!-- no translation found for labelCallBarring (3452870940716226978) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_enabled (6804489690436703488) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_disabled (5900772179198857783) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc (1199843944333106035) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_enabled (8112118391869380361) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_disabled (7806697133004697974) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic (3162154267825211826) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_enabled (2634377543147258105) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_disabled (5817895648306183464) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr (8951699885885742076) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_enabled (2519630715322138317) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_disabled (5831267468931377699) -->
+    <skip />
+    <!-- no translation found for call_barring_baic (5272726081458339912) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_enabled (2457134916223203380) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_disabled (6945604947500275636) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr (5728784220691481693) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_enabled (6533336994391716127) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_disabled (6746329853943256566) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all (5269788384941003415) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_description (4972365443287257704) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_success (8014685598632000936) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd (6887420609726284232) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description (5505087790260233953) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description_disabled (7630770327645349957) -->
+    <skip />
+    <!-- no translation found for call_barring_pwd_not_match (6716711689350314525) -->
+    <skip />
+    <!-- no translation found for call_barring_right_pwd_number (2902966502520410446) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_success (3278310763742760321) -->
+    <skip />
+    <!-- no translation found for call_barring_old_pwd (6080515987320238522) -->
+    <skip />
+    <!-- no translation found for call_barring_new_pwd (7048532299150269547) -->
+    <skip />
+    <!-- no translation found for call_barring_confirm_pwd (1947167278466285411) -->
+    <skip />
+    <!-- no translation found for messageCallBarring (2412123220272136055) -->
+    <skip />
+    <!-- no translation found for call_barring_settings (80766145008623645) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_no_password (920902774366557311) -->
+    <skip />
 </resources>

diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 0970c79..76eb9c4 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml

@@ -246,7 +246,7 @@
     <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>
-    <string name="keywords_carrier_settings_euicc" msgid="783429609643157743">"mobilo sakaru operators, esim, sim, euicc"</string>
+    <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"mobilo sakaru operators, esim, sim, euicc, pārslēgt mobilo sakaru operatorus, pievienot mobilo sakaru operatoru"</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">"Mobilie dati"</string>
     <string name="mobile_data_settings_summary" msgid="5087255915840576895">"Piekļuve datiem, izmantojot mobilo tīklu"</string>
@@ -422,7 +422,7 @@
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Notiek fiksētā numuru sastādīšanas numura dzēšana…"</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Fiksētais numuru sastādīšanas numurs ir atspējots."</string>
     <string name="pin2_invalid" msgid="5470854099230755944">"IZSN nav atjaunināts, jo tika ievadīts nepareizs PIN."</string>
-    <string name="fdn_invalid_number" msgid="8602417141715473998">"IZSN netika atjaunināts, jo numura lauks ir tukšs vai numurā ir vairāk par 20 cipariem."</string>
+    <string name="fdn_invalid_number" msgid="2062898833049589309">"IZSN netika atjaunināts, jo numurā ir vairāk par 20 cipariem."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"IZSN netika atjaunināts. Ievadītais PIN2 nebija pareizs, vai tālruņa numurs tika noraidīts."</string>
     <string name="fdn_failed" msgid="540018079008319747">"IZSN ievadīšana neizdevās."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Notiek lasīšana no SIM kartes..."</string>
@@ -691,4 +691,70 @@
     <string name="clh_callFailed_recovery_on_timer_expiry_txt" msgid="3680765722923600294">"Atkopšana taimera darbības beigās"</string>
     <string name="clh_callFailed_protocol_Error_unspecified_txt" msgid="8294907817156524790">"Protokola kļūda, nav norādīta"</string>
     <string name="clh_callFailed_interworking_unspecified_txt" msgid="8838850798491763729">"Mijiedarbība, nav norādīta"</string>
+    <!-- no translation found for labelCallBarring (3452870940716226978) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_enabled (6804489690436703488) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_disabled (5900772179198857783) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc (1199843944333106035) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_enabled (8112118391869380361) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_disabled (7806697133004697974) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic (3162154267825211826) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_enabled (2634377543147258105) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_disabled (5817895648306183464) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr (8951699885885742076) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_enabled (2519630715322138317) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_disabled (5831267468931377699) -->
+    <skip />
+    <!-- no translation found for call_barring_baic (5272726081458339912) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_enabled (2457134916223203380) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_disabled (6945604947500275636) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr (5728784220691481693) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_enabled (6533336994391716127) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_disabled (6746329853943256566) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all (5269788384941003415) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_description (4972365443287257704) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_success (8014685598632000936) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd (6887420609726284232) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description (5505087790260233953) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description_disabled (7630770327645349957) -->
+    <skip />
+    <!-- no translation found for call_barring_pwd_not_match (6716711689350314525) -->
+    <skip />
+    <!-- no translation found for call_barring_right_pwd_number (2902966502520410446) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_success (3278310763742760321) -->
+    <skip />
+    <!-- no translation found for call_barring_old_pwd (6080515987320238522) -->
+    <skip />
+    <!-- no translation found for call_barring_new_pwd (7048532299150269547) -->
+    <skip />
+    <!-- no translation found for call_barring_confirm_pwd (1947167278466285411) -->
+    <skip />
+    <!-- no translation found for messageCallBarring (2412123220272136055) -->
+    <skip />
+    <!-- no translation found for call_barring_settings (80766145008623645) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_no_password (920902774366557311) -->
+    <skip />
 </resources>

diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index aa1a58b..28fdfbb 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml

@@ -246,7 +246,7 @@
     <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="783429609643157743">"carrier, esim, sim, euicc"</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>
@@ -420,7 +420,7 @@
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Тогтвортой залгах дугаарыг устгаж байна…"</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Тогтвортой залгах дугаарыг устгав."</string>
     <string name="pin2_invalid" msgid="5470854099230755944">"Та буруу PIN оруулсан учир FDN шинэчлэгдсэнгүй."</string>
-    <string name="fdn_invalid_number" msgid="8602417141715473998">"Дугаар хоосон, эсвэл 20 цифрээс хэтэрсэн учир FDN шинэчлэгдээгүй."</string>
+    <string name="fdn_invalid_number" msgid="2062898833049589309">"Дугаар 20 цифрээс хэтэрсэн учир FDN шинэчлэгдээгүй."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN шинэчлэгдсэнгүй. PIN2 буруу байсан, эсхүл утасны дугаар зөвшөөрөгдсөнгүй."</string>
     <string name="fdn_failed" msgid="540018079008319747">"ФДН ажиллуулах амжилтгүй."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"SIM картаас уншиж байна…"</string>
@@ -687,4 +687,70 @@
     <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>
+    <!-- no translation found for labelCallBarring (3452870940716226978) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_enabled (6804489690436703488) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_disabled (5900772179198857783) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc (1199843944333106035) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_enabled (8112118391869380361) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_disabled (7806697133004697974) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic (3162154267825211826) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_enabled (2634377543147258105) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_disabled (5817895648306183464) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr (8951699885885742076) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_enabled (2519630715322138317) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_disabled (5831267468931377699) -->
+    <skip />
+    <!-- no translation found for call_barring_baic (5272726081458339912) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_enabled (2457134916223203380) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_disabled (6945604947500275636) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr (5728784220691481693) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_enabled (6533336994391716127) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_disabled (6746329853943256566) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all (5269788384941003415) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_description (4972365443287257704) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_success (8014685598632000936) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd (6887420609726284232) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description (5505087790260233953) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description_disabled (7630770327645349957) -->
+    <skip />
+    <!-- no translation found for call_barring_pwd_not_match (6716711689350314525) -->
+    <skip />
+    <!-- no translation found for call_barring_right_pwd_number (2902966502520410446) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_success (3278310763742760321) -->
+    <skip />
+    <!-- no translation found for call_barring_old_pwd (6080515987320238522) -->
+    <skip />
+    <!-- no translation found for call_barring_new_pwd (7048532299150269547) -->
+    <skip />
+    <!-- no translation found for call_barring_confirm_pwd (1947167278466285411) -->
+    <skip />
+    <!-- no translation found for messageCallBarring (2412123220272136055) -->
+    <skip />
+    <!-- no translation found for call_barring_settings (80766145008623645) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_no_password (920902774366557311) -->
+    <skip />
 </resources>

diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 1bf7c4e..77895c9 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml

@@ -246,7 +246,7 @@
     <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="783429609643157743">"ဖုန်းလိုင်း၊ esim၊ ဆင်းမ်ကဒ်၊ euicc"</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>
@@ -420,7 +420,8 @@
     <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="8602417141715473998">"နံပါတ်သည် ဗလာဖြစ်နေခြင်း (သို့) အလုံး ၂၀ ကျော်နေခြင်းကြောင့် FDN ကို မပြင်ဆင်နိုင်ပါ။"</string>
+    <!-- no translation found for fdn_invalid_number (2062898833049589309) -->
+    <skip />
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN ပြောင်းလဲမှု မဖြစ်ပါ။ ပင်နံပါတ် ၂ မှားယွင်းခြင်း သို့မဟုတ် ဖုန်းနံပါတ်ကို ငြင်းဖယ်ခံရခြင်း တစ်ခုခုဖြစ်ပါသည်"</string>
     <string name="fdn_failed" msgid="540018079008319747">"FDN လုပ်ဆောင်ချက် မအောင်မြင်ပါ"</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"ဆင်းမ်ကဒ်မှ ဖတ်နေပါသည်..."</string>
@@ -687,4 +688,70 @@
     <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>
+    <!-- no translation found for labelCallBarring (3452870940716226978) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_enabled (6804489690436703488) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_disabled (5900772179198857783) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc (1199843944333106035) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_enabled (8112118391869380361) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_disabled (7806697133004697974) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic (3162154267825211826) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_enabled (2634377543147258105) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_disabled (5817895648306183464) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr (8951699885885742076) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_enabled (2519630715322138317) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_disabled (5831267468931377699) -->
+    <skip />
+    <!-- no translation found for call_barring_baic (5272726081458339912) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_enabled (2457134916223203380) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_disabled (6945604947500275636) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr (5728784220691481693) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_enabled (6533336994391716127) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_disabled (6746329853943256566) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all (5269788384941003415) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_description (4972365443287257704) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_success (8014685598632000936) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd (6887420609726284232) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description (5505087790260233953) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description_disabled (7630770327645349957) -->
+    <skip />
+    <!-- no translation found for call_barring_pwd_not_match (6716711689350314525) -->
+    <skip />
+    <!-- no translation found for call_barring_right_pwd_number (2902966502520410446) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_success (3278310763742760321) -->
+    <skip />
+    <!-- no translation found for call_barring_old_pwd (6080515987320238522) -->
+    <skip />
+    <!-- no translation found for call_barring_new_pwd (7048532299150269547) -->
+    <skip />
+    <!-- no translation found for call_barring_confirm_pwd (1947167278466285411) -->
+    <skip />
+    <!-- no translation found for messageCallBarring (2412123220272136055) -->
+    <skip />
+    <!-- no translation found for call_barring_settings (80766145008623645) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_no_password (920902774366557311) -->
+    <skip />
 </resources>

diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 9e8e1da..0369a97 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml

@@ -246,7 +246,7 @@
     <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>
-    <string name="keywords_carrier_settings_euicc" msgid="783429609643157743">"operatør, esim, sim, euicc"</string>
+    <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"mobiloperatør, esim, sim, euicc, bytt operatør, legg til operatør"</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">"Bruk data via mobilnettverket"</string>
@@ -426,7 +426,7 @@
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Sletter programmert telefonnummer ..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Programmert telefonnummer er slettet."</string>
     <string name="pin2_invalid" msgid="5470854099230755944">"FDN er ikke oppdatert fordi du skrev inn feil PIN-kode."</string>
-    <string name="fdn_invalid_number" msgid="8602417141715473998">"Det programmerte telefonnummeret kan ikke oppdateres fordi det er er tomt eller inneholder over 20 sifre."</string>
+    <string name="fdn_invalid_number" msgid="2062898833049589309">"FDN ble ikke oppdatert fordi tallet er lengre enn 20 sifre."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Fast nummer ble ikke oppdatert. PIN2 var feil, eller telefonnummeret ble avvist."</string>
     <string name="fdn_failed" msgid="540018079008319747">"FDN-handlingen mislyktes."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Leser fra SIM-kort …"</string>
@@ -693,4 +693,70 @@
     <string name="clh_callFailed_recovery_on_timer_expiry_txt" msgid="3680765722923600294">"Gjenoppretting ved tidsavbrudd"</string>
     <string name="clh_callFailed_protocol_Error_unspecified_txt" msgid="8294907817156524790">"Protokollfeil – uspesifisert"</string>
     <string name="clh_callFailed_interworking_unspecified_txt" msgid="8838850798491763729">"Interfunksjon – uspesifisert"</string>
+    <!-- no translation found for labelCallBarring (3452870940716226978) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_enabled (6804489690436703488) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_disabled (5900772179198857783) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc (1199843944333106035) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_enabled (8112118391869380361) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_disabled (7806697133004697974) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic (3162154267825211826) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_enabled (2634377543147258105) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_disabled (5817895648306183464) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr (8951699885885742076) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_enabled (2519630715322138317) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_disabled (5831267468931377699) -->
+    <skip />
+    <!-- no translation found for call_barring_baic (5272726081458339912) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_enabled (2457134916223203380) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_disabled (6945604947500275636) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr (5728784220691481693) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_enabled (6533336994391716127) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_disabled (6746329853943256566) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all (5269788384941003415) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_description (4972365443287257704) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_success (8014685598632000936) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd (6887420609726284232) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description (5505087790260233953) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description_disabled (7630770327645349957) -->
+    <skip />
+    <!-- no translation found for call_barring_pwd_not_match (6716711689350314525) -->
+    <skip />
+    <!-- no translation found for call_barring_right_pwd_number (2902966502520410446) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_success (3278310763742760321) -->
+    <skip />
+    <!-- no translation found for call_barring_old_pwd (6080515987320238522) -->
+    <skip />
+    <!-- no translation found for call_barring_new_pwd (7048532299150269547) -->
+    <skip />
+    <!-- no translation found for call_barring_confirm_pwd (1947167278466285411) -->
+    <skip />
+    <!-- no translation found for messageCallBarring (2412123220272136055) -->
+    <skip />
+    <!-- no translation found for call_barring_settings (80766145008623645) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_no_password (920902774366557311) -->
+    <skip />
 </resources>

diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 76b28b5..9b7e634 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml

@@ -53,7 +53,7 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"नेटवर्क अनलक गर्न अनुरोध गर्दै..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"नेटवर्क अनलक अनुरोध असफल"</string>
     <string name="unlock_success" msgid="6770085622238180152">"नेटवर्क अनलक सफल।"</string>
-    <string name="mobile_network_settings_not_available" msgid="7355254462995117896">"मोबाइल सञ्जाल सेटिङ्हरू यस प्रयोगकर्ताको लागि उपलब्ध छैनन्"</string>
+    <string name="mobile_network_settings_not_available" msgid="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>
@@ -246,7 +246,7 @@
     <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="783429609643157743">"सेवा प्रदायक, esim, sim, euicc"</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>
@@ -379,7 +379,7 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"उपकरण सक्रिय बनाउनुहोस्"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"सेटअप डेटा सेवा"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"वाहक सेटिङ्हरू"</string>
+    <string name="carrier_settings_title" msgid="9028166176523012300">"वाहक सेटिङहरू"</string>
     <string name="fdn" msgid="7878832555095183202">"स्थिर डायल गर्ने नम्बर"</string>
     <string name="fdn_with_label" msgid="187084204115493366">"स्थिर डायल नम्बरहरू ( <xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g> )"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FDN सूची"</string>
@@ -420,7 +420,8 @@
     <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="8602417141715473998">"नम्बर प्रविष्ट नगरिएकाले वा २० अङ्कको सीमा नाघेकाले FDN अद्यावधिक गरिएन।"</string>
+    <!-- no translation found for fdn_invalid_number (2062898833049589309) -->
+    <skip />
     <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>
@@ -687,4 +688,70 @@
     <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>
+    <!-- no translation found for labelCallBarring (3452870940716226978) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_enabled (6804489690436703488) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_disabled (5900772179198857783) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc (1199843944333106035) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_enabled (8112118391869380361) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_disabled (7806697133004697974) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic (3162154267825211826) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_enabled (2634377543147258105) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_disabled (5817895648306183464) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr (8951699885885742076) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_enabled (2519630715322138317) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_disabled (5831267468931377699) -->
+    <skip />
+    <!-- no translation found for call_barring_baic (5272726081458339912) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_enabled (2457134916223203380) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_disabled (6945604947500275636) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr (5728784220691481693) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_enabled (6533336994391716127) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_disabled (6746329853943256566) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all (5269788384941003415) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_description (4972365443287257704) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_success (8014685598632000936) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd (6887420609726284232) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description (5505087790260233953) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description_disabled (7630770327645349957) -->
+    <skip />
+    <!-- no translation found for call_barring_pwd_not_match (6716711689350314525) -->
+    <skip />
+    <!-- no translation found for call_barring_right_pwd_number (2902966502520410446) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_success (3278310763742760321) -->
+    <skip />
+    <!-- no translation found for call_barring_old_pwd (6080515987320238522) -->
+    <skip />
+    <!-- no translation found for call_barring_new_pwd (7048532299150269547) -->
+    <skip />
+    <!-- no translation found for call_barring_confirm_pwd (1947167278466285411) -->
+    <skip />
+    <!-- no translation found for messageCallBarring (2412123220272136055) -->
+    <skip />
+    <!-- no translation found for call_barring_settings (80766145008623645) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_no_password (920902774366557311) -->
+    <skip />
 </resources>

diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index c2b3c95..ee8b2a1 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml

@@ -246,7 +246,7 @@
     <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>
-    <string name="keywords_carrier_settings_euicc" msgid="783429609643157743">"provider, esim, sim, euicc"</string>
+    <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"provider, e-simkaart, simkaart, euicc, van provider veranderen, provider toevoegen"</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">"Mobiele data"</string>
     <string name="mobile_data_settings_summary" msgid="5087255915840576895">"Datatoegang via mobiel netwerk"</string>
@@ -420,7 +420,7 @@
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Vast nummer verwijderen..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Vast nummer verwijderd."</string>
     <string name="pin2_invalid" msgid="5470854099230755944">"FDN is niet bijgewerkt omdat je een onjuiste pincode hebt ingevoerd."</string>
-    <string name="fdn_invalid_number" msgid="8602417141715473998">"FDN is niet geüpdatet omdat het nummer leeg is of langer is dan twintig tekens."</string>
+    <string name="fdn_invalid_number" msgid="2062898833049589309">"FDN is niet geüpdatet omdat het nummer langer is dan twintig tekens."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN is niet bijgewerkt. De PIN2 was onjuist of het telefoonnummer is geweigerd."</string>
     <string name="fdn_failed" msgid="540018079008319747">"FDN-bewerking mislukt."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Lezen vanaf simkaart..."</string>
@@ -687,4 +687,70 @@
     <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>
+    <!-- no translation found for labelCallBarring (3452870940716226978) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_enabled (6804489690436703488) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_disabled (5900772179198857783) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc (1199843944333106035) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_enabled (8112118391869380361) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_disabled (7806697133004697974) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic (3162154267825211826) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_enabled (2634377543147258105) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_disabled (5817895648306183464) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr (8951699885885742076) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_enabled (2519630715322138317) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_disabled (5831267468931377699) -->
+    <skip />
+    <!-- no translation found for call_barring_baic (5272726081458339912) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_enabled (2457134916223203380) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_disabled (6945604947500275636) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr (5728784220691481693) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_enabled (6533336994391716127) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_disabled (6746329853943256566) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all (5269788384941003415) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_description (4972365443287257704) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_success (8014685598632000936) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd (6887420609726284232) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description (5505087790260233953) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description_disabled (7630770327645349957) -->
+    <skip />
+    <!-- no translation found for call_barring_pwd_not_match (6716711689350314525) -->
+    <skip />
+    <!-- no translation found for call_barring_right_pwd_number (2902966502520410446) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_success (3278310763742760321) -->
+    <skip />
+    <!-- no translation found for call_barring_old_pwd (6080515987320238522) -->
+    <skip />
+    <!-- no translation found for call_barring_new_pwd (7048532299150269547) -->
+    <skip />
+    <!-- no translation found for call_barring_confirm_pwd (1947167278466285411) -->
+    <skip />
+    <!-- no translation found for messageCallBarring (2412123220272136055) -->
+    <skip />
+    <!-- no translation found for call_barring_settings (80766145008623645) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_no_password (920902774366557311) -->
+    <skip />
 </resources>

diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index b46df33..31dbed3 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml

@@ -246,7 +246,7 @@
     <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>
-    <string name="keywords_carrier_settings_euicc" msgid="783429609643157743">"operator, esim, sim, euicc"</string>
+    <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"operator, esim, sim, euicc, przełącz operatora, dodaj operatora"</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">"Mobilna transmisja danych"</string>
     <string name="mobile_data_settings_summary" msgid="5087255915840576895">"Korzystaj z danych przy użyciu sieci komórkowej"</string>
@@ -420,7 +420,7 @@
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Trwa usuwanie ustalonego numeru…"</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Usunięto ustalony numer."</string>
     <string name="pin2_invalid" msgid="5470854099230755944">"Nie zaktualizowano usługi FDN, ponieważ wpisano nieprawidłowy kod PIN."</string>
-    <string name="fdn_invalid_number" msgid="8602417141715473998">"Nie zaktualizowano usługi FDN, ponieważ numer jest pusty lub zawiera ponad 20 cyfr."</string>
+    <string name="fdn_invalid_number" msgid="2062898833049589309">"Nie zaktualizowano usługi FDN, ponieważ numer zawiera ponad 20 cyfr."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Nie zaktualizowano FDN. PIN2 był niepoprawny lub numer telefonu został odrzucony."</string>
     <string name="fdn_failed" msgid="540018079008319747">"Operacja FDN nie udała się."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Czytanie z karty SIM..."</string>
@@ -691,4 +691,70 @@
     <string name="clh_callFailed_recovery_on_timer_expiry_txt" msgid="3680765722923600294">"Przywracanie po wygaśnięciu licznika"</string>
     <string name="clh_callFailed_protocol_Error_unspecified_txt" msgid="8294907817156524790">"Błąd protokołu – nie określono"</string>
     <string name="clh_callFailed_interworking_unspecified_txt" msgid="8838850798491763729">"Współpraca – nie określono"</string>
+    <!-- no translation found for labelCallBarring (3452870940716226978) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_enabled (6804489690436703488) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_disabled (5900772179198857783) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc (1199843944333106035) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_enabled (8112118391869380361) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_disabled (7806697133004697974) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic (3162154267825211826) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_enabled (2634377543147258105) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_disabled (5817895648306183464) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr (8951699885885742076) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_enabled (2519630715322138317) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_disabled (5831267468931377699) -->
+    <skip />
+    <!-- no translation found for call_barring_baic (5272726081458339912) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_enabled (2457134916223203380) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_disabled (6945604947500275636) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr (5728784220691481693) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_enabled (6533336994391716127) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_disabled (6746329853943256566) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all (5269788384941003415) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_description (4972365443287257704) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_success (8014685598632000936) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd (6887420609726284232) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description (5505087790260233953) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description_disabled (7630770327645349957) -->
+    <skip />
+    <!-- no translation found for call_barring_pwd_not_match (6716711689350314525) -->
+    <skip />
+    <!-- no translation found for call_barring_right_pwd_number (2902966502520410446) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_success (3278310763742760321) -->
+    <skip />
+    <!-- no translation found for call_barring_old_pwd (6080515987320238522) -->
+    <skip />
+    <!-- no translation found for call_barring_new_pwd (7048532299150269547) -->
+    <skip />
+    <!-- no translation found for call_barring_confirm_pwd (1947167278466285411) -->
+    <skip />
+    <!-- no translation found for messageCallBarring (2412123220272136055) -->
+    <skip />
+    <!-- no translation found for call_barring_settings (80766145008623645) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_no_password (920902774366557311) -->
+    <skip />
 </resources>

diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 1ecb7b5..a6ce206 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml

@@ -246,7 +246,7 @@
     <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>
-    <string name="keywords_carrier_settings_euicc" msgid="783429609643157743">"operador, esim, sim, euicc"</string>
+    <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"operador, esim, sim, euicc, mudar de operador, adicionar 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">"Dados móveis"</string>
     <string name="mobile_data_settings_summary" msgid="5087255915840576895">"Aceder aos dados através de rede móvel"</string>
@@ -420,7 +420,7 @@
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"A eliminar números autorizados..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Números autorizados eliminados."</string>
     <string name="pin2_invalid" msgid="5470854099230755944">"Os números autorizados não foram atualizados porque introduziu um PIN incorreto."</string>
-    <string name="fdn_invalid_number" msgid="8602417141715473998">"O FDN não foi atualizado porque o número está vazio ou excede os 20 dígitos."</string>
+    <string name="fdn_invalid_number" msgid="2062898833049589309">"O FDN não foi atualizado porque o número excede os 20 dígitos."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Não foram atualizados os números autorizados. O PIN2 estava errado ou o número de telefone foi rejeitado."</string>
     <string name="fdn_failed" msgid="540018079008319747">"Falha de FDN."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"A ler a partir do cartão SIM..."</string>
@@ -580,7 +580,7 @@
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Não definido&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"Outras definições de chamada"</string>
     <string name="calling_via_template" msgid="4839419581866928142">"A chamar via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="contactPhoto" msgid="4713193418046639466">"fotografia do contacto"</string>
+    <string name="contactPhoto" msgid="4713193418046639466">"foto do contacto"</string>
     <string name="goPrivate" msgid="865837794424530980">"tornar privado"</string>
     <string name="selectContact" msgid="781975788478987237">"seleccionar contacto"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Chamadas de voz não suportadas"</string>
@@ -687,4 +687,70 @@
     <string name="clh_callFailed_recovery_on_timer_expiry_txt" msgid="3680765722923600294">"Recuperação após expiração do temporizador"</string>
     <string name="clh_callFailed_protocol_Error_unspecified_txt" msgid="8294907817156524790">"Erro de protocolo, não especificado"</string>
     <string name="clh_callFailed_interworking_unspecified_txt" msgid="8838850798491763729">"Funcionamento interligado, não especificado"</string>
+    <!-- no translation found for labelCallBarring (3452870940716226978) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_enabled (6804489690436703488) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_disabled (5900772179198857783) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc (1199843944333106035) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_enabled (8112118391869380361) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_disabled (7806697133004697974) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic (3162154267825211826) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_enabled (2634377543147258105) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_disabled (5817895648306183464) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr (8951699885885742076) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_enabled (2519630715322138317) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_disabled (5831267468931377699) -->
+    <skip />
+    <!-- no translation found for call_barring_baic (5272726081458339912) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_enabled (2457134916223203380) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_disabled (6945604947500275636) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr (5728784220691481693) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_enabled (6533336994391716127) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_disabled (6746329853943256566) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all (5269788384941003415) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_description (4972365443287257704) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_success (8014685598632000936) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd (6887420609726284232) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description (5505087790260233953) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description_disabled (7630770327645349957) -->
+    <skip />
+    <!-- no translation found for call_barring_pwd_not_match (6716711689350314525) -->
+    <skip />
+    <!-- no translation found for call_barring_right_pwd_number (2902966502520410446) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_success (3278310763742760321) -->
+    <skip />
+    <!-- no translation found for call_barring_old_pwd (6080515987320238522) -->
+    <skip />
+    <!-- no translation found for call_barring_new_pwd (7048532299150269547) -->
+    <skip />
+    <!-- no translation found for call_barring_confirm_pwd (1947167278466285411) -->
+    <skip />
+    <!-- no translation found for messageCallBarring (2412123220272136055) -->
+    <skip />
+    <!-- no translation found for call_barring_settings (80766145008623645) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_no_password (920902774366557311) -->
+    <skip />
 </resources>

diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index da7204f..b04fcc8 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml

@@ -246,7 +246,7 @@
     <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>
-    <string name="keywords_carrier_settings_euicc" msgid="783429609643157743">"operadora, esim, sim, euicc"</string>
+    <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"operadora, esim, sim, euicc, alternar operadoras, adicionar operadora"</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">"Dados móveis"</string>
     <string name="mobile_data_settings_summary" msgid="5087255915840576895">"Acessar os dados pela rede móvel"</string>
@@ -420,7 +420,7 @@
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Excluindo número de chamadas fixas…"</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Número de chamadas fixas excluído."</string>
     <string name="pin2_invalid" msgid="5470854099230755944">"O FDN não foi atualizado porque você digitou um PIN incorreto."</string>
-    <string name="fdn_invalid_number" msgid="8602417141715473998">"O FDN não foi atualizado porque o número está vazio ou excede 20 dígitos."</string>
+    <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 cartão SIM…"</string>
@@ -687,4 +687,70 @@
     <string name="clh_callFailed_recovery_on_timer_expiry_txt" msgid="3680765722923600294">"Recuperação na expiração do timer"</string>
     <string name="clh_callFailed_protocol_Error_unspecified_txt" msgid="8294907817156524790">"Erro de protocolo, não especificado"</string>
     <string name="clh_callFailed_interworking_unspecified_txt" msgid="8838850798491763729">"Interfuncionamento, não especificado"</string>
+    <!-- no translation found for labelCallBarring (3452870940716226978) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_enabled (6804489690436703488) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_disabled (5900772179198857783) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc (1199843944333106035) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_enabled (8112118391869380361) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_disabled (7806697133004697974) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic (3162154267825211826) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_enabled (2634377543147258105) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_disabled (5817895648306183464) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr (8951699885885742076) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_enabled (2519630715322138317) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_disabled (5831267468931377699) -->
+    <skip />
+    <!-- no translation found for call_barring_baic (5272726081458339912) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_enabled (2457134916223203380) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_disabled (6945604947500275636) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr (5728784220691481693) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_enabled (6533336994391716127) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_disabled (6746329853943256566) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all (5269788384941003415) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_description (4972365443287257704) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_success (8014685598632000936) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd (6887420609726284232) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description (5505087790260233953) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description_disabled (7630770327645349957) -->
+    <skip />
+    <!-- no translation found for call_barring_pwd_not_match (6716711689350314525) -->
+    <skip />
+    <!-- no translation found for call_barring_right_pwd_number (2902966502520410446) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_success (3278310763742760321) -->
+    <skip />
+    <!-- no translation found for call_barring_old_pwd (6080515987320238522) -->
+    <skip />
+    <!-- no translation found for call_barring_new_pwd (7048532299150269547) -->
+    <skip />
+    <!-- no translation found for call_barring_confirm_pwd (1947167278466285411) -->
+    <skip />
+    <!-- no translation found for messageCallBarring (2412123220272136055) -->
+    <skip />
+    <!-- no translation found for call_barring_settings (80766145008623645) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_no_password (920902774366557311) -->
+    <skip />
 </resources>

diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 915e7e3..4d57af2 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml

@@ -246,7 +246,7 @@
     <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="783429609643157743">"වාහකය, esim, sim, euicc"</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>
@@ -420,7 +420,7 @@
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"ස්ථිර ඇමතුම් අංකය මකමින්..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"ස්ථාවර ඇමතුම් අංකය මකන ලදි."</string>
     <string name="pin2_invalid" msgid="5470854099230755944">"ඔබ වැරදි PIN එකක් ඇතුලත් කළ බැවින් FDN යාවත්කාලින නොවුණි."</string>
-    <string name="fdn_invalid_number" msgid="8602417141715473998">"අංකය හිස් නිසා හෝ ඉලක්කම් 20ක් ඉක්මවන නිසා FDN යාවත්කාලීන නොවීය."</string>
+    <string name="fdn_invalid_number" msgid="2062898833049589309">"අංකය ඉලක්කම් 20ක් ඉක්මවන නිසා FDN යාවත්කාලීන නොකරන ලදී."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN යාවත්කාලින නොවුණි. PIN2 වැරදියි, නැති නම් දුරකථන අංකය ප්‍රතික්ෂේප විය."</string>
     <string name="fdn_failed" msgid="540018079008319747">"FDN ක්‍රියාවලිය අසමත්."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"SIM කාඩ් පතෙන් කියවමින්…"</string>
@@ -687,4 +687,70 @@
     <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>
+    <!-- no translation found for labelCallBarring (3452870940716226978) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_enabled (6804489690436703488) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_disabled (5900772179198857783) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc (1199843944333106035) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_enabled (8112118391869380361) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_disabled (7806697133004697974) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic (3162154267825211826) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_enabled (2634377543147258105) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_disabled (5817895648306183464) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr (8951699885885742076) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_enabled (2519630715322138317) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_disabled (5831267468931377699) -->
+    <skip />
+    <!-- no translation found for call_barring_baic (5272726081458339912) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_enabled (2457134916223203380) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_disabled (6945604947500275636) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr (5728784220691481693) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_enabled (6533336994391716127) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_disabled (6746329853943256566) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all (5269788384941003415) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_description (4972365443287257704) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_success (8014685598632000936) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd (6887420609726284232) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description (5505087790260233953) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description_disabled (7630770327645349957) -->
+    <skip />
+    <!-- no translation found for call_barring_pwd_not_match (6716711689350314525) -->
+    <skip />
+    <!-- no translation found for call_barring_right_pwd_number (2902966502520410446) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_success (3278310763742760321) -->
+    <skip />
+    <!-- no translation found for call_barring_old_pwd (6080515987320238522) -->
+    <skip />
+    <!-- no translation found for call_barring_new_pwd (7048532299150269547) -->
+    <skip />
+    <!-- no translation found for call_barring_confirm_pwd (1947167278466285411) -->
+    <skip />
+    <!-- no translation found for messageCallBarring (2412123220272136055) -->
+    <skip />
+    <!-- no translation found for call_barring_settings (80766145008623645) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_no_password (920902774366557311) -->
+    <skip />
 </resources>

diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 4322f1b..8459039 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml

@@ -246,7 +246,7 @@
     <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>
-    <string name="keywords_carrier_settings_euicc" msgid="783429609643157743">"operátor, esim, sim, euicc"</string>
+    <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"operátor, esim, sim, euicc, prepnúť operátora, pridať operátora"</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">"Mobilné dáta"</string>
     <string name="mobile_data_settings_summary" msgid="5087255915840576895">"Prístup k dátam pomocou mobilnej siete"</string>
@@ -420,7 +420,7 @@
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Odstraňuje sa povolené číslo…"</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Povolené číslo bolo odstránené."</string>
     <string name="pin2_invalid" msgid="5470854099230755944">"Povolené čísla neboli aktualizované. Zadali ste nesprávny kód PIN."</string>
-    <string name="fdn_invalid_number" msgid="8602417141715473998">"Režim povolených čísel nebol aktualizovaný, pretože číslo je prázdne alebo obsahuje viac než 20 číslic."</string>
+    <string name="fdn_invalid_number" msgid="2062898833049589309">"Režim povolených čísel nebol aktualizovaný, pretože číslo obsahuje viac než 20 číslic."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Povolené čísla neboli aktualizované. Kód PIN2 je nesprávny alebo bolo telefónne číslo odmietnuté."</string>
     <string name="fdn_failed" msgid="540018079008319747">"Operácia s povolenými číslami zlyhala."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Prebieha čítanie zo SIM karty..."</string>
@@ -691,4 +691,70 @@
     <string name="clh_callFailed_recovery_on_timer_expiry_txt" msgid="3680765722923600294">"Obnovenie pri vypršaní časovača"</string>
     <string name="clh_callFailed_protocol_Error_unspecified_txt" msgid="8294907817156524790">"Chyba protokolu, nešpecifikované"</string>
     <string name="clh_callFailed_interworking_unspecified_txt" msgid="8838850798491763729">"Spolupráca, nešpecifikované"</string>
+    <!-- no translation found for labelCallBarring (3452870940716226978) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_enabled (6804489690436703488) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_disabled (5900772179198857783) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc (1199843944333106035) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_enabled (8112118391869380361) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_disabled (7806697133004697974) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic (3162154267825211826) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_enabled (2634377543147258105) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_disabled (5817895648306183464) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr (8951699885885742076) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_enabled (2519630715322138317) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_disabled (5831267468931377699) -->
+    <skip />
+    <!-- no translation found for call_barring_baic (5272726081458339912) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_enabled (2457134916223203380) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_disabled (6945604947500275636) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr (5728784220691481693) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_enabled (6533336994391716127) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_disabled (6746329853943256566) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all (5269788384941003415) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_description (4972365443287257704) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_success (8014685598632000936) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd (6887420609726284232) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description (5505087790260233953) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description_disabled (7630770327645349957) -->
+    <skip />
+    <!-- no translation found for call_barring_pwd_not_match (6716711689350314525) -->
+    <skip />
+    <!-- no translation found for call_barring_right_pwd_number (2902966502520410446) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_success (3278310763742760321) -->
+    <skip />
+    <!-- no translation found for call_barring_old_pwd (6080515987320238522) -->
+    <skip />
+    <!-- no translation found for call_barring_new_pwd (7048532299150269547) -->
+    <skip />
+    <!-- no translation found for call_barring_confirm_pwd (1947167278466285411) -->
+    <skip />
+    <!-- no translation found for messageCallBarring (2412123220272136055) -->
+    <skip />
+    <!-- no translation found for call_barring_settings (80766145008623645) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_no_password (920902774366557311) -->
+    <skip />
 </resources>

diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 614a1ea..51c79f0 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml

@@ -246,7 +246,7 @@
     <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>
-    <string name="keywords_carrier_settings_euicc" msgid="783429609643157743">"operater, esim, sim, euicc"</string>
+    <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"operater, esim, sim, euicc, preklopi med operaterji, dodaj operaterja"</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">"Prenos podatkov v mobilnem omrežju"</string>
     <string name="mobile_data_settings_summary" msgid="5087255915840576895">"Dostop do podatkov prek mobilnega omrežja"</string>
@@ -420,7 +420,7 @@
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Brisanje zapore odhodnega klica ..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Zapora odhodnega klica izbrisana."</string>
     <string name="pin2_invalid" msgid="5470854099230755944">"FDN ni bil posodobljen, ker ste vnesli napačno kodo PIN."</string>
-    <string name="fdn_invalid_number" msgid="8602417141715473998">"Funkcija FDN ni bila posodobljena, ker je številka prazna ali ima več kot 20 mest."</string>
+    <string name="fdn_invalid_number" msgid="2062898833049589309">"FDN ni bil posodobljen, ker število presega 20 mest."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN ni bil posodobljen. Koda PIN2 je bila napačna ali pa je bila telefonska številka zavrnjena."</string>
     <string name="fdn_failed" msgid="540018079008319747">"Postopek za omejeno klicanje ni uspel."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Branje kartice SIM ..."</string>
@@ -691,4 +691,70 @@
     <string name="clh_callFailed_recovery_on_timer_expiry_txt" msgid="3680765722923600294">"Obnovitev ob poteku merilnika časa"</string>
     <string name="clh_callFailed_protocol_Error_unspecified_txt" msgid="8294907817156524790">"Napaka protokola, neopredeljeno"</string>
     <string name="clh_callFailed_interworking_unspecified_txt" msgid="8838850798491763729">"Interakcija, neopredeljeno"</string>
+    <!-- no translation found for labelCallBarring (3452870940716226978) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_enabled (6804489690436703488) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_disabled (5900772179198857783) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc (1199843944333106035) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_enabled (8112118391869380361) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_disabled (7806697133004697974) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic (3162154267825211826) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_enabled (2634377543147258105) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_disabled (5817895648306183464) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr (8951699885885742076) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_enabled (2519630715322138317) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_disabled (5831267468931377699) -->
+    <skip />
+    <!-- no translation found for call_barring_baic (5272726081458339912) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_enabled (2457134916223203380) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_disabled (6945604947500275636) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr (5728784220691481693) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_enabled (6533336994391716127) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_disabled (6746329853943256566) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all (5269788384941003415) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_description (4972365443287257704) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_success (8014685598632000936) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd (6887420609726284232) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description (5505087790260233953) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description_disabled (7630770327645349957) -->
+    <skip />
+    <!-- no translation found for call_barring_pwd_not_match (6716711689350314525) -->
+    <skip />
+    <!-- no translation found for call_barring_right_pwd_number (2902966502520410446) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_success (3278310763742760321) -->
+    <skip />
+    <!-- no translation found for call_barring_old_pwd (6080515987320238522) -->
+    <skip />
+    <!-- no translation found for call_barring_new_pwd (7048532299150269547) -->
+    <skip />
+    <!-- no translation found for call_barring_confirm_pwd (1947167278466285411) -->
+    <skip />
+    <!-- no translation found for messageCallBarring (2412123220272136055) -->
+    <skip />
+    <!-- no translation found for call_barring_settings (80766145008623645) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_no_password (920902774366557311) -->
+    <skip />
 </resources>

diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 81099d1..39228d2 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml

@@ -246,7 +246,7 @@
     <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="783429609643157743">"мобилни оператер, esim, sim, euicc"</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>
@@ -420,7 +420,7 @@
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Брисање броја за фиксно бирање…"</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Избрисан је број за фиксно бирање."</string>
     <string name="pin2_invalid" msgid="5470854099230755944">"Број за фиксно бирање није ажуриран јер сте унели нетачан PIN кôд."</string>
-    <string name="fdn_invalid_number" msgid="8602417141715473998">"Број за фиксно бирање није ажуриран јер је празан или има више од 20 цифара."</string>
+    <string name="fdn_invalid_number" msgid="2062898833049589309">"Број за фиксно бирање није ажуриран јер има више од 20 цифара."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN није ажуриран. PIN2 је нетачан или је број телефона одбачен."</string>
     <string name="fdn_failed" msgid="540018079008319747">"Радња са бројем за фиксно бирање није успела."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Чита се са SIM картице…"</string>
@@ -689,4 +689,70 @@
     <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>
+    <!-- no translation found for labelCallBarring (3452870940716226978) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_enabled (6804489690436703488) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_disabled (5900772179198857783) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc (1199843944333106035) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_enabled (8112118391869380361) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_disabled (7806697133004697974) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic (3162154267825211826) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_enabled (2634377543147258105) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_disabled (5817895648306183464) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr (8951699885885742076) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_enabled (2519630715322138317) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_disabled (5831267468931377699) -->
+    <skip />
+    <!-- no translation found for call_barring_baic (5272726081458339912) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_enabled (2457134916223203380) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_disabled (6945604947500275636) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr (5728784220691481693) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_enabled (6533336994391716127) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_disabled (6746329853943256566) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all (5269788384941003415) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_description (4972365443287257704) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_success (8014685598632000936) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd (6887420609726284232) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description (5505087790260233953) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description_disabled (7630770327645349957) -->
+    <skip />
+    <!-- no translation found for call_barring_pwd_not_match (6716711689350314525) -->
+    <skip />
+    <!-- no translation found for call_barring_right_pwd_number (2902966502520410446) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_success (3278310763742760321) -->
+    <skip />
+    <!-- no translation found for call_barring_old_pwd (6080515987320238522) -->
+    <skip />
+    <!-- no translation found for call_barring_new_pwd (7048532299150269547) -->
+    <skip />
+    <!-- no translation found for call_barring_confirm_pwd (1947167278466285411) -->
+    <skip />
+    <!-- no translation found for messageCallBarring (2412123220272136055) -->
+    <skip />
+    <!-- no translation found for call_barring_settings (80766145008623645) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_no_password (920902774366557311) -->
+    <skip />
 </resources>

diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 5acb3d6..808cacf 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml

@@ -246,7 +246,7 @@
     <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>
-    <string name="keywords_carrier_settings_euicc" msgid="783429609643157743">"operatör, esim, sim, euicc"</string>
+    <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"operatör, esim, sim, euicc, byt operatör, lägg till operatör"</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">"Få åtkomst till data via mobilt nätverk"</string>
@@ -426,7 +426,7 @@
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Tar bort fast nummer…"</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Det fasta numret har tagits bort."</string>
     <string name="pin2_invalid" msgid="5470854099230755944">"FDN uppdaterades inte eftersom du skrev en felaktig PIN-kod."</string>
-    <string name="fdn_invalid_number" msgid="8602417141715473998">"Det fasta uppringningsnumret (FDN) uppdaterades inte eftersom det är tomt eller överskriver 20 siffror."</string>
+    <string name="fdn_invalid_number" msgid="2062898833049589309">"FDN uppdaterades inte eftersom numret översteg 20 siffror."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN uppdaterades inte. Antingen har du angivit fel PIN2, eller så avvisades telefonnumret."</string>
     <string name="fdn_failed" msgid="540018079008319747">"Det gick inte att ringa till fast uppringningsnummer."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Läser från SIM-kort…"</string>
@@ -693,4 +693,70 @@
     <string name="clh_callFailed_recovery_on_timer_expiry_txt" msgid="3680765722923600294">"Återställning vid timerutgång"</string>
     <string name="clh_callFailed_protocol_Error_unspecified_txt" msgid="8294907817156524790">"Protokollfel, ej angivet"</string>
     <string name="clh_callFailed_interworking_unspecified_txt" msgid="8838850798491763729">"Interworking, ej angiven"</string>
+    <!-- no translation found for labelCallBarring (3452870940716226978) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_enabled (6804489690436703488) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_disabled (5900772179198857783) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc (1199843944333106035) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_enabled (8112118391869380361) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_disabled (7806697133004697974) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic (3162154267825211826) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_enabled (2634377543147258105) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_disabled (5817895648306183464) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr (8951699885885742076) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_enabled (2519630715322138317) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_disabled (5831267468931377699) -->
+    <skip />
+    <!-- no translation found for call_barring_baic (5272726081458339912) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_enabled (2457134916223203380) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_disabled (6945604947500275636) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr (5728784220691481693) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_enabled (6533336994391716127) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_disabled (6746329853943256566) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all (5269788384941003415) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_description (4972365443287257704) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_success (8014685598632000936) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd (6887420609726284232) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description (5505087790260233953) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description_disabled (7630770327645349957) -->
+    <skip />
+    <!-- no translation found for call_barring_pwd_not_match (6716711689350314525) -->
+    <skip />
+    <!-- no translation found for call_barring_right_pwd_number (2902966502520410446) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_success (3278310763742760321) -->
+    <skip />
+    <!-- no translation found for call_barring_old_pwd (6080515987320238522) -->
+    <skip />
+    <!-- no translation found for call_barring_new_pwd (7048532299150269547) -->
+    <skip />
+    <!-- no translation found for call_barring_confirm_pwd (1947167278466285411) -->
+    <skip />
+    <!-- no translation found for messageCallBarring (2412123220272136055) -->
+    <skip />
+    <!-- no translation found for call_barring_settings (80766145008623645) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_no_password (920902774366557311) -->
+    <skip />
 </resources>

diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 7a005ff..ae6ff65 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml

@@ -246,7 +246,7 @@
     <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="783429609643157743">"தொலைத்தொடர்பு நிறுவனம், இ-சிம், சிம், euicc"</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>
@@ -420,7 +420,7 @@
     <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="8602417141715473998">"எண் எதையும் உள்ளிடாததால் அல்லது உள்ளிட்ட எண் 20 இலக்கங்களுக்கும் அதிகமாக உள்ளதால் FDN புதுப்பிக்கப்படவில்லை."</string>
+    <string name="fdn_invalid_number" msgid="2062898833049589309">"உள்ளிட்ட எண் 20 இலக்கங்களுக்கும் அதிகமாக உள்ளதால் FDN புதுப்பிக்கப்படவில்லை."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN புதுப்பிக்கப்படவில்லை. PIN2 தவறானது அல்லது மொபைல் எண் நிராகரிக்கப்பட்டது."</string>
     <string name="fdn_failed" msgid="540018079008319747">"FDN செயல்பாடு தோல்வி."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"சிம் கார்டில் இருப்பதைப் படிக்கிறது…"</string>
@@ -687,4 +687,70 @@
     <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>
+    <!-- no translation found for labelCallBarring (3452870940716226978) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_enabled (6804489690436703488) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_disabled (5900772179198857783) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc (1199843944333106035) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_enabled (8112118391869380361) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_disabled (7806697133004697974) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic (3162154267825211826) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_enabled (2634377543147258105) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_disabled (5817895648306183464) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr (8951699885885742076) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_enabled (2519630715322138317) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_disabled (5831267468931377699) -->
+    <skip />
+    <!-- no translation found for call_barring_baic (5272726081458339912) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_enabled (2457134916223203380) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_disabled (6945604947500275636) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr (5728784220691481693) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_enabled (6533336994391716127) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_disabled (6746329853943256566) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all (5269788384941003415) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_description (4972365443287257704) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_success (8014685598632000936) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd (6887420609726284232) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description (5505087790260233953) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description_disabled (7630770327645349957) -->
+    <skip />
+    <!-- no translation found for call_barring_pwd_not_match (6716711689350314525) -->
+    <skip />
+    <!-- no translation found for call_barring_right_pwd_number (2902966502520410446) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_success (3278310763742760321) -->
+    <skip />
+    <!-- no translation found for call_barring_old_pwd (6080515987320238522) -->
+    <skip />
+    <!-- no translation found for call_barring_new_pwd (7048532299150269547) -->
+    <skip />
+    <!-- no translation found for call_barring_confirm_pwd (1947167278466285411) -->
+    <skip />
+    <!-- no translation found for messageCallBarring (2412123220272136055) -->
+    <skip />
+    <!-- no translation found for call_barring_settings (80766145008623645) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_no_password (920902774366557311) -->
+    <skip />
 </resources>

diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 1ea8519..d3264d6 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml

@@ -246,7 +246,7 @@
     <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="783429609643157743">"ผู้ให้บริการ, esim, sim, euicc"</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>
@@ -420,7 +420,7 @@
     <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="8602417141715473998">"FDN ไม่อัปเดตเพราะหมายเลขว่างเปล่าหรือมีจำนวนเกิน 20 หลัก"</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">"กำลังอ่านจากซิมการ์ด…"</string>
@@ -687,4 +687,70 @@
     <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>
+    <!-- no translation found for labelCallBarring (3452870940716226978) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_enabled (6804489690436703488) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_disabled (5900772179198857783) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc (1199843944333106035) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_enabled (8112118391869380361) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_disabled (7806697133004697974) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic (3162154267825211826) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_enabled (2634377543147258105) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_disabled (5817895648306183464) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr (8951699885885742076) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_enabled (2519630715322138317) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_disabled (5831267468931377699) -->
+    <skip />
+    <!-- no translation found for call_barring_baic (5272726081458339912) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_enabled (2457134916223203380) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_disabled (6945604947500275636) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr (5728784220691481693) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_enabled (6533336994391716127) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_disabled (6746329853943256566) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all (5269788384941003415) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_description (4972365443287257704) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_success (8014685598632000936) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd (6887420609726284232) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description (5505087790260233953) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description_disabled (7630770327645349957) -->
+    <skip />
+    <!-- no translation found for call_barring_pwd_not_match (6716711689350314525) -->
+    <skip />
+    <!-- no translation found for call_barring_right_pwd_number (2902966502520410446) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_success (3278310763742760321) -->
+    <skip />
+    <!-- no translation found for call_barring_old_pwd (6080515987320238522) -->
+    <skip />
+    <!-- no translation found for call_barring_new_pwd (7048532299150269547) -->
+    <skip />
+    <!-- no translation found for call_barring_confirm_pwd (1947167278466285411) -->
+    <skip />
+    <!-- no translation found for messageCallBarring (2412123220272136055) -->
+    <skip />
+    <!-- no translation found for call_barring_settings (80766145008623645) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_no_password (920902774366557311) -->
+    <skip />
 </resources>

diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index ecd3cda..ef4fb44 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml

@@ -246,7 +246,7 @@
     <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="783429609643157743">"оператор, esim, sim, euicc"</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>
@@ -420,7 +420,7 @@
     <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="8602417141715473998">"FDN не оновлено (номер не вказаний або довший за 20 цифр)."</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">"Помилка набору фіксованого номера."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Читання із SIM-карти…"</string>
@@ -691,4 +691,70 @@
     <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>
+    <!-- no translation found for labelCallBarring (3452870940716226978) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_enabled (6804489690436703488) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_disabled (5900772179198857783) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc (1199843944333106035) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_enabled (8112118391869380361) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_disabled (7806697133004697974) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic (3162154267825211826) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_enabled (2634377543147258105) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_disabled (5817895648306183464) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr (8951699885885742076) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_enabled (2519630715322138317) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_disabled (5831267468931377699) -->
+    <skip />
+    <!-- no translation found for call_barring_baic (5272726081458339912) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_enabled (2457134916223203380) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_disabled (6945604947500275636) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr (5728784220691481693) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_enabled (6533336994391716127) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_disabled (6746329853943256566) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all (5269788384941003415) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_description (4972365443287257704) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_success (8014685598632000936) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd (6887420609726284232) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description (5505087790260233953) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description_disabled (7630770327645349957) -->
+    <skip />
+    <!-- no translation found for call_barring_pwd_not_match (6716711689350314525) -->
+    <skip />
+    <!-- no translation found for call_barring_right_pwd_number (2902966502520410446) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_success (3278310763742760321) -->
+    <skip />
+    <!-- no translation found for call_barring_old_pwd (6080515987320238522) -->
+    <skip />
+    <!-- no translation found for call_barring_new_pwd (7048532299150269547) -->
+    <skip />
+    <!-- no translation found for call_barring_confirm_pwd (1947167278466285411) -->
+    <skip />
+    <!-- no translation found for messageCallBarring (2412123220272136055) -->
+    <skip />
+    <!-- no translation found for call_barring_settings (80766145008623645) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_no_password (920902774366557311) -->
+    <skip />
 </resources>

diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 15d7576..0fcbf12 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml

@@ -246,7 +246,7 @@
     <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="783429609643157743">"流動網絡供應商, esim, sim, euicc"</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>
@@ -426,7 +426,7 @@
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"正在刪除固定撥號…"</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"固定撥號已刪除。"</string>
     <string name="pin2_invalid" msgid="5470854099230755944">"您所輸入的 PIN 碼不正確，FDN 未更新。"</string>
-    <string name="fdn_invalid_number" msgid="8602417141715473998">"號碼空白或超過 20 位數，FDN 未更新。"</string>
+    <string name="fdn_invalid_number" msgid="2062898833049589309">"號碼超過 20 位數，FDN 未更新。"</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN 無法更新。PIN2 碼不正確或電話號碼被拒。"</string>
     <string name="fdn_failed" msgid="540018079008319747">"FDN 操作失敗。"</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"正在從 SIM 卡讀取..."</string>
@@ -693,4 +693,70 @@
     <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>
+    <!-- no translation found for labelCallBarring (3452870940716226978) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_enabled (6804489690436703488) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_disabled (5900772179198857783) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc (1199843944333106035) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_enabled (8112118391869380361) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_disabled (7806697133004697974) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic (3162154267825211826) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_enabled (2634377543147258105) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_disabled (5817895648306183464) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr (8951699885885742076) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_enabled (2519630715322138317) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_disabled (5831267468931377699) -->
+    <skip />
+    <!-- no translation found for call_barring_baic (5272726081458339912) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_enabled (2457134916223203380) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_disabled (6945604947500275636) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr (5728784220691481693) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_enabled (6533336994391716127) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_disabled (6746329853943256566) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all (5269788384941003415) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_description (4972365443287257704) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_success (8014685598632000936) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd (6887420609726284232) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description (5505087790260233953) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description_disabled (7630770327645349957) -->
+    <skip />
+    <!-- no translation found for call_barring_pwd_not_match (6716711689350314525) -->
+    <skip />
+    <!-- no translation found for call_barring_right_pwd_number (2902966502520410446) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_success (3278310763742760321) -->
+    <skip />
+    <!-- no translation found for call_barring_old_pwd (6080515987320238522) -->
+    <skip />
+    <!-- no translation found for call_barring_new_pwd (7048532299150269547) -->
+    <skip />
+    <!-- no translation found for call_barring_confirm_pwd (1947167278466285411) -->
+    <skip />
+    <!-- no translation found for messageCallBarring (2412123220272136055) -->
+    <skip />
+    <!-- no translation found for call_barring_settings (80766145008623645) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_no_password (920902774366557311) -->
+    <skip />
 </resources>

diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 152aa67..58b030b 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml

@@ -246,7 +246,7 @@
     <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>
-    <string name="keywords_carrier_settings_euicc" msgid="783429609643157743">"inkampani yenethiwekhi, i-esim, i-sim, i-euicc"</string>
+    <string name="keywords_carrier_settings_euicc" msgid="6861505396475991277">"inkampani yenethiwekhi, i-esim, i-sim, i-euicc, shintsha izinkampani zenethiwekhi, engeza inkampani yenethiwekhi"</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">"Idatha yeselula"</string>
     <string name="mobile_data_settings_summary" msgid="5087255915840576895">"Finyelela kudatha usebenzisa inethiwekhi yeselula"</string>
@@ -424,7 +424,7 @@
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Isusa othintana naye wokudayela okungaguquki..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Othintana naye wokudayela okungaguquki ususiwe"</string>
     <string name="pin2_invalid" msgid="5470854099230755944">"I-FDN ayivuselelwanga ngoba uthayiphe i-PIN engalungile."</string>
-    <string name="fdn_invalid_number" msgid="8602417141715473998">"I-FDN ayizange ibuyekezwe ngoba inombolo ayinalutho noma idlula amadijithi angu-20."</string>
+    <string name="fdn_invalid_number" msgid="2062898833049589309">"I-FDN ayizange ibuyekezwe ngoba inombolo yeza amadijithi angu-20."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"I-FDN ayibuyekeziwe. I-PIN2 kade ingalungile, noma inombolo yefoni yenqatshelwe."</string>
     <string name="fdn_failed" msgid="540018079008319747">"Umsebenzi we-FDN wehlulekile."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Ifunda ekhadini le-SIM..."</string>
@@ -691,4 +691,70 @@
     <string name="clh_callFailed_recovery_on_timer_expiry_txt" msgid="3680765722923600294">"Ukuphela kwesibali-sikhathi"</string>
     <string name="clh_callFailed_protocol_Error_unspecified_txt" msgid="8294907817156524790">"Iphutha lephrothokholi, akucacisiwe"</string>
     <string name="clh_callFailed_interworking_unspecified_txt" msgid="8838850798491763729">"Inethiwekhi, akucacisiwe"</string>
+    <!-- no translation found for labelCallBarring (3452870940716226978) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_enabled (6804489690436703488) -->
+    <skip />
+    <!-- no translation found for sum_call_barring_disabled (5900772179198857783) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc (1199843944333106035) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_enabled (8112118391869380361) -->
+    <skip />
+    <!-- no translation found for call_barring_baoc_disabled (7806697133004697974) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic (3162154267825211826) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_enabled (2634377543147258105) -->
+    <skip />
+    <!-- no translation found for call_barring_baoic_disabled (5817895648306183464) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr (8951699885885742076) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_enabled (2519630715322138317) -->
+    <skip />
+    <!-- no translation found for call_barring_baoicr_disabled (5831267468931377699) -->
+    <skip />
+    <!-- no translation found for call_barring_baic (5272726081458339912) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_enabled (2457134916223203380) -->
+    <skip />
+    <!-- no translation found for call_barring_baic_disabled (6945604947500275636) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr (5728784220691481693) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_enabled (6533336994391716127) -->
+    <skip />
+    <!-- no translation found for call_barring_baicr_disabled (6746329853943256566) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all (5269788384941003415) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_description (4972365443287257704) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_success (8014685598632000936) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd (6887420609726284232) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description (5505087790260233953) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_description_disabled (7630770327645349957) -->
+    <skip />
+    <!-- no translation found for call_barring_pwd_not_match (6716711689350314525) -->
+    <skip />
+    <!-- no translation found for call_barring_right_pwd_number (2902966502520410446) -->
+    <skip />
+    <!-- no translation found for call_barring_change_pwd_success (3278310763742760321) -->
+    <skip />
+    <!-- no translation found for call_barring_old_pwd (6080515987320238522) -->
+    <skip />
+    <!-- no translation found for call_barring_new_pwd (7048532299150269547) -->
+    <skip />
+    <!-- no translation found for call_barring_confirm_pwd (1947167278466285411) -->
+    <skip />
+    <!-- no translation found for messageCallBarring (2412123220272136055) -->
+    <skip />
+    <!-- no translation found for call_barring_settings (80766145008623645) -->
+    <skip />
+    <!-- no translation found for call_barring_deactivate_all_no_password (920902774366557311) -->
+    <skip />
 </resources>

diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 61c5f97..fca8acf 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml

@@ -50,6 +50,21 @@
         </attr>
     </declare-styleable>
 
+    <declare-styleable name="CallBarringEditPreference">
+        <!-- AO: All outgoing, CommandsInterface.CB_FACILITY_BAOC. -->
+        <!-- OI: Outgoing international, CommandsInterface.CB_FACILITY_BAOIC. -->
+        <!-- OX: Outgoing international roaming, CommandsInterface.CB_FACILITY_BAOICxH. -->
+        <!-- AI: All incoming, CommandsInterface.CB_FACILITY_BAIC. -->
+        <!-- IR: Incoming international roaming, CommandsInterface.CB_FACILITY_BAICr. -->
+        <!-- BA: Disable all, CommandsInterface.CB_FACILITY_BA_ALL -->
+        <attr name="facility" format="string" />
+
+        <!-- Message when password is not in use, and call barring is enabled -->
+        <attr name="dialogMessageEnabledNoPwd" format="string" />
+        <!-- Message when password is not in use, and call barring is disabled -->
+        <attr name="dialogMessageDisabledNoPwd" format="string" />
+    </declare-styleable>
+
     <attr name="preferenceBackgroundColor" format="color" />
     <attr name="emergencyButtonBackgroundColor" format="color" />
     <attr name="dialpadTheme" format="reference" />

diff --git a/res/values/config.xml b/res/values/config.xml
index 1b612c9..855fa92 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml

@@ -241,4 +241,10 @@
 
     <!-- Whether the cellular radio is allowed to be power down when the Bluetooth can provide the data/call capabilities -->
     <bool name="config_allowRadioPowerDownOnBluetooth">false</bool>
+
+    <!-- Whether the device supports the AudioManager Telephony audio device and output onto this
+         device using {@link AudioDeviceInfo#TYPE_TELEPHONY}.
+         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>
 </resources>

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3737fd1..2fb1ef7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml

@@ -1169,6 +1169,11 @@
     <string name="hac_mode_title">Hearing aids</string>
     <string name="hac_mode_summary">Turn on hearing aid compatibility</string>
 
+    <!-- RTT settings: used to turn on/off Real-Time Text, an accessibility feature similar to
+         TTY that allows users to send text over a phone call. -->
+    <string name="rtt_mode_title">RTT</string>
+    <string name="rtt_mode_summary">Turn RTT on or off</string>
+
     <!-- Service option entries.  -->
     <string-array name="tty_mode_entries">
         <item>TTY Off</item>
@@ -1603,4 +1608,71 @@
     <string name="clh_callFailed_protocol_Error_unspecified_txt">Protocol error, unspecified</string>
     <!-- In-call screen: call failure reason (Cause Number 127) -->
     <string name="clh_callFailed_interworking_unspecified_txt">Interworking, unspecified</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 -->
+    <string name="sum_call_barring_enabled">On</string>
+    <!-- Call barring settings screen, setting summary text when a call barring option is deactivated -->
+    <string name="sum_call_barring_disabled">Off</string>
+    <!-- Call barring settings screen, setting option name -->
+    <string name="call_barring_baoc">All outgoing</string>
+    <!-- Call barring settings screen, Disable blocking of all outgoing calls -->
+    <string name="call_barring_baoc_enabled">Disable blocking of all outgoing calls?</string>
+    <!-- Call barring settings screen, Block all outgoing calls -->
+    <string name="call_barring_baoc_disabled">Block all outgoing calls?</string>
+    <!-- Call barring settings screen, setting option name -->
+    <string name="call_barring_baoic">Outgoing international</string>
+    <!-- Call barring settings screen, Disable blocking of outgoing international calls -->
+    <string name="call_barring_baoic_enabled">Disable blocking of outgoing international calls?</string>
+    <!-- Call barring settings screen, Block outgoing international calls-->
+    <string name="call_barring_baoic_disabled">Block outgoing international calls?</string>
+    <!-- Call barring settings screen, setting option name -->
+    <string name="call_barring_baoicr">Outgoing international roaming</string>
+    <!-- Call barring settings screen, Disable blocking of outgoing international roaming -->
+    <string name="call_barring_baoicr_enabled">Disable blocking of outgoing international roaming?</string>
+    <!-- Call barring settings screen, Block outgoing international roaming -->
+    <string name="call_barring_baoicr_disabled">Block outgoing international roaming?</string>
+    <!-- Call barring settings screen, setting option name -->
+    <string name="call_barring_baic">All incoming</string>
+    <!-- Call barring settings screen, Disable blocking of all incoming calls -->
+    <string name="call_barring_baic_enabled">Disable blocking of all incoming calls?</string>
+    <!-- Call barring settings screen, Block all incoming calls -->
+    <string name="call_barring_baic_disabled">Block all incoming calls?</string>
+    <!-- Call barring settings screen, setting option name -->
+    <string name="call_barring_baicr">Incoming international roaming</string>
+    <!-- Call barring settings screen, Disable blocking of all incoming international roaming -->
+    <string name="call_barring_baicr_enabled">Disable blocking of all incoming international roaming?</string>
+    <!-- Call barring settings screen, Block incoming international roaming-->
+    <string name="call_barring_baicr_disabled">Block incoming international roaming?</string>
+    <!-- Call barring settings screen, setting option name -->
+    <string name="call_barring_deactivate_all">Deactivate all</string>
+    <!-- Call barring settings screen, setting summary text when BAAll check box is selected -->
+    <string name="call_barring_deactivate_all_description">Deactivate all call barring settings</string>
+    <!-- Call barring settings screen, deactivate all successfully -->
+    <string name="call_barring_deactivate_success">Call barring deactivated</string>
+    <!-- Call barring settings screen, change password -->
+    <string name="call_barring_change_pwd">Change password</string>
+    <!-- Call barring settings screen, change password -->
+    <string name="call_barring_change_pwd_description">Change call barring password</string>
+    <!-- Call barring settings screen, not possible to change call barring password -->
+    <string name="call_barring_change_pwd_description_disabled">Cannot change call barring password.</string>
+    <!-- Call barring settings screen, change password -->
+    <string name="call_barring_pwd_not_match">Passwords do not match</string>
+    <!-- Call barring settings screen, change password -->
+    <string name="call_barring_right_pwd_number">Enter a password with 4 numbers</string>
+    <!-- Call barring settings screen, change password -->
+    <string name="call_barring_change_pwd_success">Password changed</string>
+    <!-- Call barring settings screen, change password -->
+    <string name="call_barring_old_pwd">Old password</string>
+    <!-- Call barring settings screen, change password -->
+    <string name="call_barring_new_pwd">New password</string>
+    <!-- Call barring settings screen, change password -->
+    <string name="call_barring_confirm_pwd">Confirm password</string>
+    <!-- Call forwarding dialog box, text field label -->
+    <string name="messageCallBarring">Enter password</string>
+    <!-- Call barring settings screen, section heading -->
+    <string name="call_barring_settings">Call barring settings</string>
+    <!-- Call barring settings screen, deactivate all call barring settings -->
+    <string name="call_barring_deactivate_all_no_password">Deactivate all call barring settings?</string>
 </resources>

diff --git a/res/values/styles.xml b/res/values/styles.xml
index f8cd9ec..2b893e5 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml

@@ -304,4 +304,7 @@
         <item name="android:backgroundDimEnabled">false</item>
     </style>
 
+    <style name="CallSettingsWithoutDividerTheme" parent="SettingsLight">
+        <item name="android:listDivider">@null</item>
+    </style>
 </resources>

diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index 2c007f6..e674e74 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml

@@ -32,4 +32,10 @@
         android:persistent="true"
         android:summary="@string/hac_mode_summary"/>
 
+    <SwitchPreference
+        android:key="button_rtt_key"
+        android:title="@string/rtt_mode_title"
+        android:persistent="true"
+        android:summary="@string/rtt_mode_summary"/>
+
 </PreferenceScreen>

diff --git a/res/xml/callbarring_options.xml b/res/xml/callbarring_options.xml
new file mode 100644
index 0000000..6f2c48a
--- /dev/null
+++ b/res/xml/callbarring_options.xml

@@ -0,0 +1,116 @@
+<?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.
+-->
+<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_barring_settings">
+
+    <!-- Note for all com.android.phone.EditPinPreference objects
+
+         The last several attributes are for use with the EditText field
+         in the dialog. These attributes are forwarded to that field
+         when the edittext is created. The attributes include:
+           1. android:singleLine
+           2. android:autoText -->
+
+    <!-- All outgoing -->
+    <com.android.phone.CallBarringEditPreference
+        android:key="button_baoc_key"
+        android:title="@string/call_barring_baoc"
+        android:persistent="false"
+        android:summaryOn="@string/sum_call_barring_enabled"
+        android:summaryOff="@string/sum_call_barring_disabled"
+        android:dialogTitle="@string/call_barring_baoc"
+        phone:dialogMessageEnabledNoPwd="@string/call_barring_baoc_enabled"
+        phone:dialogMessageDisabledNoPwd="@string/call_barring_baoc_disabled"
+        phone:facility="AO"
+        android:singleLine="true"
+        android:autoText="false"/>
+
+    <!-- Outgoing international -->
+    <com.android.phone.CallBarringEditPreference
+        android:key="button_baoic_key"
+        android:title="@string/call_barring_baoic"
+        android:persistent="false"
+        android:summaryOn="@string/sum_call_barring_enabled"
+        android:summaryOff="@string/sum_call_barring_disabled"
+        android:dialogTitle="@string/call_barring_baoic"
+        phone:dialogMessageEnabledNoPwd="@string/call_barring_baoic_enabled"
+        phone:dialogMessageDisabledNoPwd="@string/call_barring_baoic_disabled"
+        phone:facility="OI"
+        android:dependency="button_baoc_key"
+        android:singleLine="true"
+        android:autoText="false"/>
+
+    <!-- Outgoing international roaming -->
+    <com.android.phone.CallBarringEditPreference
+        android:key="button_baoicxh_key"
+        android:title="@string/call_barring_baoicr"
+        android:persistent="false"
+        android:summaryOn="@string/sum_call_barring_enabled"
+        android:summaryOff="@string/sum_call_barring_disabled"
+        android:dialogTitle="@string/call_barring_baoicr"
+        phone:dialogMessageEnabledNoPwd="@string/call_barring_baoicr_enabled"
+        phone:dialogMessageDisabledNoPwd="@string/call_barring_baoicr_disabled"
+        phone:facility="OX"
+        android:dependency="button_baoc_key"
+        android:singleLine="true"
+        android:autoText="false"/>
+
+    <!-- All incoming -->
+    <com.android.phone.CallBarringEditPreference
+        android:key="button_baic_key"
+        android:title="@string/call_barring_baic"
+        android:persistent="false"
+        android:summaryOn="@string/sum_call_barring_enabled"
+        android:summaryOff="@string/sum_call_barring_disabled"
+        android:dialogTitle="@string/call_barring_baic"
+        phone:dialogMessageEnabledNoPwd="@string/call_barring_baic_enabled"
+        phone:dialogMessageDisabledNoPwd="@string/call_barring_baic_disabled"
+        phone:facility="AI"
+        android:singleLine="true"
+        android:autoText="false"/>
+
+    <!-- Incoming international roaming -->
+    <com.android.phone.CallBarringEditPreference
+        android:key="button_baicr_key"
+        android:title="@string/call_barring_baicr"
+        android:persistent="false"
+        android:summaryOn="@string/sum_call_barring_enabled"
+        android:summaryOff="@string/sum_call_barring_disabled"
+        android:dialogTitle="@string/call_barring_baicr"
+        phone:dialogMessageEnabledNoPwd="@string/call_barring_baicr_enabled"
+        phone:dialogMessageDisabledNoPwd="@string/call_barring_baicr_disabled"
+        phone:facility="IR"
+        android:dependency="button_baic_key"
+        android:singleLine="true"
+        android:autoText="false"/>
+
+    <!-- Disable all -->
+    <com.android.phone.CallBarringDeselectAllPreference
+        android:key="button_ba_all_key"
+        android:title="@string/call_barring_deactivate_all"
+        android:persistent="false"
+        android:dialogTitle="@string/call_barring_deactivate_all"
+        android:summary="@string/call_barring_deactivate_all_description"/>
+
+    <!-- Change password -->
+    <com.android.phone.settings.fdn.EditPinPreference
+        android:key="button_change_pw_key"
+        android:title="@string/call_barring_change_pwd"
+        android:dialogTitle="@string/call_barring_change_pwd"
+        android:summary="@string/call_barring_change_pwd_description"
+        android:persistent="false"/>
+</PreferenceScreen>

diff --git a/res/xml/gsm_umts_call_options.xml b/res/xml/gsm_umts_call_options.xml
index 5f3dfe4..774aec8 100644
--- a/res/xml/gsm_umts_call_options.xml
+++ b/res/xml/gsm_umts_call_options.xml

@@ -10,6 +10,11 @@
         android:persistent="false" />
 
     <PreferenceScreen
+         android:key="call_barring_key"
+         android:title="@string/labelCallBarring"
+         android:persistent="false" />
+
+    <PreferenceScreen
         android:key="additional_gsm_call_settings_key"
         android:title="@string/additional_gsm_call_settings"
         android:persistent="false" />

diff --git a/sip/res/values-ne/strings.xml b/sip/res/values-ne/strings.xml
index 2f9010b..0368643 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>

diff --git a/sip/src/com/android/services/telephony/sip/SipConnectionService.java b/sip/src/com/android/services/telephony/sip/SipConnectionService.java
index a5f48d3..27be9b4 100644
--- a/sip/src/com/android/services/telephony/sip/SipConnectionService.java
+++ b/sip/src/com/android/services/telephony/sip/SipConnectionService.java

@@ -37,6 +37,7 @@
 
 import com.android.internal.telephony.CallStateException;
 import com.android.internal.telephony.PhoneFactory;
+import com.android.internal.telephony.PhoneInternalInterface;
 import com.android.internal.telephony.sip.SipPhone;
 import com.android.services.telephony.DisconnectCauseUtil;
 
@@ -258,7 +259,9 @@
 
         try {
             com.android.internal.telephony.Connection originalConnection =
-                    phone.dial(number, request.getVideoState());
+                    phone.dial(number, new PhoneInternalInterface.DialArgs.Builder<>()
+                            .setVideoState(request.getVideoState())
+                            .build());
             return originalConnection;
         } catch (CallStateException e) {
             log("startCallWithPhone, exception: " + e);

diff --git a/src/com/android/phone/CallBarringDeselectAllPreference.java b/src/com/android/phone/CallBarringDeselectAllPreference.java
new file mode 100644
index 0000000..153bc0c
--- /dev/null
+++ b/src/com/android/phone/CallBarringDeselectAllPreference.java

@@ -0,0 +1,100 @@
+/*
+ * 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.Bundle;
+import android.telephony.ServiceState;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.View;
+import android.widget.EditText;
+
+import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.imsphone.ImsPhone;
+import com.android.phone.settings.fdn.EditPinPreference;
+
+/**
+ * This preference represents the status of disable all barring option.
+ */
+public class CallBarringDeselectAllPreference extends EditPinPreference {
+    private static final String LOG_TAG = "CallBarringDeselectAllPreference";
+    private static final boolean DBG = (PhoneGlobals.DBG_LEVEL >= 2);
+
+    private boolean mShowPassword;
+    private Phone mPhone;
+
+    /**
+     * CallBarringDeselectAllPreference constructor.
+     *
+     * @param context The context of view.
+     * @param attrs The attributes of the XML tag that is inflating EditTextPreference.
+     */
+    public CallBarringDeselectAllPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    protected void showDialog(Bundle state) {
+        // Finds out if the password field should be shown or not.
+        ImsPhone imsPhone = mPhone != null ? (ImsPhone) mPhone.getImsPhone() : null;
+        mShowPassword = !(imsPhone != null
+                && ((imsPhone.getServiceState().getState() == ServiceState.STATE_IN_SERVICE)
+                        || imsPhone.isUtEnabled()));
+
+        // Selects dialog message depending on if the password field is shown or not.
+        setDialogMessage(getContext().getString(mShowPassword
+                ? R.string.messageCallBarring : R.string.call_barring_deactivate_all_no_password));
+
+        if (DBG) {
+            Log.d(LOG_TAG, "showDialog: mShowPassword: " + mShowPassword);
+        }
+
+        super.showDialog(state);
+    }
+
+    void init(Phone phone) {
+        if (DBG) {
+            Log.d(LOG_TAG, "init: phoneId = " + phone.getPhoneId());
+        }
+        mPhone = phone;
+    }
+
+    @Override
+    protected void onBindDialogView(View view) {
+        super.onBindDialogView(view);
+
+        final EditText editText = (EditText) view.findViewById(android.R.id.edit);
+        if (editText != null) {
+            // Hide the input-text-line if the password is not shown.
+            editText.setVisibility(mShowPassword ? View.VISIBLE : View.GONE);
+        }
+    }
+
+    @Override
+    protected boolean needInputMethod() {
+        // Input method should only be displayed if the password-field is shown.
+        return mShowPassword;
+    }
+
+    /**
+     * Returns whether the password field is shown.
+     */
+    boolean isPasswordShown() {
+        return mShowPassword;
+    }
+}

diff --git a/src/com/android/phone/CallBarringEditPreference.java b/src/com/android/phone/CallBarringEditPreference.java
new file mode 100644
index 0000000..72b3ea5
--- /dev/null
+++ b/src/com/android/phone/CallBarringEditPreference.java

@@ -0,0 +1,383 @@
+/*
+ * 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 com.android.phone.TimeConsumingPreferenceActivity.RESPONSE_ERROR;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.res.TypedArray;
+import android.os.AsyncResult;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.telephony.ServiceState;
+import android.text.method.DigitsKeyListener;
+import android.text.method.PasswordTransformationMethod;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.android.internal.telephony.CommandException;
+import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.PhoneFactory;
+import com.android.internal.telephony.imsphone.ImsPhone;
+import com.android.phone.settings.fdn.EditPinPreference;
+
+import java.lang.ref.WeakReference;
+
+/**
+ * This preference represents the status of call barring options, enabling/disabling
+ * the call barring option will prompt the user for the current password.
+ */
+public class CallBarringEditPreference extends EditPinPreference {
+    private static final String LOG_TAG = "CallBarringEditPreference";
+    private static final boolean DBG = (PhoneGlobals.DBG_LEVEL >= 2);
+
+    private String mFacility;
+    boolean mIsActivated = false;
+    private CharSequence mEnableText;
+    private CharSequence mDisableText;
+    private CharSequence mSummaryOn;
+    private CharSequence mSummaryOff;
+    private CharSequence mDialogMessageEnabled;
+    private CharSequence mDialogMessageDisabled;
+    private int mButtonClicked;
+    private boolean mShowPassword;
+    private final MyHandler mHandler = new MyHandler(this);
+    private Phone mPhone;
+    private TimeConsumingPreferenceListener mTcpListener;
+
+    private static final int PW_LENGTH = 4;
+
+    /**
+     * CallBarringEditPreference constructor.
+     *
+     * @param context The context of view.
+     * @param attrs The attributes of the XML tag that is inflating EditTextPreference.
+     */
+    public CallBarringEditPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        // Get the summary settings, use CheckBoxPreference as the standard.
+        TypedArray typedArray = context.obtainStyledAttributes(attrs,
+                android.R.styleable.CheckBoxPreference, 0, 0);
+        mSummaryOn = typedArray.getString(android.R.styleable.CheckBoxPreference_summaryOn);
+        mSummaryOff = typedArray.getString(android.R.styleable.CheckBoxPreference_summaryOff);
+        mDisableText = context.getText(R.string.disable);
+        mEnableText = context.getText(R.string.enable);
+        typedArray.recycle();
+
+        // Get default phone
+        mPhone = PhoneFactory.getDefaultPhone();
+
+        typedArray = context.obtainStyledAttributes(attrs,
+                R.styleable.CallBarringEditPreference, 0, R.style.EditPhoneNumberPreference);
+        mFacility = typedArray.getString(R.styleable.CallBarringEditPreference_facility);
+        mDialogMessageEnabled = typedArray.getString(
+                R.styleable.CallBarringEditPreference_dialogMessageEnabledNoPwd);
+        mDialogMessageDisabled = typedArray.getString(
+                R.styleable.CallBarringEditPreference_dialogMessageDisabledNoPwd);
+        typedArray.recycle();
+    }
+
+    /**
+     * CallBarringEditPreference constructor.
+     *
+     * @param context The context of view.
+     */
+    public CallBarringEditPreference(Context context) {
+        this(context, null);
+    }
+
+    void init(TimeConsumingPreferenceListener listener, boolean skipReading, Phone phone) {
+        if (DBG) {
+            Log.d(LOG_TAG, "init: phone id = " + phone.getPhoneId());
+        }
+        mPhone = phone;
+
+        mTcpListener = listener;
+        if (!skipReading) {
+            // Query call barring status
+            mPhone.getCallBarring(mFacility, "", mHandler.obtainMessage(
+                    MyHandler.MESSAGE_GET_CALL_BARRING), 0);
+            if (mTcpListener != null) {
+                mTcpListener.onStarted(this, true);
+            }
+        }
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        super.onClick(dialog, which);
+        mButtonClicked = which;
+    }
+
+    @Override
+    protected boolean needInputMethod() {
+        // Input method should only be displayed if the password-field is shown.
+        return mShowPassword;
+    }
+
+    void setInputMethodNeeded(boolean needed) {
+        mShowPassword = needed;
+    }
+
+    @Override
+    protected void showDialog(Bundle state) {
+        setShowPassword();
+        if (mShowPassword) {
+            setDialogMessage(getContext().getString(R.string.messageCallBarring));
+        } else {
+            setDialogMessage(mIsActivated ? mDialogMessageEnabled : mDialogMessageDisabled);
+        }
+
+        if (DBG) {
+            Log.d(LOG_TAG, "showDialog: mShowPassword: " + mShowPassword
+                    + ", mIsActivated: " + mIsActivated);
+        }
+
+        super.showDialog(state);
+    }
+
+    @Override
+    protected void onBindView(View view) {
+        super.onBindView(view);
+
+        // Sync the summary view
+        TextView summaryView = (TextView) view.findViewById(android.R.id.summary);
+        if (summaryView != null) {
+            CharSequence sum;
+            int vis;
+
+            // Set summary depending upon mode
+            if (mIsActivated) {
+                sum = (mSummaryOn == null) ? getSummary() : mSummaryOn;
+            } else {
+                sum = (mSummaryOff == null) ? getSummary() : mSummaryOff;
+            }
+
+            if (sum != null) {
+                summaryView.setText(sum);
+                vis = View.VISIBLE;
+            } else {
+                vis = View.GONE;
+            }
+
+            if (vis != summaryView.getVisibility()) {
+                summaryView.setVisibility(vis);
+            }
+        }
+    }
+
+    @Override
+    protected void onPrepareDialogBuilder(AlertDialog.Builder builder) {
+        builder.setPositiveButton(null, null);
+        builder.setNeutralButton(mIsActivated ? mDisableText : mEnableText, this);
+    }
+
+    @Override
+    protected void onBindDialogView(View view) {
+        super.onBindDialogView(view);
+        // Default the button clicked to be the cancel button.
+        mButtonClicked = DialogInterface.BUTTON_NEGATIVE;
+
+        final EditText editText = (EditText) view.findViewById(android.R.id.edit);
+        if (editText != null) {
+            editText.setSingleLine(true);
+            editText.setTransformationMethod(PasswordTransformationMethod.getInstance());
+            editText.setKeyListener(DigitsKeyListener.getInstance());
+
+            // Hide the input-text-line if the password is not shown.
+            editText.setVisibility(mShowPassword ? View.VISIBLE : View.GONE);
+        }
+    }
+
+    @Override
+    protected void onDialogClosed(boolean positiveResult) {
+        super.onDialogClosed(positiveResult);
+        if (DBG) {
+            Log.d(LOG_TAG, "onDialogClosed: mButtonClicked=" + mButtonClicked + ", positiveResult="
+                    + positiveResult);
+        }
+        if (mButtonClicked != DialogInterface.BUTTON_NEGATIVE) {
+            String password = null;
+            if (mShowPassword) {
+                password = getEditText().getText().toString();
+
+                // Check if the password is valid.
+                if (password == null || password.length() != PW_LENGTH) {
+                    Toast.makeText(getContext(),
+                            getContext().getString(R.string.call_barring_right_pwd_number),
+                            Toast.LENGTH_SHORT).show();
+                    return;
+                }
+            }
+
+            if (DBG) {
+                Log.d(LOG_TAG, "onDialogClosed: password=" + password);
+            }
+            // Send set call barring message to RIL layer.
+            mPhone.setCallBarring(mFacility, !mIsActivated, password,
+                    mHandler.obtainMessage(MyHandler.MESSAGE_SET_CALL_BARRING), 0);
+            if (mTcpListener != null) {
+                mTcpListener.onStarted(this, false);
+            }
+        }
+    }
+
+    void handleCallBarringResult(boolean status) {
+        mIsActivated = status;
+        if (DBG) {
+            Log.d(LOG_TAG, "handleCallBarringResult: mIsActivated=" + mIsActivated);
+        }
+    }
+
+    void updateSummaryText() {
+        notifyChanged();
+        notifyDependencyChange(shouldDisableDependents());
+    }
+
+    private void setShowPassword() {
+        ImsPhone imsPhone = mPhone != null ? (ImsPhone) mPhone.getImsPhone() : null;
+        mShowPassword = !(imsPhone != null
+                && ((imsPhone.getServiceState().getState() == ServiceState.STATE_IN_SERVICE)
+                        || imsPhone.isUtEnabled()));
+    }
+
+    @Override
+    public boolean shouldDisableDependents() {
+        return mIsActivated;
+    }
+
+    // Message protocol:
+    // what: get vs. set
+    // arg1: action -- register vs. disable
+    // arg2: get vs. set for the preceding request
+    private static class MyHandler extends Handler {
+        private static final int MESSAGE_GET_CALL_BARRING = 0;
+        private static final int MESSAGE_SET_CALL_BARRING = 1;
+
+        private final WeakReference<CallBarringEditPreference> mCallBarringEditPreference;
+
+        private MyHandler(CallBarringEditPreference callBarringEditPreference) {
+            mCallBarringEditPreference =
+                    new WeakReference<CallBarringEditPreference>(callBarringEditPreference);
+        }
+
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+                case MESSAGE_GET_CALL_BARRING:
+                    handleGetCallBarringResponse(msg);
+                    break;
+                case MESSAGE_SET_CALL_BARRING:
+                    handleSetCallBarringResponse(msg);
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        // Handle the response message for query CB status.
+        private void handleGetCallBarringResponse(Message msg) {
+            final CallBarringEditPreference pref = mCallBarringEditPreference.get();
+            if (pref == null) {
+                return;
+            }
+
+            if (DBG) {
+                Log.d(LOG_TAG, "handleGetCallBarringResponse: done");
+            }
+
+            AsyncResult ar = (AsyncResult) msg.obj;
+
+            if (msg.arg2 == MESSAGE_SET_CALL_BARRING) {
+                pref.mTcpListener.onFinished(pref, false);
+            } else {
+                pref.mTcpListener.onFinished(pref, true);
+                ImsPhone imsPhone = pref.mPhone != null
+                        ? (ImsPhone) pref.mPhone.getImsPhone() : null;
+                if (!pref.mShowPassword && (imsPhone == null || !imsPhone.isUtEnabled())) {
+                    // Re-enable password when rejected from NW and modem would perform CSFB
+                    pref.mShowPassword = true;
+                    if (DBG) {
+                        Log.d(LOG_TAG,
+                                "handleGetCallBarringResponse: mShowPassword changed for CSFB");
+                    }
+                }
+            }
+
+            // Unsuccessful query for call barring.
+            if (ar.exception != null) {
+                if (DBG) {
+                    Log.d(LOG_TAG, "handleGetCallBarringResponse: ar.exception=" + ar.exception);
+                }
+                pref.mTcpListener.onException(pref, (CommandException) ar.exception);
+            } else {
+                if (ar.userObj instanceof Throwable) {
+                    pref.mTcpListener.onError(pref, RESPONSE_ERROR);
+                }
+                int[] ints = (int[]) ar.result;
+                if (ints.length == 0) {
+                    if (DBG) {
+                        Log.d(LOG_TAG, "handleGetCallBarringResponse: ar.result.length==0");
+                    }
+                    pref.setEnabled(false);
+                    pref.mTcpListener.onError(pref, RESPONSE_ERROR);
+                } else {
+                    pref.handleCallBarringResult(ints[0] != 0);
+                    if (DBG) {
+                        Log.d(LOG_TAG,
+                                "handleGetCallBarringResponse: CB state successfully queried: "
+                                        + ints[0]);
+                    }
+                }
+            }
+            // Update call barring status.
+            pref.updateSummaryText();
+        }
+
+        // Handle the response message for CB settings.
+        private void handleSetCallBarringResponse(Message msg) {
+            final CallBarringEditPreference pref = mCallBarringEditPreference.get();
+            if (pref == null) {
+                return;
+            }
+
+            AsyncResult ar = (AsyncResult) msg.obj;
+
+            if (ar.exception != null || ar.userObj instanceof Throwable) {
+                if (DBG) {
+                    Log.d(LOG_TAG, "handleSetCallBarringResponse: ar.exception=" + ar.exception);
+                }
+            }
+            if (DBG) {
+                Log.d(LOG_TAG, "handleSetCallBarringResponse: re-get call barring option");
+            }
+            pref.mPhone.getCallBarring(
+                    pref.mFacility,
+                    "",
+                    obtainMessage(MESSAGE_GET_CALL_BARRING, 0, MESSAGE_SET_CALL_BARRING,
+                            ar.exception),
+                    0);
+        }
+    }
+}

diff --git a/src/com/android/phone/GsmUmtsCallBarringOptions.java b/src/com/android/phone/GsmUmtsCallBarringOptions.java
new file mode 100644
index 0000000..4b875ee
--- /dev/null
+++ b/src/com/android/phone/GsmUmtsCallBarringOptions.java

@@ -0,0 +1,536 @@
+/*
+ * 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.app.ActionBar;
+import android.app.Dialog;
+import android.os.AsyncResult;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.preference.Preference;
+import android.preference.PreferenceScreen;
+import android.telephony.ServiceState;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.util.Log;
+import android.view.MenuItem;
+import android.widget.Toast;
+
+import com.android.internal.telephony.CommandException;
+import com.android.internal.telephony.CommandsInterface;
+import com.android.internal.telephony.GsmCdmaPhone;
+import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.imsphone.ImsPhone;
+import com.android.phone.settings.fdn.EditPinPreference;
+
+import java.util.ArrayList;
+
+/**
+ * Implements the preference to enable/disable calling barring options and
+ * the dialogs to change the passward.
+ */
+public class GsmUmtsCallBarringOptions extends TimeConsumingPreferenceActivity
+        implements EditPinPreference.OnPinEnteredListener {
+    private static final String LOG_TAG = "GsmUmtsCallBarringOptions";
+    private static final boolean DBG = (PhoneGlobals.DBG_LEVEL >= 2);
+
+    // String keys for preference lookup
+    // Preference is handled solely in xml.
+    // Block all outgoing calls
+    private static final String BUTTON_BAOC_KEY = "button_baoc_key";
+    // Block all outgoing international calls
+    private static final String BUTTON_BAOIC_KEY = "button_baoic_key";
+    // Block all outgoing international roaming calls
+    private static final String BUTTON_BAOICxH_KEY = "button_baoicxh_key";
+    // Block all incoming calls
+    private static final String BUTTON_BAIC_KEY = "button_baic_key";
+    // Block all incoming international roaming calls
+    private static final String BUTTON_BAICr_KEY = "button_baicr_key";
+    // Disable all barring
+    private static final String BUTTON_BA_ALL_KEY = "button_ba_all_key";
+    // Change passward
+    private static final String BUTTON_BA_CHANGE_PW_KEY = "button_change_pw_key";
+
+    private static final String PW_CHANGE_STATE_KEY = "pin_change_state_key";
+    private static final String OLD_PW_KEY = "old_pw_key";
+    private static final String NEW_PW_KEY = "new_pw_key";
+    private static final String DIALOG_MESSAGE_KEY = "dialog_message_key";
+    private static final String DIALOG_PW_ENTRY_KEY = "dialog_pw_enter_key";
+    private static final String KEY_STATUS = "toggle";
+    private static final String PREFERENCE_ENABLED_KEY = "PREFERENCE_ENABLED";
+    private static final String PREFERENCE_SHOW_PASSWORD_KEY = "PREFERENCE_SHOW_PASSWORD";
+    private static final String SAVED_BEFORE_LOAD_COMPLETED_KEY = "PROGRESS_SHOWING";
+
+    private CallBarringEditPreference mButtonBAOC;
+    private CallBarringEditPreference mButtonBAOIC;
+    private CallBarringEditPreference mButtonBAOICxH;
+    private CallBarringEditPreference mButtonBAIC;
+    private CallBarringEditPreference mButtonBAICr;
+    private CallBarringDeselectAllPreference mButtonDisableAll;
+    private EditPinPreference mButtonChangePW;
+
+    // State variables
+    private int mPwChangeState;
+    private String mOldPassword;
+    private String mNewPassword;
+    private int mPwChangeDialogStrId;
+
+    private static final int PW_CHANGE_OLD = 0;
+    private static final int PW_CHANGE_NEW = 1;
+    private static final int PW_CHANGE_REENTER = 2;
+
+    private static final int BUSY_READING_DIALOG = 100;
+    private static final int BUSY_SAVING_DIALOG = 200;
+
+    // Password change complete event
+    private static final int EVENT_PW_CHANGE_COMPLETE = 100;
+    // Disable all complete event
+    private static final int EVENT_DISABLE_ALL_COMPLETE = 200;
+
+    private static final int PW_LENGTH = 4;
+
+    private Phone mPhone;
+    private ArrayList<CallBarringEditPreference> mPreferences =
+            new ArrayList<CallBarringEditPreference>();
+    private int mInitIndex = 0;
+    private boolean mFirstResume;
+    private Bundle mIcicle;
+
+    private SubscriptionInfoHelper mSubscriptionInfoHelper;
+    private Dialog mProgressDialog;
+
+    @Override
+    public void onPinEntered(EditPinPreference preference, boolean positiveResult) {
+        if (preference == mButtonChangePW) {
+            updatePWChangeState(positiveResult);
+        } else if (preference == mButtonDisableAll) {
+            disableAllBarring(positiveResult);
+        }
+    }
+
+    /**
+     * Display a toast for message.
+     */
+    private void displayMessage(int strId) {
+        Toast.makeText(this, getString(strId), Toast.LENGTH_SHORT).show();
+    }
+
+    /**
+     * Attempt to disable all for call barring settings.
+     */
+    private void disableAllBarring(boolean positiveResult) {
+        if (!positiveResult) {
+            // Return on cancel
+            return;
+        }
+
+        String password = null;
+        if (mButtonDisableAll.isPasswordShown()) {
+            password = mButtonDisableAll.getText();
+            // Validate the length of password first, before submitting it to the
+            // RIL for CB disable.
+            if (!validatePassword(password)) {
+                mButtonDisableAll.setText("");
+                displayMessage(R.string.call_barring_right_pwd_number);
+                return;
+            }
+        }
+
+        // Submit the disable all request
+        mButtonDisableAll.setText("");
+        Message onComplete = mHandler.obtainMessage(EVENT_DISABLE_ALL_COMPLETE);
+        mPhone.setCallBarring(CommandsInterface.CB_FACILITY_BA_ALL, false, password, onComplete, 0);
+        this.onStarted(mButtonDisableAll, false);
+    }
+
+    /**
+     * Attempt to change the password for call barring settings.
+     */
+    private void updatePWChangeState(boolean positiveResult) {
+        if (!positiveResult) {
+            // Reset the state on cancel
+            resetPwChangeState();
+            return;
+        }
+
+        // Progress through the dialog states, generally in this order:
+        // 1. Enter old password
+        // 2. Enter new password
+        // 3. Re-Enter new password
+        // In general, if any invalid entries are made, the dialog re-
+        // appears with text to indicate what the issue is.
+        switch (mPwChangeState) {
+            case PW_CHANGE_OLD:
+                mOldPassword = mButtonChangePW.getText();
+                mButtonChangePW.setText("");
+                if (validatePassword(mOldPassword)) {
+                    mPwChangeState = PW_CHANGE_NEW;
+                    displayPwChangeDialog();
+                } else {
+                    displayPwChangeDialog(R.string.call_barring_right_pwd_number, true);
+                }
+                break;
+            case PW_CHANGE_NEW:
+                mNewPassword = mButtonChangePW.getText();
+                mButtonChangePW.setText("");
+                if (validatePassword(mNewPassword)) {
+                    mPwChangeState = PW_CHANGE_REENTER;
+                    displayPwChangeDialog();
+                } else {
+                    displayPwChangeDialog(R.string.call_barring_right_pwd_number, true);
+                }
+                break;
+            case PW_CHANGE_REENTER:
+                // If the re-entered password is not valid, display a message
+                // and reset the state.
+                if (!mNewPassword.equals(mButtonChangePW.getText())) {
+                    mPwChangeState = PW_CHANGE_NEW;
+                    mButtonChangePW.setText("");
+                    displayPwChangeDialog(R.string.call_barring_pwd_not_match, true);
+                } else {
+                    // If the password is valid, then submit the change password request
+                    mButtonChangePW.setText("");
+                    Message onComplete = mHandler.obtainMessage(EVENT_PW_CHANGE_COMPLETE);
+                    ((GsmCdmaPhone) mPhone).changeCallBarringPassword(
+                            CommandsInterface.CB_FACILITY_BA_ALL,
+                            mOldPassword, mNewPassword, onComplete);
+                    this.onStarted(mButtonChangePW, false);
+                }
+                break;
+            default:
+                if (DBG) {
+                    Log.d(LOG_TAG, "updatePWChangeState: Unknown password change state: "
+                            + mPwChangeState);
+                }
+                break;
+        }
+    }
+
+    /**
+     * Handler for asynchronous replies from the framework layer.
+     */
+    private Handler mHandler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            AsyncResult ar = (AsyncResult) msg.obj;
+            switch (msg.what) {
+                // Handle the response message for password change from the framework layer.
+                case EVENT_PW_CHANGE_COMPLETE: {
+                    onFinished(mButtonChangePW, false);
+                    // Unsuccessful change, display a toast to user with failure reason.
+                    if (ar.exception != null) {
+                        if (DBG) {
+                            Log.d(LOG_TAG,
+                                    "change password for call barring failed with exception: "
+                                            + ar.exception);
+                        }
+                        onException(mButtonChangePW, (CommandException) ar.exception);
+                        mButtonChangePW.setEnabled(true);
+                    } else if (ar.userObj instanceof Throwable) {
+                        onError(mButtonChangePW, RESPONSE_ERROR);
+                    } else {
+                        // Successful change.
+                        displayMessage(R.string.call_barring_change_pwd_success);
+                    }
+                    resetPwChangeState();
+                    break;
+                }
+                // When disabling all call barring, either fail and display a toast,
+                // or just update the UI.
+                case EVENT_DISABLE_ALL_COMPLETE: {
+                    onFinished(mButtonDisableAll, false);
+                    if (ar.exception != null) {
+                        if (DBG) {
+                            Log.d(LOG_TAG, "can not disable all call barring with exception: "
+                                    + ar.exception);
+                        }
+                        onException(mButtonDisableAll, (CommandException) ar.exception);
+                        mButtonDisableAll.setEnabled(true);
+                    } else if (ar.userObj instanceof Throwable) {
+                        onError(mButtonDisableAll, RESPONSE_ERROR);
+                    } else {
+                        // Reset to normal behaviour on successful change.
+                        displayMessage(R.string.call_barring_deactivate_success);
+                        resetCallBarringPrefState(false);
+                    }
+                    break;
+                }
+                default: {
+                    if (DBG) {
+                        Log.d(LOG_TAG, "Unknown message id: " + msg.what);
+                    }
+                    break;
+                }
+            }
+        }
+    };
+
+    /**
+     * The next two functions are for updating the message field on the dialog.
+     */
+    private void displayPwChangeDialog() {
+        displayPwChangeDialog(0, true);
+    }
+
+    private void displayPwChangeDialog(int strId, boolean shouldDisplay) {
+        int msgId = 0;
+        switch (mPwChangeState) {
+            case PW_CHANGE_OLD:
+                msgId = R.string.call_barring_old_pwd;
+                break;
+            case PW_CHANGE_NEW:
+                msgId = R.string.call_barring_new_pwd;
+                break;
+            case PW_CHANGE_REENTER:
+                msgId = R.string.call_barring_confirm_pwd;
+                break;
+            default:
+                break;
+        }
+
+        // Append the note/additional message, if needed.
+        if (strId != 0) {
+            mButtonChangePW.setDialogMessage(getText(msgId) + "\n" + getText(strId));
+        } else {
+            mButtonChangePW.setDialogMessage(msgId);
+        }
+
+        // Only display if requested.
+        if (shouldDisplay) {
+            mButtonChangePW.showPinDialog();
+        }
+        mPwChangeDialogStrId = strId;
+    }
+
+    /**
+     * Reset the state of the password change dialog.
+     */
+    private void resetPwChangeState() {
+        mPwChangeState = PW_CHANGE_OLD;
+        displayPwChangeDialog(0, false);
+        mOldPassword = "";
+        mNewPassword = "";
+    }
+
+    /**
+     * Reset the state of the all call barring setting to disable.
+     */
+    private void resetCallBarringPrefState(boolean enable) {
+        for (CallBarringEditPreference pref : mPreferences) {
+            pref.mIsActivated = enable;
+            pref.updateSummaryText();
+        }
+    }
+
+    /**
+     * Validate the password entry.
+     *
+     * @param password This is the password to validate
+     */
+    private boolean validatePassword(String password) {
+        return password != null && password.length() == PW_LENGTH;
+    }
+
+    @Override
+    protected void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        if (DBG) {
+            Log.d(LOG_TAG, "onCreate, reading callbarring_options.xml file");
+        }
+        addPreferencesFromResource(R.xml.callbarring_options);
+
+        mSubscriptionInfoHelper = new SubscriptionInfoHelper(this, getIntent());
+        mPhone = mSubscriptionInfoHelper.getPhone();
+        if (DBG) {
+            Log.d(LOG_TAG, "onCreate, reading callbarring_options.xml file finished!");
+        }
+
+        // Get UI object references
+        PreferenceScreen prefSet = getPreferenceScreen();
+        mButtonBAOC = (CallBarringEditPreference) prefSet.findPreference(BUTTON_BAOC_KEY);
+        mButtonBAOIC = (CallBarringEditPreference) prefSet.findPreference(BUTTON_BAOIC_KEY);
+        mButtonBAOICxH = (CallBarringEditPreference) prefSet.findPreference(BUTTON_BAOICxH_KEY);
+        mButtonBAIC = (CallBarringEditPreference) prefSet.findPreference(BUTTON_BAIC_KEY);
+        mButtonBAICr = (CallBarringEditPreference) prefSet.findPreference(BUTTON_BAICr_KEY);
+        mButtonDisableAll = (CallBarringDeselectAllPreference)
+                prefSet.findPreference(BUTTON_BA_ALL_KEY);
+        mButtonChangePW = (EditPinPreference) prefSet.findPreference(BUTTON_BA_CHANGE_PW_KEY);
+
+        // Assign click listener and update state
+        mButtonBAOC.setOnPinEnteredListener(this);
+        mButtonBAOIC.setOnPinEnteredListener(this);
+        mButtonBAOICxH.setOnPinEnteredListener(this);
+        mButtonBAIC.setOnPinEnteredListener(this);
+        mButtonBAICr.setOnPinEnteredListener(this);
+        mButtonDisableAll.setOnPinEnteredListener(this);
+        mButtonChangePW.setOnPinEnteredListener(this);
+
+        // Store CallBarringEditPreferencence objects in array list.
+        mPreferences.add(mButtonBAOC);
+        mPreferences.add(mButtonBAOIC);
+        mPreferences.add(mButtonBAOICxH);
+        mPreferences.add(mButtonBAIC);
+        mPreferences.add(mButtonBAICr);
+
+        // Find out if password is currently used.
+        boolean usePassword = true;
+        boolean useDisableaAll = true;
+
+        ImsPhone imsPhone = mPhone != null ? (ImsPhone) mPhone.getImsPhone() : null;
+        if (imsPhone != null
+                && ((imsPhone.getServiceState().getState() == ServiceState.STATE_IN_SERVICE)
+                        || imsPhone.isUtEnabled())) {
+            usePassword = false;
+            useDisableaAll = false;
+        }
+
+        // Find out if the sim card is ready.
+        boolean isSimReady = TelephonyManager.from(this).getSimState(
+                SubscriptionManager.getSlotIndex(mPhone.getSubId()))
+                        == TelephonyManager.SIM_STATE_READY;
+
+        // Deactivate all option is unavailable when sim card is not ready or Ut is enabled.
+        if (isSimReady && useDisableaAll) {
+            mButtonDisableAll.setEnabled(true);
+            mButtonDisableAll.init(mPhone);
+        } else {
+            mButtonDisableAll.setEnabled(false);
+        }
+
+        // Change password option is unavailable when sim card is not ready or when the password is
+        // not used.
+        if (isSimReady && usePassword) {
+            mButtonChangePW.setEnabled(true);
+        } else {
+            mButtonChangePW.setEnabled(false);
+            mButtonChangePW.setSummary(R.string.call_barring_change_pwd_description_disabled);
+        }
+
+        // Wait to do the initialization until onResume so that the TimeConsumingPreferenceActivity
+        // dialog can display as it relies on onResume / onPause to maintain its foreground state.
+        mFirstResume = true;
+        mIcicle = icicle;
+
+        ActionBar actionBar = getActionBar();
+        if (actionBar != null) {
+            // android.R.id.home will be triggered in onOptionsItemSelected()
+            actionBar.setDisplayHomeAsUpEnabled(true);
+        }
+
+        if (mIcicle != null && !mIcicle.getBoolean(SAVED_BEFORE_LOAD_COMPLETED_KEY)) {
+            if (DBG) {
+                Log.d(LOG_TAG, "restore stored states");
+            }
+            mInitIndex = mPreferences.size();
+
+            for (CallBarringEditPreference pref : mPreferences) {
+                Bundle bundle = mIcicle.getParcelable(pref.getKey());
+                if (bundle != null) {
+                    pref.handleCallBarringResult(bundle.getBoolean(KEY_STATUS));
+                    pref.init(this, true, mPhone);
+                    pref.setEnabled(bundle.getBoolean(PREFERENCE_ENABLED_KEY, pref.isEnabled()));
+                    pref.setInputMethodNeeded(bundle.getBoolean(PREFERENCE_SHOW_PASSWORD_KEY,
+                            pref.needInputMethod()));
+                }
+            }
+            mPwChangeState = mIcicle.getInt(PW_CHANGE_STATE_KEY);
+            mOldPassword = mIcicle.getString(OLD_PW_KEY);
+            mNewPassword = mIcicle.getString(NEW_PW_KEY);
+            displayPwChangeDialog(mIcicle.getInt(DIALOG_MESSAGE_KEY, mPwChangeDialogStrId), false);
+            mButtonChangePW.setText(mIcicle.getString(DIALOG_PW_ENTRY_KEY));
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        if (mFirstResume) {
+            if (mIcicle == null || mIcicle.getBoolean(SAVED_BEFORE_LOAD_COMPLETED_KEY)) {
+                if (DBG) {
+                    Log.d(LOG_TAG, "onResume: start to init ");
+                }
+                resetPwChangeState();
+                mPreferences.get(mInitIndex).init(this, false, mPhone);
+
+                // Request removing BUSY_SAVING_DIALOG because reading is restarted.
+                // (If it doesn't exist, nothing happen.)
+                removeDialog(BUSY_SAVING_DIALOG);
+            }
+            mFirstResume = false;
+            mIcicle = null;
+        }
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        for (CallBarringEditPreference pref : mPreferences) {
+            Bundle bundle = new Bundle();
+            bundle.putBoolean(KEY_STATUS, pref.mIsActivated);
+            bundle.putBoolean(PREFERENCE_ENABLED_KEY, pref.isEnabled());
+            bundle.putBoolean(PREFERENCE_SHOW_PASSWORD_KEY, pref.needInputMethod());
+            outState.putParcelable(pref.getKey(), bundle);
+        }
+        outState.putInt(PW_CHANGE_STATE_KEY, mPwChangeState);
+        outState.putString(OLD_PW_KEY, mOldPassword);
+        outState.putString(NEW_PW_KEY, mNewPassword);
+        outState.putInt(DIALOG_MESSAGE_KEY, mPwChangeDialogStrId);
+        outState.putString(DIALOG_PW_ENTRY_KEY, mButtonChangePW.getText());
+
+        outState.putBoolean(SAVED_BEFORE_LOAD_COMPLETED_KEY,
+                mProgressDialog != null && mProgressDialog.isShowing());
+    }
+
+    /**
+     * Finish initialization of this preference and start next.
+     *
+     * @param preference The preference.
+     * @param reading If true to dismiss the busy reading dialog,
+     *                false to dismiss the busy saving dialog.
+     */
+    public void onFinished(Preference preference, boolean reading) {
+        if (mInitIndex < mPreferences.size() - 1 && !isFinishing()) {
+            mInitIndex++;
+            mPreferences.get(mInitIndex).init(this, false, mPhone);
+        }
+        super.onFinished(preference, reading);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        final int itemId = item.getItemId();
+        if (itemId == android.R.id.home) {
+            CallFeaturesSetting.goUpToTopLevelSetting(this, mSubscriptionInfoHelper);
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    protected void onPrepareDialog(int id, Dialog dialog, Bundle args) {
+        super.onPrepareDialog(id, dialog, args);
+        if (id == BUSY_READING_DIALOG || id == BUSY_SAVING_DIALOG) {
+            // For onSaveInstanceState, treat the SAVING dialog as the same as the READING. As
+            // the result, if the activity is recreated while waiting for SAVING, it starts reading
+            // all the newest data.
+            mProgressDialog = dialog;
+        }
+    }
+}

diff --git a/src/com/android/phone/GsmUmtsCallOptions.java b/src/com/android/phone/GsmUmtsCallOptions.java
index 419e72c..3b27d28 100644
--- a/src/com/android/phone/GsmUmtsCallOptions.java
+++ b/src/com/android/phone/GsmUmtsCallOptions.java

@@ -17,10 +17,12 @@
 package com.android.phone;
 
 import android.os.Bundle;
+import android.os.PersistableBundle;
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
+import android.telephony.CarrierConfigManager;
 import android.view.MenuItem;
 
 import com.android.internal.telephony.Phone;
@@ -31,6 +33,7 @@
     private final boolean DBG = (PhoneGlobals.DBG_LEVEL >= 2);
 
     private static final String CALL_FORWARDING_KEY = "call_forwarding_key";
+    private static final String CALL_BARRING_KEY = "call_barring_key";
     private static final String ADDITIONAL_GSM_SETTINGS_KEY = "additional_gsm_call_settings_key";
 
     @Override
@@ -68,5 +71,18 @@
                 prefScreen.findPreference(ADDITIONAL_GSM_SETTINGS_KEY);
         additionalGsmSettingsPref.setIntent(
                 subInfoHelper.getIntent(GsmUmtsAdditionalCallOptions.class));
+
+        Preference callBarringPref = prefScreen.findPreference(CALL_BARRING_KEY);
+        PersistableBundle b = null;
+        if (subInfoHelper.hasSubId()) {
+            b = PhoneGlobals.getInstance().getCarrierConfigForSubId(subInfoHelper.getSubId());
+        } else {
+            b = PhoneGlobals.getInstance().getCarrierConfig();
+        }
+        if (b != null && b.getBoolean(CarrierConfigManager.KEY_CALL_BARRING_VISIBILITY_BOOL)) {
+            callBarringPref.setIntent(subInfoHelper.getIntent(GsmUmtsCallBarringOptions.class));
+        } else {
+            prefScreen.removePreference(callBarringPref);
+        }
     }
 }

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 433567f..5db535f 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java

@@ -3262,6 +3262,14 @@
         return mPhone.getContext().getResources().getBoolean(R.bool.hac_enabled);
     }
 
+    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;
+    }
+
     /**
      * Returns the unique device ID of phone, for example, the IMEI for
      * GSM and the MEID for CDMA phones. Return null if device ID is not available.

diff --git a/src/com/android/phone/settings/AccessibilitySettingsFragment.java b/src/com/android/phone/settings/AccessibilitySettingsFragment.java
index af7d4bf..7ede23a 100644
--- a/src/com/android/phone/settings/AccessibilitySettingsFragment.java
+++ b/src/com/android/phone/settings/AccessibilitySettingsFragment.java

@@ -24,8 +24,10 @@
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceScreen;
 import android.provider.Settings;
+import android.telecom.TelecomManager;
 import android.telephony.CarrierConfigManager;
 import android.telephony.PhoneStateListener;
+import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.util.Log;
 
@@ -41,6 +43,7 @@
 
     private static final String BUTTON_TTY_KEY = "button_tty_mode_key";
     private static final String BUTTON_HAC_KEY = "button_hac_key";
+    private static final String BUTTON_RTT_KEY = "button_rtt_key";
 
     private final PhoneStateListener mPhoneStateListener = new PhoneStateListener() {
         /**
@@ -67,6 +70,7 @@
 
     private TtyModeListPreference mButtonTty;
     private SwitchPreference mButtonHac;
+    private SwitchPreference mButtonRtt;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -80,6 +84,7 @@
         mButtonTty = (TtyModeListPreference) findPreference(
                 getResources().getString(R.string.tty_mode_key));
         mButtonHac = (SwitchPreference) findPreference(BUTTON_HAC_KEY);
+        mButtonRtt = (SwitchPreference) findPreference(BUTTON_RTT_KEY);
 
         if (PhoneGlobals.getInstance().phoneMgr.isTtyModeSupported()) {
             mButtonTty.init();
@@ -96,6 +101,19 @@
             getPreferenceScreen().removePreference(mButtonHac);
             mButtonHac = null;
         }
+
+        if (PhoneGlobals.getInstance().phoneMgr.isRttSupported()) {
+            // 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.System.getInt(
+                    mContext.getContentResolver(), Settings.System.RTT_CALLING_MODE,
+                    TelecomManager.TTY_MODE_OFF)
+                    != TelecomManager.TTY_MODE_OFF;
+            mButtonRtt.setChecked(rttOn);
+        } else {
+            getPreferenceScreen().removePreference(mButtonRtt);
+            mButtonRtt = null;
+        }
     }
 
     @Override
@@ -129,7 +147,19 @@
                     hac == SettingsConstants.HAC_ENABLED
                             ? SettingsConstants.HAC_VAL_ON : SettingsConstants.HAC_VAL_OFF);
             return true;
+        } else if (preference == mButtonRtt) {
+            Log.i(LOG_TAG, "RTT setting changed -- now " + mButtonRtt.isChecked());
+            int rttMode = mButtonRtt.isChecked()
+                    ? TelecomManager.TTY_MODE_FULL : TelecomManager.TTY_MODE_OFF;
+            Settings.System.putInt(mContext.getContentResolver(), Settings.System.RTT_CALLING_MODE,
+                    rttMode);
+            // Update RTT config with IMS Manager
+            ImsManager imsManager = ImsManager.getInstance(getContext(),
+                    SubscriptionManager.getDefaultVoicePhoneId());
+            imsManager.setRttEnabled(mButtonRtt.isChecked());
+            return true;
         }
+
         return false;
     }
 

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
new file mode 100644
index 0000000..70d1677
--- /dev/null
+++ b/src/com/android/phone/settings/assisteddialing/res/values-bg/strings.xml

@@ -0,0 +1,26 @@
+<?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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    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>
+    <string name="assisted_dialing_setting_cc_default_summary" msgid="685943419594424066">"Автоматично установена • <xliff:g id="AD_COUNTRY_CODE_INFO">%1$s</xliff:g>"</string>
+    <string name="assisted_dialing_setting_cc_default_summary_fallback" msgid="8118256527932394202">"Автоматично установена"</string>
+    <string name="assisted_dialing_setting_cc_category_title" msgid="7235638453980787757">"Родна държава"</string>
+    <string name="assisted_dialing_setting_cc_title" msgid="5195769254506637585">"Родна държава по подразбиране"</string>
+</resources>

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
new file mode 100644
index 0000000..adbcf5f
--- /dev/null
+++ b/src/com/android/phone/settings/assisteddialing/res/values-en-rAU/strings.xml

@@ -0,0 +1,26 @@
+<?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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    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>
+    <string name="assisted_dialing_setting_cc_default_summary" msgid="685943419594424066">"Automatically detected • <xliff:g id="AD_COUNTRY_CODE_INFO">%1$s</xliff:g>"</string>
+    <string name="assisted_dialing_setting_cc_default_summary_fallback" msgid="8118256527932394202">"Automatically detected"</string>
+    <string name="assisted_dialing_setting_cc_category_title" msgid="7235638453980787757">"Home country"</string>
+    <string name="assisted_dialing_setting_cc_title" msgid="5195769254506637585">"Default home country"</string>
+</resources>

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
new file mode 100644
index 0000000..adbcf5f
--- /dev/null
+++ b/src/com/android/phone/settings/assisteddialing/res/values-en-rCA/strings.xml

@@ -0,0 +1,26 @@
+<?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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    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>
+    <string name="assisted_dialing_setting_cc_default_summary" msgid="685943419594424066">"Automatically detected • <xliff:g id="AD_COUNTRY_CODE_INFO">%1$s</xliff:g>"</string>
+    <string name="assisted_dialing_setting_cc_default_summary_fallback" msgid="8118256527932394202">"Automatically detected"</string>
+    <string name="assisted_dialing_setting_cc_category_title" msgid="7235638453980787757">"Home country"</string>
+    <string name="assisted_dialing_setting_cc_title" msgid="5195769254506637585">"Default home country"</string>
+</resources>

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
new file mode 100644
index 0000000..adbcf5f
--- /dev/null
+++ b/src/com/android/phone/settings/assisteddialing/res/values-en-rGB/strings.xml

@@ -0,0 +1,26 @@
+<?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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    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>
+    <string name="assisted_dialing_setting_cc_default_summary" msgid="685943419594424066">"Automatically detected • <xliff:g id="AD_COUNTRY_CODE_INFO">%1$s</xliff:g>"</string>
+    <string name="assisted_dialing_setting_cc_default_summary_fallback" msgid="8118256527932394202">"Automatically detected"</string>
+    <string name="assisted_dialing_setting_cc_category_title" msgid="7235638453980787757">"Home country"</string>
+    <string name="assisted_dialing_setting_cc_title" msgid="5195769254506637585">"Default home country"</string>
+</resources>

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
new file mode 100644
index 0000000..adbcf5f
--- /dev/null
+++ b/src/com/android/phone/settings/assisteddialing/res/values-en-rIN/strings.xml

@@ -0,0 +1,26 @@
+<?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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    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>
+    <string name="assisted_dialing_setting_cc_default_summary" msgid="685943419594424066">"Automatically detected • <xliff:g id="AD_COUNTRY_CODE_INFO">%1$s</xliff:g>"</string>
+    <string name="assisted_dialing_setting_cc_default_summary_fallback" msgid="8118256527932394202">"Automatically detected"</string>
+    <string name="assisted_dialing_setting_cc_category_title" msgid="7235638453980787757">"Home country"</string>
+    <string name="assisted_dialing_setting_cc_title" msgid="5195769254506637585">"Default home country"</string>
+</resources>

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
new file mode 100644
index 0000000..c863baf
--- /dev/null
+++ b/src/com/android/phone/settings/assisteddialing/res/values-fr/strings.xml

@@ -0,0 +1,26 @@
+<?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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    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>
+    <string name="assisted_dialing_setting_cc_default_summary" msgid="685943419594424066">"Supprimé automatiquement • <xliff:g id="AD_COUNTRY_CODE_INFO">%1$s</xliff:g>"</string>
+    <string name="assisted_dialing_setting_cc_default_summary_fallback" msgid="8118256527932394202">"Détecté automatiquement"</string>
+    <string name="assisted_dialing_setting_cc_category_title" msgid="7235638453980787757">"Pays d’origine"</string>
+    <string name="assisted_dialing_setting_cc_title" msgid="5195769254506637585">"Pays d\'origine par défaut"</string>
+</resources>

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
new file mode 100644
index 0000000..127a7f7
--- /dev/null
+++ b/src/com/android/phone/settings/assisteddialing/res/values-hi/strings.xml

@@ -0,0 +1,26 @@
+<?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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    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>
+    <string name="assisted_dialing_setting_cc_default_summary" msgid="685943419594424066">"अपने आप पता लगाया गया • <xliff:g id="AD_COUNTRY_CODE_INFO">%1$s</xliff:g>"</string>
+    <string name="assisted_dialing_setting_cc_default_summary_fallback" msgid="8118256527932394202">"अपने आप पता लगाया गया"</string>
+    <string name="assisted_dialing_setting_cc_category_title" msgid="7235638453980787757">"आपका देश"</string>
+    <string name="assisted_dialing_setting_cc_title" msgid="5195769254506637585">"आपका डिफ़ॉल्ट देश"</string>
+</resources>

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
new file mode 100644
index 0000000..2d5bb15
--- /dev/null
+++ b/src/com/android/phone/settings/assisteddialing/res/values-is/strings.xml

@@ -0,0 +1,26 @@
+<?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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    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>
+    <string name="assisted_dialing_setting_cc_default_summary" msgid="685943419594424066">"Greint sjálfkrafa • <xliff:g id="AD_COUNTRY_CODE_INFO">%1$s</xliff:g>"</string>
+    <string name="assisted_dialing_setting_cc_default_summary_fallback" msgid="8118256527932394202">"Greint sjálfkrafa"</string>
+    <string name="assisted_dialing_setting_cc_category_title" msgid="7235638453980787757">"Heimaland"</string>
+    <string name="assisted_dialing_setting_cc_title" msgid="5195769254506637585">"Sjálfgefið heimaland"</string>
+</resources>

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
new file mode 100644
index 0000000..305d2b5
--- /dev/null
+++ b/src/com/android/phone/settings/assisteddialing/res/values-ko/strings.xml

@@ -0,0 +1,26 @@
+<?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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    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>
+    <string name="assisted_dialing_setting_cc_default_summary" msgid="685943419594424066">"자동으로 감지 • <xliff:g id="AD_COUNTRY_CODE_INFO">%1$s</xliff:g>"</string>
+    <string name="assisted_dialing_setting_cc_default_summary_fallback" msgid="8118256527932394202">"자동으로 감지"</string>
+    <string name="assisted_dialing_setting_cc_category_title" msgid="7235638453980787757">"국가"</string>
+    <string name="assisted_dialing_setting_cc_title" msgid="5195769254506637585">"기본 국가"</string>
+</resources>

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
new file mode 100644
index 0000000..d55b5ec
--- /dev/null
+++ b/src/com/android/phone/settings/assisteddialing/res/values-lt/strings.xml

@@ -0,0 +1,26 @@
+<?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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    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>
+    <string name="assisted_dialing_setting_cc_default_summary" msgid="685943419594424066">"Automatiškai aptikta • <xliff:g id="AD_COUNTRY_CODE_INFO">%1$s</xliff:g>"</string>
+    <string name="assisted_dialing_setting_cc_default_summary_fallback" msgid="8118256527932394202">"Automatiškai aptikta"</string>
+    <string name="assisted_dialing_setting_cc_category_title" msgid="7235638453980787757">"Gyvenamoji šalis"</string>
+    <string name="assisted_dialing_setting_cc_title" msgid="5195769254506637585">"Numatytoji gyvenamoji šalis"</string>
+</resources>

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
new file mode 100644
index 0000000..634c2d6
--- /dev/null
+++ b/src/com/android/phone/settings/assisteddialing/res/values-lv/strings.xml

@@ -0,0 +1,26 @@
+<?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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    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>
+    <string name="assisted_dialing_setting_cc_default_summary" msgid="685943419594424066">"Noteikta automātiski • <xliff:g id="AD_COUNTRY_CODE_INFO">%1$s</xliff:g>"</string>
+    <string name="assisted_dialing_setting_cc_default_summary_fallback" msgid="8118256527932394202">"Noteikta automātiski"</string>
+    <string name="assisted_dialing_setting_cc_category_title" msgid="7235638453980787757">"Mītnes zeme"</string>
+    <string name="assisted_dialing_setting_cc_title" msgid="5195769254506637585">"Noklusējuma mītnes zeme"</string>
+</resources>

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
new file mode 100644
index 0000000..a723ff6
--- /dev/null
+++ b/src/com/android/phone/settings/assisteddialing/res/values-mn/strings.xml

@@ -0,0 +1,26 @@
+<?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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    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>
+    <string name="assisted_dialing_setting_cc_default_summary" msgid="685943419594424066">"Автоматаар таньсан • <xliff:g id="AD_COUNTRY_CODE_INFO">%1$s</xliff:g>"</string>
+    <string name="assisted_dialing_setting_cc_default_summary_fallback" msgid="8118256527932394202">"Автоматаар таньсан"</string>
+    <string name="assisted_dialing_setting_cc_category_title" msgid="7235638453980787757">"Эх орон"</string>
+    <string name="assisted_dialing_setting_cc_title" msgid="5195769254506637585">"Өгөгдмөл эх орон"</string>
+</resources>

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
new file mode 100644
index 0000000..f28d54b
--- /dev/null
+++ b/src/com/android/phone/settings/assisteddialing/res/values-my/strings.xml

@@ -0,0 +1,26 @@
+<?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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    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>
+    <string name="assisted_dialing_setting_cc_default_summary" msgid="685943419594424066">"အလိုအလျောက် ရှာတွေ့ထားသည် • <xliff:g id="AD_COUNTRY_CODE_INFO">%1$s</xliff:g>"</string>
+    <string name="assisted_dialing_setting_cc_default_summary_fallback" msgid="8118256527932394202">"အလိုအလျောက် ရှာတွေ့ထားသည်"</string>
+    <string name="assisted_dialing_setting_cc_category_title" msgid="7235638453980787757">"နေရပ်နိုင်ငံ"</string>
+    <string name="assisted_dialing_setting_cc_title" msgid="5195769254506637585">"မူလ နေရပ်နိုင်ငံ"</string>
+</resources>

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
new file mode 100644
index 0000000..45a981e
--- /dev/null
+++ b/src/com/android/phone/settings/assisteddialing/res/values-nb/strings.xml

@@ -0,0 +1,26 @@
+<?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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    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>
+    <string name="assisted_dialing_setting_cc_default_summary" msgid="685943419594424066">"Identifisert automatisk • <xliff:g id="AD_COUNTRY_CODE_INFO">%1$s</xliff:g>"</string>
+    <string name="assisted_dialing_setting_cc_default_summary_fallback" msgid="8118256527932394202">"Identifisert automatisk"</string>
+    <string name="assisted_dialing_setting_cc_category_title" msgid="7235638453980787757">"Hjemland"</string>
+    <string name="assisted_dialing_setting_cc_title" msgid="5195769254506637585">"Standard hjemland"</string>
+</resources>

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
new file mode 100644
index 0000000..a2cc899
--- /dev/null
+++ b/src/com/android/phone/settings/assisteddialing/res/values-ne/strings.xml

@@ -0,0 +1,26 @@
+<?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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    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>
+    <string name="assisted_dialing_setting_cc_default_summary" msgid="685943419594424066">"स्वतः पत्ता लाग्यो • <xliff:g id="AD_COUNTRY_CODE_INFO">%1$s</xliff:g>"</string>
+    <string name="assisted_dialing_setting_cc_default_summary_fallback" msgid="8118256527932394202">"स्वतः पत्ता लाग्यो"</string>
+    <string name="assisted_dialing_setting_cc_category_title" msgid="7235638453980787757">"गृह देश"</string>
+    <string name="assisted_dialing_setting_cc_title" msgid="5195769254506637585">"पूर्वनिर्धारित गृह देश"</string>
+</resources>

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
new file mode 100644
index 0000000..0a4b1ea
--- /dev/null
+++ b/src/com/android/phone/settings/assisteddialing/res/values-nl/strings.xml

@@ -0,0 +1,26 @@
+<?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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    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>
+    <string name="assisted_dialing_setting_cc_default_summary" msgid="685943419594424066">"Automatisch gedetecteerd • <xliff:g id="AD_COUNTRY_CODE_INFO">%1$s</xliff:g>"</string>
+    <string name="assisted_dialing_setting_cc_default_summary_fallback" msgid="8118256527932394202">"Automatisch gedetecteerd"</string>
+    <string name="assisted_dialing_setting_cc_category_title" msgid="7235638453980787757">"Thuisland"</string>
+    <string name="assisted_dialing_setting_cc_title" msgid="5195769254506637585">"Standaard thuisland"</string>
+</resources>

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
new file mode 100644
index 0000000..9ce564b
--- /dev/null
+++ b/src/com/android/phone/settings/assisteddialing/res/values-sk/strings.xml

@@ -0,0 +1,26 @@
+<?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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    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>
+    <string name="assisted_dialing_setting_cc_default_summary" msgid="685943419594424066">"Automaticky rozpoznané • <xliff:g id="AD_COUNTRY_CODE_INFO">%1$s</xliff:g>"</string>
+    <string name="assisted_dialing_setting_cc_default_summary_fallback" msgid="8118256527932394202">"Automaticky rozpoznané"</string>
+    <string name="assisted_dialing_setting_cc_category_title" msgid="7235638453980787757">"Domovská krajina"</string>
+    <string name="assisted_dialing_setting_cc_title" msgid="5195769254506637585">"Predvolená domovská krajina"</string>
+</resources>

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
new file mode 100644
index 0000000..5658198
--- /dev/null
+++ b/src/com/android/phone/settings/assisteddialing/res/values-sv/strings.xml

@@ -0,0 +1,26 @@
+<?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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    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>
+    <string name="assisted_dialing_setting_cc_default_summary" msgid="685943419594424066">"Automatiskt identifierat • <xliff:g id="AD_COUNTRY_CODE_INFO">%1$s</xliff:g>"</string>
+    <string name="assisted_dialing_setting_cc_default_summary_fallback" msgid="8118256527932394202">"Automatiskt identifierat"</string>
+    <string name="assisted_dialing_setting_cc_category_title" msgid="7235638453980787757">"Hemland"</string>
+    <string name="assisted_dialing_setting_cc_title" msgid="5195769254506637585">"Standardhemland"</string>
+</resources>

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
new file mode 100644
index 0000000..a274319
--- /dev/null
+++ b/src/com/android/phone/settings/assisteddialing/res/values-ta/strings.xml

@@ -0,0 +1,26 @@
+<?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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    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>
+    <string name="assisted_dialing_setting_cc_default_summary" msgid="685943419594424066">"தானாகக் கண்டறியப்பட்டது • <xliff:g id="AD_COUNTRY_CODE_INFO">%1$s</xliff:g>"</string>
+    <string name="assisted_dialing_setting_cc_default_summary_fallback" msgid="8118256527932394202">"தானாகக் கண்டறியப்பட்டது"</string>
+    <string name="assisted_dialing_setting_cc_category_title" msgid="7235638453980787757">"சொந்த நாடு"</string>
+    <string name="assisted_dialing_setting_cc_title" msgid="5195769254506637585">"சொந்த நாடு (இயல்பு)"</string>
+</resources>

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
new file mode 100644
index 0000000..e0bc91d
--- /dev/null
+++ b/src/com/android/phone/settings/assisteddialing/res/values-th/strings.xml

@@ -0,0 +1,26 @@
+<?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
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    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>
+    <string name="assisted_dialing_setting_cc_default_summary" msgid="685943419594424066">"ตรวจพบโดยอัตโนมัติ • <xliff:g id="AD_COUNTRY_CODE_INFO">%1$s</xliff:g>"</string>
+    <string name="assisted_dialing_setting_cc_default_summary_fallback" msgid="8118256527932394202">"ตรวจพบโดยอัตโนมัติ"</string>
+    <string name="assisted_dialing_setting_cc_category_title" msgid="7235638453980787757">"ประเทศบ้านเกิด"</string>
+    <string name="assisted_dialing_setting_cc_title" msgid="5195769254506637585">"ประเทศบ้านเกิดที่เป็นค่าเริ่มต้น"</string>
+</resources>

diff --git a/src/com/android/phone/settings/fdn/EditPinPreference.java b/src/com/android/phone/settings/fdn/EditPinPreference.java
index eaa3507..42fc418 100644
--- a/src/com/android/phone/settings/fdn/EditPinPreference.java
+++ b/src/com/android/phone/settings/fdn/EditPinPreference.java

@@ -39,7 +39,17 @@
 
     private boolean shouldHideButtons;
 
-    interface OnPinEnteredListener {
+    /**
+     * Interface definition for a callback to be invoked when the PIN is entered.
+     */
+    public interface OnPinEnteredListener {
+        /**
+         * Called when the dialog of {@link #EditPinPreference} is dismissed.
+         *
+         * @param preference the specified {@link #EditPinPreference}
+         * @param positiveResult Whether the positive button was clicked (true), or
+         *                       the negative button was clicked or the dialog was canceled (false).
+         */
         void onPinEntered(EditPinPreference preference, boolean positiveResult);
     }
 

diff --git a/src/com/android/services/telephony/EmergencyTonePlayer.java b/src/com/android/services/telephony/EmergencyTonePlayer.java
index aaec24f..a21489d 100644
--- a/src/com/android/services/telephony/EmergencyTonePlayer.java
+++ b/src/com/android/services/telephony/EmergencyTonePlayer.java

@@ -67,11 +67,7 @@
                 startVibrate();
                 break;
             case EMERGENCY_TONE_ALERT:
-                // Only start if we are not in silent mode.
-                int ringerMode = mAudioManager.getRingerMode();
-                if (ringerMode == AudioManager.RINGER_MODE_NORMAL) {
-                    startAlert();
-                }
+                startAlert();
                 break;
             case EMERGENCY_TONE_OFF:
                 // nothing;

diff --git a/src/com/android/services/telephony/GsmConnection.java b/src/com/android/services/telephony/GsmConnection.java
index 0a58fba..999c6f5 100644
--- a/src/com/android/services/telephony/GsmConnection.java
+++ b/src/com/android/services/telephony/GsmConnection.java

@@ -81,12 +81,6 @@
             }
         }
 
-        // For GSM connections, CAPABILITY_CONFERENCE_HAS_NO_CHILDREN should be applied whenever
-        // PROPERTY_IS_DOWNGRADED_CONFERENCE is true.
-        if ((getConnectionProperties() & PROPERTY_IS_DOWNGRADED_CONFERENCE) != 0) {
-            capabilities |= CAPABILITY_CONFERENCE_HAS_NO_CHILDREN;
-        }
-
         return capabilities;
     }
 

diff --git a/src/com/android/services/telephony/ImsConference.java b/src/com/android/services/telephony/ImsConference.java
index d523787..72184c4 100644
--- a/src/com/android/services/telephony/ImsConference.java
+++ b/src/com/android/services/telephony/ImsConference.java

@@ -910,7 +910,6 @@
                         mConferenceHost.isOutgoingCall());
                 // This is a newly created conference connection as a result of SRVCC
                 c.setConferenceSupported(true);
-                c.addCapability(Connection.CAPABILITY_CONFERENCE_HAS_NO_CHILDREN);
                 c.setConnectionProperties(
                         c.getConnectionProperties() | Connection.PROPERTY_IS_DOWNGRADED_CONFERENCE);
                 c.updateState();

diff --git a/src/com/android/services/telephony/TelecomAccountRegistry.java b/src/com/android/services/telephony/TelecomAccountRegistry.java
index 93d7f87..13b0494 100644
--- a/src/com/android/services/telephony/TelecomAccountRegistry.java
+++ b/src/com/android/services/telephony/TelecomAccountRegistry.java

@@ -227,9 +227,14 @@
                         isHandoverFromSupported);
             }
 
-            boolean isDeviceRttSupported = mContext.getResources().getBoolean(
-                    R.bool.config_support_rtt);
-            if (isDeviceRttSupported && isCarrierRttSupported()) {
+            final boolean isTelephonyAudioDeviceSupported = mContext.getResources().getBoolean(
+                    R.bool.config_support_telephony_audio_device);
+            if (isTelephonyAudioDeviceSupported && !isEmergency
+                    && isCarrierUseCallRecordingTone()) {
+                extras.putBoolean(PhoneAccount.EXTRA_PLAY_CALL_RECORDING_TONE, true);
+            }
+
+            if (PhoneGlobals.getInstance().phoneMgr.isRttSupported()) {
                 capabilities |= PhoneAccount.CAPABILITY_RTT;
             }
 
@@ -398,12 +403,6 @@
                     b.getBoolean(CarrierConfigManager.KEY_SUPPORT_VIDEO_CONFERENCE_CALL_BOOL);
         }
 
-        private boolean isCarrierRttSupported() {
-            PersistableBundle b =
-                    PhoneGlobals.getInstance().getCarrierConfigForSubId(mPhone.getSubId());
-            return b != null && b.getBoolean(CarrierConfigManager.KEY_RTT_SUPPORTED_BOOL);
-        }
-
         /**
          * Determines from carrier config whether merging of wifi calls is allowed when VoWIFI is
          * turned off.
@@ -444,6 +443,18 @@
         }
 
         /**
+         * Determines from carrier config whether the carrier requires the use of a call recording
+         * tone.
+         *
+         * @return {@code true} if a call recording tone should be used, {@code false} otherwise.
+         */
+        private boolean isCarrierUseCallRecordingTone() {
+            PersistableBundle b =
+                    PhoneGlobals.getInstance().getCarrierConfigForSubId(mPhone.getSubId());
+            return b.getBoolean(CarrierConfigManager.KEY_PLAY_CALL_RECORDING_TONE_BOOL);
+        }
+
+        /**
          * Where a device supports instant lettering and call subjects, retrieves the necessary
          * PhoneAccount extras for those features.
          *

diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index b82c202..ea0e6fb 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java

@@ -33,6 +33,7 @@
 import android.telecom.TelecomManager;
 import android.telecom.VideoProfile;
 import android.telephony.CarrierConfigManager;
+import android.telephony.DisconnectCause;
 import android.telephony.PhoneNumberUtils;
 import android.telephony.TelephonyManager;
 import android.telephony.ims.ImsCallProfile;
@@ -443,6 +444,22 @@
                 sendRttInitiationFailure(status);
             }
         }
+
+        @Override
+        public void onDisconnect(int cause) {
+            Log.i(this, "onDisconnect: cause=%s", DisconnectCause.toString(cause));
+            mHandler.obtainMessage(MSG_DISCONNECT);
+        }
+
+        @Override
+        public void onRttInitiated() {
+            sendRttInitiationSuccess();
+        }
+
+        @Override
+        public void onRttTerminated() {
+            sendRttSessionRemotelyTerminated();
+        }
     };
 
     protected com.android.internal.telephony.Connection mOriginalConnection;
@@ -451,6 +468,7 @@
     private boolean mIsStateOverridden = false;
     private Call.State mOriginalConnectionState = Call.State.IDLE;
     private Call.State mConnectionOverriddenState = Call.State.IDLE;
+    private RttTextStream mRttTextStream = null;
 
     private boolean mWasImsConnection;
 
@@ -845,6 +863,8 @@
                 mIsCdmaVoicePrivacyEnabled);
         newProperties = changeBitmask(newProperties, PROPERTY_ASSISTED_DIALING_USED,
                 mIsUsingAssistedDialing);
+        newProperties = changeBitmask(newProperties, PROPERTY_IS_RTT,
+                (getConnectionProperties() & PROPERTY_IS_RTT) != 0);
 
         if (getConnectionProperties() != newProperties) {
             setConnectionProperties(newProperties);
@@ -899,7 +919,6 @@
         getPhone().registerForHandoverStateChanged(
                 mHandler, MSG_HANDOVER_STATE_CHANGED, null);
         getPhone().registerForRingbackTone(mHandler, MSG_RINGBACK_TONE, null);
-        getPhone().registerForDisconnect(mHandler, MSG_DISCONNECT, null);
         getPhone().registerForSuppServiceNotification(mHandler, MSG_SUPP_SERVICE_NOTIFY, null);
         getPhone().registerForOnHoldTone(mHandler, MSG_ON_HOLD_TONE, null);
         getPhone().registerForInCallVoicePrivacyOn(mHandler, MSG_CDMA_VOICE_PRIVACY_ON, null);
@@ -1050,6 +1069,8 @@
                 b != null && b.getBoolean(CarrierConfigManager.KEY_WIFI_CALLS_CAN_BE_HD_AUDIO);
         boolean canVideoCallsBeHdAudio =
                 b != null && b.getBoolean(CarrierConfigManager.KEY_VIDEO_CALLS_CAN_BE_HD_AUDIO);
+        boolean canGsmCdmaCallsBeHdAudio =
+                b != null && b.getBoolean(CarrierConfigManager.KEY_GSM_CDMA_CALLS_CAN_BE_HD_AUDIO);
         boolean shouldDisplayHdAudio =
                 b != null && b.getBoolean(CarrierConfigManager.KEY_DISPLAY_HD_AUDIO_PROPERTY_BOOL);
 
@@ -1057,6 +1078,10 @@
             return false;
         }
 
+        if (isGsmCdmaConnection() && !canGsmCdmaCallsBeHdAudio) {
+            return false;
+        }
+
         if (isVideoCall && !canVideoCallsBeHdAudio) {
             return false;
         }
@@ -1339,7 +1364,8 @@
             newState = mOriginalConnection.getState();
         }
         int cause = mOriginalConnection.getDisconnectCause();
-        Log.v(this, "Update state from %s to %s for %s", mConnectionState, newState, this);
+        Log.v(this, "Update state from %s to %s for %s", mConnectionState, newState,
+                getTelecomCallId());
 
         if (mConnectionState != newState) {
             mConnectionState = newState;
@@ -1645,6 +1671,14 @@
         return false;
     }
 
+    public void setRttTextStream(RttTextStream s) {
+        mRttTextStream = s;
+    }
+
+    public RttTextStream getRttTextStream() {
+        return mRttTextStream;
+    }
+
     /**
      * For video calls, sets whether this connection supports pausing the outgoing video for the
      * call using the {@link android.telecom.VideoProfile#STATE_PAUSED} VideoState.
@@ -1720,6 +1754,25 @@
     }
 
     /**
+     * Whether the original connection is an GSM/CDMA connection.
+     * @return {@code True} if the original connection is an GSM/CDMA connection, {@code false}
+     *     otherwise.
+     */
+    protected boolean isGsmCdmaConnection() {
+        Phone phone = getPhone();
+        if (phone != null) {
+            switch (phone.getPhoneType()) {
+                case PhoneConstants.PHONE_TYPE_GSM:
+                case PhoneConstants.PHONE_TYPE_CDMA:
+                    return true;
+                default:
+                    return false;
+            }
+        }
+        return false;
+    }
+
+    /**
      * Whether the original connection was ever an IMS connection, either before or now.
      * @return {@code True} if the original connection was ever an IMS connection, {@code false}
      *     otherwise.

diff --git a/src/com/android/services/telephony/TelephonyConnectionService.java b/src/com/android/services/telephony/TelephonyConnectionService.java
index 04d560a..e2f596f 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java

@@ -715,6 +715,7 @@
         connection.setAddress(handle, PhoneConstants.PRESENTATION_ALLOWED);
         connection.setInitializing();
         connection.setVideoState(request.getVideoState());
+        connection.setRttTextStream(request.getRttTextStream());
 
         return connection;
     }
@@ -1088,7 +1089,11 @@
         com.android.internal.telephony.Connection originalConnection = null;
         try {
             if (phone != null) {
-                originalConnection = phone.dial(number, null, videoState, extras);
+                originalConnection = phone.dial(number, new ImsPhone.ImsDialArgs.Builder()
+                        .setVideoState(videoState)
+                        .setIntentExtras(extras)
+                        .setRttTextStream(connection.getRttTextStream())
+                        .build());
             }
         } catch (CallStateException e) {
             Log.e(this, e, "placeOutgoingConnection, phone.dial exception: " + e);

diff --git a/testapps/TelephonyRegistryTestApp/Android.mk b/testapps/TelephonyRegistryTestApp/Android.mk
new file mode 100644
index 0000000..ed1f2a3
--- /dev/null
+++ b/testapps/TelephonyRegistryTestApp/Android.mk

@@ -0,0 +1,17 @@
+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_PACKAGE_NAME := TelephonyRegistryTestApp
+
+LOCAL_CERTIFICATE := platform
+LOCAL_MODULE_TAGS := tests
+#LOCAL_MODULE_TAGS := debug
+
+include $(BUILD_PACKAGE)

diff --git a/testapps/TelephonyRegistryTestApp/AndroidManifest.xml b/testapps/TelephonyRegistryTestApp/AndroidManifest.xml
new file mode 100644
index 0000000..5f19509
--- /dev/null
+++ b/testapps/TelephonyRegistryTestApp/AndroidManifest.xml

@@ -0,0 +1,33 @@
+<?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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.android.phone.testapps.telephonyregistry">
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+    <application android:label="TelephonyRegistryTestApp">
+        <activity
+            android:name=".TelephonyRegistryTestApp"
+            android:label="TelephonyRegistryTestApp">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
+

diff --git a/testapps/TelephonyRegistryTestApp/res/layout/activity_main.xml b/testapps/TelephonyRegistryTestApp/res/layout/activity_main.xml
new file mode 100644
index 0000000..405efe2
--- /dev/null
+++ b/testapps/TelephonyRegistryTestApp/res/layout/activity_main.xml

@@ -0,0 +1,52 @@
+<?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" >
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:id="@+id/events">
+        </LinearLayout>
+    </ScrollView>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+        <Button
+            android:id="@+id/queryCellLocationButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_row="0"
+            android:layout_column="0"
+            android:text="@string/query_cell_location_button" />
+        <Button
+            android:id="@+id/registerButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_row="0"
+            android:layout_column="0"
+            android:text="@string/register_button" />
+    </LinearLayout>
+</LinearLayout>

diff --git a/testapps/TelephonyRegistryTestApp/res/values/donottranslate_strings.xml b/testapps/TelephonyRegistryTestApp/res/values/donottranslate_strings.xml
new file mode 100644
index 0000000..897b83e
--- /dev/null
+++ b/testapps/TelephonyRegistryTestApp/res/values/donottranslate_strings.xml

@@ -0,0 +1,21 @@
+<?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
+  -->
+
+<resources>
+    <string name="register_button">Register</string>
+    <string name="query_cell_location_button">Query</string>
+</resources>
\ No newline at end of file

diff --git a/testapps/TelephonyRegistryTestApp/src/com/android/phone/testapps/telephonyregistry/TelephonyRegistryTestApp.java b/testapps/TelephonyRegistryTestApp/src/com/android/phone/testapps/telephonyregistry/TelephonyRegistryTestApp.java
new file mode 100644
index 0000000..e423619
--- /dev/null
+++ b/testapps/TelephonyRegistryTestApp/src/com/android/phone/testapps/telephonyregistry/TelephonyRegistryTestApp.java

@@ -0,0 +1,131 @@
+/*
+ * 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
+ */
+
+package com.android.phone.testapps.telephonyregistry;
+
+import android.app.Activity;
+import android.app.Notification;
+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;
+import android.telephony.TelephonyManager;
+import android.util.SparseArray;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.LinearLayout;
+import android.widget.Toast;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class TelephonyRegistryTestApp extends Activity {
+    private TelephonyManager telephonyManager;
+    private NotificationManager notificationManager;
+    private int mSelectedEvents = 0;
+    private static final String NOTIFICATION_CHANNEL = "registryUpdate";
+
+    private static final SparseArray<String> EVENTS = new SparseArray<String>() {{
+        put(PhoneStateListener.LISTEN_SERVICE_STATE, "SERVICE_STATE");
+        put(PhoneStateListener.LISTEN_MESSAGE_WAITING_INDICATOR, "MESSAGE_WAITING_INDICATOR");
+        put(PhoneStateListener.LISTEN_CALL_FORWARDING_INDICATOR, "CALL_FORWARDING_INDICATOR");
+        put(PhoneStateListener.LISTEN_CELL_LOCATION, "CELL_LOCATION");
+        put(PhoneStateListener.LISTEN_CALL_STATE, "CALL_STATE");
+        put(PhoneStateListener.LISTEN_DATA_CONNECTION_STATE, "DATA_CONNECTION_STATE");
+        put(PhoneStateListener.LISTEN_DATA_ACTIVITY, "DATA_ACTIVITY");
+        put(PhoneStateListener.LISTEN_SIGNAL_STRENGTHS, "SIGNAL_STRENGTHS");
+        put(PhoneStateListener.LISTEN_OTASP_CHANGED, "OTASP_CHANGED");
+        put(PhoneStateListener.LISTEN_CELL_INFO, "CELL_INFO");
+        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_CARRIER_NETWORK_CHANGE, "CARRIER_NETWORK_CHANGE");
+        put(PhoneStateListener.LISTEN_VOICE_ACTIVATION_STATE, "VOICE_ACTIVATION_STATE");
+        put(PhoneStateListener.LISTEN_DATA_ACTIVATION_STATE, "DATA_ACTIVATION_STATE");
+    }};
+
+    private final PhoneStateListener phoneStateListener = new PhoneStateListener() {
+        @Override
+        public void onCellLocationChanged(CellLocation location) {
+            notify("onCellLocationChanged", location);
+        }
+
+        @Override
+        public void onCellInfoChanged(List<CellInfo> cellInfo) {
+            notify("onCellInfoChanged", cellInfo);
+        }
+
+        private void notify(String method, Object data) {
+            Notification.Builder builder = new Notification.Builder(TelephonyRegistryTestApp.this,
+                    NOTIFICATION_CHANNEL);
+            Notification notification = builder.setSmallIcon(android.R.drawable.sym_def_app_icon)
+                    .setContentTitle("Registry update: " + method)
+                    .setContentText(data == null ? "null" : data.toString())
+                    .build();
+            notificationManager.notify(0, notification);
+        }
+    };
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        telephonyManager = getSystemService(TelephonyManager.class);
+
+        LinearLayout eventContainer = (LinearLayout) findViewById(R.id.events);
+        for (int i = 0; i < EVENTS.size(); i++) {
+            CheckBox box = new CheckBox(this);
+            box.setText(EVENTS.valueAt(i));
+            final int eventCode = EVENTS.keyAt(i);
+            box.setOnCheckedChangeListener((buttonView, isChecked) -> {
+                if (buttonView.isChecked()) {
+                    mSelectedEvents |= eventCode;
+                } else {
+                    mSelectedEvents &= ~eventCode;
+                }
+            });
+            eventContainer.addView(box);
+        }
+
+        Button registerButton = (Button) findViewById(R.id.registerButton);
+        registerButton.setOnClickListener(v ->
+                telephonyManager.listen(phoneStateListener, mSelectedEvents));
+
+        Button queryCellLocationButton = findViewById(R.id.queryCellLocationButton);
+        queryCellLocationButton.setOnClickListener(v -> {
+            List<CellInfo> cellInfos = telephonyManager.getAllCellInfo();
+            String cellInfoText;
+            if (cellInfos == null || cellInfos.size() == 0) {
+                cellInfoText = "null";
+            } else {
+                cellInfoText = cellInfos.stream().map(CellInfo::toString)
+                        .collect(Collectors.joining(","));
+            }
+            Toast.makeText(TelephonyRegistryTestApp.this, "queryCellInfo: " + cellInfoText,
+                    Toast.LENGTH_SHORT).show();
+        });
+
+        notificationManager = getSystemService(NotificationManager.class);
+        NotificationChannel channel = new NotificationChannel(NOTIFICATION_CHANNEL,
+                "Telephony Registry updates", NotificationManager.IMPORTANCE_HIGH);
+        notificationManager.createNotificationChannel(channel);
+    }
+}

diff --git a/tests/robotests/Android.mk b/tests/robotests/Android.mk
index d686e42..1aee1e3 100644
--- a/tests/robotests/Android.mk
+++ b/tests/robotests/Android.mk

@@ -1,46 +1,40 @@
-#############################################
-# Telephony Robolectric test target. #
-#############################################
-LOCAL_PATH:= $(call my-dir)
+##############################################
+# Compile TeleService robolectric tests
+##############################################
+LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_PRIVILEGED_MODULE := true
+LOCAL_MODULE := TeleService_robotests
 
-# Include the testing libraries (JUnit4 + Robolectric libs).
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    platform-robolectric-android-all-stubs \
-    android-support-test \
-    mockito-robolectric-prebuilt \
-    platform-test-annotations \
-    truth-prebuilt \
-    testng
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_JAVA_RESOURCE_DIRS := res
 
 LOCAL_JAVA_LIBRARIES := \
-    junit \
-    platform-robolectric-3.6.1-prebuilt \
-    telephony-common \
-    sdk_vcurrent
+  robolectric_android-all-stub \
+  Robolectric_all-target \
+  truth-prebuilt
 
 LOCAL_INSTRUMENTATION_FOR := TeleService
-LOCAL_MODULE := TeleRobo
-
-LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
-#############################################################
-# Telephony runner target to run the previous target. #
-#############################################################
+##############################################
+# Execute TeleService robolectric tests
+##############################################
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := TelephonyRoboTests
-
-LOCAL_SDK_VERSION := current
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    TeleRobo \
+LOCAL_MODULE := Run_TeleService_robotests
 
 LOCAL_TEST_PACKAGE := TeleService
 
-include prebuilts/misc/common/robolectric/3.6.1/run_robotests.mk
\ No newline at end of file
+LOCAL_JAVA_LIBRARIES := \
+  TeleService_robotests \
+  robolectric_android-all-stub \
+  Robolectric_all-target \
+  truth-prebuilt
+
+LOCAL_ROBOTEST_FILES := $(filter-out %/BaseRobolectricTest.java,\
+  $(call find-files-in-subdirs, $(LOCAL_PATH)/src, *Test.java, .))
+
+include external/robolectric-shadows/run_robotests.mk
\ No newline at end of file

diff --git a/tests/robotests/res/robolectric.properties b/tests/robotests/res/robolectric.properties
new file mode 100644
index 0000000..d83f967
--- /dev/null
+++ b/tests/robotests/res/robolectric.properties

@@ -0,0 +1,3 @@
+manifest=/packages/services/Telephony/AndroidManifest.xml
+sdk=NEWEST_SDK
+shadows=com.android.phone.ShadowPhoneGlobals
\ No newline at end of file

diff --git a/tests/robotests/src/com/android/phone/ShadowPhoneGlobals.java b/tests/robotests/src/com/android/phone/ShadowPhoneGlobals.java
new file mode 100644
index 0000000..fb38d10
--- /dev/null
+++ b/tests/robotests/src/com/android/phone/ShadowPhoneGlobals.java

@@ -0,0 +1,41 @@
+/*
+ * 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.os.Build;
+
+import com.android.i18n.phonenumbers.PhoneNumberUtil;
+
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+@Implements(PhoneGlobals.class)
+public class ShadowPhoneGlobals {
+
+  private final PhoneNumberUtil mPhoneNumberUtil = PhoneNumberUtil.getInstance();
+
+  @Implementation
+  public static PhoneGlobals getInstance() {
+    return new PhoneGlobals(RuntimeEnvironment.application);
+  }
+
+  @Implementation(minSdk = Build.VERSION_CODES.P)
+  public PhoneNumberUtil getPhoneNumberUtil() {
+    return mPhoneNumberUtil;
+  }
+}
\ No newline at end of file

diff --git a/tests/robotests/src/com/android/phone/TestPhoneApp.java b/tests/robotests/src/com/android/phone/TestPhoneApp.java
new file mode 100644
index 0000000..ce4a576
--- /dev/null
+++ b/tests/robotests/src/com/android/phone/TestPhoneApp.java

@@ -0,0 +1,33 @@
+/*
+ * 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.app.Application;
+
+/**
+ * TestPhoneApp replaces {@link PhoneApp} when TelephonyService robolectric tests are executed.
+ */
+@SuppressWarnings("unused")
+public class TestPhoneApp extends Application {
+
+  @Override
+  public void onCreate() {
+    // Obscure the call to PhoneApp.onCreate(). It triggers a lot of static initialization that:
+    // a) does not like to execute more than once in a process
+    // b) relies on many values found in Android that would have to be mocked
+  }
+}

diff --git a/tests/robotests/src/com/android/phone/assisteddialing/AssistedDialingMediatorStubTest.java b/tests/robotests/src/com/android/phone/assisteddialing/AssistedDialingMediatorStubTest.java
index 57bf127..225776f 100755
--- a/tests/robotests/src/com/android/phone/assisteddialing/AssistedDialingMediatorStubTest.java
+++ b/tests/robotests/src/com/android/phone/assisteddialing/AssistedDialingMediatorStubTest.java

@@ -16,28 +16,24 @@
 
 package com.android.phone.assisteddialing;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import android.content.Context;
 import android.telephony.TelephonyManager;
 
-import static com.google.common.truth.Truth.assertThat;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
 import org.robolectric.shadow.api.Shadow;
 import org.robolectric.shadows.ShadowTelephonyManager;
 
 import java.util.Optional;
+
 /**
  * Unit Tests for AssistedDialingMediator.
  */
 @RunWith(RobolectricTestRunner.class)
-@Config(
-        manifest = Config.NONE,
-        shadows = {ShadowTelephonyManager.class}
-)
 public class AssistedDialingMediatorStubTest {
 
     private final TelephonyManager mTelephonyManager =

diff --git a/tests/robotests/src/com/android/phone/assisteddialing/ConstraintsTest.java b/tests/robotests/src/com/android/phone/assisteddialing/ConstraintsTest.java
new file mode 100644
index 0000000..f67e06f
--- /dev/null
+++ b/tests/robotests/src/com/android/phone/assisteddialing/ConstraintsTest.java

@@ -0,0 +1,147 @@
+/*
+ * 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.assisteddialing;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+/**
+ * Unit Tests for Constraints.
+ */
+@RunWith(RobolectricTestRunner.class)
+public class ConstraintsTest {
+
+  public final Context mContext = RuntimeEnvironment.application.getBaseContext();
+  private final CountryCodeProvider mCountryCodeProvider = new CountryCodeProvider();
+  private Constraints mConstraints = new Constraints(mContext, mCountryCodeProvider);
+
+  @Test
+  public void testnumberMeetsPreconditionsForAssistedDialing_countryCodesEquivalent() {
+    assertThat(
+        mConstraints.meetsPreconditions(
+            AssistedDialingTestHelper.TEST_NUMBER_UNITED_STATES,
+            AssistedDialingTestHelper.SUPPORTED_COUNTRY_CODE_UNITED_STATES,
+            AssistedDialingTestHelper.SUPPORTED_COUNTRY_CODE_UNITED_STATES))
+        .isFalse();
+  }
+
+  @Test
+  public void testnumberMeetsPreconditionsForAssistedDialing_countryCodesUnsupported() {
+    assertThat(
+        mConstraints.meetsPreconditions(
+            AssistedDialingTestHelper.TEST_NUMBER_UNITED_STATES,
+            AssistedDialingTestHelper.SUPPORTED_COUNTRY_CODE_UNITED_STATES,
+            AssistedDialingTestHelper.UNSUPPORTED_COUNTRY_CODE_NORTH_KOREA))
+        .isFalse();
+  }
+
+  @Test
+  public void testnumberMeetsPreconditionsForAssistedDialing_numberIsAlreadyInternational() {
+    assertThat(
+        mConstraints.meetsPreconditions(
+            AssistedDialingTestHelper.INTERNATIONAL_TEST_NUMBER_UNITED_STATES,
+            AssistedDialingTestHelper.SUPPORTED_COUNTRY_CODE_UNITED_STATES,
+            AssistedDialingTestHelper.SUPPORTED_COUNTRY_CODE_UNITED_KINGDOM))
+        .isFalse();
+  }
+
+  @Test
+  public void testnumberMeetsPreconditionsForAssistedDialing_conditionsAreCorrect() {
+    assertThat(
+        mConstraints.meetsPreconditions(
+            AssistedDialingTestHelper.TEST_NUMBER_UNITED_STATES,
+            AssistedDialingTestHelper.SUPPORTED_COUNTRY_CODE_UNITED_STATES,
+            AssistedDialingTestHelper.SUPPORTED_COUNTRY_CODE_UNITED_KINGDOM))
+        .isTrue();
+  }
+
+  @Test
+  public void testLocalesAreAlwaysUpperCase() {
+    assertThat(
+        mConstraints.meetsPreconditions(
+            AssistedDialingTestHelper.TEST_NUMBER_UNITED_STATES,
+            AssistedDialingTestHelper
+                .SUPPORTED_COUNTRY_CODE_UNITED_STATES.toLowerCase(),
+            AssistedDialingTestHelper
+                .SUPPORTED_COUNTRY_CODE_UNITED_KINGDOM.toLowerCase()))
+        .isTrue();
+  }
+
+  @Test
+  public void testnumberMeetsPreconditionsForAssistedDialing_nullNumber() {
+    assertThat(
+        mConstraints.meetsPreconditions(
+            null,
+            AssistedDialingTestHelper.SUPPORTED_COUNTRY_CODE_UNITED_STATES,
+            AssistedDialingTestHelper.SUPPORTED_COUNTRY_CODE_UNITED_KINGDOM))
+        .isFalse();
+  }
+
+  @Test
+  public void testnumberMeetsPreconditionsForAssistedDialing_hasExtension() {
+    assertThat(
+        mConstraints.meetsPreconditions(AssistedDialingTestHelper
+                .TEST_NUMBER_UNITED_STATES_WITH_POST_DIAL_EXTENSION,
+            AssistedDialingTestHelper.SUPPORTED_COUNTRY_CODE_UNITED_STATES,
+            AssistedDialingTestHelper.SUPPORTED_COUNTRY_CODE_UNITED_KINGDOM))
+        .isFalse();
+  }
+
+  @Test
+  public void testnumberMeetsPreconditionsForAssistedDialing_nullCountryCodes() {
+    assertThat(
+        mConstraints.meetsPreconditions(
+            AssistedDialingTestHelper.TEST_NUMBER_UNITED_STATES, null, null))
+        .isFalse();
+  }
+
+  @Test
+  public void testnumberPreconditionsForAssistedDialing_isLocalEmergencyNumber_unitedStates() {
+    assertThat(
+        mConstraints.meetsPreconditions(
+            AssistedDialingTestHelper.TEST_NUMBER_EMERGENCY_UNITED_STATES,
+            AssistedDialingTestHelper.SUPPORTED_COUNTRY_CODE_UNITED_KINGDOM,
+            AssistedDialingTestHelper.SUPPORTED_COUNTRY_CODE_UNITED_STATES))
+        .isFalse();
+  }
+
+  @Test
+  public void testnumberMeetsPreconditionsForAssistedDialing_numberIsInvalid() {
+    assertThat(
+        mConstraints.meetsPreconditions(
+            AssistedDialingTestHelper.INVALID_TEST_NUMBER_UNITED_STATES,
+            AssistedDialingTestHelper.SUPPORTED_COUNTRY_CODE_UNITED_STATES,
+            AssistedDialingTestHelper.SUPPORTED_COUNTRY_CODE_UNITED_KINGDOM))
+        .isFalse();
+  }
+
+  @Test
+  public void testnumberMeetsPreconditionsForAssistedDialing_numberShouldNotParse() {
+    assertThat(
+        mConstraints.meetsPreconditions(
+            AssistedDialingTestHelper.INVALID_NUMBER_ENCODING,
+            AssistedDialingTestHelper.SUPPORTED_COUNTRY_CODE_UNITED_STATES,
+            AssistedDialingTestHelper.SUPPORTED_COUNTRY_CODE_UNITED_KINGDOM))
+        .isFalse();
+  }
+}

diff --git a/tests/robotests/src/com/android/phone/assisteddialing/CountryCodeProviderTest.java b/tests/robotests/src/com/android/phone/assisteddialing/CountryCodeProviderTest.java
index 3afbc76..028b0f2 100755
--- a/tests/robotests/src/com/android/phone/assisteddialing/CountryCodeProviderTest.java
+++ b/tests/robotests/src/com/android/phone/assisteddialing/CountryCodeProviderTest.java

@@ -21,13 +21,11 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
 
 /**
  * Unit Tests for CountryCodeProvider.
  */
 @RunWith(RobolectricTestRunner.class)
-@Config(manifest = Config.NONE)
 public class CountryCodeProviderTest {
 
     private final CountryCodeProvider mCountryCodeProvider = new CountryCodeProvider();
@@ -38,5 +36,4 @@
             assertThat(mCountryCodeProvider.isSupportedCountryCode(country)).isTrue();
         }
     }
-
 }

diff --git a/tests/robotests/src/com/android/phone/assisteddialing/LocationDetectorTest.java b/tests/robotests/src/com/android/phone/assisteddialing/LocationDetectorTest.java
index 4b19f71..70dc5b0 100755
--- a/tests/robotests/src/com/android/phone/assisteddialing/LocationDetectorTest.java
+++ b/tests/robotests/src/com/android/phone/assisteddialing/LocationDetectorTest.java

@@ -16,16 +16,15 @@
 
 package com.android.phone.assisteddialing;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import android.content.Context;
 import android.telephony.TelephonyManager;
 
-import static com.google.common.truth.Truth.assertThat;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
 import org.robolectric.shadow.api.Shadow;
 import org.robolectric.shadows.ShadowTelephonyManager;
 
@@ -36,10 +35,6 @@
  * Unit Tests for LocationDetector.
  */
 @RunWith(RobolectricTestRunner.class)
-@Config(
-        manifest = Config.NONE,
-        shadows = {ShadowTelephonyManager.class}
-)
 public class LocationDetectorTest {
 
     private final TelephonyManager mTelephonyManager =

diff --git a/tests/src/com/android/services/telephony/TelephonyConnectionServiceTest.java b/tests/src/com/android/services/telephony/TelephonyConnectionServiceTest.java
index eb8c48a..700b626 100644
--- a/tests/src/com/android/services/telephony/TelephonyConnectionServiceTest.java
+++ b/tests/src/com/android/services/telephony/TelephonyConnectionServiceTest.java

@@ -533,7 +533,7 @@
         // was redialed on the same slot
         assertEquals(0, c.getNotifyPhoneAccountChangedCount());
         try {
-            verify(slot0Phone).dial(anyString(), any(), anyInt(), any());
+            verify(slot0Phone).dial(anyString(), any());
         } catch (CallStateException e) {
             // This shouldn't happen
             fail();
@@ -565,7 +565,7 @@
         // was never redialed
         assertEquals(0, c.getNotifyPhoneAccountChangedCount());
         try {
-            verify(slot0Phone, never()).dial(anyString(), any(), anyInt(), any());
+            verify(slot0Phone, never()).dial(anyString(), any());
         } catch (CallStateException e) {
             // This shouldn't happen
             fail();
@@ -605,7 +605,7 @@
         // redialed on another slot
         assertEquals(1, c.getNotifyPhoneAccountChangedCount());
         try {
-            verify(slot1Phone).dial(anyString(), any(), anyInt(), any());
+            verify(slot1Phone).dial(anyString(), any());
         } catch (CallStateException e) {
             // This shouldn't happen
             fail();
@@ -643,7 +643,7 @@
         // redialed on another slot
         assertEquals(1, c.getNotifyPhoneAccountChangedCount());
         try {
-            verify(slot1Phone).dial(anyString(), any(), anyInt(), any());
+            verify(slot1Phone).dial(anyString(), any());
         } catch (CallStateException e) {
             // This shouldn't happen
             fail();
@@ -694,8 +694,8 @@
         // redialed on another slot
         assertEquals(2, c.getNotifyPhoneAccountChangedCount());
         try {
-            verify(slot0Phone).dial(anyString(), any(), anyInt(), any());
-            verify(slot1Phone).dial(anyString(), any(), anyInt(), any());
+            verify(slot0Phone).dial(anyString(), any());
+            verify(slot1Phone).dial(anyString(), any());
         } catch (CallStateException e) {
             // This shouldn't happen
             fail();
@@ -744,8 +744,8 @@
         // redialed on another slot
         assertEquals(1, c.getNotifyPhoneAccountChangedCount());
         try {
-            verify(slot1Phone).dial(anyString(), any(), anyInt(), any());
-            verify(slot0Phone, never()).dial(anyString(), any(), anyInt(), any());
+            verify(slot1Phone).dial(anyString(), any());
+            verify(slot0Phone, never()).dial(anyString(), any());
         } catch (CallStateException e) {
             // This shouldn't happen
             fail();
@@ -792,7 +792,7 @@
 
     private void setPhonesDialConnection(Phone phone, Connection c) {
         try {
-            when(phone.dial(anyString(), anyInt())).thenReturn(c);
+            when(phone.dial(anyString(), any())).thenReturn(c);
         } catch (CallStateException e) {
             // this shouldn't happen
             fail();
commit	32dc8bf292ca653edbd598209571a04c4284b1aa	[log] [tgz]
author	TreeHugger Robot <treehugger-gerrit@google.com>	Wed Feb 07 23:31:37 2018 +0000
committer	Android (Google) Code Review <android-gerrit@google.com>	Wed Feb 07 23:31:37 2018 +0000
tree	ad3c319bed7ff3188061f6080453cfd06722f4cf
parent	b9bd52cab83f4ac934fb1e17d57f320f613dd239 [diff]
parent	795c588594b0a38f4dd9fe2e5a3f6a37e607b7e6 [diff]