Merge "String changes in UI for enabling roaming data."
diff --git a/res/layout/dialog_ussd_response.xml b/res/layout/dialog_ussd_response.xml
index dabce3e..93efee3 100644
--- a/res/layout/dialog_ussd_response.xml
+++ b/res/layout/dialog_ussd_response.xml
@@ -4,9 +4,9 @@
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,7 +19,14 @@
scrollView ScrollView, in the contentPanel LinearLayout, so it
does not need to be replaced here. For now, all we have is the
input_field EditText to display user data entry. -->
-<EditText xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/input_field"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="wrap_content"/>
+ android:layout_height="wrap_content"
+ android:paddingStart="20dp"
+ android:paddingEnd="20dp">
+
+ <EditText android:id="@+id/input_field"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+
+</FrameLayout>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index 829ccbf..f497a70 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -111,7 +111,7 @@
<string name="sum_cfb_disabled" msgid="4913145177320506827">"বন্ধ আছে"</string>
<string name="disable_cfb_forbidden" msgid="3506984333877998061">"আপনার অপারেটর আপনার ফোন ব্যস্ত থাকাকালীন কল ফরওয়ার্ডিংকে অক্ষম করা সমর্থন করে না৷"</string>
<string name="labelCFNRy" msgid="1736067178393744351">"যখন উত্তর দেয় না"</string>
- <string name="messageCFNRy" msgid="672317899884380374">"যখন উত্তর করছে না তখনকার নম্বর"</string>
+ <string name="messageCFNRy" msgid="672317899884380374">"যখন নম্বর থেকে উত্তর আসছে না তখন"</string>
<string name="sum_cfnry_enabled" msgid="6955775691317662910">"<xliff:g id="PHONENUMBER">{0}</xliff:g> এ ফরওয়ার্ড করা হচ্ছে"</string>
<string name="sum_cfnry_disabled" msgid="3884684060443538097">"বন্ধ আছে"</string>
<string name="disable_cfnry_forbidden" msgid="4308233959150658058">"আপনার অপারেটর আপনার ফোনে যখন উত্তর করা যাচ্ছে না তখন কল ফরওয়ার্ডিংকে অক্ষম করা সমর্থন করে না৷"</string>
@@ -200,7 +200,7 @@
<string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"ভয়েস এবং অন্যান্য যোগাযোগব্যবস্থা উন্নত করতে LTE পরিষেবা ব্যবহার করুন (প্রস্তাবিত)"</string>
<string name="data_enabled" msgid="5972538663568715366">"ডেটা সক্ষম করা হয়েছে"</string>
<string name="data_enable_summary" msgid="2382798156640007971">"ডেটা ব্যবহারের অনুমতি দিন"</string>
- <string name="roaming" msgid="8871412572928323707">"ডেটা রোমিং"</string>
+ <string name="roaming" msgid="8871412572928323707">"রোমিং ডেটা"</string>
<string name="roaming_enable" msgid="7331106985174381987">"রোমিংয়ে থাকাকালীন ডেটা পরিষেবাগুলির সাথে সংযোগ স্থাপন করুন"</string>
<string name="roaming_disable" msgid="1843417228755568110">"রোমিংয়ে থাকাকালীন ডেটা পরিষেবাগুলির সাথে সংযোগ স্থাপন করুন"</string>
<string name="roaming_reenable_message" msgid="8913735676127858115">"আপনি ডেটা রোমিং বন্ধ করে আপনার হোম নেটওয়ার্কের বাইরে চলে আসায় আপনার ডেটা সংযোগ হারিয়ে ফেলেছেন৷"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index c0183d1..55c81da 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -329,18 +329,18 @@
<string name="cdma_activate_device" msgid="3793805892364814518">"Aktivovat zařízení"</string>
<string name="cdma_lte_data_service" msgid="4255018217292548962">"Nastavit datovou službu"</string>
<string name="carrier_settings_title" msgid="9028166176523012300">"Nastavení operátora"</string>
- <string name="fdn" msgid="7878832555095183202">"Povolená telefonní čísla"</string>
- <string name="fdn_with_label" msgid="187084204115493366">"Povolená telefonní čísla (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+ <string name="fdn" msgid="7878832555095183202">"Povolená tel. čísla"</string>
+ <string name="fdn_with_label" msgid="187084204115493366">"Povolená tel. čísla (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="manage_fdn_list" msgid="8777755791892122369">"Seznam povolených telefonních čísel"</string>
<string name="fdn_list_with_label" msgid="7437232552210469217">"Seznam povolených telefonních čísel (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="fdn_activation" msgid="2156479741307463576">"Aktivace povolených telefonních čísel"</string>
- <string name="fdn_enabled" msgid="5238109009915521240">"Funkce Povolená telefonní čísla je zapnuta"</string>
- <string name="fdn_disabled" msgid="4700049736675368279">"Funkce Povolená telefonní čísla je vypnuta"</string>
- <string name="enable_fdn" msgid="3740191529180493851">"Zapnout funkci Povolená telefonní čísla"</string>
- <string name="disable_fdn" msgid="7944020890722540616">"Vypnout funkci Povolená telefonní čísla"</string>
+ <string name="fdn_enabled" msgid="5238109009915521240">"Funkce Povolená tel. čísla je zapnuta"</string>
+ <string name="fdn_disabled" msgid="4700049736675368279">"Funkce Povolená tel. čísla je vypnuta"</string>
+ <string name="enable_fdn" msgid="3740191529180493851">"Zapnout funkci Povolená tel. čísla"</string>
+ <string name="disable_fdn" msgid="7944020890722540616">"Vypnout funkci Povolená tel. čísla"</string>
<string name="change_pin2" msgid="2153563695382176676">"Změna kódu PIN2"</string>
- <string name="enable_fdn_ok" msgid="7215588870329688132">"Vypnout funkci Povolená telefonní čísla"</string>
- <string name="disable_fdn_ok" msgid="5727046928930740173">"Zapnout funkci Povolená telefonní čísla"</string>
+ <string name="enable_fdn_ok" msgid="7215588870329688132">"Vypnout funkci Povolená tel. čísla"</string>
+ <string name="disable_fdn_ok" msgid="5727046928930740173">"Zapnout funkci Povolená tel. čísla"</string>
<string name="sum_fdn" msgid="1959399454900272878">"Umožňuje spravovat povolená telefonní čísla"</string>
<string name="sum_fdn_change_pin" msgid="6666549734792827932">"Umožňuje změnit kód PIN pro přístup k povoleným telefonním číslům"</string>
<string name="sum_fdn_manage_list" msgid="8431088265332628316">"Správa telefonního seznamu"</string>
@@ -366,9 +366,9 @@
<string name="delete_fdn_contact" msgid="6668958073074151717">"Smazat povolené telefonní číslo"</string>
<string name="deleting_fdn_contact" msgid="5669163206349319969">"Mazání povoleného telefonního čísla..."</string>
<string name="fdn_contact_deleted" msgid="7154162327112259569">"Povolené telefonní číslo bylo smazáno."</string>
- <string name="pin2_invalid" msgid="5470854099230755944">"Funkce Povolená telefonní čísla nebyla aktualizována, protože jste zadali chybný kód PIN."</string>
- <string name="fdn_invalid_number" msgid="1494755047900009147">"Funkce Povolená telefonní čísla nebyla aktualizována, protože číslo nesmí obsahovat více než 20 číslic."</string>
- <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Povolená telefonní čísla (FDN) nebyla aktualizována. Kód PIN2 byl nesprávný nebo bylo telefonní číslo odmítnuto."</string>
+ <string name="pin2_invalid" msgid="5470854099230755944">"Funkce Povolená tel. čísla nebyla aktualizována, protože jste zadali chybný kód PIN."</string>
+ <string name="fdn_invalid_number" msgid="1494755047900009147">"Funkce Povolená tel. čísla nebyla aktualizována, protože číslo nesmí obsahovat více než 20 číslic."</string>
+ <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Povolená tel. čísla (FDN) nebyla aktualizována. Kód PIN2 byl nesprávný nebo bylo telefonní číslo odmítnuto."</string>
<string name="fdn_failed" msgid="540018079008319747">"Operace s čísly FDN se nezdařila."</string>
<string name="simContacts_emptyLoading" msgid="2203331234764498011">"Čtení ze SIM karty..."</string>
<string name="simContacts_empty" msgid="5270660846489561932">"Na SIM kartě nejsou žádné kontakty."</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index ce4790e..b75ee8a 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -122,14 +122,14 @@
<string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Η εταιρεία κινητής τηλεφωνίας δεν υποστηρίζει την απενεργοποίηση της προώθησης κλήσεων όταν το τηλέφωνό σας δεν έχει σήμα."</string>
<string name="updating_title" msgid="6146755386174019046">"Ρυθμίσεις κλήσης"</string>
<string name="call_settings_primary_user_only" msgid="5679923943740900965">"Οι ρυθμίσεις κλήσεων μπορούν να αλλάξουν μόνο από τον κύριο χρήστη."</string>
- <string name="call_settings_with_label" msgid="89359812614544532">"Ρυθμίσεις κλήσεων (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+ <string name="call_settings_with_label" msgid="89359812614544532">"Ρυθ/σεις (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="7970259216988931777">"Σφάλμα ρυθμίσεων κλήσης"</string>
<string name="reading_settings" msgid="1920291699287055284">"Ανάγνωση ρυθμίσεων…"</string>
<string name="updating_settings" msgid="8171225533884883252">"Ενημέρωση ρυθμίσεων..."</string>
<string name="reverting_settings" msgid="4752151682666912828">"Επαναφορά ρυθμίσεων…"</string>
<string name="response_error" msgid="6674110501330139405">"Μη αναμενόμενη απάντηση από το δίκτυο."</string>
<string name="exception_error" msgid="7027667130619518211">"Σφάλμα δικτύου ή κάρτας SIM."</string>
- <string name="fdn_check_failure" msgid="18200614306525434">"Έχει ενεργοποιηθεί η ρύθμιση αριθμών κλήσης καθορισμένων αριθμών της εφαρμογής του τηλεφώνου σας. Γι αυτόν τον λόγο δεν λειτουργούν ορισμένες λειτουργίες που σχετίζονται με τις κλήσεις."</string>
+ <string name="fdn_check_failure" msgid="18200614306525434">"Έχει ενεργοποιηθεί η προκαθορισμένων αριθμών κλήσης της εφαρμογής του τηλεφώνου σας. Γι αυτόν τον λόγο δεν λειτουργούν ορισμένες λειτουργίες που σχετίζονται με τις κλήσεις."</string>
<string name="radio_off_error" msgid="2304459933248513376">"Πριν προβάλετε αυτές τις ρυθμίσεις, ενεργοποιήστε τον πομπό."</string>
<string name="close_dialog" msgid="2365884406356986917">"OK"</string>
<string name="enable" msgid="7248657275000173526">"Ενεργοποίηση"</string>
@@ -329,19 +329,19 @@
<string name="cdma_activate_device" msgid="3793805892364814518">"Ενεργοποίηση συσκευής"</string>
<string name="cdma_lte_data_service" msgid="4255018217292548962">"Ρύθμιση υπηρεσίας δεδομένων"</string>
<string name="carrier_settings_title" msgid="9028166176523012300">"Ρυθμ. εταιρ. κιν. τηλεφ."</string>
- <string name="fdn" msgid="7878832555095183202">"Αριθμοί κλήσης καθορισμένων αριθμών"</string>
+ <string name="fdn" msgid="7878832555095183202">"Προκ/νοι αριθμοί κλήσης"</string>
<string name="fdn_with_label" msgid="187084204115493366">"Προκαθορισμένοι αριθμοί κλήσης (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="manage_fdn_list" msgid="8777755791892122369">"Λίστα FDN"</string>
<string name="fdn_list_with_label" msgid="7437232552210469217">"Λίστα προκαθορισμένων αριθμών κλήσης (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="fdn_activation" msgid="2156479741307463576">"Ενεργοποίηση FDN"</string>
- <string name="fdn_enabled" msgid="5238109009915521240">"Οι αριθμοί κλήσης καθορισμένων αριθμών είναι ενεργοποιημένοι"</string>
- <string name="fdn_disabled" msgid="4700049736675368279">"Οι αριθμοί κλήσης καθορισμένων αριθμών είναι απενεργοποιημένοι"</string>
+ <string name="fdn_enabled" msgid="5238109009915521240">"Οι αριθμοί προκαθορισμένων κλήσεων είναι ενεργοποιημένοι"</string>
+ <string name="fdn_disabled" msgid="4700049736675368279">"Οι αριθμοί προκαθορισμένων κλήσεων είναι απενεργοποιημένοι"</string>
<string name="enable_fdn" msgid="3740191529180493851">"Ενεργοποίηση FDN"</string>
<string name="disable_fdn" msgid="7944020890722540616">"Απενεργοποίηση του FDN"</string>
<string name="change_pin2" msgid="2153563695382176676">"Αλλαγή του αριθμού PIN2"</string>
<string name="enable_fdn_ok" msgid="7215588870329688132">"Απενεργοποίηση του FDN"</string>
<string name="disable_fdn_ok" msgid="5727046928930740173">"Ενεργοποίηση FDN"</string>
- <string name="sum_fdn" msgid="1959399454900272878">"Διαχείριση αριθμών κλήσης καθορισμένων αριθμών"</string>
+ <string name="sum_fdn" msgid="1959399454900272878">"Διαχείριση προκαθορισμένων αριθμών κλήσης"</string>
<string name="sum_fdn_change_pin" msgid="6666549734792827932">"Αλλαγή αριθμού PIN για πρόσβαση FDN"</string>
<string name="sum_fdn_manage_list" msgid="8431088265332628316">"Διαχείριση λίστας αριθμών τηλεφώνου"</string>
<string name="voice_privacy" msgid="3776841382844614716">"Απόρρητο φωνής"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 894aac9..d90b2f8 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -129,7 +129,7 @@
<string name="reverting_settings" msgid="4752151682666912828">"Reverting settings…"</string>
<string name="response_error" msgid="6674110501330139405">"Unexpected response from network."</string>
<string name="exception_error" msgid="7027667130619518211">"Network or SIM card error."</string>
- <string name="fdn_check_failure" msgid="18200614306525434">"Your Phone app\'s Fixed Dialing Numbers setting is turned on. As a result, some call-related features aren\'t working."</string>
+ <string name="fdn_check_failure" msgid="18200614306525434">"Your Phone app\'s fixed dialling numbers setting is turned on. As a result, some call-related features aren\'t working."</string>
<string name="radio_off_error" msgid="2304459933248513376">"Please turn on the radio before viewing these settings."</string>
<string name="close_dialog" msgid="2365884406356986917">"OK"</string>
<string name="enable" msgid="7248657275000173526">"Turn on"</string>
@@ -329,19 +329,19 @@
<string name="cdma_activate_device" msgid="3793805892364814518">"Activate device"</string>
<string name="cdma_lte_data_service" msgid="4255018217292548962">"Set up data service"</string>
<string name="carrier_settings_title" msgid="9028166176523012300">"Provider settings"</string>
- <string name="fdn" msgid="7878832555095183202">"Fixed Dialling Numbers"</string>
- <string name="fdn_with_label" msgid="187084204115493366">"Fixed Dialing Numbers (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+ <string name="fdn" msgid="7878832555095183202">"Fixed dialling numbers"</string>
+ <string name="fdn_with_label" msgid="187084204115493366">"Fixed dialling numbers (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="manage_fdn_list" msgid="8777755791892122369">"FDN list"</string>
<string name="fdn_list_with_label" msgid="7437232552210469217">"FDN list (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="fdn_activation" msgid="2156479741307463576">"FDN activation"</string>
- <string name="fdn_enabled" msgid="5238109009915521240">"Fixed Dialling Numbers are enabled"</string>
- <string name="fdn_disabled" msgid="4700049736675368279">"Fixed Dialling Numbers are disabled"</string>
+ <string name="fdn_enabled" msgid="5238109009915521240">"Fixed dialling numbers are enabled"</string>
+ <string name="fdn_disabled" msgid="4700049736675368279">"Fixed dialling numbers are disabled"</string>
<string name="enable_fdn" msgid="3740191529180493851">"Enable FDN"</string>
<string name="disable_fdn" msgid="7944020890722540616">"Disable FDN"</string>
<string name="change_pin2" msgid="2153563695382176676">"Change PIN2"</string>
<string name="enable_fdn_ok" msgid="7215588870329688132">"Disable FDN"</string>
<string name="disable_fdn_ok" msgid="5727046928930740173">"Enable FDN"</string>
- <string name="sum_fdn" msgid="1959399454900272878">"Manage Fixed Dialling Numbers"</string>
+ <string name="sum_fdn" msgid="1959399454900272878">"Manage fixed dialling numbers"</string>
<string name="sum_fdn_change_pin" msgid="6666549734792827932">"Change PIN for FDN access"</string>
<string name="sum_fdn_manage_list" msgid="8431088265332628316">"Manage phone number list"</string>
<string name="voice_privacy" msgid="3776841382844614716">"Voice privacy"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 894aac9..d90b2f8 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -129,7 +129,7 @@
<string name="reverting_settings" msgid="4752151682666912828">"Reverting settings…"</string>
<string name="response_error" msgid="6674110501330139405">"Unexpected response from network."</string>
<string name="exception_error" msgid="7027667130619518211">"Network or SIM card error."</string>
- <string name="fdn_check_failure" msgid="18200614306525434">"Your Phone app\'s Fixed Dialing Numbers setting is turned on. As a result, some call-related features aren\'t working."</string>
+ <string name="fdn_check_failure" msgid="18200614306525434">"Your Phone app\'s fixed dialling numbers setting is turned on. As a result, some call-related features aren\'t working."</string>
<string name="radio_off_error" msgid="2304459933248513376">"Please turn on the radio before viewing these settings."</string>
<string name="close_dialog" msgid="2365884406356986917">"OK"</string>
<string name="enable" msgid="7248657275000173526">"Turn on"</string>
@@ -329,19 +329,19 @@
<string name="cdma_activate_device" msgid="3793805892364814518">"Activate device"</string>
<string name="cdma_lte_data_service" msgid="4255018217292548962">"Set up data service"</string>
<string name="carrier_settings_title" msgid="9028166176523012300">"Provider settings"</string>
- <string name="fdn" msgid="7878832555095183202">"Fixed Dialling Numbers"</string>
- <string name="fdn_with_label" msgid="187084204115493366">"Fixed Dialing Numbers (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+ <string name="fdn" msgid="7878832555095183202">"Fixed dialling numbers"</string>
+ <string name="fdn_with_label" msgid="187084204115493366">"Fixed dialling numbers (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="manage_fdn_list" msgid="8777755791892122369">"FDN list"</string>
<string name="fdn_list_with_label" msgid="7437232552210469217">"FDN list (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="fdn_activation" msgid="2156479741307463576">"FDN activation"</string>
- <string name="fdn_enabled" msgid="5238109009915521240">"Fixed Dialling Numbers are enabled"</string>
- <string name="fdn_disabled" msgid="4700049736675368279">"Fixed Dialling Numbers are disabled"</string>
+ <string name="fdn_enabled" msgid="5238109009915521240">"Fixed dialling numbers are enabled"</string>
+ <string name="fdn_disabled" msgid="4700049736675368279">"Fixed dialling numbers are disabled"</string>
<string name="enable_fdn" msgid="3740191529180493851">"Enable FDN"</string>
<string name="disable_fdn" msgid="7944020890722540616">"Disable FDN"</string>
<string name="change_pin2" msgid="2153563695382176676">"Change PIN2"</string>
<string name="enable_fdn_ok" msgid="7215588870329688132">"Disable FDN"</string>
<string name="disable_fdn_ok" msgid="5727046928930740173">"Enable FDN"</string>
- <string name="sum_fdn" msgid="1959399454900272878">"Manage Fixed Dialling Numbers"</string>
+ <string name="sum_fdn" msgid="1959399454900272878">"Manage fixed dialling numbers"</string>
<string name="sum_fdn_change_pin" msgid="6666549734792827932">"Change PIN for FDN access"</string>
<string name="sum_fdn_manage_list" msgid="8431088265332628316">"Manage phone number list"</string>
<string name="voice_privacy" msgid="3776841382844614716">"Voice privacy"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index dc88232..c28ec9b 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -92,11 +92,11 @@
<string name="sum_loading_settings" msgid="1826692909391168620">"Cargando ajustes…"</string>
<string name="sum_hide_caller_id" msgid="1071407020290873782">"Número oculto en llamadas salientes"</string>
<string name="sum_show_caller_id" msgid="6768534125447290401">"Número mostrado en llamadas salientes"</string>
- <string name="sum_default_caller_id" msgid="1954518825510901365">"Utilizar la configuración de operador predeterminada para mostrar mi número en las llamadas salientes"</string>
+ <string name="sum_default_caller_id" msgid="1954518825510901365">"Utilizar la configuración predeterminada del operador para mostrar mi número en las llamadas salientes"</string>
<string name="labelCW" msgid="6120513814915920200">"Llamada en espera"</string>
<string name="sum_cw_enabled" msgid="8083061901633671397">"Notificarme de llamadas entrantes durante una llamada"</string>
- <string name="sum_cw_disabled" msgid="3648693907300104575">"Notificarme de las llamadas entrantes durante las llamadas"</string>
- <string name="call_forwarding_settings" msgid="3378927671091537173">"Ajustes de desvío de llamada"</string>
+ <string name="sum_cw_disabled" msgid="3648693907300104575">"Notificar si hay una llamada entrante durante una llamada"</string>
+ <string name="call_forwarding_settings" msgid="3378927671091537173">"Ajustes de desvío de llamadas"</string>
<string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Ajustes de reenvío de llamadas (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="labelCF" msgid="2574386948026924737">"Desvío de llamada"</string>
<string name="labelCFU" msgid="8147177368148660600">"Desviar siempre"</string>
@@ -111,18 +111,18 @@
<string name="sum_cfb_disabled" msgid="4913145177320506827">"Desactivado"</string>
<string name="disable_cfb_forbidden" msgid="3506984333877998061">"Tu operador no permite inhabilitar el desvío de llamadas si el teléfono está ocupado."</string>
<string name="labelCFNRy" msgid="1736067178393744351">"Cuando no responda"</string>
- <string name="messageCFNRy" msgid="672317899884380374">"Número cuando no se responde la llamada"</string>
+ <string name="messageCFNRy" msgid="672317899884380374">"Número cuando no se responda la llamada"</string>
<string name="sum_cfnry_enabled" msgid="6955775691317662910">"Desviando a <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
<string name="sum_cfnry_disabled" msgid="3884684060443538097">"Desactivado"</string>
<string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Tu operador no permite inhabilitar el desvío de llamadas si el teléfono no responde."</string>
<string name="labelCFNRc" msgid="2614827454402079766">"Cuando no esté disponible"</string>
- <string name="messageCFNRc" msgid="6380695421020295119">"Número cuando no se puede establecer la llamada"</string>
+ <string name="messageCFNRc" msgid="6380695421020295119">"Número cuando no se pueda establecer la llamada"</string>
<string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Desviando a <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
<string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Inhabilitado"</string>
<string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Tu operador no permite inhabilitar el desvío de llamadas si no se puede establecer la llamada."</string>
<string name="updating_title" msgid="6146755386174019046">"Ajustes de llamadas"</string>
- <string name="call_settings_primary_user_only" msgid="5679923943740900965">"El usuario principal es el único que puede cambiar los ajustes de llamada."</string>
- <string name="call_settings_with_label" msgid="89359812614544532">"Ajustes de llamada (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+ <string name="call_settings_primary_user_only" msgid="5679923943740900965">"El usuario principal es el único que puede cambiar los ajustes de llamadas."</string>
+ <string name="call_settings_with_label" msgid="89359812614544532">"Ajustes de llamadas (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="7970259216988931777">"Error de configuración de llamada"</string>
<string name="reading_settings" msgid="1920291699287055284">"Leyendo configuración..."</string>
<string name="updating_settings" msgid="8171225533884883252">"Actualizando configuración..."</string>
@@ -157,14 +157,14 @@
<string name="not_allowed" msgid="5613353860205691579">"La tarjeta SIM no permite establecer conexión con esta red."</string>
<string name="connect_later" msgid="2308119155752343975">"No se puede conectar a la red en este momento. Inténtalo de nuevo más tarde."</string>
<string name="registration_done" msgid="495135664535876612">"Conexión con la red establecida"</string>
- <string name="sum_carrier_select" msgid="3494252551249882718">"Seleccionar un operador de red"</string>
+ <string name="sum_carrier_select" msgid="3494252551249882718">"Selecciona un operador de red"</string>
<string name="sum_search_networks" msgid="2921092249873272715">"Buscar todas las redes disponibles"</string>
<string name="select_automatically" msgid="5628402124471810174">"Seleccionar automáticamente"</string>
<string name="sum_select_automatically" msgid="5614890115123292400">"Seleccionar red preferida automáticamente"</string>
<string name="register_automatically" msgid="6017849844573519637">"Registro automático..."</string>
- <string name="preferred_network_mode_title" msgid="2336624679902659306">"Tipo de red preferido"</string>
+ <string name="preferred_network_mode_title" msgid="2336624679902659306">"Tipo de red preferida"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Cambiar el modo operativo de la red"</string>
- <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Tipo de red preferido"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Tipo de red preferida"</string>
<string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Modo de red preferido: WCDMA preferido"</string>
<string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Modo de red preferido: solo GSM"</string>
<string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Modo de red preferido: solo WCDMA"</string>
@@ -201,10 +201,10 @@
<string name="data_enabled" msgid="5972538663568715366">"Habilitar datos"</string>
<string name="data_enable_summary" msgid="2382798156640007971">"Permitir uso de datos"</string>
<string name="roaming" msgid="8871412572928323707">"Itinerancia de datos"</string>
- <string name="roaming_enable" msgid="7331106985174381987">"Establecer conexión con servicios de datos en itinerancia"</string>
- <string name="roaming_disable" msgid="1843417228755568110">"Establecer conexión con servicios de datos en itinerancia"</string>
+ <string name="roaming_enable" msgid="7331106985174381987">"Conectarse a servicios de datos en itinerancia"</string>
+ <string name="roaming_disable" msgid="1843417228755568110">"Conectarse a servicios de datos en itinerancia"</string>
<string name="roaming_reenable_message" msgid="8913735676127858115">"Has perdido la conectividad de datos porque has dejado desactivada la itinerancia de datos de tu red doméstica."</string>
- <string name="roaming_warning" msgid="7126227198294007907">"¿Permitir el uso de datos en itinerancia? Se pueden aplicar cargos importantes."</string>
+ <string name="roaming_warning" msgid="7126227198294007907">"¿Quieres permitir el uso de datos en itinerancia? Se pueden aplicar cargos importantes."</string>
<string name="gsm_umts_options" msgid="6538311689850981686">"Opciones GSM/UMTS"</string>
<string name="cdma_options" msgid="4016822858172249884">"Opciones de CDMA"</string>
<string name="throttle_data_usage" msgid="3715677828160555808">"Uso de datos"</string>
@@ -346,7 +346,7 @@
<string name="enable_fdn_ok" msgid="7215588870329688132">"Inhabilitar FDN"</string>
<string name="disable_fdn_ok" msgid="5727046928930740173">"Habilitar FDN"</string>
<string name="sum_fdn" msgid="1959399454900272878">"Administrar números de marcación fija"</string>
- <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Cambiar PIN para acceso de FDN"</string>
+ <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Cambiar PIN para el acceso de FDN"</string>
<string name="sum_fdn_manage_list" msgid="8431088265332628316">"Administrar lista de números de teléfono"</string>
<string name="voice_privacy" msgid="3776841382844614716">"Privacidad de voz"</string>
<string name="voice_privacy_summary" msgid="3159383389833516214">"Habilitar modo de privacidad mejorado"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 3df2b3e..55d73e8 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -147,7 +147,7 @@
<string name="no_change" msgid="3186040086622435212">"Aucune modification n\'a été apportée."</string>
<string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Choisissez un service de messagerie vocale."</string>
<string name="voicemail_default" msgid="2001233554889016880">"Votre opérateur"</string>
- <string name="mobile_networks" msgid="2843854043339307375">"Paramètres des réseaux mobiles"</string>
+ <string name="mobile_networks" msgid="2843854043339307375">"Paramètres du réseau mobile"</string>
<string name="label_available" msgid="1181658289009300430">"Réseaux disponibles"</string>
<string name="load_networks_progress" msgid="5230707536168902952">"Recherche..."</string>
<string name="empty_networks_list" msgid="4249426905018815316">"Aucun réseau trouvé."</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index c1fbe8d..e13a911 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -96,9 +96,9 @@
<string name="labelCW" msgid="6120513814915920200">"कॉल प्रतीक्षा"</string>
<string name="sum_cw_enabled" msgid="8083061901633671397">"कॉल के दौरान, मुझे इनकमिंग कॉल की नोटिफिकेशन दें"</string>
<string name="sum_cw_disabled" msgid="3648693907300104575">"कॉल के दौरान, मुझे इनकमिंग कॉल की नोटिफिकेशन दें"</string>
- <string name="call_forwarding_settings" msgid="3378927671091537173">"कॉल अग्रेषण सेटिंग"</string>
+ <string name="call_forwarding_settings" msgid="3378927671091537173">"कॉल आगे भेजने की सेटिंग"</string>
<string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"कॉल आगे भेजने की सेटिंग (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
- <string name="labelCF" msgid="2574386948026924737">"कॉल अग्रेषण"</string>
+ <string name="labelCF" msgid="2574386948026924737">"कॉल आगे भेजना"</string>
<string name="labelCFU" msgid="8147177368148660600">"हमेशा आगे भेजें"</string>
<string name="messageCFU" msgid="3560082430662923687">"हमेशा इस नंबर का उपयोग करें"</string>
<string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"सभी कॉल अग्रेषित कर रहा है"</string>
@@ -200,7 +200,7 @@
<string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"ध्वनि और अन्य संचारों को बेहतर बनाने हेतु LTE सेवाओं का उपयोग करें (अनुशंसित)"</string>
<string name="data_enabled" msgid="5972538663568715366">"डेटा सक्षम किया गया"</string>
<string name="data_enable_summary" msgid="2382798156640007971">"डेटा उपयोग करने दें"</string>
- <string name="roaming" msgid="8871412572928323707">"डेटा रोमिंग"</string>
+ <string name="roaming" msgid="8871412572928323707">"रोमिंग डेटा"</string>
<string name="roaming_enable" msgid="7331106985174381987">"रोमिंग के समय डेटा सेवाएं कनेक्ट करें"</string>
<string name="roaming_disable" msgid="1843417228755568110">"रोमिंग के समय डेटा सेवाएं कनेक्ट करें"</string>
<string name="roaming_reenable_message" msgid="8913735676127858115">"आपकी डेटा कनेक्टिविटी खो गई है क्योंकि आप डेटा रोमिंग बंद करके अपने होम नेटवर्क से बाहर आ गए हैं."</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index fe7636e..576f3f8 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -20,7 +20,7 @@
<string name="phoneAppLabel" product="default" msgid="906161039445636857">"Telefon"</string>
<string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Segélyhívó tárcsázó"</string>
<string name="phoneIconLabel" msgid="2331230813161304895">"Telefon"</string>
- <string name="fdnListLabel" msgid="8630418672279521003">"FDN lista"</string>
+ <string name="fdnListLabel" msgid="8630418672279521003">"Fix hívószámok listája"</string>
<string name="unknown" msgid="6878797917991465859">"Ismeretlen"</string>
<string name="private_num" msgid="6713286113000232309">"Magántelefonszám"</string>
<string name="payphone" msgid="4793877574636445118">"Nyilvános telefon"</string>
@@ -100,7 +100,7 @@
<string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Hívásátirányítási beállítások (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="labelCF" msgid="2574386948026924737">"Hívásátirányítás"</string>
<string name="labelCFU" msgid="8147177368148660600">"Mindig legyen átirányítás"</string>
- <string name="messageCFU" msgid="3560082430662923687">"Mindig a következő szám használata"</string>
+ <string name="messageCFU" msgid="3560082430662923687">"Mindig a következő számot használja"</string>
<string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Minden hívás átirányítása"</string>
<string name="sum_cfu_enabled" msgid="2450052502198827927">"Minden hívás átirányítása ide: <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
<string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"A szám nem érhető el"</string>
@@ -330,19 +330,19 @@
<string name="cdma_lte_data_service" msgid="4255018217292548962">"Adatszolgáltatás beállítása"</string>
<string name="carrier_settings_title" msgid="9028166176523012300">"Szolgáltatói beállítások"</string>
<string name="fdn" msgid="7878832555095183202">"Fix hívószámok"</string>
- <string name="fdn_with_label" msgid="187084204115493366">"Rögzített hívószámok (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
- <string name="manage_fdn_list" msgid="8777755791892122369">"FDN lista"</string>
- <string name="fdn_list_with_label" msgid="7437232552210469217">"FDN lista (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
- <string name="fdn_activation" msgid="2156479741307463576">"FDN aktiválása"</string>
+ <string name="fdn_with_label" msgid="187084204115493366">"Fix hívószámok (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+ <string name="manage_fdn_list" msgid="8777755791892122369">"Fix hívószámok listája"</string>
+ <string name="fdn_list_with_label" msgid="7437232552210469217">"Fix hívószámok listája (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+ <string name="fdn_activation" msgid="2156479741307463576">"Fix hívószám aktiválása"</string>
<string name="fdn_enabled" msgid="5238109009915521240">"A fix hívószámok engedélyezve"</string>
<string name="fdn_disabled" msgid="4700049736675368279">"A fix hívószámok letiltva"</string>
- <string name="enable_fdn" msgid="3740191529180493851">"FDN engedélyezése"</string>
- <string name="disable_fdn" msgid="7944020890722540616">"FDN letiltása"</string>
- <string name="change_pin2" msgid="2153563695382176676">"PIN2-kód módosítása"</string>
- <string name="enable_fdn_ok" msgid="7215588870329688132">"FDN letiltása"</string>
- <string name="disable_fdn_ok" msgid="5727046928930740173">"FDN engedélyezése"</string>
+ <string name="enable_fdn" msgid="3740191529180493851">"Fix hívószám engedélyezése"</string>
+ <string name="disable_fdn" msgid="7944020890722540616">"Fix hívószám letiltása"</string>
+ <string name="change_pin2" msgid="2153563695382176676">"PIN2 kód módosítása"</string>
+ <string name="enable_fdn_ok" msgid="7215588870329688132">"Fix hívószám letiltása"</string>
+ <string name="disable_fdn_ok" msgid="5727046928930740173">"Fix hívószám engedélyezése"</string>
<string name="sum_fdn" msgid="1959399454900272878">"Fix hívószámok kezelése"</string>
- <string name="sum_fdn_change_pin" msgid="6666549734792827932">"PIN-kód módosítása az FDN eléréséhez"</string>
+ <string name="sum_fdn_change_pin" msgid="6666549734792827932">"PIN kód módosítása a fix hívószámok eléréséhez"</string>
<string name="sum_fdn_manage_list" msgid="8431088265332628316">"Telefonszámok listájának kezelése"</string>
<string name="voice_privacy" msgid="3776841382844614716">"Adatvédelem"</string>
<string name="voice_privacy_summary" msgid="3159383389833516214">"Fokozott adatvédelmi mód engedélyezése"</string>
@@ -366,10 +366,10 @@
<string name="delete_fdn_contact" msgid="6668958073074151717">"Fix hívószám törlése"</string>
<string name="deleting_fdn_contact" msgid="5669163206349319969">"Fix hívószám törlése..."</string>
<string name="fdn_contact_deleted" msgid="7154162327112259569">"A fix hívószám törölve."</string>
- <string name="pin2_invalid" msgid="5470854099230755944">"Az FDN nem volt frissítve, mert hibás PIN-kódot írt be."</string>
- <string name="fdn_invalid_number" msgid="1494755047900009147">"Az FDN nem lett frissítve, mert a szám nem haladhatja meg a 20 számjegyet."</string>
- <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Az FDN nem lett frissítve. Hibás a PIN2 kód, vagy a telefonszámot elutasították."</string>
- <string name="fdn_failed" msgid="540018079008319747">"Az FDN-művelet sikertelen."</string>
+ <string name="pin2_invalid" msgid="5470854099230755944">"A fix hívószám nincs frissítve, mert hibás PIN kódot írt be."</string>
+ <string name="fdn_invalid_number" msgid="1494755047900009147">"A fix hívószám nem lett frissítve, mert a szám nem haladhatja meg a 20 számjegyet."</string>
+ <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"A fix hívószám nem lett frissítve. Hibás a PIN2 kód, vagy a telefonszámot elutasították."</string>
+ <string name="fdn_failed" msgid="540018079008319747">"Sikertelen a fix hívószámmal végzett művelet."</string>
<string name="simContacts_emptyLoading" msgid="2203331234764498011">"Beolvasás a SIM kártyáról..."</string>
<string name="simContacts_empty" msgid="5270660846489561932">"Nincsenek névjegyek a SIM kártyán."</string>
<string name="simContacts_title" msgid="1861472842524839921">"Válassza ki az importálni kívánt névjegyeket"</string>
@@ -392,8 +392,8 @@
<string name="pin_changed" msgid="4455736268023261662">"PIN kód frissítve"</string>
<string name="puk_requested" msgid="5921393215789090200">"A jelszó helytelen. PIN kód letiltva. Adja meg a PUK kódot."</string>
<string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
- <string name="oldPin2Label" msgid="8559146795026261502">"Régi PIN2-kód"</string>
- <string name="newPin2Label" msgid="4573956902204349054">"Új PIN2-kód"</string>
+ <string name="oldPin2Label" msgid="8559146795026261502">"Régi PIN2 kód"</string>
+ <string name="newPin2Label" msgid="4573956902204349054">"Új PIN2 kód"</string>
<string name="confirmPin2Label" msgid="8100319484454787708">"Erősítse meg az új PIN2-kódot"</string>
<string name="badPuk2" msgid="7910064009531541708">"A PUK2 kód helytelen. Próbálja újra."</string>
<string name="badPin2" msgid="6646896629970023109">"A régi PIN2 kód helytelen. Próbálja újra."</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 2e119a9..ef67783 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -57,7 +57,7 @@
<string name="labelCDMAMore" msgid="1630676740428229339">"Setelan panggilan CDMA"</string>
<string name="apn_settings" msgid="9043423184895642077">"Nama Titik Akses"</string>
<string name="settings_label" msgid="3876743539816984008">"Setelan jaringan"</string>
- <string name="phone_accounts" msgid="6376603393888116364">"Akun yang menelepon"</string>
+ <string name="phone_accounts" msgid="6376603393888116364">"Akun panggilan"</string>
<string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Lakukan panggilan dengan"</string>
<string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Lakukan panggilan SIP dengan"</string>
<string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Tanyakan terlebih dahulu"</string>
@@ -106,23 +106,23 @@
<string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Nomor tidak tersedia"</string>
<string name="sum_cfu_disabled" msgid="8384177689501334080">"Nonaktif"</string>
<string name="labelCFB" msgid="6139853033106283172">"Saat sibuk"</string>
- <string name="messageCFB" msgid="3711089705936187129">"Nomor ketika sibuk"</string>
+ <string name="messageCFB" msgid="3711089705936187129">"Nomor saat sibuk"</string>
<string name="sum_cfb_enabled" msgid="5984198104833116690">"Meneruskan ke <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
<string name="sum_cfb_disabled" msgid="4913145177320506827">"Nonaktif"</string>
<string name="disable_cfb_forbidden" msgid="3506984333877998061">"Operator Anda tidak mendukung penonaktifan penerusan panggilan ketika ponsel sibuk."</string>
<string name="labelCFNRy" msgid="1736067178393744351">"Jika tidak dijawab"</string>
- <string name="messageCFNRy" msgid="672317899884380374">"Nomor ketika tidak dapat dihubungi"</string>
+ <string name="messageCFNRy" msgid="672317899884380374">"Nomor jika tidak dijawab"</string>
<string name="sum_cfnry_enabled" msgid="6955775691317662910">"Meneruskan ke <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
<string name="sum_cfnry_disabled" msgid="3884684060443538097">"Nonaktif"</string>
<string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Operator Anda tidak mendukung penonaktifan penerusan panggilan ketika ponsel tidak menjawab panggilan."</string>
<string name="labelCFNRc" msgid="2614827454402079766">"Saat tidak dapat dijangkau"</string>
- <string name="messageCFNRc" msgid="6380695421020295119">"Nomor ketika tidak dapat dihubungi"</string>
+ <string name="messageCFNRc" msgid="6380695421020295119">"Nomor jika tidak dapat dihubungi"</string>
<string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Meneruskan ke <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
<string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Dinonaktifkan"</string>
<string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Operator Anda tidak mendukung penonaktifan penerusan panggilan ketika ponsel tidak dapat dijangkau."</string>
<string name="updating_title" msgid="6146755386174019046">"Setelan panggilan"</string>
- <string name="call_settings_primary_user_only" msgid="5679923943740900965">"Setelan panggilan telepon hanya dapat diubah oleh pengguna utama."</string>
- <string name="call_settings_with_label" msgid="89359812614544532">"Setelan panggilan telepon (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+ <string name="call_settings_primary_user_only" msgid="5679923943740900965">"Setelan panggilan hanya dapat diubah oleh pengguna utama."</string>
+ <string name="call_settings_with_label" msgid="89359812614544532">"Setelan panggilan (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="7970259216988931777">"Kesalahan setelan panggilan"</string>
<string name="reading_settings" msgid="1920291699287055284">"Membaca setelan…"</string>
<string name="updating_settings" msgid="8171225533884883252">"Memperbarui setelan…"</string>
@@ -204,7 +204,7 @@
<string name="roaming_enable" msgid="7331106985174381987">"Sambungkan ke layanan data ketika roaming"</string>
<string name="roaming_disable" msgid="1843417228755568110">"Sambungkan ke layanan data ketika roaming"</string>
<string name="roaming_reenable_message" msgid="8913735676127858115">"Anda telah kehilangan konektivitas data karena meninggalkan jaringan asal dalam keadaan roaming data dimatikan."</string>
- <string name="roaming_warning" msgid="7126227198294007907">"Izinkan penggunaan data saat roaming? Tagihan signifikan mungkin berlaku."</string>
+ <string name="roaming_warning" msgid="7126227198294007907">"Izinkan penggunaan data saat roaming? Anda dapat dikenakan tagihan dalam jumlah besar."</string>
<string name="gsm_umts_options" msgid="6538311689850981686">"Opsi GSM//UMTS"</string>
<string name="cdma_options" msgid="4016822858172249884">"Opsi CDMA"</string>
<string name="throttle_data_usage" msgid="3715677828160555808">"Penggunaan data"</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 3bec4b4..2b8d2ed 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -28,10 +28,10 @@
<string name="mmiStarted" msgid="6347869857061147003">"បានចាប់ផ្ដើមកូដ MMI"</string>
<string name="ussdRunning" msgid="485588686340541690">"កូដ USSD កំពុងដំណើរការ…"</string>
<string name="mmiCancelled" msgid="2771923949751842276">"បានបោះបង់កូដ MMI"</string>
- <string name="cancel" msgid="5044513931633602634">"បោះបង់"</string>
+ <string name="cancel" msgid="5044513931633602634">"បោះបង់"</string>
<string name="enter_input" msgid="1810529547726803893">"សារ USSD ត្រូវតែមានតួអក្សរចន្លោះ <xliff:g id="MIN_LEN">%d</xliff:g> និង <xliff:g id="MAX_LEN">%d</xliff:g> ។ សូមព្យាយាមម្ដងទៀត។"</string>
<string name="manageConferenceLabel" msgid="4691922394301969053">"គ្រប់គ្រងការហៅជាសន្និសីទ"</string>
- <string name="ok" msgid="3811371167865772377">"យល់ព្រម"</string>
+ <string name="ok" msgid="3811371167865772377">"យល់ព្រម"</string>
<string name="audio_mode_speaker" msgid="27649582100085266">"អូប៉ាល័រ"</string>
<string name="audio_mode_earpiece" msgid="4156527186373869107">"កាស"</string>
<string name="audio_mode_wired_headset" msgid="1465350758489175975">"កាសមានខ្សែ"</string>
@@ -131,7 +131,7 @@
<string name="exception_error" msgid="7027667130619518211">"កំហុសស៊ីមកាត ឬបណ្ដាញ។"</string>
<string name="fdn_check_failure" msgid="18200614306525434">"បានបើកការកំណត់លេខហៅថេរនៃកម្មវិធីទូរស័ព្ទរបស់អ្នក។ ជាលទ្ធផល លក្ខណៈមួយចំនួនដែលទាក់ទងនឹងការហៅមិនដំណើរការ។"</string>
<string name="radio_off_error" msgid="2304459933248513376">"បើកវិទ្យុមុនពេលមើលការកំណត់ទាំងនេះ។"</string>
- <string name="close_dialog" msgid="2365884406356986917">"យល់ព្រម"</string>
+ <string name="close_dialog" msgid="2365884406356986917">"យល់ព្រម"</string>
<string name="enable" msgid="7248657275000173526">"បើក"</string>
<string name="disable" msgid="4678348128118573672">"បិទ"</string>
<string name="change_num" msgid="239476305819844391">"ធ្វើបច្ចុប្បន្នភាព"</string>
@@ -194,7 +194,7 @@
<item msgid="5958053792390386668">"GSM/WCDMA ស្វ័យប្រវត្តិ"</item>
<item msgid="7913148405605373434">"តែ WCDMA ប៉ុណ្ណោះ"</item>
<item msgid="1524224863879435516">"តែ GSM ប៉ុណ្ណោះ"</item>
- <item msgid="3817924849415716259">"GSM/WCDMA ដែលចូលចិត្ត"</item>
+ <item msgid="3817924849415716259">"GSM/WCDMA ដែលចូលចិត្ត"</item>
</string-array>
<string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"របៀប 4G LTE ធ្វើឲ្យប្រសើរឡើង"</string>
<string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"ប្រើសេវាកម្ម LTE ដើម្បីធ្វើឲ្យសម្លេង និងការទំនាក់ទំនងផ្សេងទៀតប្រសើរឡើង (បានណែនាំ)"</string>
@@ -208,7 +208,7 @@
<string name="gsm_umts_options" msgid="6538311689850981686">"ជម្រើស GSM/UMTS"</string>
<string name="cdma_options" msgid="4016822858172249884">"ជម្រើស CDMA"</string>
<string name="throttle_data_usage" msgid="3715677828160555808">"ការប្រើប្រាស់ទិន្នន័យ"</string>
- <string name="throttle_current_usage" msgid="8762280193043815361">"បច្ចុប្បន្នបានប្រើទិន្នន័យ"</string>
+ <string name="throttle_current_usage" msgid="8762280193043815361">"បច្ចុប្បន្នបានប្រើទិន្នន័យ"</string>
<string name="throttle_time_frame" msgid="1915198770363734685">"ទិន្នន័យប្រើរយៈពេល"</string>
<string name="throttle_rate" msgid="4710388992676803508">"គោលនយោបាយអត្រាទិន្នន័យ"</string>
<string name="throttle_help" msgid="243651091785169900">"ស្វែងយល់បន្ថែម"</string>
@@ -240,7 +240,7 @@
<string name="local_enable" msgid="6370463247609136359">"បានបើកព័ត៌មានក្នុងស្រុក"</string>
<string name="local_disable" msgid="4405691986943795798">"បានបិទព័ត៌មានក្នុងស្រុក"</string>
<string name="enable_disable_regional" msgid="4905652414535565872">"នៃតំបន់"</string>
- <string name="regional_enable" msgid="4434680415437834759">"បានបើកព័ត៌មានក្នុងតំបន់"</string>
+ <string name="regional_enable" msgid="4434680415437834759">"បានបើកព័ត៌មានក្នុងតំបន់"</string>
<string name="regional_disable" msgid="5359325527213850077">"បានបិទព័ត៌មានក្នុងតំបន់"</string>
<string name="enable_disable_national" msgid="236278090206880734">"ជាតិ"</string>
<string name="national_enable" msgid="1172443648912246952">"បានបើកព័ត៌មានជាតិ"</string>
@@ -276,11 +276,11 @@
<string name="atr_enable" msgid="5541757457789181799">"បានបើករបាយការណ៍ចរាចរណ៍តំបន់"</string>
<string name="atr_disable" msgid="7085558154727596455">"បានបិទរបាយការណ៍ចរាចរណ៍តំបន់"</string>
<string name="enable_disable_lafs" msgid="668189073721277199">"កាលវិភាគហោះហើរអាកាសយានដ្ឋានក្នុងស្រុក"</string>
- <string name="lafs_enable" msgid="2791978667205137052">"បានបើកកាលវិភាគហោះហើរអាកាសយានដ្ឋានក្នុងស្រុក"</string>
- <string name="lafs_disable" msgid="2391212397725495350">"បានបិទកាលវិភាគហោះហើរអាកាសយានដ្ឋានក្នុងស្រុក"</string>
+ <string name="lafs_enable" msgid="2791978667205137052">"បានបើកកាលវិភាគហោះហើរអាកាសយានដ្ឋានក្នុងស្រុក"</string>
+ <string name="lafs_disable" msgid="2391212397725495350">"បានបិទកាលវិភាគហោះហើរអាកាសយានដ្ឋានក្នុងស្រុក"</string>
<string name="enable_disable_restaurants" msgid="6240381945336814024">"ភោជនីយដ្ឋាន"</string>
<string name="restaurants_enable" msgid="5137657479469118847">"បានបើកភោជនីយដ្ឋាន"</string>
- <string name="restaurants_disable" msgid="3678480270938424092">"បានបិទភោជនីយដ្ឋាន"</string>
+ <string name="restaurants_disable" msgid="3678480270938424092">"បានបិទភោជនីយដ្ឋាន"</string>
<string name="enable_disable_lodgings" msgid="1822029172658551202">"បណ្ដោះអាសន្ន"</string>
<string name="lodgings_enable" msgid="3230042508992850322">"បានបើកជាបណ្ដោះអាសន្ន"</string>
<string name="lodgings_disable" msgid="3387879742320682391">"បានបិទជាបណ្ដោះអាសន្ន"</string>
@@ -294,7 +294,7 @@
<string name="stock_quotes_enable" msgid="4384802470887170543">"បានបើកសម្រង់ស្ដុក"</string>
<string name="stock_quotes_disable" msgid="4781450084565594998">"បានបិទសម្រង់ស្ដុក"</string>
<string name="enable_disable_eo" msgid="4863043263443942494">"ឱកាសការងារ"</string>
- <string name="eo_enable" msgid="8623559062015685813">"បានបើកឱកាសការងារ"</string>
+ <string name="eo_enable" msgid="8623559062015685813">"បានបើកឱកាសការងារ"</string>
<string name="eo_disable" msgid="3863812478090907609">"បានបិទឱកាសការងារ"</string>
<string name="enable_disable_mhh" msgid="908214593528968522">"វេជ្ជសាស្ត្រ សុខភាព និងមន្ទីរពេទ្យ"</string>
<string name="mhh_enable" msgid="5544500632306446815">"បានបើក វេជ្ជសាស្ត្រ សុខភាព និងមន្ទីរពេទ្យ"</string>
@@ -491,7 +491,7 @@
<string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"រំលងការធ្វើឲ្យសកម្ម?"</string>
<string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"ប្រសិនបើអ្នករំលងការធ្វើឲ្យសកម្ម អ្នកមិនអាចកំណត់ការហៅ ឬតភ្ជាប់បណ្ដាញទិន្នន័យឧបករណ៍ចល័តបានទេ (អ្នកអាចតភ្ជាប់តាមបណ្ដាញវ៉ាយហ្វាយ )។ លុះត្រាតែអ្នកធ្វើឲ្យទូរស័ព្ទរបស់អ្នកសកម្ម អ្នកត្រូវបានស្នើធ្វើឲ្យវាសកម្មនៅពេលដែលអ្នកបិទវា។"</string>
<string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"រំលង"</string>
- <string name="ota_activate" msgid="1368528132525626264">"ធ្វើឲ្យសកម្ម"</string>
+ <string name="ota_activate" msgid="1368528132525626264">"ធ្វើឲ្យសកម្ម"</string>
<string name="ota_title_activate_success" msgid="6570240212263372046">"បានធ្វើឲ្យទូរស័ព្ទសកម្ម។"</string>
<string name="ota_title_problem_with_activation" msgid="7095824491970084367">"មានបញ្ហាជាមួយនឹងការធ្វើឲ្យសកម្ម"</string>
<string name="ota_listen" msgid="162923839877584937">"អនុវត្តតាមសេចក្ដីណែនាំដែលបាននិយាយរហូតដល់លោកអ្នកស្ដាប់ឮហើយធ្វើឲ្យសកម្មពេញលេញ។"</string>
@@ -503,7 +503,7 @@
<string name="ota_spc_failure" msgid="3909983542575030796">"ការបរាជ័យ SPC លើស"</string>
<string name="ota_call_end" msgid="4537279738134612388">"ថយក្រោយ"</string>
<string name="ota_try_again" msgid="7685477206465902290">"ព្យាយាមម្ដងទៀត"</string>
- <string name="ota_next" msgid="3904945374358235910">"បន្ទាប់"</string>
+ <string name="ota_next" msgid="3904945374358235910">"បន្ទាប់"</string>
<string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
<string name="phone_entered_ecm_text" msgid="6266424252578731203">"បានបញ្ចូលរបៀបការហៅទៅវិញពេលមានអាសន្ន"</string>
<string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"របៀបហៅទៅវិញពេលមានអាសន្ន"</string>
@@ -513,7 +513,7 @@
<item quantity="other" msgid="3122217344579273583">"ការតភ្ជាប់គ្មានទិន្នន័យសម្រាប់ <xliff:g id="COUNT">%s</xliff:g> នាទី"</item>
</plurals>
<plurals name="alert_dialog_exit_ecm">
- <item quantity="one" msgid="8060210887681426682">"ទូរស័ព្ទនឹងនៅក្នុងរបៀបហៅទៅវិញសម្រាប់តម្រូវការបន្ទាន់ <xliff:g id="COUNT">%s</xliff:g> នាទី។ ខណៈពេលដែលនៅក្នុងរបៀបនេះគ្មានកម្មវិធីដែលប្រើការតភ្ជាប់ទិន្នន័យឡើយ។ តើអ្នកចង់ចាកចេញឥឡូវនេះឬ?"</item>
+ <item quantity="one" msgid="8060210887681426682">"ទូរស័ព្ទនឹងនៅក្នុងរបៀបហៅទៅវិញសម្រាប់តម្រូវការបន្ទាន់ <xliff:g id="COUNT">%s</xliff:g> នាទី។ ខណៈពេលដែលនៅក្នុងរបៀបនេះគ្មានកម្មវិធីដែលប្រើការតភ្ជាប់ទិន្នន័យឡើយ។ តើអ្នកចង់ចាកចេញឥឡូវនេះឬ?"</item>
<item quantity="other" msgid="8617116564023933114">"ទូរស័ព្ទនឹងនៅក្នុងរបៀបហៅទៅវិញសម្រាប់ពេលមានអាសន្ន <xliff:g id="COUNT">%s</xliff:g> នាទី។ ខណៈពេលដែលនៅក្នុងរបៀបនេះគ្មានកម្មវិធីដែលបានប្រើការតភ្ជាប់ទិន្នន័យឡើយ។ តើអ្នកចង់ចាកចេញឥឡូវនេះឬ?"</item>
</plurals>
<plurals name="alert_dialog_not_avaialble_in_ecm">
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 4922f91..2022dbd 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -132,7 +132,7 @@
<string name="fdn_check_failure" msgid="18200614306525434">"ການຕັ້ງຄ່າແອັບຯໝາຍເລກຈຳກັດການໂທອອກ ຂອງໂທລະສັບທ່ານຖືກເປີດໃຊ້ຢູ່ ເຊິ່ງຈະເຮັດໃຫ້ຄຸນສົມບັດທີ່ກ່ຽວກັບການໂທບາງຢ່າງ ບໍ່ສາມາດໃຊ້ໄດ້."</string>
<string name="radio_off_error" msgid="2304459933248513376">"ເປີດໃຊ້ວິທະຍຸກ່ອນການເບິ່ງການຕັ້ງຄ່າເຫຼົ່ານີ້."</string>
<string name="close_dialog" msgid="2365884406356986917">"ຕົກລົງ"</string>
- <string name="enable" msgid="7248657275000173526">"ເປີດ"</string>
+ <string name="enable" msgid="7248657275000173526">"ເປີດ"</string>
<string name="disable" msgid="4678348128118573672">"ປິດ"</string>
<string name="change_num" msgid="239476305819844391">"ອັບເດດ"</string>
<string-array name="clir_display_values">
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index ee1ef2e..fe98a23 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -57,10 +57,10 @@
<string name="labelCDMAMore" msgid="1630676740428229339">"CDMA കോൾ ക്രമീകരണങ്ങൾ"</string>
<string name="apn_settings" msgid="9043423184895642077">"ആക്സസ്സ് പോയിന്റ് പേരുകൾ"</string>
<string name="settings_label" msgid="3876743539816984008">"നെറ്റ്വർക്ക് ക്രമീകരണങ്ങൾ"</string>
- <string name="phone_accounts" msgid="6376603393888116364">"കോൾ ചെയ്യാനുള്ള അക്കൗണ്ടുകൾ"</string>
- <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"ഇനിപ്പറയുന്നത് ഉപയോഗിച്ച് കോളുകൾ ചെയ്യുക"</string>
- <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"ഇനിപ്പറയുന്നത് ഉപയോഗിച്ച് SIP കോളുകൾ ചെയ്യുക"</string>
- <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"ആദ്യം ചോദിക്കുക"</string>
+ <string name="phone_accounts" msgid="6376603393888116364">"കോളുചെയ്യാനുള്ള അക്കൗണ്ട്"</string>
+ <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"ഇത് ഉപയോഗിച്ച് കോളുചെയ്യുക"</string>
+ <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"ഇതുപയോഗിച്ച് SIP കോളുചെയ്യുക"</string>
+ <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"ആദ്യതവണ ചോദിക്കുക"</string>
<string name="phone_accounts_settings_header" msgid="4141710640883261094">"ക്രമീകരണങ്ങൾ"</string>
<string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"അക്കൗണ്ടുകൾ തിരഞ്ഞെടുക്കുക"</string>
<string name="phone_accounts_selection_header" msgid="1365215726106915865">"ഫോൺ അക്കൗണ്ടുകൾ"</string>
@@ -157,7 +157,7 @@
<string name="not_allowed" msgid="5613353860205691579">"നിങ്ങളുടെ സിം കാർഡ് ഈ നെറ്റ്വർക്കിലേക്ക് ഒരു കണക്ഷൻ അനുവദിക്കുന്നില്ല."</string>
<string name="connect_later" msgid="2308119155752343975">"ഈ നെറ്റ്വർക്കിൽ ഇപ്പോൾ കണക്റ്റുചെയ്യാനാകുന്നില്ല. പിന്നീട് വീണ്ടും ശ്രമിക്കുക."</string>
<string name="registration_done" msgid="495135664535876612">"ഒരു നെറ്റ്വർക്കിൽ രജിസ്റ്റർ ചെയ്തു."</string>
- <string name="sum_carrier_select" msgid="3494252551249882718">"ഒരു നെറ്റ്വർക്ക് ഓപ്പറേറ്റർ തിരഞ്ഞെടുക്കുക"</string>
+ <string name="sum_carrier_select" msgid="3494252551249882718">"ഒരു നെറ്റ്വർക്ക് ഓപ്പറേറ്ററെ തിരഞ്ഞെടുക്കുക"</string>
<string name="sum_search_networks" msgid="2921092249873272715">"ലഭ്യമായ എല്ലാ നെറ്റ്വർക്കുകൾക്കായും തിരയുക"</string>
<string name="select_automatically" msgid="5628402124471810174">"യാന്ത്രികമായി തിരഞ്ഞെടുക്കുക"</string>
<string name="sum_select_automatically" msgid="5614890115123292400">"താൽപ്പര്യമുള്ള നെറ്റ്വർക്ക് യാന്ത്രികമായി തിരഞ്ഞെടുക്കുക"</string>
@@ -204,7 +204,7 @@
<string name="roaming_enable" msgid="7331106985174381987">"റോമിംഗിലാകുമ്പോൾ ഡാറ്റ സേവനങ്ങളുമായി കണക്റ്റുചെയ്യുക"</string>
<string name="roaming_disable" msgid="1843417228755568110">"റോമിംഗിലാകുമ്പോൾ ഡാറ്റ സേവനങ്ങളുമായി കണക്റ്റുചെയ്യുക"</string>
<string name="roaming_reenable_message" msgid="8913735676127858115">"നിങ്ങൾ ഡാറ്റ റോമിംഗ് ഓഫുചെയ്തതിനൊപ്പം നിങ്ങളുടെ ഹോം നെറ്റ്വർക്കും വിട്ടതിനാൽ നിങ്ങൾക്ക് ഡാറ്റ കണക്റ്റിവിറ്റി നഷ്ടപ്പെട്ടു."</string>
- <string name="roaming_warning" msgid="7126227198294007907">"റോമിംഗിലായിരിക്കുമ്പോൾ ഡാറ്റ ഉപയോഗം അനുവദിക്കുക? നിശ്ചിത നിരക്കുകൾ ബാധകമായേക്കാം."</string>
+ <string name="roaming_warning" msgid="7126227198294007907">"റോമിംഗിലായിരിക്കുമ്പോൾ ഡാറ്റ ഉപയോഗം അനുവദിക്കണോ? നിശ്ചിത നിരക്കുകൾ ബാധകമായേക്കാം."</string>
<string name="gsm_umts_options" msgid="6538311689850981686">"GSM/UMTS ഓപ്ഷനുകൾ"</string>
<string name="cdma_options" msgid="4016822858172249884">"CDMA ഓപ്ഷനുകൾ"</string>
<string name="throttle_data_usage" msgid="3715677828160555808">"ഡാറ്റ ഉപയോഗം"</string>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 32330d0..ae45208 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -57,7 +57,7 @@
<string name="labelCDMAMore" msgid="1630676740428229339">"CDMA कॉल सेटिंग्ज"</string>
<string name="apn_settings" msgid="9043423184895642077">"प्रवेश बिंदू नावे"</string>
<string name="settings_label" msgid="3876743539816984008">"नेटवर्क सेटिंग्ज"</string>
- <string name="phone_accounts" msgid="6376603393888116364">"कॉल करणे खाती"</string>
+ <string name="phone_accounts" msgid="6376603393888116364">"कॉल करण्याची खाती"</string>
<string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"यासह कॉल करा"</string>
<string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"यासह SIP कॉल करा"</string>
<string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"प्रथम विचारा"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 600eb98..2e28e46 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -330,7 +330,7 @@
<string name="cdma_lte_data_service" msgid="4255018217292548962">"Penyediaan perkhidmatan data"</string>
<string name="carrier_settings_title" msgid="9028166176523012300">"Tetapan pembawa"</string>
<string name="fdn" msgid="7878832555095183202">"Nombor Dailan Tetap"</string>
- <string name="fdn_with_label" msgid="187084204115493366">"Nombor Pendailan Tetap (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+ <string name="fdn_with_label" msgid="187084204115493366">"Nombor Dailan Tetap (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="manage_fdn_list" msgid="8777755791892122369">"Senarai FDN"</string>
<string name="fdn_list_with_label" msgid="7437232552210469217">"Senarai FDN (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="fdn_activation" msgid="2156479741307463576">"Pengaktifan FDN"</string>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index 0cb93bf..c1e2a5b 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -23,7 +23,7 @@
<string name="fdnListLabel" msgid="8630418672279521003">"FDN အမှတ်စဉ်"</string>
<string name="unknown" msgid="6878797917991465859">"အကြောင်းအရာ မသိရှိ"</string>
<string name="private_num" msgid="6713286113000232309">"လျို့ဝှက် နံပါတ်"</string>
- <string name="payphone" msgid="4793877574636445118">"ငွေပေးရသည့်ဖုန်း"</string>
+ <string name="payphone" msgid="4793877574636445118">"ငွေပေးရသည့်ဖုန်း"</string>
<string name="onHold" msgid="9035493194749959955">"ခဏ ကိုင်ထားစဉ်"</string>
<string name="mmiStarted" msgid="6347869857061147003">"MMIကုတ်နံပါတ်ကို စတင်ပြီးပါပြီ"</string>
<string name="ussdRunning" msgid="485588686340541690">"USSD ကုဒ် လုပ်ဆောင်နေပါသည်…"</string>
@@ -47,7 +47,7 @@
<string name="add_vm_number_str" msgid="4676479471644687453">"နံပါတ်ထပ်ထည့်ရန်"</string>
<string name="puk_unlocked" msgid="2284912838477558454">"သင့် ဆင်းမ်ကဒ်အား ပိတ်ဆို့မှုကို ဖယ်ရှားပြီးပါပြီ။ သင့်ဖုန်းဟာ သော့ဖွင့်နေပါသည်…"</string>
<string name="label_ndp" msgid="780479633159517250">"ဆင်းမ်ကဒ် ကွန်ရက် သော့ဖွင့်သော ပင်နံပါတ်"</string>
- <string name="sim_ndp_unlock_text" msgid="683628237760543009">"ဖွင့်ရန်"</string>
+ <string name="sim_ndp_unlock_text" msgid="683628237760543009">"ဖွင့်ရန်"</string>
<string name="sim_ndp_dismiss_text" msgid="1604823375752456947">"လွှတ်လိုက်သည်"</string>
<string name="requesting_unlock" msgid="6412629401033249351">"ကွန်ယက်သော့ဖွင့်ခြင်း တောင်းဆိုနေပါသည်…"</string>
<string name="unlock_failed" msgid="6490531697031504225">"ကွန်ယက်ဖွင့်ရန် တောင်းဆိုမှု မအောင်မြင်ပါ"</string>
@@ -55,9 +55,9 @@
<string name="mobile_network_settings_not_available" msgid="3831911315358856062">"ဒီအသုံးပြုသူ အတွက် မိုဘိုင်း ကွန်ရက် ဆက်တင်များ မရှိ"</string>
<string name="labelGSMMore" msgid="5930842194056092106">"ဂျီအက်စ်အမ် ခေါ်ဆိုမှု ဆက်တင်"</string>
<string name="labelCDMAMore" msgid="1630676740428229339">"CDMA ဖုန်းခေါ်ဆိုမှု ဆက်တင်"</string>
- <string name="apn_settings" msgid="9043423184895642077">"ချိတ်ဆက်သောပွိုင့်အမည်များ"</string>
+ <string name="apn_settings" msgid="9043423184895642077">"ချိတ်ဆက်သောပွိုင့်အမည်များ"</string>
<string name="settings_label" msgid="3876743539816984008">"ကွန်ရက် ဆက်တင်များ"</string>
- <string name="phone_accounts" msgid="6376603393888116364">"ခေါ်ဆိုသော အကောင့်များ"</string>
+ <string name="phone_accounts" msgid="6376603393888116364">"ခေါ်ဆိုသော အကောင့်များ"</string>
<string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"ဖြင့် ခေါ်ဆိုမှုများပြုလုပ်မည်"</string>
<string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"ဖြင့် SIP ခေါ်ဆိုမှုများ ပြုလုပ်မည်"</string>
<string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"အရင်မေးပါ"</string>
@@ -67,57 +67,57 @@
<string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"SIP အကောင့်ပေါင်းထည့်မည်။"</string>
<string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"အကောင့် ချိန်ညှိချက်များ ပြုပြင်မည်"</string>
<string name="phone_account_wifi_calling" msgid="1840272538233414629">"ကြိုးမဲ့ ခေါ်ဆိုမှု"</string>
- <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"ကြိုးမဲ့ ခေါ်ဆိုမှုကို မသုံးပါနှင့်"</string>
+ <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"ကြိုးမဲ့ ခေါ်ဆိုမှုကို မသုံးပါနှင့်"</string>
<string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"ခေါ်ဆိုမှု အကူ အသုံးမပြုပါ"</string>
<string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"မရှိ"</string>
<string name="wifi_calling_call_assistant" msgid="229102032881680320">"ခေါ်ဆိုမှု အကူ"</string>
<string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"ခေါ်ဆိုမှု အကူအသုံးပြုမည်"</string>
<string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"ခေါ်ဆိုမှုအကူ ရွေးချယ်မည်"</string>
- <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"ခေါ်ဆိုရန် အသုံးပြုသည့် ကွန်ရက်များကို စီမံကွပ်ကဲရန်"</string>
+ <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"ခေါ်ဆိုရန် အသုံးပြုသည့် ကွန်ရက်များကို စီမံကွပ်ကဲရန်"</string>
<string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"ခေါ်ဆိုမှုအတွက် အသုံးပြုမည့် ကွန်ရကန်များအား app များသို့မဟုတ် ဝန်ဆောင်မှုများကို စီမံစေမည်"</string>
<string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"ပုံပေါ်စေသည်"</string>
<string name="connection_service_default_label" msgid="1498481943805913754">"တပ်ဆင်ပြီး ချိတ်ဆက်ရေး ဝန်ဆောင်မှု"</string>
<string name="voicemail" msgid="8693759337917898954">"အသံစာပို့စနစ်"</string>
<string name="voicemail_abbreviated" msgid="2215592488517217448">"အသံစာပို့နစ်အမှတ် -"</string>
<string name="networks" msgid="8873030692174541976">"ကွန်ရက် အော်ပရေတာများ"</string>
- <string name="cell_broadcast_settings" msgid="8740238216690502563">"အရေးပေါ် ထုတ်လွှင့်မှုများ"</string>
+ <string name="cell_broadcast_settings" msgid="8740238216690502563">"အရေးပေါ် ထုတ်လွှင့်မှုများ"</string>
<string name="call_settings" msgid="6112441768261754562">"ခေါ်ဆိုခြင်း အဆင်အပြင်များ"</string>
<string name="additional_gsm_call_settings" msgid="1391795981938800617">"ပိုမိုသော အပြင်အဆင်များ"</string>
<string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"နောက်ထပ် ချိန်ညှိချက်များ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
- <string name="sum_gsm_call_settings" msgid="4076647190996778012">"GSM ခေါ်ဆိုမှုအတွက်သာ ဖြည့်စွက်အပြင်အဆင်"</string>
+ <string name="sum_gsm_call_settings" msgid="4076647190996778012">"GSM ခေါ်ဆိုမှုအတွက်သာ ဖြည့်စွက်အပြင်အဆင်"</string>
<string name="additional_cdma_call_settings" msgid="8628958775721886909">"ပိုမိုသော CDMA ခေါ်ဆိုမှု အပြင်အဆင်"</string>
- <string name="sum_cdma_call_settings" msgid="284753265979035549">"CDMA ခေါ်ဆိုမှုအတွက်သာ ဖြည့်စွက်အပြင်အဆင်"</string>
+ <string name="sum_cdma_call_settings" msgid="284753265979035549">"CDMA ခေါ်ဆိုမှုအတွက်သာ ဖြည့်စွက်အပြင်အဆင်"</string>
<string name="labelNwService" msgid="4699970172021870983">"ကွန်ရက် ဝန်ဆောင်မှု ဆက်တင်"</string>
<string name="labelCallerId" msgid="3888899447379069198">"ခေါ်ဆိုသူအိုင်ဒီ"</string>
<string name="sum_loading_settings" msgid="1826692909391168620">"ဆက်တင်များကို ကြည့်ရှုရန် လုပ်နေပါသည်…"</string>
<string name="sum_hide_caller_id" msgid="1071407020290873782">"အထွက်ဖုန်းများတွင် နံပါတ်ဖျောက်ထားပါ"</string>
<string name="sum_show_caller_id" msgid="6768534125447290401">"အထွက်ဖုန်းများတွင် နံပါတ်မြင်ရသည်"</string>
<string name="sum_default_caller_id" msgid="1954518825510901365">"အထွက်ခေါ်ဆိုခြင်းများတွင် မိမိနံပါတ်အားပြသရန် ဝန်ဆောင်မှုပေးသူ၏ ပုံသေ ဆက်တင်ကို အသုံးပြုပါ"</string>
- <string name="labelCW" msgid="6120513814915920200">"ခေါ်ဆိုမှု စောင့်ဆိုင်းခြင်း"</string>
+ <string name="labelCW" msgid="6120513814915920200">"ခေါ်ဆိုမှု စောင့်ဆိုင်းခြင်း"</string>
<string name="sum_cw_enabled" msgid="8083061901633671397">"ဖုန်းပြောနေစဉ် အဝင်ခေါ်ဆိုမှုရှိပါက အသိပေးပါ"</string>
<string name="sum_cw_disabled" msgid="3648693907300104575">"ဖုန်းပြောနေစဉ် အဝင်ခေါ်ဆိုမှုရှိပါက အသိပေးပါ"</string>
<string name="call_forwarding_settings" msgid="3378927671091537173">"ဖုန်းခေါ်ဆိုမှု ထပ်မံလွှဲပြောင်းခြင်း အပြင်အဆင်"</string>
<string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"ခေါ်ဆိုမှု ထပ်ဆင့်ပို့ခြင်း ချိန်ညှိချက်များ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
- <string name="labelCF" msgid="2574386948026924737">"အဝင်ခေါ်ဆိုမှုအား ထပ်ဆင့်ပို့ခြင်း"</string>
+ <string name="labelCF" msgid="2574386948026924737">"အဝင်ခေါ်ဆိုမှုအား ထပ်ဆင့်ပို့ခြင်း"</string>
<string name="labelCFU" msgid="8147177368148660600">"အမြဲတမ်း ထပ်ဆင့်ပို့ပါ"</string>
<string name="messageCFU" msgid="3560082430662923687">"ဤနံပါတ်ကို အမြဲသုံးပါ"</string>
- <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"ခေါ်ဆိုမှုအားလုံးအား တဆင့်ထပ်ပို့နေသည်"</string>
- <string name="sum_cfu_enabled" msgid="2450052502198827927">"<xliff:g id="PHONENUMBER">{0}</xliff:g> သို့ခေါ်ဆိုမှုအားလုံးအား တဆင့်ထပ်ပို့နေသည်"</string>
+ <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"ခေါ်ဆိုမှုအားလုံးအား တဆင့်ထပ်ပို့နေသည်"</string>
+ <string name="sum_cfu_enabled" msgid="2450052502198827927">"<xliff:g id="PHONENUMBER">{0}</xliff:g> သို့ခေါ်ဆိုမှုအားလုံးအား တဆင့်ထပ်ပို့နေသည်"</string>
<string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"ဖုန်းနံပါတ်မှာ မရှိပါ"</string>
<string name="sum_cfu_disabled" msgid="8384177689501334080">"ပိတ်ထားရန်"</string>
<string name="labelCFB" msgid="6139853033106283172">"မအားလပ်ချိန်"</string>
<string name="messageCFB" msgid="3711089705936187129">"ဖုန်းမအားလျှင် ပို့ရန် နံပါတ်"</string>
- <string name="sum_cfb_enabled" msgid="5984198104833116690">"<xliff:g id="PHONENUMBER">{0}</xliff:g> သို့ခေါ်ဆိုမှုအား တဆင့်ထပ်ပို့နေသည်"</string>
+ <string name="sum_cfb_enabled" msgid="5984198104833116690">"<xliff:g id="PHONENUMBER">{0}</xliff:g> သို့ခေါ်ဆိုမှုအား တဆင့်ထပ်ပို့နေသည်"</string>
<string name="sum_cfb_disabled" msgid="4913145177320506827">"ပိတ်ထားရန်"</string>
<string name="disable_cfb_forbidden" msgid="3506984333877998061">"သင့် ဖုန်း အလုပ်များနေစဉ် call forwarding ပြုလုပ်မှု ပယ်ဖျက်ရန် သင့် အော်ပရေတာမှ ခွင့်မပြုပါ"</string>
<string name="labelCFNRy" msgid="1736067178393744351">"ဖုန်းမကိုင်ချိန်"</string>
<string name="messageCFNRy" msgid="672317899884380374">"ဖုန်းမကိုင်လျှင်ပို့ရန် နံပါတ်"</string>
- <string name="sum_cfnry_enabled" msgid="6955775691317662910">"<xliff:g id="PHONENUMBER">{0}</xliff:g> သို့ခေါ်ဆိုမှုအား တဆင့်ထပ်ပို့နေသည်"</string>
+ <string name="sum_cfnry_enabled" msgid="6955775691317662910">"<xliff:g id="PHONENUMBER">{0}</xliff:g> သို့ခေါ်ဆိုမှုအား တဆင့်ထပ်ပို့နေသည်"</string>
<string name="sum_cfnry_disabled" msgid="3884684060443538097">"ပိတ်ထားရန်"</string>
<string name="disable_cfnry_forbidden" msgid="4308233959150658058">"သင့် ဖုန်း မကိုင်စဉ် call forwarding ပြုလုပ်မှု ပယ်ဖျက်ရန် သင့် အော်ပရေတာမှ ခွင့်မပြုပါ"</string>
<string name="labelCFNRc" msgid="2614827454402079766">"ဆက်သွယ်၍ မရချိန်"</string>
<string name="messageCFNRc" msgid="6380695421020295119">"ဖုန်းခေါ်မရလျှင် ပို့ရန် နံပါတ်"</string>
- <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"<xliff:g id="PHONENUMBER">{0}</xliff:g> သို့ခေါ်ဆိုမှုအား တဆင့်ထပ်ပို့နေသည်"</string>
+ <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"<xliff:g id="PHONENUMBER">{0}</xliff:g> သို့ခေါ်ဆိုမှုအား တဆင့်ထပ်ပို့နေသည်"</string>
<string name="sum_cfnrc_disabled" msgid="7222141261321276464">"သုံးမရအောင် ပိတ်ထားခြင်း"</string>
<string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"သင့် ဖုန်း ဆက်သွယ်မှု လုပ်လို့မရစဉ် call forwarding ပြုလုပ်မှု ပယ်ဖျက်ရန် သင့် အော်ပရေတာမှ ခွင့်မပြုပါ"</string>
<string name="updating_title" msgid="6146755386174019046">"ခေါ်ဆိုခြင်း အဆင်အပြင်များ"</string>
@@ -196,14 +196,14 @@
<item msgid="1524224863879435516">"GSM သာ"</item>
<item msgid="3817924849415716259">"GSM/WCDMA preferred"</item>
</string-array>
- <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"မြှင့်တင်ထား 4G LTE မုဒ်"</string>
+ <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"မြှင့်တင်ထား 4G LTE မုဒ်"</string>
<string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"အသံခေါ်ဆိုမှုနှင့် အခြားဆက်သွယ်ရေးများ တိုးတက်စေရန် LTE ဝန်ဆောင်မှုများ ကိုအသုံးပြုမည် (အကြံပြုထား)"</string>
- <string name="data_enabled" msgid="5972538663568715366">"ဒေတာ ဖွင့်ထားပြီး"</string>
- <string name="data_enable_summary" msgid="2382798156640007971">"ဒေတာ သုံးစွဲမှု ခွင့်ပြုရန်"</string>
+ <string name="data_enabled" msgid="5972538663568715366">"ဒေတာ ဖွင့်ထားပြီး"</string>
+ <string name="data_enable_summary" msgid="2382798156640007971">"ဒေတာ သုံးစွဲမှု ခွင့်ပြုရန်"</string>
<string name="roaming" msgid="8871412572928323707">"ဒေတာရုန်းမင်း"</string>
<string name="roaming_enable" msgid="7331106985174381987">"ရုန်းမင်းပြုလုပ်နေစဉ် ဒေတာဝန်ဆောင်မှုများကို ဆက်သွယ်ခြင်း"</string>
<string name="roaming_disable" msgid="1843417228755568110">"ရုန်းမင်းပြုလုပ်နေစဉ် ဒေတာဝန်ဆောင်မှုများကို ဆက်သွယ်ခြင်း"</string>
- <string name="roaming_reenable_message" msgid="8913735676127858115">"ဒေတာဆက်သွယ်မှုပြတ်တောက်သွားပါသည် အဘယ်ကြောင့်ဆိုသော် သင့်အိမ်၏ကွန်ယက်မှထွက်ကာ ဒေတာရုန်းမင်းကွန်ယက်ကိုလဲပိတ်ထားသောကြောင့်ဖြစ်သည်"</string>
+ <string name="roaming_reenable_message" msgid="8913735676127858115">"ဒေတာဆက်သွယ်မှုပြတ်တောက်သွားပါသည် အဘယ်ကြောင့်ဆိုသော် သင့်အိမ်၏ကွန်ယက်မှထွက်ကာ ဒေတာရုန်းမင်းကွန်ယက်ကိုလဲပိတ်ထားသောကြောင့်ဖြစ်သည်"</string>
<string name="roaming_warning" msgid="7126227198294007907">"ရွမ်မင်းသုံးချိန်တွင် ဒေတာအသုံးပြုမှု ခွင့်ပြုမလား? သိသာသည့် ကုန်ကျမှုများ ရှိမည်ဖြစ်ပါသည်။"</string>
<string name="gsm_umts_options" msgid="6538311689850981686">"GSM/UMTS ရွေးချယ်မှုများ"</string>
<string name="cdma_options" msgid="4016822858172249884">"CDMA ရွေးချယ်စရာများ"</string>
@@ -217,7 +217,7 @@
<string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"<xliff:g id="USED_0">%1$s</xliff:g> အမြင့်ဆုံး ကျော်လွန်\nဒေတာနှုန်း <xliff:g id="USED_1">%2$d</xliff:g> Kb/s သို့လျှော့ချလိုက်သည်"</string>
<string name="throttle_time_frame_subtext" msgid="7732763021560399960">"<xliff:g id="USED_0">%1$d</xliff:g>٪ ကုန်ဆုံးပြီး \n နောက်သတ်မှတ်ကာလစရန် <xliff:g id="USED_1">%2$d</xliff:g> ရက်(<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
<string name="throttle_rate_subtext" msgid="2149102656120726855">"ဒေတာအသုံးပြုမှု သတ်မှတ်ချက်ထက်ကျော်လွန်ပါက ဒေတာမြန်နှုန်းဟာ <xliff:g id="USED">%1$d</xliff:g> Kb/s သို့လျှော့ချပါမည်"</string>
- <string name="throttle_help_subtext" msgid="3633091498168446044">"သင့် အတွက် စီမံပေးသူ၏ မိုဘိုင်ကွန်ရက် ဒေတာအသုံးပြုမှု မူဝါဒ အကြောင်း အချက်အလက်များကို ပိုမိုသိရှိရန်"</string>
+ <string name="throttle_help_subtext" msgid="3633091498168446044">"သင့် အတွက် စီမံပေးသူ၏ မိုဘိုင်ကွန်ရက် ဒေတာအသုံးပြုမှု မူဝါဒ အကြောင်း အချက်အလက်များကို ပိုမိုသိရှိရန်"</string>
<string name="cell_broadcast_sms" msgid="5584192824053625842">"စာတိုများ ဖြန့်ဝေခြင်းစနစ် စာတိုသည်"</string>
<string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"စာတိုများ ဖြန့်ဝေခြင်းစနစ် စာတို"</string>
<string name="cell_bc_sms_enable" msgid="6441688565738921084">"စာတိုများ ဖြန့်ဝေခြင်းစနစ် စာတို ကို ဖွင့်ထား"</string>
@@ -329,7 +329,7 @@
<string name="cdma_activate_device" msgid="3793805892364814518">"စက်ကို အက်တီဗိတ် လုပ်ရန်"</string>
<string name="cdma_lte_data_service" msgid="4255018217292548962">"ဒေတာဝန်ဆောင်မှု စတင်ရန်"</string>
<string name="carrier_settings_title" msgid="9028166176523012300">"ဖုန်းလိုင်းဝန်ဆောင်မှုပေးသူ၏ အပြင်အဆင်"</string>
- <string name="fdn" msgid="7878832555095183202">"ခေါ်ဆိုသည့်အခြေစိုက်နံပါတ်များ"</string>
+ <string name="fdn" msgid="7878832555095183202">"ခေါ်ဆိုသည့်အခြေစိုက်နံပါတ်များ"</string>
<string name="fdn_with_label" msgid="187084204115493366">"အထိုင်ဖုန်းနံပါတ် (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="manage_fdn_list" msgid="8777755791892122369">"FDN စာရင်း"</string>
<string name="fdn_list_with_label" msgid="7437232552210469217">"FDN စာရင်း (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
@@ -341,7 +341,7 @@
<string name="change_pin2" msgid="2153563695382176676">"ပင်နံပါတ်၂ ကို ပြောင်းရန်"</string>
<string name="enable_fdn_ok" msgid="7215588870329688132">"FDN ကို ပယ်ဖျက်ရန်"</string>
<string name="disable_fdn_ok" msgid="5727046928930740173">"FDN ကို သုံးနိုင်ရန်"</string>
- <string name="sum_fdn" msgid="1959399454900272878">"ခေါ်ဆိုသည့်အခြေစိုက်နံပါတ်အားကြီးကြပ်သည်"</string>
+ <string name="sum_fdn" msgid="1959399454900272878">"ခေါ်ဆိုသည့်အခြေစိုက်နံပါတ်အားကြီးကြပ်သည်"</string>
<string name="sum_fdn_change_pin" msgid="6666549734792827932">"FDN သုံးစွဲမှုအတွက် ပင် နံပါတ်ပြောင်းပါ"</string>
<string name="sum_fdn_manage_list" msgid="8431088265332628316">"ဖုန်းနံပါတ်စာရင်းကို ကြီးကြပ်ရန်"</string>
<string name="voice_privacy" msgid="3776841382844614716">"အသံလုံခြုံရေး"</string>
@@ -357,16 +357,16 @@
<string name="name" msgid="7329028332786872378">"အမည်"</string>
<string name="number" msgid="7905950798349903858">"နံပါတ်"</string>
<string name="save" msgid="4094274636321939086">"သိမ်းဆည်းသည်"</string>
- <string name="add_fdn_contact" msgid="2481915899633353976">"ခေါ်ဆိုသည့်အခြေစိုက်နံပါတ်အားထည့်သည်"</string>
- <string name="adding_fdn_contact" msgid="7627379633721940991">"ခေါ်ဆိုသည့်အခြေစိုက်နံပါတ်အားထည့်နေသည်"</string>
+ <string name="add_fdn_contact" msgid="2481915899633353976">"ခေါ်ဆိုသည့်အခြေစိုက်နံပါတ်အားထည့်သည်"</string>
+ <string name="adding_fdn_contact" msgid="7627379633721940991">"ခေါ်ဆိုသည့်အခြေစိုက်နံပါတ်အားထည့်နေသည်"</string>
<string name="fdn_contact_added" msgid="7458335758501736665">"ပုံသေခေါ်ဆိုမှု နံပါတ် ထပ်ထည့်ပြီး"</string>
- <string name="edit_fdn_contact" msgid="7976936035587081480">"ခေါ်ဆိုသည့်အခြေစိုက်နံပါတ်အားပြင်သည်"</string>
- <string name="updating_fdn_contact" msgid="8370929876849803600">"ခေါ်ဆိုသည့်အခြေစိုက်နံပါတ်အား အဆင့်မြှင့်နေသည်"</string>
+ <string name="edit_fdn_contact" msgid="7976936035587081480">"ခေါ်ဆိုသည့်အခြေစိုက်နံပါတ်အားပြင်သည်"</string>
+ <string name="updating_fdn_contact" msgid="8370929876849803600">"ခေါ်ဆိုသည့်အခြေစိုက်နံပါတ်အား အဆင့်မြှင့်နေသည်"</string>
<string name="fdn_contact_updated" msgid="5497828782609005017">"ပုံသေခေါ်ဆိုမှု နံပါတ် ပြင်ဆင်ပြီး"</string>
- <string name="delete_fdn_contact" msgid="6668958073074151717">"ခေါ်ဆိုသည့်အခြေစိုက်နံပါတ်အားဖျက်သည်"</string>
- <string name="deleting_fdn_contact" msgid="5669163206349319969">"ခေါ်ဆိုသည့်အခြေစိုက်နံပါတ်အားဖျက်နေသည်"</string>
+ <string name="delete_fdn_contact" msgid="6668958073074151717">"ခေါ်ဆိုသည့်အခြေစိုက်နံပါတ်အားဖျက်သည်"</string>
+ <string name="deleting_fdn_contact" msgid="5669163206349319969">"ခေါ်ဆိုသည့်အခြေစိုက်နံပါတ်အားဖျက်နေသည်"</string>
<string name="fdn_contact_deleted" msgid="7154162327112259569">"ပုံသေ ခေါ်ဆိုမှု နံပါတ် ဖျက်ပြီး"</string>
- <string name="pin2_invalid" msgid="5470854099230755944">"ပင်နံပါတ် မမှန်သောကြောင့် FDNကို အဆင့်မြှင့်တင်ခြင်းမပြုလုပ်နိုင်ပါ"</string>
+ <string name="pin2_invalid" msgid="5470854099230755944">"ပင်နံပါတ် မမှန်သောကြောင့် FDNကို အဆင့်မြှင့်တင်ခြင်းမပြုလုပ်နိုင်ပါ"</string>
<string name="fdn_invalid_number" msgid="1494755047900009147">"နံပါတ် အလုံးရေ (၂၀) ထက် ရှည်လို့ မရသောကြောင့် FDN ကို မပြင်ဆင်ဖြစ်ပါ"</string>
<string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN ပြောင်းလဲမှု မဖြစ်ပါ။ ပင်နံပါတ် ၂ မှားယွင်းခြင်း သို့မဟုတ် ဖုန်းနံပါတ်ကို ငြင်းဖယ်ခံရခြင်း တစ်ခုခုဖြစ်ပါသည်"</string>
<string name="fdn_failed" msgid="540018079008319747">"FDN လုပ်ဆောင်ချက် မအောင်မြင်ပါ"</string>
@@ -437,7 +437,7 @@
<string name="incall_error_power_off" msgid="6550191216405193368">"ဖုန်းခေါ်ဆိုမှုပြုရန်, လေယာဥ်ပျံပေါ်အသုံးပြုသောစနစ်ကို ပိတ်ပါ"</string>
<string name="incall_error_emergency_only" msgid="4678640422710818317">"ကွန်ယက်ပေါ်မှာ မှတ်ပုံတင်မှု မပြုလုပ်ထားပါ"</string>
<string name="incall_error_out_of_service" msgid="4100065333878929223">"ဆယ်လူလာ ကွန်ရက် မရှိပါ။"</string>
- <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"ဖုန်းခေါ်ရန်အတွက်၊ သင့်လျော်သည့်နံပါတ် ရိုက်ထည့်ပါ။"</string>
+ <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"ဖုန်းခေါ်ရန်အတွက်၊ သင့်လျော်သည့်နံပါတ် ရိုက်ထည့်ပါ။"</string>
<string name="incall_error_call_failed" msgid="6302746943230078197">"မခေါ်ဆိုနိုင်ပါ။"</string>
<string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI အမှတ်စဉ်ကို စတင်နေပါသည်…"</string>
<string name="incall_error_supp_service_unknown" msgid="655570339115407698">"ဤဝန်ဆောင်မှုအား မပံ့ပိုးပါ။"</string>
@@ -457,7 +457,7 @@
<string name="onscreenEndCallText" msgid="4403855834875398585">"ပြီးပါပြီ"</string>
<string name="onscreenShowDialpadText" msgid="8561805492659639893">"နံပါတ်ကွက်"</string>
<string name="onscreenMuteText" msgid="5011369181754261374">"အသံတိတ်"</string>
- <string name="onscreenAddCallText" msgid="5140385634712287403">"ဖုန်းခေါ်မှု ထပ်ထည့်ပါ"</string>
+ <string name="onscreenAddCallText" msgid="5140385634712287403">"ဖုန်းခေါ်မှု ထပ်ထည့်ပါ"</string>
<string name="onscreenMergeCallsText" msgid="6640195098064538950">"ဖုန်းခေါ်မှုများကို ပူးပေါင်းသည်"</string>
<string name="onscreenSwapCallsText" msgid="1602990689244030047">"လဲပြောင်းသည်"</string>
<string name="onscreenManageCallsText" msgid="5473231160123254154">"ဖုန်းခေါ်မှုကို ကြီးကြပ်သည်"</string>
@@ -538,10 +538,10 @@
<string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"တုန်ခါခြင်း"</string>
<string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"တုန်ခါခြင်း"</string>
<string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"အသံ"</string>
- <string name="dial_pad_autocomplete" msgid="7683489952557536398">"နံပါတ်ကွက် အလိုအလျောက်ဖြည့်ရန်"</string>
+ <string name="dial_pad_autocomplete" msgid="7683489952557536398">"နံပါတ်ကွက် အလိုအလျောက်ဖြည့်ရန်"</string>
<string name="preference_category_ringtone" msgid="5197960752529332721">"ဖုန်းမြည်သံ & တုန်ခါသံ"</string>
<string name="pstn_connection_service_label" msgid="1743245930577325900">"တပ်ဆင်ပြီး ဆင်းမ် ကဒ်များ"</string>
- <string name="enable_video_calling_title" msgid="7237253660669000899">"ဗီဒီယို ခေါ်ဆိုမှုများကို ဖွင့်ထားရန်"</string>
+ <string name="enable_video_calling_title" msgid="7237253660669000899">"ဗီဒီယို ခေါ်ဆိုမှုများကို ဖွင့်ထားရန်"</string>
<string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"ဗွီဒီယို ခေါ်ဆိုမှု ဖွင့်ရန်၊ မြှင့်ထားသည့် 4G LTE မုဒ်ကို ကွန်ရက် ချိိန်ညှိချက်များတွင် ဖွင့်ပေးရပါမည်။"</string>
<string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"ကွန်ရက် ဆက်တင်များ"</string>
<string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"ပိတ်ရန်"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 3ba5032..e0f4a5a 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -82,8 +82,8 @@
<string name="networks" msgid="8873030692174541976">"Operadoras de rede"</string>
<string name="cell_broadcast_settings" msgid="8740238216690502563">"Transmissões de emergência"</string>
<string name="call_settings" msgid="6112441768261754562">"Configurações de chamadas"</string>
- <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Configurações adicionais"</string>
- <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Configurações adicionais (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+ <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Config. adicionais"</string>
+ <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Config. adicionais (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="sum_gsm_call_settings" msgid="4076647190996778012">"Configurações adicionais somente de chamada GSM"</string>
<string name="additional_cdma_call_settings" msgid="8628958775721886909">"Configurações de chamada CDMA adicionais"</string>
<string name="sum_cdma_call_settings" msgid="284753265979035549">"Configurações adicionais somente de chamada CDMA"</string>
@@ -96,8 +96,8 @@
<string name="labelCW" msgid="6120513814915920200">"Chamada em espera"</string>
<string name="sum_cw_enabled" msgid="8083061901633671397">"Durante uma chamada, me avise sobre chamadas recebidas"</string>
<string name="sum_cw_disabled" msgid="3648693907300104575">"Durante uma chamada, me avise sobre chamadas recebidas"</string>
- <string name="call_forwarding_settings" msgid="3378927671091537173">"Configurações de encaminhamento de chamada"</string>
- <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Configurações de encaminhamento de chamada (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+ <string name="call_forwarding_settings" msgid="3378927671091537173">"Config. de encaminhamento de chamada"</string>
+ <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Config. de encaminhamento de chamada (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="labelCF" msgid="2574386948026924737">"Encaminhamento"</string>
<string name="labelCFU" msgid="8147177368148660600">"Sempre encaminhar"</string>
<string name="messageCFU" msgid="3560082430662923687">"Sempre usar este número"</string>
@@ -116,7 +116,7 @@
<string name="sum_cfnry_disabled" msgid="3884684060443538097">"Desativado"</string>
<string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Sua operadora não suporta a desativação do encaminhamento de chamada quando seu telefone não responde."</string>
<string name="labelCFNRc" msgid="2614827454402079766">"Quando inacessível"</string>
- <string name="messageCFNRc" msgid="6380695421020295119">"Número quando não acessível"</string>
+ <string name="messageCFNRc" msgid="6380695421020295119">"Número quando inacessível"</string>
<string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Encaminhando para <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
<string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Desativado"</string>
<string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Sua operadora não suporta a desativação do encaminhamento de chamada quando seu telefone não está acessível."</string>
@@ -346,8 +346,8 @@
<string name="sum_fdn_manage_list" msgid="8431088265332628316">"Gerenciar lista de números telefônicos"</string>
<string name="voice_privacy" msgid="3776841382844614716">"Privacidade de voz"</string>
<string name="voice_privacy_summary" msgid="3159383389833516214">"Ativar modo de privacidade aprimorado"</string>
- <string name="tty_mode_option_title" msgid="9033098925144434669">"Modo TTY"</string>
- <string name="tty_mode_option_summary" msgid="1073835131534808732">"Definir modo TTY"</string>
+ <string name="tty_mode_option_title" msgid="9033098925144434669">"Modo TTD"</string>
+ <string name="tty_mode_option_summary" msgid="1073835131534808732">"Definir modo TTD"</string>
<string name="auto_retry_mode_title" msgid="4073265511427813322">"Repetir automaticamente"</string>
<string name="auto_retry_mode_summary" msgid="4973886004067532288">"Ativar modo Repetir automaticamente"</string>
<string name="menu_add" msgid="1882023737425114762">"Adicionar contato"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 8298960..81a416b 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -92,11 +92,11 @@
<string name="sum_loading_settings" msgid="1826692909391168620">"Загрузка настроек…"</string>
<string name="sum_hide_caller_id" msgid="1071407020290873782">"Скрывать номер при исходящих вызовах"</string>
<string name="sum_show_caller_id" msgid="6768534125447290401">"Номер, отображающийся при исходящих вызовах"</string>
- <string name="sum_default_caller_id" msgid="1954518825510901365">"При исходящих вызовах использовать для отображения моего номера настройки, предоставляемые оператором"</string>
+ <string name="sum_default_caller_id" msgid="1954518825510901365">"Использовать стандартные настройки оператора для показа моего номера при исходящих вызовах"</string>
<string name="labelCW" msgid="6120513814915920200">"Параллельный вызов"</string>
<string name="sum_cw_enabled" msgid="8083061901633671397">"Извещать меня о входящих вызовах во время разговора"</string>
<string name="sum_cw_disabled" msgid="3648693907300104575">"Извещать меня о входящих вызовах во время разговора"</string>
- <string name="call_forwarding_settings" msgid="3378927671091537173">"Настройки переадресации вызова"</string>
+ <string name="call_forwarding_settings" msgid="3378927671091537173">"Переадресация"</string>
<string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Настройки переадресации вызовов (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="labelCF" msgid="2574386948026924737">"Переадресация вызова"</string>
<string name="labelCFU" msgid="8147177368148660600">"Переадресовывать всегда"</string>
@@ -106,23 +106,23 @@
<string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Номер не указан"</string>
<string name="sum_cfu_disabled" msgid="8384177689501334080">"Выкл."</string>
<string name="labelCFB" msgid="6139853033106283172">"Если номер занят"</string>
- <string name="messageCFB" msgid="3711089705936187129">"Номер, использующийся, когда линия занята"</string>
+ <string name="messageCFB" msgid="3711089705936187129">"Переадресовывать на этот номер"</string>
<string name="sum_cfb_enabled" msgid="5984198104833116690">"Переадресация на номер <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
<string name="sum_cfb_disabled" msgid="4913145177320506827">"Выкл."</string>
<string name="disable_cfb_forbidden" msgid="3506984333877998061">"Ваш оператор не позволяет отключать переадресацию вызовов, если телефон занят."</string>
<string name="labelCFNRy" msgid="1736067178393744351">"Если нет ответа"</string>
- <string name="messageCFNRy" msgid="672317899884380374">"Номер для переадресации при отсутствии ответа"</string>
+ <string name="messageCFNRy" msgid="672317899884380374">"Переадресовывать на этот номер"</string>
<string name="sum_cfnry_enabled" msgid="6955775691317662910">"Переадресация на номер <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
<string name="sum_cfnry_disabled" msgid="3884684060443538097">"Выкл."</string>
<string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Ваш оператор не позволяет отключать переадресацию вызовов, если нет ответа."</string>
<string name="labelCFNRc" msgid="2614827454402079766">"Если номер недоступен"</string>
- <string name="messageCFNRc" msgid="6380695421020295119">"Номер для переадресации, если абонент недоступен"</string>
+ <string name="messageCFNRc" msgid="6380695421020295119">"Переадресовывать на этот номер"</string>
<string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Переадресация на номер <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
<string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Отключено"</string>
<string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Ваш оператор не позволяет отключать переадресацию вызовов, если телефон находится вне зоны доступа."</string>
<string name="updating_title" msgid="6146755386174019046">"Настройки вызовов"</string>
<string name="call_settings_primary_user_only" msgid="5679923943740900965">"Настройки вызовов может изменить только основной пользователь."</string>
- <string name="call_settings_with_label" msgid="89359812614544532">"Настройки вызовов (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+ <string name="call_settings_with_label" msgid="89359812614544532">"Настройки (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="7970259216988931777">"Ошибка настройки вызовов"</string>
<string name="reading_settings" msgid="1920291699287055284">"Чтение настроек…"</string>
<string name="updating_settings" msgid="8171225533884883252">"Обновление настроек…"</string>
@@ -338,11 +338,11 @@
<string name="fdn_activation" msgid="2156479741307463576">"Активация разреш. номеров"</string>
<string name="fdn_enabled" msgid="5238109009915521240">"Разрешенные номера включены"</string>
<string name="fdn_disabled" msgid="4700049736675368279">"Разрешенные номера отключены"</string>
- <string name="enable_fdn" msgid="3740191529180493851">"Вкл. разреш. номера"</string>
+ <string name="enable_fdn" msgid="3740191529180493851">"Вкл. разрешенные номера"</string>
<string name="disable_fdn" msgid="7944020890722540616">"Откл. разреш. номера"</string>
<string name="change_pin2" msgid="2153563695382176676">"Изменить PIN2"</string>
<string name="enable_fdn_ok" msgid="7215588870329688132">"Откл. разреш. номера"</string>
- <string name="disable_fdn_ok" msgid="5727046928930740173">"Вкл. разреш. номера"</string>
+ <string name="disable_fdn_ok" msgid="5727046928930740173">"Вкл. разрешенные номера"</string>
<string name="sum_fdn" msgid="1959399454900272878">"Управление списком разрешенных номеров"</string>
<string name="sum_fdn_change_pin" msgid="6666549734792827932">"Изменить PIN для доступа к списку разрешенных номеров"</string>
<string name="sum_fdn_manage_list" msgid="8431088265332628316">"Управление списком разрешенных номеров"</string>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index 5b52d6e..1d283d5 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -92,7 +92,7 @@
<string name="sum_loading_settings" msgid="1826692909391168620">"సెట్టింగ్లను లోడ్ చేస్తోంది…"</string>
<string name="sum_hide_caller_id" msgid="1071407020290873782">"అవుట్గోయింగ్ కాల్ల్లో నంబర్ దాచబడుతుంది"</string>
<string name="sum_show_caller_id" msgid="6768534125447290401">"అవుట్గోయింగ్ కాల్ల్లో నంబర్ ప్రదర్శించబడుతుంది"</string>
- <string name="sum_default_caller_id" msgid="1954518825510901365">"అవుట్గోయింగ్ కాల్ల్లో నా నంబర్ను ప్రదర్శించడానికి డిఫాల్ట్ ఆపరేటర్ సెట్టింగ్లను ఉపయోగించండి"</string>
+ <string name="sum_default_caller_id" msgid="1954518825510901365">"అవుట్గోయింగ్ కాల్ల్లో నా నంబర్ను ప్రదర్శించడానికి డిఫాల్ట్ ఆపరేటర్ సెట్టింగ్లను ఉపయోగించు"</string>
<string name="labelCW" msgid="6120513814915920200">"కాల్ నిరీక్షణ"</string>
<string name="sum_cw_enabled" msgid="8083061901633671397">"కాల్ సమయంలో, ఇన్కమింగ్ కాల్ల గురించి నాకు తెలియజేయి"</string>
<string name="sum_cw_disabled" msgid="3648693907300104575">"కాల్ సమయంలో, ఇన్కమింగ్ కాల్ల గురించి నాకు తెలియజేయి"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 1bb7a4e..d2f6bb6 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -105,17 +105,17 @@
<string name="sum_cfu_enabled" msgid="2450052502198827927">"โอนสายทั้งหมดไปที่ <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
<string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"หมายเลขใช้งานไม่ได้"</string>
<string name="sum_cfu_disabled" msgid="8384177689501334080">"ปิด"</string>
- <string name="labelCFB" msgid="6139853033106283172">"เมื่อไม่ว่าง"</string>
+ <string name="labelCFB" msgid="6139853033106283172">"เมื่อสายไม่ว่าง"</string>
<string name="messageCFB" msgid="3711089705936187129">"หมายเลขเมื่อสายไม่ว่าง"</string>
<string name="sum_cfb_enabled" msgid="5984198104833116690">"โอนสายไปที่ <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
<string name="sum_cfb_disabled" msgid="4913145177320506827">"ปิด"</string>
<string name="disable_cfb_forbidden" msgid="3506984333877998061">"ผู้ให้บริการของคุณไม่สนับสนุนการปิดใช้งานการโอนสายเมื่อสายไม่ว่าง"</string>
- <string name="labelCFNRy" msgid="1736067178393744351">"เมื่อไม่มีการตอบ"</string>
+ <string name="labelCFNRy" msgid="1736067178393744351">"เมื่อไม่รับสาย"</string>
<string name="messageCFNRy" msgid="672317899884380374">"หมายเลขเมื่อไม่ได้รับสาย"</string>
<string name="sum_cfnry_enabled" msgid="6955775691317662910">"โอนสายไปที่ <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
<string name="sum_cfnry_disabled" msgid="3884684060443538097">"ปิด"</string>
<string name="disable_cfnry_forbidden" msgid="4308233959150658058">"ผู้ให้บริการของคุณไม่สนับสนุนการปิดใช้งานการโอนสายเมื่อไม่มีผู้รับสาย"</string>
- <string name="labelCFNRc" msgid="2614827454402079766">"เมื่อไม่สามารถติดต่อได้"</string>
+ <string name="labelCFNRc" msgid="2614827454402079766">"เมื่อติดต่อไม่ได้"</string>
<string name="messageCFNRc" msgid="6380695421020295119">"หมายเลขเมื่อติดต่อไม่ได้"</string>
<string name="sum_cfnrc_enabled" msgid="7010898346095497421">"โอนสายไปที่ <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
<string name="sum_cfnrc_disabled" msgid="7222141261321276464">"ถูกปิดใช้งาน"</string>
@@ -204,7 +204,7 @@
<string name="roaming_enable" msgid="7331106985174381987">"เชื่อมต่อบริการข้อมูลขณะโรมมิ่ง"</string>
<string name="roaming_disable" msgid="1843417228755568110">"เชื่อมต่อบริการข้อมูลขณะโรมมิ่ง"</string>
<string name="roaming_reenable_message" msgid="8913735676127858115">"การเชื่อมต่อข้อมูลของคุณหายไปเนื่องจากคุณออกจากเครือข่ายที่บ้านโดยปิดการโรมมิ่งข้อมูลไว้"</string>
- <string name="roaming_warning" msgid="7126227198294007907">"อนุญาตการใช้อินเทอร์เน็ตขณะโรมมิ่งไหม อาจมีการเรียกเก็บเงินจำนวนมาก"</string>
+ <string name="roaming_warning" msgid="7126227198294007907">"อนุญาตให้ใช้อินเทอร์เน็ตขณะใช้บริการโรมมิ่งไหม บริการนี้อาจมีค่าใช้จ่ายสูง"</string>
<string name="gsm_umts_options" msgid="6538311689850981686">"ตัวเลือก GSM//UMTS"</string>
<string name="cdma_options" msgid="4016822858172249884">"ตัวเลือก CDMA"</string>
<string name="throttle_data_usage" msgid="3715677828160555808">"การใช้ข้อมูล"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 9cecc05..72ed336 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -110,7 +110,7 @@
<string name="sum_cfb_enabled" msgid="5984198104833116690">"Şuraya yönlendiriliyor: <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
<string name="sum_cfb_disabled" msgid="4913145177320506827">"Kapalı"</string>
<string name="disable_cfb_forbidden" msgid="3506984333877998061">"Operatörünüz, telefonunuz meşgul olduğunda çağrı yönlendirmenin devre dışı bırakılmasını desteklemiyor."</string>
- <string name="labelCFNRy" msgid="1736067178393744351">"Yanıt verilmediğinde"</string>
+ <string name="labelCFNRy" msgid="1736067178393744351">"Yanıtlanmadığında"</string>
<string name="messageCFNRy" msgid="672317899884380374">"Yanıtlanmadığında kullanılacak numara"</string>
<string name="sum_cfnry_enabled" msgid="6955775691317662910">"Şuraya yönlendiriliyor: <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
<string name="sum_cfnry_disabled" msgid="3884684060443538097">"Kapalı"</string>
@@ -201,10 +201,10 @@
<string name="data_enabled" msgid="5972538663568715366">"Veri etkin"</string>
<string name="data_enable_summary" msgid="2382798156640007971">"Veri kullanımına izin ver"</string>
<string name="roaming" msgid="8871412572928323707">"Veri dolaşımı"</string>
- <string name="roaming_enable" msgid="7331106985174381987">"Dolaşırken veri hizmetlerine bağlan"</string>
- <string name="roaming_disable" msgid="1843417228755568110">"Dolaşırken veri hizmetlerine bağlan"</string>
+ <string name="roaming_enable" msgid="7331106985174381987">"Dolaşımdayken veri hizmetlerine bağlan"</string>
+ <string name="roaming_disable" msgid="1843417228755568110">"Dolaşımdayken veri hizmetlerine bağlan"</string>
<string name="roaming_reenable_message" msgid="8913735676127858115">"Veri dolaşımı kapalıyken ev ağınızdan ayrıldığınız için veri bağlantısını kaybettiniz."</string>
- <string name="roaming_warning" msgid="7126227198294007907">"Dolaşımda veri kullanımına izin verilsin mi? Kayda değer ücretler ödenmesi gerekebilir."</string>
+ <string name="roaming_warning" msgid="7126227198294007907">"Dolaşımdayken veri kullanımına izin verilsin mi? Kayda değer ücretler ödenmesi gerekebilir."</string>
<string name="gsm_umts_options" msgid="6538311689850981686">"GSM/UMTS Seçenekleri"</string>
<string name="cdma_options" msgid="4016822858172249884">"CDMA Seçenekleri"</string>
<string name="throttle_data_usage" msgid="3715677828160555808">"Veri kullanımı"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index b36c9ca..8234946 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -57,7 +57,7 @@
<string name="labelCDMAMore" msgid="1630676740428229339">"Налашт. викл. в CDMA"</string>
<string name="apn_settings" msgid="9043423184895642077">"Назва точки доступу"</string>
<string name="settings_label" msgid="3876743539816984008">"Налашт-ння мережі"</string>
- <string name="phone_accounts" msgid="6376603393888116364">"Облікові записи для дзвінків"</string>
+ <string name="phone_accounts" msgid="6376603393888116364">"Обл. записи для дзвінків"</string>
<string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Здійснювати дзвінки за допомогою"</string>
<string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Здійснювати дзвінки SIP за допомогою"</string>
<string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Спершу запитувати"</string>
@@ -92,31 +92,31 @@
<string name="sum_loading_settings" msgid="1826692909391168620">"Завантаження налаштувань…"</string>
<string name="sum_hide_caller_id" msgid="1071407020290873782">"Номер приховано у вихідних дзвінках"</string>
<string name="sum_show_caller_id" msgid="6768534125447290401">"Номер відображ. у вихідних дзвінках"</string>
- <string name="sum_default_caller_id" msgid="1954518825510901365">"Використ. налаштув. оператора для показу мого номера для вихідних дзвінків"</string>
+ <string name="sum_default_caller_id" msgid="1954518825510901365">"Використовувати налаштування оператора для показу мого номера для вихідних дзвінків"</string>
<string name="labelCW" msgid="6120513814915920200">"Паралельний виклик"</string>
<string name="sum_cw_enabled" msgid="8083061901633671397">"Під час дзвінка сповіщати про вхідні дзвінки"</string>
<string name="sum_cw_disabled" msgid="3648693907300104575">"Під час дзвінка сповіщати про вхідні дзвінки"</string>
<string name="call_forwarding_settings" msgid="3378927671091537173">"Налаштування переадресації виклику"</string>
<string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Налаштування переадресації виклику (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
- <string name="labelCF" msgid="2574386948026924737">"Переадрес. виклику"</string>
+ <string name="labelCF" msgid="2574386948026924737">"Переадресація виклику"</string>
<string name="labelCFU" msgid="8147177368148660600">"Завжди переадресовувати"</string>
- <string name="messageCFU" msgid="3560082430662923687">"Завжди викор. цей номер"</string>
+ <string name="messageCFU" msgid="3560082430662923687">"Завжди переадресовувати на цей номер"</string>
<string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Пересил. всіх викликів"</string>
<string name="sum_cfu_enabled" msgid="2450052502198827927">"Пересилання всіх викликів на <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
<string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Номер недоступний"</string>
<string name="sum_cfu_disabled" msgid="8384177689501334080">"Вимкнено"</string>
<string name="labelCFB" msgid="6139853033106283172">"Коли зайнято"</string>
- <string name="messageCFB" msgid="3711089705936187129">"Номер., коли зайн."</string>
+ <string name="messageCFB" msgid="3711089705936187129">"Переадресовувати на цей номер"</string>
<string name="sum_cfb_enabled" msgid="5984198104833116690">"Пересилання на <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
<string name="sum_cfb_disabled" msgid="4913145177320506827">"Вимкнено"</string>
<string name="disable_cfb_forbidden" msgid="3506984333877998061">"Ваш оператор не підтримує вимкнення переадресації викликів, коли телефон зайнятий."</string>
<string name="labelCFNRy" msgid="1736067178393744351">"Коли немає відповіді"</string>
- <string name="messageCFNRy" msgid="672317899884380374">"Номер., якщо не відпов."</string>
+ <string name="messageCFNRy" msgid="672317899884380374">"Переадресовувати на цей номер"</string>
<string name="sum_cfnry_enabled" msgid="6955775691317662910">"Пересилання на <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
<string name="sum_cfnry_disabled" msgid="3884684060443538097">"Вимкнено"</string>
<string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Ваш оператор не підтримує вимкнення переадресації викликів, коли телефон не відповідає."</string>
<string name="labelCFNRc" msgid="2614827454402079766">"Коли недоступно"</string>
- <string name="messageCFNRc" msgid="6380695421020295119">"Номер., якщо недосяжн."</string>
+ <string name="messageCFNRc" msgid="6380695421020295119">"Переадресовувати на цей номер"</string>
<string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Пересилання на <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
<string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Вимкнено"</string>
<string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Ваш оператор не підтримує вимкнення переадресації викликів, коли телефон недосяжний."</string>
@@ -343,7 +343,7 @@
<string name="disable_fdn_ok" msgid="5727046928930740173">"Увімк. FDN"</string>
<string name="sum_fdn" msgid="1959399454900272878">"Керув. номерами фікс. набору"</string>
<string name="sum_fdn_change_pin" msgid="6666549734792827932">"Змінити PIN-код для доступу FDN"</string>
- <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Керув. списком номерів тел."</string>
+ <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Керувати списком номерів"</string>
<string name="voice_privacy" msgid="3776841382844614716">"Конфіденційність Voice"</string>
<string name="voice_privacy_summary" msgid="3159383389833516214">"Увімкн. режим розшир. конфіденц."</string>
<string name="tty_mode_option_title" msgid="9033098925144434669">"Режим TTY"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index ebb2a1e..60baa1c 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -116,7 +116,7 @@
<string name="sum_cfnry_disabled" msgid="3884684060443538097">"Tắt"</string>
<string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Nhà cung cấp dịch vụ của bạn không hỗ trợ vô hiệu hóa chuyển tiếp cuộc gọi khi điện thoại của bạn không trả lời."</string>
<string name="labelCFNRc" msgid="2614827454402079766">"Khi không liên lạc được"</string>
- <string name="messageCFNRc" msgid="6380695421020295119">"Số khi không thể truy cập được"</string>
+ <string name="messageCFNRc" msgid="6380695421020295119">"Số khi không liên lạc được"</string>
<string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Chuyển tiếp tới <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
<string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Đã tắt"</string>
<string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Nhà cung cấp dịch vụ của bạn không hỗ trợ vô hiệu hóa chuyển tiếp cuộc gọi khi điện thoại của bạn không thể truy cập được."</string>
@@ -204,7 +204,7 @@
<string name="roaming_enable" msgid="7331106985174381987">"Kết nối với dịch vụ dữ liệu khi chuyển vùng"</string>
<string name="roaming_disable" msgid="1843417228755568110">"Kết nối với dịch vụ dữ liệu khi chuyển vùng"</string>
<string name="roaming_reenable_message" msgid="8913735676127858115">"Bạn đã mất kết nối dữ liệu vì bạn đã tắt chuyển vùng dữ liệu của mạng gia đình của mình."</string>
- <string name="roaming_warning" msgid="7126227198294007907">"Cho phép sử dụng dữ liệu khi chuyển vùng? Mức phí đáng kể có thể được áp dụng."</string>
+ <string name="roaming_warning" msgid="7126227198294007907">"Cho phép sử dụng dữ liệu khi chuyển vùng? Mức phí có thể tăng đáng kể."</string>
<string name="gsm_umts_options" msgid="6538311689850981686">"Tùy chọn GSM/UMTS"</string>
<string name="cdma_options" msgid="4016822858172249884">"Tùy chọn CDMA"</string>
<string name="throttle_data_usage" msgid="3715677828160555808">"Sử dụng dữ liệu"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 847712e..685542c 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -332,18 +332,18 @@
<string name="fdn" msgid="7878832555095183202">"固定拨号"</string>
<string name="fdn_with_label" msgid="187084204115493366">"固定拨号 (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="manage_fdn_list" msgid="8777755791892122369">"固定拨号列表"</string>
- <string name="fdn_list_with_label" msgid="7437232552210469217">"FDN 列表 (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+ <string name="fdn_list_with_label" msgid="7437232552210469217">"固定拨号列表 (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="fdn_activation" msgid="2156479741307463576">"激活固定拨号"</string>
<string name="fdn_enabled" msgid="5238109009915521240">"已启用固定拨号"</string>
<string name="fdn_disabled" msgid="4700049736675368279">"未启用固定拨号"</string>
<string name="enable_fdn" msgid="3740191529180493851">"启用固定拨号"</string>
<string name="disable_fdn" msgid="7944020890722540616">"停用固定拨号"</string>
- <string name="change_pin2" msgid="2153563695382176676">"更改 PIN2"</string>
+ <string name="change_pin2" msgid="2153563695382176676">"更改 PIN2 码"</string>
<string name="enable_fdn_ok" msgid="7215588870329688132">"停用固定拨号"</string>
<string name="disable_fdn_ok" msgid="5727046928930740173">"启用固定拨号"</string>
<string name="sum_fdn" msgid="1959399454900272878">"管理固定拨号"</string>
<string name="sum_fdn_change_pin" msgid="6666549734792827932">"更改使用固定拨号所需的 PIN 码"</string>
- <string name="sum_fdn_manage_list" msgid="8431088265332628316">"管理手机号码列表"</string>
+ <string name="sum_fdn_manage_list" msgid="8431088265332628316">"管理号码列表"</string>
<string name="voice_privacy" msgid="3776841382844614716">"语音隐私权"</string>
<string name="voice_privacy_summary" msgid="3159383389833516214">"启用增强型隐秘模式"</string>
<string name="tty_mode_option_title" msgid="9033098925144434669">"TTY 模式"</string>
@@ -353,7 +353,7 @@
<string name="menu_add" msgid="1882023737425114762">"添加联系人"</string>
<string name="menu_edit" msgid="7143003705504672374">"编辑联系人"</string>
<string name="menu_delete" msgid="3977150783449642851">"删除联系人"</string>
- <string name="get_pin2" msgid="8204677063922225311">"键入 PIN2"</string>
+ <string name="get_pin2" msgid="8204677063922225311">"输入 PIN2 码"</string>
<string name="name" msgid="7329028332786872378">"名称"</string>
<string name="number" msgid="7905950798349903858">"号码"</string>
<string name="save" msgid="4094274636321939086">"保存"</string>
@@ -366,10 +366,10 @@
<string name="delete_fdn_contact" msgid="6668958073074151717">"删除固定拨号联系人"</string>
<string name="deleting_fdn_contact" msgid="5669163206349319969">"正在删除固定拨号联系人..."</string>
<string name="fdn_contact_deleted" msgid="7154162327112259569">"已删除固定拨号联系人。"</string>
- <string name="pin2_invalid" msgid="5470854099230755944">"系统未更新 FDN，因为键入的 PIN 码有误。"</string>
- <string name="fdn_invalid_number" msgid="1494755047900009147">"系统未更新 FDN，因为号码不能超过 20 位。"</string>
- <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN 未更新。PIN2 有误，或电话号码遭拒。"</string>
- <string name="fdn_failed" msgid="540018079008319747">"FDN 操作失败。"</string>
+ <string name="pin2_invalid" msgid="5470854099230755944">"固定拨号未更新，因为输入的 PIN 码有误。"</string>
+ <string name="fdn_invalid_number" msgid="1494755047900009147">"固定拨号未更新，因为号码不能超过 20 位。"</string>
+ <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"固定拨号未更新。PIN2 码有误，或电话号码遭拒。"</string>
+ <string name="fdn_failed" msgid="540018079008319747">"固定拨号操作失败。"</string>
<string name="simContacts_emptyLoading" msgid="2203331234764498011">"正在从SIM卡读取..."</string>
<string name="simContacts_empty" msgid="5270660846489561932">"SIM卡上无联系人。"</string>
<string name="simContacts_title" msgid="1861472842524839921">"选择要导入的联系人"</string>
@@ -391,10 +391,10 @@
<string name="pin_failed" msgid="5644377896213584760">"PIN 码不正确"</string>
<string name="pin_changed" msgid="4455736268023261662">"PIN 码已更新"</string>
<string name="puk_requested" msgid="5921393215789090200">"密码不正确。PIN 码已被锁定。已请求 PUK 码。"</string>
- <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
- <string name="oldPin2Label" msgid="8559146795026261502">"旧 PIN2"</string>
- <string name="newPin2Label" msgid="4573956902204349054">"新 PIN2"</string>
- <string name="confirmPin2Label" msgid="8100319484454787708">"确认新 PIN2"</string>
+ <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2 码"</string>
+ <string name="oldPin2Label" msgid="8559146795026261502">"旧 PIN2 码"</string>
+ <string name="newPin2Label" msgid="4573956902204349054">"新 PIN2 码"</string>
+ <string name="confirmPin2Label" msgid="8100319484454787708">"确认新 PIN2 码"</string>
<string name="badPuk2" msgid="7910064009531541708">"PUK2 码不正确，请重试。"</string>
<string name="badPin2" msgid="6646896629970023109">"旧的 PIN2 码不正确，请重试。"</string>
<string name="mismatchPin2" msgid="4177967478551851117">"PIN2 码不正确，请重试。"</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 944bbee..3d1b1ad 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -183,6 +183,7 @@
<style name="DialerAlertDialogTheme"
parent="@android:style/Theme.Material.Light.Dialog">
<item name="android:colorAccent">@color/dialer_theme_color</item>
+ <item name="android:textColor">?android:attr/textColorPrimaryInverseDisableOnly</item>
</style>
<style name="NetworkOperatorsSettingsTheme" parent="@android:style/Theme.Material.Light">
diff --git a/res/xml/cdma_options.xml b/res/xml/cdma_options.xml
index d4eaeba..78e3630 100644
--- a/res/xml/cdma_options.xml
+++ b/res/xml/cdma_options.xml
@@ -34,7 +34,7 @@
android:dialogTitle="@string/cdma_subscription_dialogtitle" />
<PreferenceScreen
- android:key="button_apn_key"
+ android:key="button_apn_key_cdma"
android:title="@string/apn_settings"
android:persistent="false">
diff --git a/sip/res/values-km-rKH/strings.xml b/sip/res/values-km-rKH/strings.xml
index 2d6997f..c1d80b3 100644
--- a/sip/res/values-km-rKH/strings.xml
+++ b/sip/res/values-km-rKH/strings.xml
@@ -27,7 +27,7 @@
<string name="sip_call_options_entry_2" msgid="1815335903940609729">"សម្រាប់ការហៅ SIP តែប៉ុណ្ណោះ"</string>
<string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"សម្រាប់ការហៅទាំងអស់"</string>
<string name="add_sip_account" msgid="800843669753980091">"បន្ថែមគណនី"</string>
- <string name="remove_sip_account" msgid="1367664438506503690">"លុបគណនី"</string>
+ <string name="remove_sip_account" msgid="1367664438506503690">"លុបគណនី"</string>
<string name="sip_account_list" msgid="5610858485304821480">"គណនី SIP"</string>
<string name="saving_account" msgid="5336529880235177448">"កំពុងរក្សាទុកគណនី…"</string>
<string name="removing_account" msgid="5537351356808985756">"កំពុងលុបគណនី…"</string>
diff --git a/sip/res/values-my-rMM/strings.xml b/sip/res/values-my-rMM/strings.xml
index a2bc8fd..621d4fe 100644
--- a/sip/res/values-my-rMM/strings.xml
+++ b/sip/res/values-my-rMM/strings.xml
@@ -26,13 +26,13 @@
<string name="sip_call_options_entry_1" msgid="7217659161237099900">"ဒေတာ ကွန်ရက် ရှိနေစဉ် ခေါ်ဆိုမှုများ အားလုံး အတွက်"</string>
<string name="sip_call_options_entry_2" msgid="1815335903940609729">"SIP ခေါ်ဆိုမှုများအတွက်သာ"</string>
<string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"ခေါ်ဆိုမှုများ အားလုံး အတွက်"</string>
- <string name="add_sip_account" msgid="800843669753980091">"အကောင့် ထည့်ရန်"</string>
+ <string name="add_sip_account" msgid="800843669753980091">"အကောင့် ထည့်ရန်"</string>
<string name="remove_sip_account" msgid="1367664438506503690">"အကောင့်ကို ဖယ်ရှားရန်"</string>
<string name="sip_account_list" msgid="5610858485304821480">"SIP အကောင့်များ"</string>
<string name="saving_account" msgid="5336529880235177448">"အကောင့်ကို သိမ်းဆည်းနေ…"</string>
<string name="removing_account" msgid="5537351356808985756">"အကောင့်ကို ဖယ်ရှားနေ…"</string>
<string name="sip_menu_save" msgid="7882219814563869225">"သိမ်းပါ"</string>
- <string name="sip_menu_discard" msgid="2350421645423888438">"စွန့်ပစ်ရန်"</string>
+ <string name="sip_menu_discard" msgid="2350421645423888438">"စွန့်ပစ်ရန်"</string>
<string name="alert_dialog_close" msgid="1326011828713435134">"ပရိုဖိုင်ကို ပိတ်ရန်"</string>
<string name="alert_dialog_ok" msgid="4752048404605388940">"အိုကေ"</string>
<string name="close_profile" msgid="3122414058856309881">"ပိတ်ရန်"</string>
diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index a97f5d0..eae9bfc 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -708,6 +708,9 @@
}
}
+ /**
+ * TODO: Refactor to make it easier to understand what's done in the different stages.
+ */
private void saveVoiceMailAndForwardingNumber(
String key, VoicemailProviderSettings newSettings) {
if (DBG) log("saveVoiceMailAndForwardingNumber: " + newSettings.toString());
@@ -715,8 +718,9 @@
mNewVMNumber = (mNewVMNumber == null) ? "" : mNewVMNumber;
mNewFwdSettings = newSettings.getForwardingSettings();
- // No fwd settings on CDMA
- if (mPhone.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA) {
+ // No fwd settings on CDMA.
+ boolean isCdma = mPhone.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA;
+ if (isCdma) {
if (DBG) log("ignoring forwarding setting since this is CDMA phone");
mNewFwdSettings = VoicemailProviderSettings.NO_FORWARDING;
}
@@ -732,7 +736,9 @@
mVMChangeCompletedSuccessfully = false;
mFwdChangesRequireRollback = false;
mVMOrFwdSetError = 0;
- if (!key.equals(mPreviousVMProviderKey)) {
+
+ // Don't read call forwarding settings if CDMA. Call forwarding is not supported by CDMA.
+ if (!key.equals(mPreviousVMProviderKey) && !isCdma) {
mReadingSettingsForDefaultProvider =
mPreviousVMProviderKey.equals(VoicemailProviderListPreference.DEFAULT_KEY);
if (DBG) log("Reading current forwarding settings");
@@ -813,7 +819,7 @@
if (mReadingSettingsForDefaultProvider) {
VoicemailProviderSettingsUtil.save(mPhone.getContext(),
VoicemailProviderListPreference.DEFAULT_KEY,
- new VoicemailProviderSettings(this.mOldVmNumber, mForwardingReadResults));
+ new VoicemailProviderSettings(mOldVmNumber, mForwardingReadResults));
mReadingSettingsForDefaultProvider = false;
}
saveVoiceMailAndForwardingNumberStage2();
@@ -825,8 +831,7 @@
mExpectedChangeResultReasons = new HashSet<Integer>();
}
- // Called after we are done saving the previous forwarding settings if
- // we needed.
+ // Called after we are done saving the previous forwarding settings if we needed.
private void saveVoiceMailAndForwardingNumberStage2() {
mForwardingChangeResults = null;
mVoicemailChangeResult = null;
diff --git a/src/com/android/phone/CallNotifier.java b/src/com/android/phone/CallNotifier.java
index 3669544..bc0e584 100644
--- a/src/com/android/phone/CallNotifier.java
+++ b/src/com/android/phone/CallNotifier.java
@@ -163,7 +163,7 @@
BluetoothProfile.HEADSET);
}
- mSubscriptionManager.registerOnSubscriptionsChangedListener(
+ mSubscriptionManager.addOnSubscriptionsChangedListener(
new OnSubscriptionsChangedListener() {
@Override
public void onSubscriptionsChanged() {
diff --git a/src/com/android/phone/CdmaOptions.java b/src/com/android/phone/CdmaOptions.java
index 897c797..a04427e 100644
--- a/src/com/android/phone/CdmaOptions.java
+++ b/src/com/android/phone/CdmaOptions.java
@@ -46,7 +46,7 @@
private static final String BUTTON_CDMA_SUBSCRIPTION_KEY = "cdma_subscription_key";
private static final String BUTTON_CDMA_ACTIVATE_DEVICE_KEY = "cdma_activate_device_key";
private static final String BUTTON_CARRIER_SETTINGS_KEY = "carrier_settings_key";
- private static final String BUTTON_APN_EXPAND_KEY = "button_apn_key";
+ private static final String BUTTON_APN_EXPAND_KEY = "button_apn_key_cdma";
private PreferenceActivity mPrefActivity;
private PreferenceScreen mPrefScreen;
diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index 53c49b4..b28a5f9 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -125,6 +125,7 @@
private MyHandler mHandler;
private boolean mOkClicked;
+ // We assume the the value returned by mTabHost.getCurrentTab() == slotId
private TabHost mTabHost;
//GsmUmts options and Cdma options
@@ -280,9 +281,12 @@
mActiveSubInfos.clear();
if (sil != null) {
mActiveSubInfos.addAll(sil);
+ // If there is only 1 sim then currenTab should represent slot no. of the sim.
+ if (sil.size() == 1) {
+ currentTab = sil.get(0).getSimSlotIndex();
+ }
}
-
switch (state) {
case UPDATE: {
if (DBG) log("initializeSubscriptions: UPDATE");
@@ -322,7 +326,6 @@
}
case NO_TABS: {
if (DBG) log("initializeSubscriptions: NO_TABS");
- currentTab = 0;
if (mTabHost != null) {
mTabHost.clearAllTabs();
@@ -333,7 +336,9 @@
}
case DO_NOTHING: {
if (DBG) log("initializeSubscriptions: DO_NOTHING");
- currentTab = 0;
+ if (mTabHost != null) {
+ currentTab = mTabHost.getCurrentTab();
+ }
break;
}
}
@@ -497,7 +502,8 @@
MyHandler.MESSAGE_GET_PREFERRED_NETWORK_TYPE));
}
- if (ImsManager.isVolteEnabledByPlatform(this)) {
+ if (ImsManager.isVolteEnabledByPlatform(this)
+ && ImsManager.isVolteProvisionedOnDevice(this)) {
TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
tm.listen(mPhoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);
}
@@ -506,7 +512,7 @@
&& ImsManager.isNonTtyOrTtyOnVolteEnabled(this));
// NOTE: The button will be enabled/disabled in mPhoneStateListener
- mSubscriptionManager.registerOnSubscriptionsChangedListener(mOnSubscriptionsChangeListener);
+ mSubscriptionManager.addOnSubscriptionsChangedListener(mOnSubscriptionsChangeListener);
if (DBG) log("onResume:-");
@@ -655,7 +661,8 @@
}
// Enable enhanced 4G LTE mode settings depending on whether exists on platform
- if (!ImsManager.isVolteEnabledByPlatform(this)) {
+ if (!(ImsManager.isVolteEnabledByPlatform(this)
+ && ImsManager.isVolteProvisionedOnDevice(this))) {
Preference pref = prefSet.findPreference(BUTTON_4G_LTE_KEY);
if (pref != null) {
prefSet.removePreference(pref);
@@ -687,6 +694,9 @@
mButtonPreferredNetworkMode.setValue(Integer.toString(settingsNetworkMode));
UpdatePreferredNetworkModeSummary(settingsNetworkMode);
UpdateEnabledNetworksValueAndSummary(settingsNetworkMode);
+ // Display preferred network type based on what modem returns b/18676277
+ mPhone.setPreferredNetworkType(settingsNetworkMode, mHandler
+ .obtainMessage(MyHandler.MESSAGE_SET_PREFERRED_NETWORK_TYPE));
/**
* Enable/disable depending upon if there are any active subscriptions.
@@ -732,13 +742,14 @@
super.onPause();
if (DBG) log("onPause:+");
- if (ImsManager.isVolteEnabledByPlatform(this)) {
+ if (ImsManager.isVolteEnabledByPlatform(this)
+ && ImsManager.isVolteProvisionedOnDevice(this)) {
TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
tm.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
}
mSubscriptionManager
- .unregisterOnSubscriptionsChangedListener(mOnSubscriptionsChangeListener);
+ .removeOnSubscriptionsChangedListener(mOnSubscriptionsChangeListener);
if (DBG) log("onPause:-");
}
diff --git a/src/com/android/phone/NetworkQueryService.java b/src/com/android/phone/NetworkQueryService.java
index 77f3720..b38b110 100644
--- a/src/com/android/phone/NetworkQueryService.java
+++ b/src/com/android/phone/NetworkQueryService.java
@@ -17,6 +17,7 @@
package com.android.phone;
import android.app.Service;
+import android.content.Context;
import android.content.Intent;
import com.android.internal.telephony.OperatorInfo;
import android.os.AsyncResult;
@@ -26,6 +27,7 @@
import android.os.Message;
import android.os.RemoteCallbackList;
import android.os.RemoteException;
+import android.telephony.SubscriptionManager;
import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneFactory;
import android.util.Log;
@@ -163,8 +165,9 @@
@Override
public void onCreate() {
- mState = QUERY_READY;
- mPhone = PhoneFactory.getDefaultPhone();
+ mState = QUERY_READY;
+ mPhone = PhoneFactory.getPhone(
+ SubscriptionManager.getPhoneId(SubscriptionManager.getDefaultSubId()));
}
/**
diff --git a/src/com/android/phone/NotificationMgr.java b/src/com/android/phone/NotificationMgr.java
index 88a13bd..c38be71 100644
--- a/src/com/android/phone/NotificationMgr.java
+++ b/src/com/android/phone/NotificationMgr.java
@@ -590,32 +590,38 @@
*/
void updateNetworkSelection(int serviceState) {
if (TelephonyCapabilities.supportsNetworkSelection(mPhone)) {
- // get the shared preference of network_selection.
- // empty is auto mode, otherwise it is the operator alpha name
- // in case there is no operator name, check the operator numeric
- SharedPreferences sp =
- PreferenceManager.getDefaultSharedPreferences(mContext);
- String networkSelection =
- sp.getString(PhoneBase.NETWORK_SELECTION_NAME_KEY, "");
- if (TextUtils.isEmpty(networkSelection)) {
- networkSelection =
- sp.getString(PhoneBase.NETWORK_SELECTION_KEY, "");
- }
+ int subId = mPhone.getSubId();
+ if (SubscriptionManager.isValidSubscriptionId(subId)) {
+ // get the shared preference of network_selection.
+ // empty is auto mode, otherwise it is the operator alpha name
+ // in case there is no operator name, check the operator numeric
+ SharedPreferences sp =
+ PreferenceManager.getDefaultSharedPreferences(mContext);
+ String networkSelection =
+ sp.getString(PhoneBase.NETWORK_SELECTION_NAME_KEY + subId, "");
+ if (TextUtils.isEmpty(networkSelection)) {
+ networkSelection =
+ sp.getString(PhoneBase.NETWORK_SELECTION_KEY + subId, "");
+ }
- if (DBG) log("updateNetworkSelection()..." + "state = " +
- serviceState + " new network " + networkSelection);
+ if (DBG) log("updateNetworkSelection()..." + "state = " +
+ serviceState + " new network " + networkSelection);
- if (serviceState == ServiceState.STATE_OUT_OF_SERVICE
- && !TextUtils.isEmpty(networkSelection)) {
- if (!mSelectedUnavailableNotify) {
- showNetworkSelection(networkSelection);
- mSelectedUnavailableNotify = true;
+ if (serviceState == ServiceState.STATE_OUT_OF_SERVICE
+ && !TextUtils.isEmpty(networkSelection)) {
+ if (!mSelectedUnavailableNotify) {
+ showNetworkSelection(networkSelection);
+ mSelectedUnavailableNotify = true;
+ }
+ } else {
+ if (mSelectedUnavailableNotify) {
+ cancelNetworkSelection();
+ mSelectedUnavailableNotify = false;
+ }
}
} else {
- if (mSelectedUnavailableNotify) {
- cancelNetworkSelection();
- mSelectedUnavailableNotify = false;
- }
+ if (DBG) log("updateNetworkSelection()..." + "state = " +
+ serviceState + " not updating network due to invalid subId " + subId);
}
}
}
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 1a5de74..9eb0b0b 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -209,13 +209,14 @@
MainThreadRequest request;
Message onCompleted;
AsyncResult ar;
- UiccCard uiccCard = UiccController.getInstance().getUiccCard();
+ UiccCard uiccCard = UiccController.getInstance().getUiccCard(mPhone.getPhoneId());
IccAPDUArgument iccArgument;
switch (msg.what) {
case CMD_HANDLE_PIN_MMI:
request = (MainThreadRequest) msg.obj;
- request.result = mPhone.handlePinMmi((String) request.argument);
+ request.result = getPhoneFromRequest(request).handlePinMmi(
+ (String) request.argument);
// Wake up the requesting thread
synchronized (request) {
request.notifyAll();
@@ -246,13 +247,13 @@
case CMD_ANSWER_RINGING_CALL:
request = (MainThreadRequest) msg.obj;
- int answer_subId = ((Integer)request.argument).intValue();
+ int answer_subId = request.subId;
answerRingingCallInternal(answer_subId);
break;
case CMD_END_CALL:
request = (MainThreadRequest) msg.obj;
- int end_subId = ((Integer)request.argument).intValue();
+ int end_subId = request.subId;
final boolean hungUp;
int phoneType = getPhone(end_subId).getPhoneType();
if (phoneType == PhoneConstants.PHONE_TYPE_CDMA) {
@@ -606,8 +607,8 @@
request = (MainThreadRequest) msg.obj;
onCompleted = obtainMessage(EVENT_SET_VOICEMAIL_NUMBER_DONE, request);
Pair<String, String> tagNum = (Pair<String, String>) request.argument;
- Phone phone = (request.subId == null) ? mPhone : getPhone(request.subId);
- phone.setVoiceMailNumber(tagNum.first, tagNum.second, onCompleted);
+ getPhoneFromRequest(request).setVoiceMailNumber(tagNum.first, tagNum.second,
+ onCompleted);
break;
case EVENT_SET_VOICEMAIL_NUMBER_DONE:
@@ -730,6 +731,10 @@
ServiceManager.addService("phone", this);
}
+ private Phone getPhoneFromRequest(MainThreadRequest request) {
+ return (request.subId == null) ? mPhone : getPhone(request.subId);
+ }
+
// returns phone associated with the subId.
private Phone getPhone(int subId) {
return PhoneFactory.getPhone(mSubscriptionController.getPhoneId(subId));
@@ -818,7 +823,7 @@
*/
public boolean endCallForSubscriber(int subId) {
enforceCallPermission();
- return (Boolean) sendRequest(CMD_END_CALL, new Integer(subId), null);
+ return (Boolean) sendRequest(CMD_END_CALL, null, new Integer(subId));
}
public void answerRingingCall() {
@@ -831,7 +836,7 @@
// but that can probably wait till the big TelephonyManager API overhaul.
// For now, protect this call with the MODIFY_PHONE_STATE permission.
enforceModifyPermission();
- sendRequest(CMD_ANSWER_RINGING_CALL, new Integer(subId), null);
+ sendRequest(CMD_ANSWER_RINGING_CALL, null, new Integer(subId));
}
/**
@@ -1574,14 +1579,19 @@
*/
public boolean hasIccCard() {
// FIXME Make changes to pass defaultSimId of type int
- return hasIccCardUsingSlotId(getDefaultSubscription());
+ return hasIccCardUsingSlotId(mSubscriptionController.getSlotId(getDefaultSubscription()));
}
/**
* @return true if a ICC card is present for a slotId
*/
public boolean hasIccCardUsingSlotId(int slotId) {
- return getPhone(slotId).getIccCard().hasIccCard();
+ int subId[] = mSubscriptionController.getSubIdUsingSlotId(slotId);
+ if (subId != null) {
+ return getPhone(subId[0]).getIccCard().hasIccCard();
+ } else {
+ return false;
+ }
}
/**
@@ -1970,7 +1980,7 @@
@Override
public int getCarrierPrivilegeStatus() {
- UiccCard card = UiccController.getInstance().getUiccCard();
+ UiccCard card = UiccController.getInstance().getUiccCard(mPhone.getPhoneId());
if (card == null) {
loge("getCarrierPrivilegeStatus: No UICC");
return TelephonyManager.CARRIER_PRIVILEGE_STATUS_RULES_NOT_LOADED;
@@ -1981,7 +1991,7 @@
@Override
public int checkCarrierPrivilegesForPackage(String pkgname) {
- UiccCard card = UiccController.getInstance().getUiccCard();
+ UiccCard card = UiccController.getInstance().getUiccCard(mPhone.getPhoneId());
if (card == null) {
loge("checkCarrierPrivilegesForPackage: No UICC");
return TelephonyManager.CARRIER_PRIVILEGE_STATUS_RULES_NOT_LOADED;
@@ -1991,7 +2001,7 @@
@Override
public List<String> getCarrierPackageNamesForIntent(Intent intent) {
- UiccCard card = UiccController.getInstance().getUiccCard();
+ UiccCard card = UiccController.getInstance().getUiccCard(mPhone.getPhoneId());
if (card == null) {
loge("getCarrierPackageNamesForIntent: No UICC");
return null ;
@@ -2224,6 +2234,24 @@
&& mTelephonySharedPreferences.getBoolean(PREF_ENABLE_VIDEO_CALLING, true);
}
+ /**
+ * 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.
+ *
+ * <p>Requires Permission:
+ * {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}
+ */
+ @Override
+ public String getDeviceId() {
+ enforceReadPermission();
+ final Phone phone = PhoneFactory.getPhone(0);
+ if (phone != null) {
+ return phone.getDeviceId();
+ } else {
+ return null;
+ }
+ }
+
/*
* {@hide}
* Returns the IMS Registration Status
diff --git a/src/com/android/phone/PhoneUtils.java b/src/com/android/phone/PhoneUtils.java
index 502a379..6b34208 100644
--- a/src/com/android/phone/PhoneUtils.java
+++ b/src/com/android/phone/PhoneUtils.java
@@ -38,6 +38,7 @@
import android.telephony.PhoneNumberUtils;
import android.text.TextUtils;
import android.util.Log;
+import android.view.ContextThemeWrapper;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.View;
@@ -1017,7 +1018,9 @@
// time that a USSD should be canceled.
// inflate the layout with the scrolling text area for the dialog.
- LayoutInflater inflater = (LayoutInflater) context.getSystemService(
+ ContextThemeWrapper contextThemeWrapper =
+ new ContextThemeWrapper(context, R.style.DialerAlertDialogTheme);
+ LayoutInflater inflater = (LayoutInflater) contextThemeWrapper.getSystemService(
Context.LAYOUT_INFLATER_SERVICE);
View dialogView = inflater.inflate(R.layout.dialog_ussd_response, null);
@@ -1056,7 +1059,7 @@
};
// build the dialog
- final AlertDialog newDialog = new AlertDialog.Builder(context, THEME)
+ final AlertDialog newDialog = new AlertDialog.Builder(contextThemeWrapper)
.setMessage(text)
.setView(dialogView)
.setPositiveButton(R.string.send_button, mUSSDDialogListener)
@@ -1092,6 +1095,11 @@
// now show the dialog!
newDialog.show();
+
+ newDialog.getButton(DialogInterface.BUTTON_POSITIVE)
+ .setTextColor(context.getResources().getColor(R.color.dialer_theme_color));
+ newDialog.getButton(DialogInterface.BUTTON_NEGATIVE)
+ .setTextColor(context.getResources().getColor(R.color.dialer_theme_color));
}
}
}
diff --git a/src/com/android/phone/settings/VoicemailNotificationSettingsUtil.java b/src/com/android/phone/settings/VoicemailNotificationSettingsUtil.java
index 7d9ce4b..9654ea7 100644
--- a/src/com/android/phone/settings/VoicemailNotificationSettingsUtil.java
+++ b/src/com/android/phone/settings/VoicemailNotificationSettingsUtil.java
@@ -71,7 +71,8 @@
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(phone.getContext());
migrateVoicemailRingtoneSettingsIfNeeded(phone, prefs);
String uriString = prefs.getString(
- getVoicemailRingtoneSharedPrefsKey(phone), Settings.System.NOTIFICATION_SOUND);
+ getVoicemailRingtoneSharedPrefsKey(phone),
+ Settings.System.DEFAULT_NOTIFICATION_URI.toString());
return !TextUtils.isEmpty(uriString) ? Uri.parse(uriString) : null;
}
diff --git a/src/com/android/phone/settings/fdn/EditFdnContactScreen.java b/src/com/android/phone/settings/fdn/EditFdnContactScreen.java
index 00bd9fc..a047b0b 100644
--- a/src/com/android/phone/settings/fdn/EditFdnContactScreen.java
+++ b/src/com/android/phone/settings/fdn/EditFdnContactScreen.java
@@ -208,6 +208,10 @@
case MENU_DELETE:
deleteSelected();
return true;
+
+ case android.R.id.home:
+ onBackPressed();
+ return true;
}
return super.onOptionsItemSelected(item);
diff --git a/src/com/android/services/telephony/ImsConference.java b/src/com/android/services/telephony/ImsConference.java
index 5a15a47..e692a30 100644
--- a/src/com/android/services/telephony/ImsConference.java
+++ b/src/com/android/services/telephony/ImsConference.java
@@ -177,6 +177,11 @@
TelephonyConnection conferenceHost) {
super(null);
+
+ // Specify the connection time of the conference to be the connection time of the original
+ // connection.
+ setConnectTimeMillis(conferenceHost.getOriginalConnection().getConnectTime());
+
mTelephonyConnectionService = telephonyConnectionService;
setConferenceHost(conferenceHost);
if (conferenceHost != null && conferenceHost.getCall() != null
diff --git a/src/com/android/services/telephony/TelecomAccountRegistry.java b/src/com/android/services/telephony/TelecomAccountRegistry.java
index 37e8147..6a533ef 100644
--- a/src/com/android/services/telephony/TelecomAccountRegistry.java
+++ b/src/com/android/services/telephony/TelecomAccountRegistry.java
@@ -229,7 +229,7 @@
// Register for SubscriptionInfo list changes which is guaranteed
// to invoke onSubscriptionsChanged the first time.
- SubscriptionManager.from(mContext).registerOnSubscriptionsChangedListener(
+ SubscriptionManager.from(mContext).addOnSubscriptionsChangedListener(
mOnSubscriptionsChangedListener);
// We also need to listen for changes to the service state (e.g. emergency -> in service)
diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index 6198ce1..d4d1746 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -109,7 +109,7 @@
public void onPostDialChar(char c) {
Log.v(TelephonyConnection.this, "onPostDialChar: %s", c);
if (mOriginalConnection != null) {
- setNextPostDialWaitChar(c);
+ setNextPostDialChar(c);
}
}
};
diff --git a/src/com/android/services/telephony/TelephonyConnectionService.java b/src/com/android/services/telephony/TelephonyConnectionService.java
index 946ee3e..1a2ef53 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -393,10 +393,6 @@
}
private Phone getPhoneForAccount(PhoneAccountHandle accountHandle, boolean isEmergency) {
- if (isEmergency) {
- return PhoneFactory.getDefaultPhone();
- }
-
if (Objects.equals(mExpectedComponentName, accountHandle.getComponentName())) {
if (accountHandle.getId() != null) {
try {
@@ -408,9 +404,53 @@
}
}
}
+
+ if (isEmergency) {
+ // If this is an emergency number and we've been asked to dial it using a PhoneAccount
+ // which does not exist, then default to whatever subscription is available currently.
+ return getFirstPhoneForEmergencyCall();
+ }
+
return null;
}
+ private Phone getFirstPhoneForEmergencyCall() {
+ Phone selectPhone = null;
+ for (int i = 0; i < TelephonyManager.getDefault().getSimCount(); i++) {
+ int[] subIds = SubscriptionController.getInstance().getSubIdUsingSlotId(i);
+ if (subIds.length == 0)
+ continue;
+
+ int phoneId = SubscriptionController.getInstance().getPhoneId(subIds[0]);
+ Phone phone = PhoneFactory.getPhone(phoneId);
+ if (phone == null)
+ continue;
+
+ if (ServiceState.STATE_IN_SERVICE == phone.getServiceState().getState()) {
+ // the slot is radio on & state is in service
+ Log.d(this, "pickBestPhoneForEmergencyCall, radio on & in service, slotId:" + i);
+ return phone;
+ } else if (ServiceState.STATE_POWER_OFF != phone.getServiceState().getState()) {
+ // the slot is radio on & with SIM card inserted.
+ if (TelephonyManager.getDefault().hasIccCard(i)) {
+ Log.d(this, "pickBestPhoneForEmergencyCall," +
+ "radio on and SIM card inserted, slotId:" + i);
+ selectPhone = phone;
+ } else if (selectPhone == null) {
+ Log.d(this, "pickBestPhoneForEmergencyCall, radio on, slotId:" + i);
+ selectPhone = phone;
+ }
+ }
+ }
+
+ if (selectPhone == null) {
+ Log.d(this, "pickBestPhoneForEmergencyCall, return default phone");
+ selectPhone = PhoneFactory.getDefaultPhone();
+ }
+
+ return selectPhone;
+ }
+
/**
* Determines if the connection should allow mute.
*
diff --git a/src/com/android/services/telephony/TelephonyGlobals.java b/src/com/android/services/telephony/TelephonyGlobals.java
index 11c3c64..02ef639 100644
--- a/src/com/android/services/telephony/TelephonyGlobals.java
+++ b/src/com/android/services/telephony/TelephonyGlobals.java
@@ -21,6 +21,9 @@
import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneFactory;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* Singleton entry point for the telephony-services app. Initializes ongoing systems relating to
* PSTN calls. This is started when the device starts and will be restarted automatically
@@ -36,7 +39,8 @@
/** The application context. */
private final Context mContext;
- private TtyManager mTtyManager;
+ // For supporting MSIM phone, change Phone and TtyManager as 1 to 1
+ private List<TtyManager> mTtyManagers = new ArrayList<>();
/**
* Persists the specified parameters.
@@ -55,10 +59,10 @@
}
public void onCreate() {
- // TODO: Make this work with Multi-SIM devices
- Phone phone = PhoneFactory.getDefaultPhone();
- if (phone != null) {
- mTtyManager = new TtyManager(mContext, phone);
+ // Make this work with Multi-SIM devices
+ Phone[] phones = PhoneFactory.getPhones();
+ for (Phone phone : phones) {
+ mTtyManagers.add(new TtyManager(mContext, phone));
}
TelecomAccountRegistry.getInstance(mContext).setupOnBoot();
diff --git a/src/com/android/services/telephony/TtyManager.java b/src/com/android/services/telephony/TtyManager.java
index 6c8a495..a3aeeb2 100644
--- a/src/com/android/services/telephony/TtyManager.java
+++ b/src/com/android/services/telephony/TtyManager.java
@@ -122,13 +122,12 @@
private static int telecomModeToPhoneMode(int telecomMode) {
switch (telecomMode) {
+ // AT command only has 0 and 1, so mapping VCO
+ // and HCO to FULL
case TelecomManager.TTY_MODE_FULL:
- return Phone.TTY_MODE_FULL;
case TelecomManager.TTY_MODE_VCO:
- return Phone.TTY_MODE_VCO;
case TelecomManager.TTY_MODE_HCO:
- return Phone.TTY_MODE_HCO;
- case TelecomManager.TTY_MODE_OFF:
+ return Phone.TTY_MODE_FULL;
default:
return Phone.TTY_MODE_OFF;
}