Merge "[TelephonyService] Improve hold capability signal"
diff --git a/res/drawable-hdpi/ic_sim_sub1.png b/res/drawable-hdpi/ic_sim_sub1.png
new file mode 100644
index 0000000..dc24b06
--- /dev/null
+++ b/res/drawable-hdpi/ic_sim_sub1.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_sim_sub2.png b/res/drawable-hdpi/ic_sim_sub2.png
new file mode 100644
index 0000000..297bc72
--- /dev/null
+++ b/res/drawable-hdpi/ic_sim_sub2.png
Binary files differ
diff --git a/res/drawable-hdpi/stat_sys_phone_call_forward.png b/res/drawable-hdpi/stat_sys_phone_call_forward.png
index 4b7c236..e8d3149 100644
--- a/res/drawable-hdpi/stat_sys_phone_call_forward.png
+++ b/res/drawable-hdpi/stat_sys_phone_call_forward.png
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_sim_sub1.png b/res/drawable-ldrtl-hdpi/ic_sim_sub1.png
new file mode 100644
index 0000000..9ec62ca
--- /dev/null
+++ b/res/drawable-ldrtl-hdpi/ic_sim_sub1.png
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_sim_sub2.png b/res/drawable-ldrtl-hdpi/ic_sim_sub2.png
new file mode 100644
index 0000000..23559bf
--- /dev/null
+++ b/res/drawable-ldrtl-hdpi/ic_sim_sub2.png
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/stat_sys_phone_call_forward.png b/res/drawable-ldrtl-hdpi/stat_sys_phone_call_forward.png
index 132b0e5..ff5451c 100644
--- a/res/drawable-ldrtl-hdpi/stat_sys_phone_call_forward.png
+++ b/res/drawable-ldrtl-hdpi/stat_sys_phone_call_forward.png
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_sim_sub1.png b/res/drawable-ldrtl-mdpi/ic_sim_sub1.png
new file mode 100644
index 0000000..64ab4c6
--- /dev/null
+++ b/res/drawable-ldrtl-mdpi/ic_sim_sub1.png
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_sim_sub2.png b/res/drawable-ldrtl-mdpi/ic_sim_sub2.png
new file mode 100644
index 0000000..c0aebdd
--- /dev/null
+++ b/res/drawable-ldrtl-mdpi/ic_sim_sub2.png
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/stat_sys_phone_call_forward.png b/res/drawable-ldrtl-mdpi/stat_sys_phone_call_forward.png
index d49745f..a42b5bb 100644
--- a/res/drawable-ldrtl-mdpi/stat_sys_phone_call_forward.png
+++ b/res/drawable-ldrtl-mdpi/stat_sys_phone_call_forward.png
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_sim_sub1.png b/res/drawable-ldrtl-xhdpi/ic_sim_sub1.png
new file mode 100644
index 0000000..2513c24
--- /dev/null
+++ b/res/drawable-ldrtl-xhdpi/ic_sim_sub1.png
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_sim_sub2.png b/res/drawable-ldrtl-xhdpi/ic_sim_sub2.png
new file mode 100644
index 0000000..1d50b29
--- /dev/null
+++ b/res/drawable-ldrtl-xhdpi/ic_sim_sub2.png
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/stat_sys_phone_call_forward.png b/res/drawable-ldrtl-xhdpi/stat_sys_phone_call_forward.png
index 4cce562..81791a8 100644
--- a/res/drawable-ldrtl-xhdpi/stat_sys_phone_call_forward.png
+++ b/res/drawable-ldrtl-xhdpi/stat_sys_phone_call_forward.png
Binary files differ
diff --git a/res/drawable-ldrtl-xxhdpi/ic_sim_sub1.png b/res/drawable-ldrtl-xxhdpi/ic_sim_sub1.png
new file mode 100644
index 0000000..4355c12
--- /dev/null
+++ b/res/drawable-ldrtl-xxhdpi/ic_sim_sub1.png
Binary files differ
diff --git a/res/drawable-ldrtl-xxhdpi/ic_sim_sub2.png b/res/drawable-ldrtl-xxhdpi/ic_sim_sub2.png
new file mode 100644
index 0000000..2bbc1ef
--- /dev/null
+++ b/res/drawable-ldrtl-xxhdpi/ic_sim_sub2.png
Binary files differ
diff --git a/res/drawable-ldrtl-xxhdpi/stat_sys_phone_call_forward.png b/res/drawable-ldrtl-xxhdpi/stat_sys_phone_call_forward.png
new file mode 100644
index 0000000..8c68bf8
--- /dev/null
+++ b/res/drawable-ldrtl-xxhdpi/stat_sys_phone_call_forward.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_sim_sub1.png b/res/drawable-mdpi/ic_sim_sub1.png
new file mode 100644
index 0000000..8d04637
--- /dev/null
+++ b/res/drawable-mdpi/ic_sim_sub1.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_sim_sub2.png b/res/drawable-mdpi/ic_sim_sub2.png
new file mode 100644
index 0000000..f3201d6
--- /dev/null
+++ b/res/drawable-mdpi/ic_sim_sub2.png
Binary files differ
diff --git a/res/drawable-mdpi/stat_sys_phone_call_forward.png b/res/drawable-mdpi/stat_sys_phone_call_forward.png
index a21718c..5975172 100644
--- a/res/drawable-mdpi/stat_sys_phone_call_forward.png
+++ b/res/drawable-mdpi/stat_sys_phone_call_forward.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sim_sub1.png b/res/drawable-xhdpi/ic_sim_sub1.png
new file mode 100644
index 0000000..2f512ee
--- /dev/null
+++ b/res/drawable-xhdpi/ic_sim_sub1.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sim_sub2.png b/res/drawable-xhdpi/ic_sim_sub2.png
new file mode 100644
index 0000000..777a7a6
--- /dev/null
+++ b/res/drawable-xhdpi/ic_sim_sub2.png
Binary files differ
diff --git a/res/drawable-xhdpi/stat_sys_phone_call_forward.png b/res/drawable-xhdpi/stat_sys_phone_call_forward.png
index 578a42a..76ffc5c 100644
--- a/res/drawable-xhdpi/stat_sys_phone_call_forward.png
+++ b/res/drawable-xhdpi/stat_sys_phone_call_forward.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_sim_sub1.png b/res/drawable-xxhdpi/ic_sim_sub1.png
new file mode 100644
index 0000000..720c326
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_sim_sub1.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_sim_sub2.png b/res/drawable-xxhdpi/ic_sim_sub2.png
new file mode 100644
index 0000000..992aff6
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_sim_sub2.png
Binary files differ
diff --git a/res/drawable-xxhdpi/stat_sys_phone_call_forward.png b/res/drawable-xxhdpi/stat_sys_phone_call_forward.png
new file mode 100644
index 0000000..9bc3435
--- /dev/null
+++ b/res/drawable-xxhdpi/stat_sys_phone_call_forward.png
Binary files differ
diff --git a/res/drawable/stat_notify_voicemail_sub1.xml b/res/drawable/stat_notify_voicemail_sub1.xml
new file mode 100644
index 0000000..0884557
--- /dev/null
+++ b/res/drawable/stat_notify_voicemail_sub1.xml
@@ -0,0 +1,25 @@
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+ <item
+ android:drawable="@android:drawable/stat_notify_voicemail"
+ android:gravity="center">
+ </item>
+ <item
+ android:drawable="@drawable/ic_sim_sub1"
+ android:gravity="center|top">
+ </item>
+</layer-list>
diff --git a/res/drawable/stat_notify_voicemail_sub2.xml b/res/drawable/stat_notify_voicemail_sub2.xml
new file mode 100644
index 0000000..3b63649
--- /dev/null
+++ b/res/drawable/stat_notify_voicemail_sub2.xml
@@ -0,0 +1,25 @@
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+ <item
+ android:drawable="@android:drawable/stat_notify_voicemail"
+ android:gravity="center">
+ </item>
+ <item
+ android:drawable="@drawable/ic_sim_sub2"
+ android:gravity="center|top">
+ </item>
+</layer-list>
diff --git a/res/drawable/stat_sys_phone_call_forward_sub1.xml b/res/drawable/stat_sys_phone_call_forward_sub1.xml
new file mode 100644
index 0000000..93f4ff6
--- /dev/null
+++ b/res/drawable/stat_sys_phone_call_forward_sub1.xml
@@ -0,0 +1,26 @@
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+ <item
+ android:drawable="@drawable/stat_sys_phone_call_forward"
+ android:gravity="center">
+ </item>
+ <item
+ android:drawable="@drawable/ic_sim_sub1"
+ android:autoMirrored="true"
+ android:gravity="start|bottom">
+ </item>
+</layer-list>
diff --git a/res/drawable/stat_sys_phone_call_forward_sub2.xml b/res/drawable/stat_sys_phone_call_forward_sub2.xml
new file mode 100644
index 0000000..fa91222
--- /dev/null
+++ b/res/drawable/stat_sys_phone_call_forward_sub2.xml
@@ -0,0 +1,26 @@
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+ <item
+ android:drawable="@drawable/stat_sys_phone_call_forward"
+ android:gravity="center">
+ </item>
+ <item
+ android:drawable="@drawable/ic_sim_sub2"
+ android:autoMirrored="true"
+ android:gravity="start|bottom">
+ </item>
+</layer-list>
diff --git a/res/layout/edit_fdn_contact_screen.xml b/res/layout/edit_fdn_contact_screen.xml
index 24e0c6b..c7ba0d4 100644
--- a/res/layout/edit_fdn_contact_screen.xml
+++ b/res/layout/edit_fdn_contact_screen.xml
@@ -31,7 +31,8 @@
android:singleLine="true"
android:scrollHorizontally="true"
android:autoText="false"
- android:capitalize="words" />
+ android:capitalize="words"
+ android:textAlignment="viewStart" />
<EditText android:id="@+id/fdn_number"
android:hint="@string/number"
@@ -42,7 +43,8 @@
android:singleLine="true"
android:scrollHorizontally="true"
android:autoText="false"
- android:capitalize="none" />
+ android:capitalize="none"
+ android:textAlignment="viewStart" />
<Button android:id="@+id/button"
android:layout_width="wrap_content"
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 38dec8a..f4873be 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"Jou SIM-kaart laat nie \'n verbinding na hierdie netwerk toe nie."</string>
<string name="connect_later" msgid="2308119155752343975">"Kan nie nou aan hierdie netwerk koppel nie. Probeer later weer."</string>
<string name="registration_done" msgid="495135664535876612">"Geregistreer op die netwerk."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Reeds in outomatiese seleksie."</string>
<string name="select_automatically" msgid="1046727200631770962">"Kies outomaties netwerk"</string>
<string name="network_select_title" msgid="7733107364757544558">"Netwerk"</string>
<string name="register_automatically" msgid="6017849844573519637">"Outomatiese registrasie..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Voorkeurnetwerktipe"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Verander die netwerkbedryfsmodus"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Voorkeurnetwerktipe"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(verbode)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA verkies"</item>
<item msgid="8442633436636425221">"Net GSM"</item>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 142100c..517b241 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"የSIM ካርድህ ወደዚህ አውታረመረብ ግንኙነት አይፈቅድም።"</string>
<string name="connect_later" msgid="2308119155752343975">"በአሁን ጊዜ ወደዚህ አውታረ መረብ ማገናኘት አልተቻለም፡፡ በኋላ እንደገና ሞክር፡፡"</string>
<string name="registration_done" msgid="495135664535876612">"በአውታረ መረብ ላይ የተመዘገበ።"</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"ቀድሞውኑ በራስ-ሰር ምርጫ ላይ ነው።"</string>
<string name="select_automatically" msgid="1046727200631770962">"አውታረ መረብን በራስ ሰር ይምረጡ"</string>
<string name="network_select_title" msgid="7733107364757544558">"አውታረ መረብ"</string>
<string name="register_automatically" msgid="6017849844573519637">"ራስ ሰር ምዝገባ...."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"የሚመረጠው የአውታረ መረብ አይነት"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"የአውታረመረቡንመከወኛ ሁነታ ለውጥ"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"የሚመረጠው የአውታረ መረብ አይነት"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(የተከለከለ)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA ይመረጣል"</item>
<item msgid="8442633436636425221">"GSM ብቻ"</item>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index b4c4258..565a74a 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"لا تسمح شريحة SIM بالاتصال بهذه الشبكة."</string>
<string name="connect_later" msgid="2308119155752343975">"يتعذر الاتصال بهذه الشبكة في الوقت الحالي. حاول مرة أخرى لاحقًا."</string>
<string name="registration_done" msgid="495135664535876612">"مسجل على الشبكة."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"في التحديد التلقائي فعلاً."</string>
<string name="select_automatically" msgid="1046727200631770962">"تحديد الشبكة تلقائيًا"</string>
<string name="network_select_title" msgid="7733107364757544558">"الشبكة"</string>
<string name="register_automatically" msgid="6017849844573519637">"التسجيل التلقائي..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"نوع الشبكة المفضل"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"تغيير وضع تشغيل الشبكة"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"نوع الشبكة المفضل"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(محظور)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA المفضل"</item>
<item msgid="8442633436636425221">"نظام GSM فقط"</item>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 3b32ffc..555c8da 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"Sizin SIM kart bu şəbəkəyə bağlantıya icazə vermir."</string>
<string name="connect_later" msgid="2308119155752343975">"Hazırda bu şəbəkəyə qoşulmaq olmur. Sonra təkrar sınayın."</string>
<string name="registration_done" msgid="495135664535876612">"Şəbəkədə qeydiyyatdan keçib."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Artıq avtomatik seçimdədir."</string>
<string name="select_automatically" msgid="1046727200631770962">"Avtomatik olaraq şəbəkə seçin"</string>
<string name="network_select_title" msgid="7733107364757544558">"Şəbəkə"</string>
<string name="register_automatically" msgid="6017849844573519637">"Avtomatik qeydiyyat ..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Tərcih edilən şəbəkə növü"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Şəbəkə əməliyyat rejimini dəyişin"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Tərcih edilən şəbəkə növü"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(qadağandır)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA\'ya üstünlük verilib"</item>
<item msgid="8442633436636425221">"Yalnız GSM"</item>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 709abf5..4769d99 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"SIM kartica ne dozvoljava vezu sa ovom mrežom."</string>
<string name="connect_later" msgid="2308119155752343975">"Trenutno nije moguće povezati se sa ovom mrežom. Probajte ponovo kasnije."</string>
<string name="registration_done" msgid="495135664535876612">"Registrovano na mreži."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Već je u automatskom izboru."</string>
<string name="select_automatically" msgid="1046727200631770962">"Automatski izaberi mrežu"</string>
<string name="network_select_title" msgid="7733107364757544558">"Mreža"</string>
<string name="register_automatically" msgid="6017849844573519637">"Automatska registracija..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Željeni tip mreže"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Promena režima rada mreže"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Željeni tip mreže"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(zabranjeno)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA ima prednost"</item>
<item msgid="8442633436636425221">"Samo GSM"</item>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 00e38dd..d220721 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"Ваша SIM-карта не дазваляе падключацца да гэтай сеткі."</string>
<string name="connect_later" msgid="2308119155752343975">"Зараз немагчыма падключыцца да гэтай сеткі. Паўтарыце спробу пазней."</string>
<string name="registration_done" msgid="495135664535876612">"Зарэгістраваны ў сетцы."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Аўтаматычны выбар ужо ўключаны."</string>
<string name="select_automatically" msgid="1046727200631770962">"Выбіраць сетку аўтаматычна"</string>
<string name="network_select_title" msgid="7733107364757544558">"Сетка"</string>
<string name="register_automatically" msgid="6017849844573519637">"Аўтаматычная рэгістрацыя..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Прыярытэтны тып сеткі"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Змяніць рэжым работы сеткі"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Прыярытэтны тып сеткі"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(забаронена)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"Прыярытэт GSM/WCDMA"</item>
<item msgid="8442633436636425221">"Толькі GSM"</item>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 171c7ec..0536df6 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"SIM картата ви не позволява връзка с тази мрежа."</string>
<string name="connect_later" msgid="2308119155752343975">"В момента не може да се осъществи връзка с тази мрежа. Опитайте отново по-късно."</string>
<string name="registration_done" msgid="495135664535876612">"Регистрация в мрежа."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Вече е избрано автоматично"</string>
<string name="select_automatically" msgid="1046727200631770962">"Автоматично избиране на мрежа"</string>
<string name="network_select_title" msgid="7733107364757544558">"Мрежа"</string>
<string name="register_automatically" msgid="6017849844573519637">"Регистрира се автоматично..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Предпочитан тип мрежа"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Промяна на операционния режим на мрежата"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Предпочитан тип мрежа"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(забранена)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"Предпочита се GSM/WCDMA"</item>
<item msgid="8442633436636425221">"Само GSM"</item>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 1c703f1..4152de4 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"আপনার সিম কার্ড এই নেটওয়ার্কে সংযোগ স্থাপনের অনুমতি দেয় না৷"</string>
<string name="connect_later" msgid="2308119155752343975">"এই মুহূর্তে এই নেটওয়ার্কের সাথে সংযোগ স্থাপন করা যাচ্ছে না৷ পরে আবার চেষ্টা করুন৷"</string>
<string name="registration_done" msgid="495135664535876612">"নেটওয়ার্কে নিবন্ধিত করা হয়েছে৷"</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"\'নিজে থেকে বেছে নেওয়া\' তালিকায় আগে থেকেই আছে।"</string>
<string name="select_automatically" msgid="1046727200631770962">"স্বয়ংক্রিয়ভাবে নেটওয়ার্ক বেছে নিন"</string>
<string name="network_select_title" msgid="7733107364757544558">"নেটওয়ার্ক"</string>
<string name="register_automatically" msgid="6017849844573519637">"স্বয়ংক্রিয় নিবন্ধীকরণ..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"পছন্দের নেটওয়ার্ক"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"নেটওয়ার্ক অপারেটিং মোড পরিবর্তন করুন"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"পছন্দের নেটওয়ার্ক"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(নিষিদ্ধ)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA ব্যবহার করতে চাই"</item>
<item msgid="8442633436636425221">"শুধুমাত্র GSM"</item>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 5e4a362..84e675e 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"Vaša SIM kartica ne dozvoljava povezivanje na ovu mrežu."</string>
<string name="connect_later" msgid="2308119155752343975">"Trenutno nije moguće povezati se s ovom mrežom. Pokušajte ponovo kasnije."</string>
<string name="registration_done" msgid="495135664535876612">"Registrirano na mrežu."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Automatski odabir se već koristi."</string>
<string name="select_automatically" msgid="1046727200631770962">"Automatski odaberi mrežu"</string>
<string name="network_select_title" msgid="7733107364757544558">"Mreža"</string>
<string name="register_automatically" msgid="6017849844573519637">"Automatska registracija u toku…"</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Preferirana vrsta mreže"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Promijeni način rada mreže"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Preferirana vrsta mreže"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(zabranjeno)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"Preferiraj GSM/WCDMA"</item>
<item msgid="8442633436636425221">"Samo GSM"</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 9137dd2..8ca21ce 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"La targeta SIM no et permet connectar-te a aquesta xarxa."</string>
<string name="connect_later" msgid="2308119155752343975">"Ara mateix no es pot connectar a aquesta xarxa. Torna-ho a provar més tard."</string>
<string name="registration_done" msgid="495135664535876612">"Registrat a la xarxa."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"La selecció automàtica ja està activada."</string>
<string name="select_automatically" msgid="1046727200631770962">"Selecciona la xarxa automàticament"</string>
<string name="network_select_title" msgid="7733107364757544558">"Xarxa"</string>
<string name="register_automatically" msgid="6017849844573519637">"Registre automàtic..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Tipus de xarxa preferit"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Canvia el mode de funcionament de la xarxa"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Tipus de xarxa preferit"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(prohibit)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"Mode GSM/WCDMA preferit"</item>
<item msgid="8442633436636425221">"Només GSM"</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 0494e3d..6c41e2b 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"Vaše SIM karta nepovoluje připojení k této síti."</string>
<string name="connect_later" msgid="2308119155752343975">"K této síti se momentálně nelze přihlásit. Zkuste to znovu později."</string>
<string name="registration_done" msgid="495135664535876612">"Přihlášení k síti bylo úspěšné."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Už v automatickém výběru."</string>
<string name="select_automatically" msgid="1046727200631770962">"Vybírat síť automaticky"</string>
<string name="network_select_title" msgid="7733107364757544558">"Síť"</string>
<string name="register_automatically" msgid="6017849844573519637">"Automatická registrace..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Preferovaný typ sítě"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Změnit provozní režim sítě"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Preferovaný typ sítě"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(zakázáno)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA – preferováno"</item>
<item msgid="8442633436636425221">"Pouze GSM"</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index d2fba73..7a8c46a 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"Dit SIM-kort tillader ikke en forbindelse til dette netværk."</string>
<string name="connect_later" msgid="2308119155752343975">"Der kan ikke oprettes forbindelse til dette netværk lige nu. Prøv igen senere."</string>
<string name="registration_done" msgid="495135664535876612">"Registreret på netværket."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Automatisk valg bruges allerede."</string>
<string name="select_automatically" msgid="1046727200631770962">"Vælg netværk automatisk"</string>
<string name="network_select_title" msgid="7733107364757544558">"Netværk"</string>
<string name="register_automatically" msgid="6017849844573519637">"Automatisk registrering..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Foretrukken netværkstype"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Skift netværksdriftstilstand"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Foretrukken netværkstype"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(forbudt)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA foretrækkes"</item>
<item msgid="8442633436636425221">"Kun GSM"</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 7576006..5f44049 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"Deine SIM-Karte unterstützt keine Verbindung mit diesem Netzwerk."</string>
<string name="connect_later" msgid="2308119155752343975">"Momentan kann keine Verbindung zu diesem Netzwerk aufgebaut werden. Bitte versuche es später erneut."</string>
<string name="registration_done" msgid="495135664535876612">"In Netzwerk registriert."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Bereits automatisch ausgewählt."</string>
<string name="select_automatically" msgid="1046727200631770962">"Netzwerk automatisch auswählen"</string>
<string name="network_select_title" msgid="7733107364757544558">"Netzwerk"</string>
<string name="register_automatically" msgid="6017849844573519637">"Automatische Registrierung..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Bevorzugter Netzwerktyp"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Netzwerkbetriebsmodus ändern"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Bevorzugter Netzwerktyp"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(nicht zulässig)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA bevorzugt"</item>
<item msgid="8442633436636425221">"Nur GSM"</item>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 95efdfc..1325ad1 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"Η κάρτα SIM δεν επιτρέπει τη σύνδεση με αυτό το δίκτυο."</string>
<string name="connect_later" msgid="2308119155752343975">"Δεν είναι δυνατή η σύνδεση στο δίκτυο αυτήν τη στιγμή. Παρακαλούμε ξαναπροσπαθήστε αργότερα."</string>
<string name="registration_done" msgid="495135664535876612">"Έγινε εγγραφή στο δίκτυο."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Ήδη σε αυτόματη επιλογή."</string>
<string name="select_automatically" msgid="1046727200631770962">"Αυτόματη επιλογή δικτύου"</string>
<string name="network_select_title" msgid="7733107364757544558">"Δίκτυο"</string>
<string name="register_automatically" msgid="6017849844573519637">"Αυτόματη εγγραφή..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Προτιμώμενος τύπος δικτύου"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Αλλαγή κατάστασης λειτουργίας δικτύου"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Προτιμώμενος τύπος δικτύου"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(απαγορευμένο)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"Προτιμώνται GSM/WCDMA"</item>
<item msgid="8442633436636425221">"Μόνο GSM"</item>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 42f794e..213b4a0 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"Your SIM card doesn\'t allow a connection to this network."</string>
<string name="connect_later" msgid="2308119155752343975">"Can\'t connect to this network at the moment. Try again later."</string>
<string name="registration_done" msgid="495135664535876612">"Registered on network."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Already in automatic selection."</string>
<string name="select_automatically" msgid="1046727200631770962">"Automatically select network"</string>
<string name="network_select_title" msgid="7733107364757544558">"Network"</string>
<string name="register_automatically" msgid="6017849844573519637">"Automatic registration..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Preferred network type"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Change the network operating mode"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Preferred network type"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(forbidden)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA preferred"</item>
<item msgid="8442633436636425221">"GSM only"</item>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 42f794e..213b4a0 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"Your SIM card doesn\'t allow a connection to this network."</string>
<string name="connect_later" msgid="2308119155752343975">"Can\'t connect to this network at the moment. Try again later."</string>
<string name="registration_done" msgid="495135664535876612">"Registered on network."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Already in automatic selection."</string>
<string name="select_automatically" msgid="1046727200631770962">"Automatically select network"</string>
<string name="network_select_title" msgid="7733107364757544558">"Network"</string>
<string name="register_automatically" msgid="6017849844573519637">"Automatic registration..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Preferred network type"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Change the network operating mode"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Preferred network type"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(forbidden)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA preferred"</item>
<item msgid="8442633436636425221">"GSM only"</item>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 42f794e..213b4a0 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"Your SIM card doesn\'t allow a connection to this network."</string>
<string name="connect_later" msgid="2308119155752343975">"Can\'t connect to this network at the moment. Try again later."</string>
<string name="registration_done" msgid="495135664535876612">"Registered on network."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Already in automatic selection."</string>
<string name="select_automatically" msgid="1046727200631770962">"Automatically select network"</string>
<string name="network_select_title" msgid="7733107364757544558">"Network"</string>
<string name="register_automatically" msgid="6017849844573519637">"Automatic registration..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Preferred network type"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Change the network operating mode"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Preferred network type"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(forbidden)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA preferred"</item>
<item msgid="8442633436636425221">"GSM only"</item>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 42f794e..213b4a0 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"Your SIM card doesn\'t allow a connection to this network."</string>
<string name="connect_later" msgid="2308119155752343975">"Can\'t connect to this network at the moment. Try again later."</string>
<string name="registration_done" msgid="495135664535876612">"Registered on network."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Already in automatic selection."</string>
<string name="select_automatically" msgid="1046727200631770962">"Automatically select network"</string>
<string name="network_select_title" msgid="7733107364757544558">"Network"</string>
<string name="register_automatically" msgid="6017849844573519637">"Automatic registration..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Preferred network type"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Change the network operating mode"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Preferred network type"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(forbidden)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA preferred"</item>
<item msgid="8442633436636425221">"GSM only"</item>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 03cc038..6c0c3c4 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"Your SIM card doesn\'t allow a connection to this network."</string>
<string name="connect_later" msgid="2308119155752343975">"Can\'t connect to this network right now. Try again later."</string>
<string name="registration_done" msgid="495135664535876612">"Registered on network."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Already in automatic selection."</string>
<string name="select_automatically" msgid="1046727200631770962">"Automatically select network"</string>
<string name="network_select_title" msgid="7733107364757544558">"Network"</string>
<string name="register_automatically" msgid="6017849844573519637">"Automatic registration…"</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Preferred network type"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Change the network operating mode"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Preferred network type"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(forbidden)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA preferred"</item>
<item msgid="8442633436636425221">"GSM only"</item>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index bba74fb..6832c4c 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"Tu tarjeta SIM no permite una conexión con esta red."</string>
<string name="connect_later" msgid="2308119155752343975">"No se puede establecer una conexión con la red en este momento. Vuelve a intentarlo más adelante."</string>
<string name="registration_done" msgid="495135664535876612">"Registrado en la red."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Ya está en selección automática."</string>
<string name="select_automatically" msgid="1046727200631770962">"Seleccionar red de forma automática"</string>
<string name="network_select_title" msgid="7733107364757544558">"Red"</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_summary" msgid="1434820673166126609">"Cambiar el modo operativo de la red"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Tipo de red preferido"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(prohibido)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA preferido"</item>
<item msgid="8442633436636425221">"Solo GSM"</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 81ce71b..2bceb2a 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -167,14 +167,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>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Ya estás en la selección automática."</string>
<string name="select_automatically" msgid="1046727200631770962">"Seleccionar una red automáticamente"</string>
<string name="network_select_title" msgid="7733107364757544558">"Red"</string>
<string name="register_automatically" msgid="6017849844573519637">"Registro automático..."</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 preferida"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(prohibida)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"Preferencia: GSM o WCDMA"</item>
<item msgid="8442633436636425221">"Solo GSM"</item>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 790ced0..1a5620b 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"Teie SIM-kaart ei võimalda ühendust selle võrguga."</string>
<string name="connect_later" msgid="2308119155752343975">"Võrguga ei saa praegu ühendust. Proovige hiljem uuesti."</string>
<string name="registration_done" msgid="495135664535876612">"Võrku registreeritud."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"On juba automaatses valikus."</string>
<string name="select_automatically" msgid="1046727200631770962">"Vali võrk automaatselt"</string>
<string name="network_select_title" msgid="7733107364757544558">"Võrk"</string>
<string name="register_automatically" msgid="6017849844573519637">"Automaatne registreerimine ..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Eelistatud võrgutüüp"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Muuda võrgu töörežiimi"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Eelistatud võrgutüüp"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(keelatud)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"Eelistatud: GSM/WCDMA"</item>
<item msgid="8442633436636425221">"Ainult GSM"</item>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index e40f753..d02c896 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"SIM txartelak ez dizu sare honetara konektatzea baimentzen."</string>
<string name="connect_later" msgid="2308119155752343975">"Une honetan, ezin da sare horretara konektatu. Saiatu berriro geroago."</string>
<string name="registration_done" msgid="495135664535876612">"Sarean erregistratuta."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Hautapen automatikoa hautatuta dago dagoeneko."</string>
<string name="select_automatically" msgid="1046727200631770962">"Hautatu sarea automatikoki"</string>
<string name="network_select_title" msgid="7733107364757544558">"Sarea"</string>
<string name="register_automatically" msgid="6017849844573519637">"Erregistratze automatikoa…"</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Sare mota hobetsia"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Aldatu sarearen funtzionamendu modua"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Sare mota hobetsia"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(debekatuta)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA hobetsita"</item>
<item msgid="8442633436636425221">"GSM soilik"</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 4924f2c..b5248b7 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"سیم کارت شما اجازه اتصال به این شبکه را نمیدهد."</string>
<string name="connect_later" msgid="2308119155752343975">"اتصال به این شبکه در حال حاضر امکانپذیر نیست. بعداً دوباره امتحان کنید."</string>
<string name="registration_done" msgid="495135664535876612">"در شبکه ثبت شد."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"درحالحاضر در حالت انتخاب خودکار است."</string>
<string name="select_automatically" msgid="1046727200631770962">"انتخاب خودکار شبکه"</string>
<string name="network_select_title" msgid="7733107364757544558">"شبکه"</string>
<string name="register_automatically" msgid="6017849844573519637">"ثبت خودکار..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"نوع شبکه برگزیده"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"تغییر حالت عملکرد شبکه"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"نوع شبکه برگزیده"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(ممنوع است)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA برگزیده"</item>
<item msgid="8442633436636425221">"فقط GSM"</item>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 0d5ece2..6647f4c 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"SIM-kortti ei anna muodostaa yhteyttä tähän verkkoon."</string>
<string name="connect_later" msgid="2308119155752343975">"Tähän verkkoon ei saa yhteyttä juuri nyt. Yritä myöhemmin uudelleen."</string>
<string name="registration_done" msgid="495135664535876612">"Rekisteröity verkkoon."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Automaattinen valinta on jo käytössä."</string>
<string name="select_automatically" msgid="1046727200631770962">"Valitse verkko automaattisesti"</string>
<string name="network_select_title" msgid="7733107364757544558">"Verkko"</string>
<string name="register_automatically" msgid="6017849844573519637">"Automaattinen rekisteröinti..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Ensisijainen verkko"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Vaihda verkon käyttötilaa"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Ensisijainen verkko"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(kielletty)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"Ensisijaisesti GSM/WCDMA"</item>
<item msgid="8442633436636425221">"Vain GSM"</item>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index ba8bf45..77b0b59 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"Votre carte SIM ne permet pas de vous connecter à ce réseau."</string>
<string name="connect_later" msgid="2308119155752343975">"Impossible de se connecter à ce réseau pour le moment. Veuillez réessayer plus tard."</string>
<string name="registration_done" msgid="495135664535876612">"Enregistré sur le réseau"</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"La sélection automatique est déjà activée."</string>
<string name="select_automatically" msgid="1046727200631770962">"Sélectionner automatiquement le réseau"</string>
<string name="network_select_title" msgid="7733107364757544558">"Réseau"</string>
<string name="register_automatically" msgid="6017849844573519637">"Enregistrement automatique…"</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Type de réseau préféré"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Changer le mode de fonctionnement du réseau"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Type de réseau préféré"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(interdit)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA de préférence"</item>
<item msgid="8442633436636425221">"GSM uniquement"</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 26ab725..3d0db18 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"Votre carte SIM ne permet pas de vous connecter à ce réseau."</string>
<string name="connect_later" msgid="2308119155752343975">"Impossible de se connecter à ce réseau pour le moment. Veuillez réessayer ultérieurement."</string>
<string name="registration_done" msgid="495135664535876612">"Enregistré sur le réseau."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"La sélection automatique est déjà activée."</string>
<string name="select_automatically" msgid="1046727200631770962">"Sélectionner automatiquement le réseau"</string>
<string name="network_select_title" msgid="7733107364757544558">"Réseau"</string>
<string name="register_automatically" msgid="6017849844573519637">"Enregistrement automatique…"</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Type de réseau préféré"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Changer le mode de fonctionnement du réseau"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Type de réseau préféré"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(interdit)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA de préférence"</item>
<item msgid="8442633436636425221">"GSM uniquement"</item>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 1c22fbb..f4134af 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -18,7 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="phoneAppLabel" product="tablet" msgid="8576272342240415145">"Datos móbiles"</string>
<string name="phoneAppLabel" product="default" msgid="6790717591729922998">"Servizos de telefonía"</string>
- <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Marcador de emerxencia"</string>
+ <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Marcador de urxencia"</string>
<string name="phoneIconLabel" msgid="2331230813161304895">"Teléfono"</string>
<string name="fdnListLabel" msgid="8630418672279521003">"Lista de NMF"</string>
<string name="unknown" msgid="6878797917991465859">"Descoñecido"</string>
@@ -78,7 +78,7 @@
<string name="voicemail_settings_with_label" msgid="152724978380748296">"Correo de voz (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="voicemail_abbreviated" msgid="2215592488517217448">"CV:"</string>
<string name="voicemail_notifications_preference_title" msgid="4019728578955102213">"Notificacións"</string>
- <string name="cell_broadcast_settings" msgid="8740238216690502563">"Difusións de emerxencia"</string>
+ <string name="cell_broadcast_settings" msgid="8740238216690502563">"Difusións de urxencia"</string>
<string name="call_settings" msgid="6112441768261754562">"Configuración de chamada"</string>
<string name="additional_gsm_call_settings" msgid="1391795981938800617">"Configuración adicional"</string>
<string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Configuración adicional (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
@@ -86,7 +86,7 @@
<string name="additional_cdma_call_settings" msgid="8628958775721886909">"Configuración adicional de chamadas CDMA"</string>
<string name="sum_cdma_call_settings" msgid="284753265979035549">"Configuración de chamadas só CDMA adicionais"</string>
<string name="labelNwService" msgid="4699970172021870983">"Configuración do servizo de rede"</string>
- <string name="labelCallerId" msgid="3888899447379069198">"ID de chamada"</string>
+ <string name="labelCallerId" msgid="3888899447379069198">"identificador de chamada"</string>
<string name="sum_loading_settings" msgid="1826692909391168620">"Cargando a configuración..."</string>
<string name="sum_hide_caller_id" msgid="1071407020290873782">"Número oculto nas chamadas saíntes"</string>
<string name="sum_show_caller_id" msgid="6768534125447290401">"Número mostrado nas chamadas saíntes"</string>
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"A tarxeta SIM non permite unha conexión a esta rede."</string>
<string name="connect_later" msgid="2308119155752343975">"Non se pode conectar con esta rede agora. Téntao de novo máis tarde."</string>
<string name="registration_done" msgid="495135664535876612">"Rexistrado na rede"</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Xa estás na selección automática."</string>
<string name="select_automatically" msgid="1046727200631770962">"Seleccionar rede automaticamente"</string>
<string name="network_select_title" msgid="7733107364757544558">"Rede"</string>
<string name="register_automatically" msgid="6017849844573519637">"Rexistro automático..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Tipo de rede preferido"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Cambiar o modo de funcionamento da rede"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Tipo de rede preferido"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(non permitido)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"Preferencia: GSM/WCDMA"</item>
<item msgid="8442633436636425221">"Só GSM"</item>
@@ -272,9 +272,9 @@
<string name="cell_bc_sms_enable" msgid="6441688565738921084">"SMS de difusión móbil activado"</string>
<string name="cell_bc_sms_disable" msgid="3398365088309408749">"SMS de difusión móbil desactivado"</string>
<string name="cb_sms_settings" msgid="651715019785107312">"Configuración de SMS da difusión móbil"</string>
- <string name="enable_disable_emergency_broadcast" msgid="2157014609041245335">"Difusión de emerxencia"</string>
- <string name="emergency_broadcast_enable" msgid="2645980025414010211">"Difusión de emerxencia activada"</string>
- <string name="emergency_broadcast_disable" msgid="3665199821267569426">"Difusión de emerxencia desactivada"</string>
+ <string name="enable_disable_emergency_broadcast" msgid="2157014609041245335">"Difusión de urxencia"</string>
+ <string name="emergency_broadcast_enable" msgid="2645980025414010211">"Difusión de urxencia activada"</string>
+ <string name="emergency_broadcast_disable" msgid="3665199821267569426">"Difusión de urxencia desactivada"</string>
<string name="enable_disable_administrative" msgid="6501582322182059412">"Administrativo"</string>
<string name="administrative_enable" msgid="1750086122962032235">"Administrativo activado"</string>
<string name="administrative_disable" msgid="8433273857248698539">"Administrativo desactivado"</string>
@@ -478,7 +478,7 @@
<string name="incall_error_power_off" product="watch" msgid="2007450435656211658">"Para facer unha chamada, activa a rede de telefonía móbil, desactiva o modo avión ou desactiva o modo Aforro de batería."</string>
<string name="incall_error_power_off" product="default" msgid="2947938060513306698">"Desactiva o modo avión para facer unha chamada."</string>
<string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Desactiva o modo avión ou conéctate a unha rede sen fíos para facer unha chamada."</string>
- <string name="incall_error_ecm_emergency_only" msgid="738708660612388692">"Sae do modo de devolución de chamada de emerxencia para facer unha chamada que non sexa de emerxencia."</string>
+ <string name="incall_error_ecm_emergency_only" msgid="738708660612388692">"Sae do modo de devolución de chamada de urxencia para facer unha chamada que non sexa de urxencia."</string>
<string name="incall_error_emergency_only" msgid="4678640422710818317">"Sen rexistro na rede"</string>
<string name="incall_error_out_of_service" msgid="8587993036435080418">"A rede móbil non está dispoñible."</string>
<string name="incall_error_out_of_service_wfc" msgid="8741629779555132471">"A rede móbil non está dispoñible. Conéctate a unha rede sen fíos para facer unha chamada."</string>
@@ -495,12 +495,12 @@
<string name="incall_error_supp_service_hold" msgid="7967020511232222078">"Non se poden poñer as chamadas en espera."</string>
<string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Conéctate a unha rede sen fíos para facer unha chamada."</string>
<string name="incall_error_promote_wfc" msgid="106510757624022064">"Activa as chamadas por wifi para facer unha chamada."</string>
- <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Chamada de emerxencia"</string>
+ <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Chamada de urxencia"</string>
<string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Activando radio..."</string>
<string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Sen servizo. Tentando de novo…"</string>
- <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Non se pode activar o modo avión durante unha chamada de emerxencia."</string>
- <string name="dial_emergency_error" msgid="1509085166367420355">"Non se pode chamar. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> non é un número de emerxencia."</string>
- <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Non se pode chamar. Marcar un número de emerxencia."</string>
+ <string name="radio_off_during_emergency_call" msgid="2535800034010306830">"Non se pode activar o modo avión durante unha chamada de urxencia."</string>
+ <string name="dial_emergency_error" msgid="1509085166367420355">"Non se pode chamar. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> non é un número de urxencia."</string>
+ <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Non se pode chamar. Marcar un número de urxencia."</string>
<string name="dialerKeyboardHintText" msgid="9192914825413747792">"Utiliza o teclado para chamar"</string>
<string name="onscreenHoldText" msgid="2285258239691145872">"Poñer en espera"</string>
<string name="onscreenEndCallText" msgid="4403855834875398585">"Finalizar"</string>
@@ -556,20 +556,20 @@
<string name="ota_try_again" msgid="7685477206465902290">"Tentar de novo"</string>
<string name="ota_next" msgid="3904945374358235910">"Seguinte"</string>
<string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
- <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Accedeuse ao modo de devolución de chamadas de emerxencia"</string>
- <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Modo de devolución de chamadas de emerxencia"</string>
+ <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Accedeuse ao modo de devolución de chamadas de urxencia"</string>
+ <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Modo de devolución de chamadas de urxencia"</string>
<string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Conexión de datos desactivada"</string>
<string name="phone_in_ecm_notification_complete_time" msgid="7730376844178948351">"Sen conexión de datos ata: <xliff:g id="COMPLETETIME">%s</xliff:g>"</string>
<plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
- <item quantity="other">O teléfono estará no modo de devolución de chamada de emerxencia durante <xliff:g id="COUNT_1">%s</xliff:g> minutos. Mentres se atope neste modo, non se poderá usar ningunha aplicación que utilice unha conexión de datos. Queres saír agora?</item>
- <item quantity="one">O teléfono estará no modo de devolución de chamada de emerxencia durante <xliff:g id="COUNT_0">%s</xliff:g> minuto. Mentres se atope neste modo, non se poderá usar ningunha aplicación que utilice unha conexión de datos. Queres saír agora?</item>
+ <item quantity="other">O teléfono estará no modo de devolución de chamada de urxencia durante <xliff:g id="COUNT_1">%s</xliff:g> minutos. Mentres se atope neste modo, non se poderá usar ningunha aplicación que utilice unha conexión de datos. Queres saír agora?</item>
+ <item quantity="one">O teléfono estará no modo de devolución de chamada de urxencia durante <xliff:g id="COUNT_0">%s</xliff:g> minuto. Mentres se atope neste modo, non se poderá usar ningunha aplicación que utilice unha conexión de datos. Queres saír agora?</item>
</plurals>
<plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
- <item quantity="other">A acción seleccionada non está dispoñible durante o modo de devolución de chamadas de emerxencia. O teléfono estará neste modo durante <xliff:g id="COUNT_1">%s</xliff:g> minutos. Queres saír agora?</item>
- <item quantity="one">A acción seleccionada non está dispoñible durante o modo de devolución de chamadas de emerxencia. O teléfono estará neste modo durante <xliff:g id="COUNT_0">%s</xliff:g> minuto. Queres saír agora?</item>
+ <item quantity="other">A acción seleccionada non está dispoñible durante o modo de devolución de chamadas de urxencia. O teléfono estará neste modo durante <xliff:g id="COUNT_1">%s</xliff:g> minutos. Queres saír agora?</item>
+ <item quantity="one">A acción seleccionada non está dispoñible durante o modo de devolución de chamadas de urxencia. O teléfono estará neste modo durante <xliff:g id="COUNT_0">%s</xliff:g> minuto. Queres saír agora?</item>
</plurals>
- <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"A acción seleccionada non está dispoñible durante as chamadas de emerxencia."</string>
- <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Saíndo do modo de devolución de chamadas de emerxencia"</string>
+ <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"A acción seleccionada non está dispoñible durante as chamadas de urxencia."</string>
+ <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Saíndo do modo de devolución de chamadas de urxencia"</string>
<string name="alert_dialog_yes" msgid="6674268047820703974">"Si"</string>
<string name="alert_dialog_no" msgid="1476091437797628703">"Non"</string>
<string name="alert_dialog_dismiss" msgid="2491494287075907171">"Rexeitar"</string>
@@ -592,8 +592,8 @@
<string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Para activar as videochamadas, necesitas activar o Modo LTE 4G mellorado na configuración do sistema."</string>
<string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Configuración de rede"</string>
<string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Pechar"</string>
- <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Chamadas de emerxencia"</string>
- <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Só chamadas de emerxencia"</string>
+ <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Chamadas de urxencia"</string>
+ <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Só chamadas de urxencia"</string>
<string name="sim_description_default" msgid="4778679519938775515">"Tarxeta SIM, rañura: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
<string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Accesibilidade"</string>
<string name="status_hint_label_incoming_wifi_call" msgid="5932176406432044638">"Chamada por wifi de"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 33c5355..1fb46ff 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"તમારું SIM કાર્ડ આ નેટવર્કથી કનેક્શનને મંજૂરી આપતું નથી."</string>
<string name="connect_later" msgid="2308119155752343975">"હમણાં આ નેટવર્કથી કનેક્ટ કરી શકાતું નથી. પછીથી ફરી પ્રયાસ કરો."</string>
<string name="registration_done" msgid="495135664535876612">"નેટવર્ક પર નોંધણી કરી."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"પહેલેથી જ આપમેળે પસંદગીમાં."</string>
<string name="select_automatically" msgid="1046727200631770962">"નેટવર્ક આપમેળે પસંદ કરો"</string>
<string name="network_select_title" msgid="7733107364757544558">"નેટવર્ક"</string>
<string name="register_automatically" msgid="6017849844573519637">"સ્વયંચાલિત નોંધણી…"</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"પસંદગીનો નેટવર્ક પ્રકાર"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"નેટવર્ક ઓપરેટિંગ મોડ બદલો"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"પસંદગીનો નેટવર્ક પ્રકાર"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(પ્રતિબંધિત)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA પસંદ કરેલ છે"</item>
<item msgid="8442633436636425221">"ફક્ત GSM"</item>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 1954e27..114f161 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"आपका सिम कार्ड इस नेटवर्क पर कनेक्शन की अनुमति नहीं देता है."</string>
<string name="connect_later" msgid="2308119155752343975">"अभी इस नेटवर्क से कनेक्ट नहीं कर सकते. बाद में पुन: प्रयास करें."</string>
<string name="registration_done" msgid="495135664535876612">"नेटवर्क पर पंजीकृत."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"पहले से ऑटोमैटिक चयन में है."</string>
<string name="select_automatically" msgid="1046727200631770962">"अपने आप नेटवर्क चुनें"</string>
<string name="network_select_title" msgid="7733107364757544558">"नेटवर्क"</string>
<string name="register_automatically" msgid="6017849844573519637">"स्वचालित पंजीकरण..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"पसंदीदा नेटवर्क प्रकार"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"नेटवर्क संचालन मोड बदलें"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"पसंदीदा नेटवर्क प्रकार"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(मना है)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA पसंदीदा"</item>
<item msgid="8442633436636425221">"केवल GSM"</item>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index df0ade1..27a80d7 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"Vaša SIM kartica ne dopušta povezivanje s ovom mrežom."</string>
<string name="connect_later" msgid="2308119155752343975">"Povezivanje s tom mrežom trenutačno nije moguće. Pokušajte kasnije."</string>
<string name="registration_done" msgid="495135664535876612">"Registrirano na mreži."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Automatski odabir već je otvoren."</string>
<string name="select_automatically" msgid="1046727200631770962">"Automatski odaberi mrežu"</string>
<string name="network_select_title" msgid="7733107364757544558">"Mreža"</string>
<string name="register_automatically" msgid="6017849844573519637">"Automatska prijava…"</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Željena vrsta mreže"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Promijenite način rada mreže"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Željena vrsta mreže"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(zabranjeno)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"Preporučeno: GSM/WCDMA"</item>
<item msgid="8442633436636425221">"Samo GSM"</item>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 41b0e27..c89aaf2 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"SIM kártyája nem teszi lehetővé a kapcsolódást ehhez a hálózathoz."</string>
<string name="connect_later" msgid="2308119155752343975">"Most nem lehet csatlakozni a hálózathoz. Próbálja meg később."</string>
<string name="registration_done" msgid="495135664535876612">"Regisztrálva a hálózaton."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Már automatikus kiválasztás van beállítva."</string>
<string name="select_automatically" msgid="1046727200631770962">"Hálózat automatikus kiválasztása"</string>
<string name="network_select_title" msgid="7733107364757544558">"Hálózat"</string>
<string name="register_automatically" msgid="6017849844573519637">"Automatikus regisztráció..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Preferált hálózattípus"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"A hálózati üzemmód megváltoztatása"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Preferált hálózattípus"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(tiltott)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA a preferált"</item>
<item msgid="8442633436636425221">"Csak GSM"</item>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 10b8b64..8cd9597 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"Ձեր SIM քարտը թույլ չի տալիս այս ցանցին միանալ:"</string>
<string name="connect_later" msgid="2308119155752343975">"Հնարավոր չէ միանալ այս ցանցին հիմա: Կրկին փորձեք մի փոքր ուշ:"</string>
<string name="registration_done" msgid="495135664535876612">"Գրանցված է ցանցում:"</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Արդեն նշել եք ավտոմատ ընտրությունը:"</string>
<string name="select_automatically" msgid="1046727200631770962">"Ավտոմատ ընտրել ցանցը"</string>
<string name="network_select_title" msgid="7733107364757544558">"Ցանց"</string>
<string name="register_automatically" msgid="6017849844573519637">"Ավտոմատ գրանցում..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Ցանցի նախընտրելի տեսակը"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Փոխել ցանցային գործավար ռեժիմը"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Ցանցի նախընտրելի տեսակը"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(արգելված)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA նախընտրելի"</item>
<item msgid="8442633436636425221">"Միայն GSM"</item>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index e767f12..9e5fcf3 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"Kartu SIM Anda tidak mengizinkan sambungan ke jaringan ini."</string>
<string name="connect_later" msgid="2308119155752343975">"Tidak dapat terhubung ke jaringan ini sekarang. Coba lagi nanti."</string>
<string name="registration_done" msgid="495135664535876612">"Terdaftar pada jaringan."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Sudah ada di pemilihan otomatis."</string>
<string name="select_automatically" msgid="1046727200631770962">"Pilih jaringan secara otomatis"</string>
<string name="network_select_title" msgid="7733107364757544558">"Jaringan"</string>
<string name="register_automatically" msgid="6017849844573519637">"Pendaftaran otomatis..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Jenis jaringan yang dipilih"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Ubah mode pengoperasian jaringan"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Jenis jaringan yang dipilih"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(terlarang)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA lebih disukai"</item>
<item msgid="8442633436636425221">"GSM saja"</item>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index ee8f444..ecb0b27 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"SIM-kortið leyfir ekki tengingu við þetta símkerfi."</string>
<string name="connect_later" msgid="2308119155752343975">"Ekki næst tenging við þetta kerfi á þessari stundu. Reyndu aftur síðar."</string>
<string name="registration_done" msgid="495135664535876612">"Skráð á símkerfi."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Nú þegar í sjálfvirku vali."</string>
<string name="select_automatically" msgid="1046727200631770962">"Velja netkerfi sjálfkrafa"</string>
<string name="network_select_title" msgid="7733107364757544558">"Netkerfi"</string>
<string name="register_automatically" msgid="6017849844573519637">"Sjálfvirk skráning…"</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Valin símkerfistegund"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Breyta virknihætti símkerfis"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Valin símkerfistegund"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(bannað)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA fyrsta val"</item>
<item msgid="8442633436636425221">"GSM eingöngu"</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index a9fbd36..39bb630 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"La scheda SIM non consente la connessione a questa rete."</string>
<string name="connect_later" msgid="2308119155752343975">"Impossibile connettersi a questa rete in questo momento. Riprova più tardi."</string>
<string name="registration_done" msgid="495135664535876612">"Registrato sulla rete."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Già in selezione automatica."</string>
<string name="select_automatically" msgid="1046727200631770962">"Seleziona automaticamente la rete"</string>
<string name="network_select_title" msgid="7733107364757544558">"Rete"</string>
<string name="register_automatically" msgid="6017849844573519637">"Registrazione automatica..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Tipo di rete preferito"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Cambia la modalità di funzionamento della rete"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Tipo di rete preferito"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(vietato)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA preferito"</item>
<item msgid="8442633436636425221">"Solo GSM"</item>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 99bf8ba..1b06d01 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"כרטיס ה-SIM לא מאפשר חיבור לרשת זו."</string>
<string name="connect_later" msgid="2308119155752343975">"לא ניתן להתחבר לרשת זו כעת. נסה שוב מאוחר יותר."</string>
<string name="registration_done" msgid="495135664535876612">"רשום ברשת."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"הבחירה האוטומטית כבר מופעלת."</string>
<string name="select_automatically" msgid="1046727200631770962">"בחירה אוטומטית של הרשת"</string>
<string name="network_select_title" msgid="7733107364757544558">"רשת"</string>
<string name="register_automatically" msgid="6017849844573519637">"רישום אוטומטי..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"סוג רשת מועדף"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"שנה את מצב ההפעלה של הרשת"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"סוג רשת מועדף"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(אסור)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA מועדפת"</item>
<item msgid="8442633436636425221">"GSM בלבד"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index d9c3c99..8fda941 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"お使いのSIMカードではこのネットワークに接続できません。"</string>
<string name="connect_later" msgid="2308119155752343975">"現在このネットワークに接続できません。しばらくしてからもう一度お試しください。"</string>
<string name="registration_done" msgid="495135664535876612">"ネットワークに登録されました。"</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"すでに自動選択が適用されています。"</string>
<string name="select_automatically" msgid="1046727200631770962">"ネットワークを自動的に選択"</string>
<string name="network_select_title" msgid="7733107364757544558">"ネットワーク"</string>
<string name="register_automatically" msgid="6017849844573519637">"自動登録..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"優先ネットワークタイプ"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"ネットワーク動作モードの変更"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"優先ネットワークタイプ"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"（禁止）"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM / WCDMA を優先"</item>
<item msgid="8442633436636425221">"GSM のみ"</item>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index ab95f0c..fa0e05a 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"თქვენი SIM ბარათი ამ ქსელთან კავშირის უფლებას არ იძლევა."</string>
<string name="connect_later" msgid="2308119155752343975">"ამჟამად ქსელთან დაკავშირება ვერ ხერხდება. სცადეთ ისევ მოგვიანებით."</string>
<string name="registration_done" msgid="495135664535876612">"რეგისტრირებულია ქსელში."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"უკვე არის ავტომატურ არჩევანში."</string>
<string name="select_automatically" msgid="1046727200631770962">"ქსელის ავტომატურად არჩევა"</string>
<string name="network_select_title" msgid="7733107364757544558">"ქსელი"</string>
<string name="register_automatically" msgid="6017849844573519637">"ავტომატური რეგისტრაცია…"</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"ქსელის სასურველი ტიპი"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"ქსელის ოპერირების რეჟიმის შეცვლა"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"ქსელის სასურველი ტიპი"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(აკრძალული)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA უპირატესობით"</item>
<item msgid="8442633436636425221">"მხოლოდ GSM"</item>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 9dff6c9..f0d11c7 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"SIM картаңыз бұл желіге жалғануға рұқсат бермейді."</string>
<string name="connect_later" msgid="2308119155752343975">"Дәл қазір бұл желіге жалғана алмайды. Кейінірек қайта әрекеттеніп көріңіз."</string>
<string name="registration_done" msgid="495135664535876612">"Желіге тіркелді."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Автоматты түрде таңдау қосылған."</string>
<string name="select_automatically" msgid="1046727200631770962">"Желіні автоматты түрде таңдау"</string>
<string name="network_select_title" msgid="7733107364757544558">"Желі"</string>
<string name="register_automatically" msgid="6017849844573519637">"Aвтоматты тіркелу…"</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Қалаулы желі түрі"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Желі жұмысының режимін өзгерту"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Қалаулы желі түрі"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(тыйым салынған)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA таңдалған"</item>
<item msgid="8442633436636425221">"Тек қана GSM"</item>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 0d3f8ce..4d2113e 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"មិនអនុញ្ញាតឲ្យស៊ីមកាតរបស់អ្នកតភ្ជាប់ទៅបណ្ដាញនេះទេ។"</string>
<string name="connect_later" msgid="2308119155752343975">"មិនអាចតភ្ជាប់ទៅបណ្ដាញឥឡូវនេះបានទេ។ ព្យាយាមម្ដងទៀតពេលក្រោយ។"</string>
<string name="registration_done" msgid="495135664535876612">"បានចុះឈ្មោះនៅលើបណ្ដាញ។"</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"នៅក្នុងការជ្រើសរើសស្វ័យប្រវត្តិរួចហើយ។"</string>
<string name="select_automatically" msgid="1046727200631770962">"ជ្រើសរើសបណ្ដាញដោយស្វ័យប្រវត្តិ"</string>
<string name="network_select_title" msgid="7733107364757544558">"បណ្ដាញ"</string>
<string name="register_automatically" msgid="6017849844573519637">"ការចុះឈ្មោះដោយស្វ័យប្រវត្តិ ..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"ប្រភេទបណ្ដាញដែលពេញចិត្ត"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"ប្ដូររបៀបប្រតិបត្តិការបណ្ដាញ"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"ប្រភេទបណ្ដាញដែលពេញចិត្ត"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(ហាម)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"ប្រើ GSM/WCDMA ជាអាទិភាព"</item>
<item msgid="8442633436636425221">"GSM ប៉ុណ្ណោះ"</item>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index dbd0299..60473c5 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"ಈ ನೆಟ್ವರ್ಕ್ಗೆ ಸಂಪರ್ಕವನ್ನು ನಿಮ್ಮ ಸಿಮ್ ಕಾರ್ಡ್ ಅನುಮತಿಸುವುದಿಲ್ಲ."</string>
<string name="connect_later" msgid="2308119155752343975">"ಇದೀಗ ಈ ನೆಟ್ವರ್ಕ್ಗೆ ಸಂಪರ್ಕಪಡಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ. ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
<string name="registration_done" msgid="495135664535876612">"ನೆಟ್ವರ್ಕ್ನಲ್ಲಿ ನೋಂದಾಯಿಸಲಾಗಿದೆ."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"ಈಗಾಗಲೇ ಸ್ವಯಂಚಾಲಿತ ಆಯ್ಕೆಯಲ್ಲಿದೆ."</string>
<string name="select_automatically" msgid="1046727200631770962">"ನೆಟ್ವರ್ಕ್ ಅನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆಯ್ಕೆಮಾಡಿ"</string>
<string name="network_select_title" msgid="7733107364757544558">"ನೆಟ್ವರ್ಕ್"</string>
<string name="register_automatically" msgid="6017849844573519637">"ಸ್ವಯಂಚಾಲಿತ ನೋಂದಣಿ…"</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"ಬಯಸಿದ ನೆಟ್ವರ್ಕ್ ಪ್ರಕಾರ"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"ನೆಟ್ವರ್ಕ್ ಕಾರ್ಯಾಚರಣಾ ಮೋಡ್ ಬದಲಿಸಿ"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"ಬಯಸಿದ ನೆಟ್ವರ್ಕ್ ಪ್ರಕಾರ"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(ನಿಷೇಧಿತ)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA ಗೆ ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಲಾಗಿದೆ"</item>
<item msgid="8442633436636425221">"GSM ಮಾತ್ರ"</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index ff7478f..a7441c5 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"SIM 카드에서 이 네트워크에 연결할 수 없습니다."</string>
<string name="connect_later" msgid="2308119155752343975">"현재 네트워크에 연결할 수 없습니다. 나중에 다시 시도해 주세요."</string>
<string name="registration_done" msgid="495135664535876612">"네트워크에 등록되었습니다."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"이미 자동 선택을 사용하는 중입니다."</string>
<string name="select_automatically" msgid="1046727200631770962">"네트워크 자동 선택"</string>
<string name="network_select_title" msgid="7733107364757544558">"네트워크"</string>
<string name="register_automatically" msgid="6017849844573519637">"자동 등록..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"기본 네트워크 유형"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"네트워크 작동 모드 변경"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"기본 네트워크 유형"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(금지됨)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA로 기본 설정"</item>
<item msgid="8442633436636425221">"GSM 전용"</item>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 336911a..7a5955b 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -168,14 +168,14 @@
<string name="not_allowed" msgid="5613353860205691579">"Сиздин SIM-картаңыз бул түйүнгө кошулганга жол бербейт."</string>
<string name="connect_later" msgid="2308119155752343975">"Бул түйүнгө азыр кошулуу мүмкүн эмес. Бир аздан соң кайра аракеттениңиз."</string>
<string name="registration_done" msgid="495135664535876612">"Тармакка катталды."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Мурунтан эле автоматтык түрдө тандоодо."</string>
<string name="select_automatically" msgid="1046727200631770962">"Тармакты автоматтык түрдө тандоо"</string>
<string name="network_select_title" msgid="7733107364757544558">"Тармак"</string>
<string name="register_automatically" msgid="6017849844573519637">"Автоматтык катталуу…"</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Тармактын түрү"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Тармактын иштөө режимин өзгөртүңүз"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Тармактын түрү"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(тыюу салынган)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA артыкчылыктуу"</item>
<item msgid="8442633436636425221">"GSM гана"</item>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 20509d7..ff9171a 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"SIM card ຂອງທ່ານບໍ່ອະນຸຍາດໃຫ້ເຊື່ອມຕໍ່ກັບເຄືອຂ່າຍນີ້."</string>
<string name="connect_later" msgid="2308119155752343975">"ບໍ່ສາມາດເຊື່ອມຕໍ່ຫາເຄືອຂ່າຍນີ້ໃນເວລານີ້ໄດ້. ກະລຸນາລອງໃໝ່ໃນພາຍຫຼັງ."</string>
<string name="registration_done" msgid="495135664535876612">"ລົງທະບຽນໃນເຄືອຂ່າຍແລ້ວ."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"ມີຢູ່ໃນການເລືອກອັດຕະໂນມັດຢູ່ແລ້ວ"</string>
<string name="select_automatically" msgid="1046727200631770962">"ເລືອກເຄືອຂ່າຍອັດຕະໂນມັດ"</string>
<string name="network_select_title" msgid="7733107364757544558">"ເຄືອຂ່າຍ"</string>
<string name="register_automatically" msgid="6017849844573519637">"ກຳລັງລົງທະບຽນອັດຕະໂນມັດ..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"ປະເພດເຄືອຂ່າຍທີ່ຕ້ອງການ"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"ປ່ຽນຮູບແບບປະຕິບັດການຂອງເຄືອຂ່າຍ"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"ປະເພດເຄືອຂ່າຍທີ່ຕ້ອງການ"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(ຂໍ້ມູນຕ້ອງຫ້າມ)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"ຕ້ອງການ GSM/WCDMA"</item>
<item msgid="8442633436636425221">"GSM ເທົ່ານັ້ນ"</item>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index df88d7d..1d431cb 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"SIM kortelė neleidžia užmegzti ryšio su šiuo tinklu."</string>
<string name="connect_later" msgid="2308119155752343975">"Dabar prie šio tinklo prisijungti nepavyksta. Bandykite dar kartą vėliau."</string>
<string name="registration_done" msgid="495135664535876612">"Registruota tinkle."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Jau automatiškai pasirinkta."</string>
<string name="select_automatically" msgid="1046727200631770962">"Automatiškai pasirinkti tinklą"</string>
<string name="network_select_title" msgid="7733107364757544558">"Tinklas"</string>
<string name="register_automatically" msgid="6017849844573519637">"Automatinė registracija..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Pageidaujamas tinklo tipas"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Pakeisti tinklo veikimo režimą"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Pageidaujamas tinklo tipas"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(uždrausta)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"Pageidaujama GSM / WCDMA"</item>
<item msgid="8442633436636425221">"Tik GSM"</item>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index df8778a..0bbd2c7 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"SIM karte neļauj izveidot savienojumu ar šo tīklu."</string>
<string name="connect_later" msgid="2308119155752343975">"Pašlaik nevar izveidot savienojumu ar šo tīklu. Vēlāk mēģiniet vēlreiz."</string>
<string name="registration_done" msgid="495135664535876612">"Reģistrēts tīklā."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Jau ir automātiskajā atlasē."</string>
<string name="select_automatically" msgid="1046727200631770962">"Automātiski atlasīt tīklu"</string>
<string name="network_select_title" msgid="7733107364757544558">"Tīkls"</string>
<string name="register_automatically" msgid="6017849844573519637">"Automātiska reģistrācija..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Ieteicamais tīkla veids"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Mainiet tīkla darbības režīmu"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Ieteicamais tīkla veids"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(aizliegts)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"Ieteicamais režīms: GSM/WCDMA"</item>
<item msgid="8442633436636425221">"Tikai GSM"</item>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 5bec5ad..17b6ebe 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"Вашата SIM картичка не дозволува поврзување со оваа мрежа."</string>
<string name="connect_later" msgid="2308119155752343975">"Не може да се поврзе со оваа мрежа во моментов. Обидете се повторно подоцна."</string>
<string name="registration_done" msgid="495135664535876612">"Регистрирање на мрежа."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Веќе со автоматски избор."</string>
<string name="select_automatically" msgid="1046727200631770962">"Избери мрежа автоматски"</string>
<string name="network_select_title" msgid="7733107364757544558">"Мрежа"</string>
<string name="register_automatically" msgid="6017849844573519637">"Автоматска регистрација..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Претпочитан тип мрежа"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Промени го режимот на работа на мрежата"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Претпочитан тип мрежа"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(забрането)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"Претпочитан: GSM/WCDMA"</item>
<item msgid="8442633436636425221">"Само GSM"</item>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 62a60a5..6002961 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"നിങ്ങളുടെ സിം കാർഡ് ഈ നെറ്റ്വർക്കിലേക്ക് ഒരു കണക്ഷൻ അനുവദിക്കുന്നില്ല."</string>
<string name="connect_later" msgid="2308119155752343975">"ഈ നെറ്റ്വർക്കിൽ ഇപ്പോൾ കണക്റ്റുചെയ്യാനാകുന്നില്ല. പിന്നീട് വീണ്ടും ശ്രമിക്കുക."</string>
<string name="registration_done" msgid="495135664535876612">"ഒരു നെറ്റ്വർക്കിൽ രജിസ്റ്റർ ചെയ്തു."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"സ്വമേധയാ ഉള്ള തിരഞ്ഞെടുക്കലിൽ ഇതിനകം ഉണ്ട്."</string>
<string name="select_automatically" msgid="1046727200631770962">"സ്വയമേവ നെറ്റ്വർക്ക് തിരഞ്ഞെടുക്കുക"</string>
<string name="network_select_title" msgid="7733107364757544558">"നെറ്റ്വർക്ക്"</string>
<string name="register_automatically" msgid="6017849844573519637">"യാന്ത്രിക രജിസ്ട്രേഷൻ…"</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"തിരഞ്ഞെടുത്ത നെറ്റ്വർക്ക് തരം"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"നെറ്റ്വർക്ക് ഓപ്പറേറ്റുചെയ്യൽ മോഡ് മാറ്റുക"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"തിരഞ്ഞെടുത്ത നെറ്റ്വർക്ക് തരം"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(നിരോധിക്കപ്പെട്ടത്)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA തിരഞ്ഞെടുത്തത്"</item>
<item msgid="8442633436636425221">"GSM മാത്രം"</item>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 71f4b0d..a40f8f0 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"Таны SIM карт энэ сүлжээнд холбогдохыг зөвшөөрөхгүй байна."</string>
<string name="connect_later" msgid="2308119155752343975">"Сүлжээнд одоо холбогдох боломжгүй байна. Дараа дахин оролдоно уу."</string>
<string name="registration_done" msgid="495135664535876612">"Сүлжээнд бүртгэгдсэн."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Аль хэдийн автомат сонголтонд байна."</string>
<string name="select_automatically" msgid="1046727200631770962">"Сүлжээг автоматаар сонгох"</string>
<string name="network_select_title" msgid="7733107364757544558">"Сүлжээ"</string>
<string name="register_automatically" msgid="6017849844573519637">"Автомат бүртгэл…"</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Сүлжээний үндсэн төрөл"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Сүлжээний ажиллах төлвийг өөрчлөх"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Сүлжээний үндсэн төрөл"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(хориотой)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA эхэнд нь"</item>
<item msgid="8442633436636425221">"Зөвхөн GSM"</item>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 3e8ba24..2927302 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"आपले सिम कार्ड या नेटवर्कच्या कनेक्शनला अनुमती देत नाही."</string>
<string name="connect_later" msgid="2308119155752343975">"आत्ता या नेटवर्कशी कनेक्ट करू शकत नाही. नंतर पुन्हा प्रयत्न करा."</string>
<string name="registration_done" msgid="495135664535876612">"नेटवर्कवर नोंदणी केली."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"आपोआप निवडीमध्ये आधीपासून आहे."</string>
<string name="select_automatically" msgid="1046727200631770962">"स्वयंचलितपणे नेटवर्क निवडा"</string>
<string name="network_select_title" msgid="7733107364757544558">"नेटवर्क"</string>
<string name="register_automatically" msgid="6017849844573519637">"स्वयंचलित नोंदणी…"</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"प्राधान्यकृत नेटवर्क प्रकार"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"नेटवर्क कार्य करण्याचा मोड बदला"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"प्राधान्यकृत नेटवर्क प्रकार"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(मनाई केलेले)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA प्राधान्यकृत"</item>
<item msgid="8442633436636425221">"केवळ GSM"</item>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index e687a93..70240ae 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"Kad SIM anda tidak membenarkan sambungan ke rangkaian ini."</string>
<string name="connect_later" msgid="2308119155752343975">"Tidak dapat menyambung kepada rangkaian ini sekarang. Cuba lagi nanti."</string>
<string name="registration_done" msgid="495135664535876612">"Didaftarkan pada rangkaian."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Sudah berada dalam pilihan automatik."</string>
<string name="select_automatically" msgid="1046727200631770962">"Pilih rangkaian secara automatik"</string>
<string name="network_select_title" msgid="7733107364757544558">"Rangkaian"</string>
<string name="register_automatically" msgid="6017849844573519637">"Pendaftaran automatik..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Jenis rangkaian pilihan"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Tukar mod pengendalian rangkaian"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Jenis rangkaian pilihan"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(dilarang)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA diutamakan"</item>
<item msgid="8442633436636425221">"GSM sahaja"</item>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 056a18b..9fa4e62 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"ဒီကွန်ယက်ကို ဆက်သွယ်ရန် သင့်ရဲ့ ဆင်းမ်ကဒ်မှ ခွင့်မပြုပါ"</string>
<string name="connect_later" msgid="2308119155752343975">"ကွန်ယက်ကို ဆက်သွယ်လို့မရပါ။ နောင်မှ ပြန်ကြိုးစားပါ"</string>
<string name="registration_done" msgid="495135664535876612">"ကွန်ယက်ပေါ်တွင် မှတ်ပုံတင်ထားခြင်း"</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"အလိုအလျောက် ရွေးချယ်မှုထဲတွင် ပါပြီးသားဖြစ်သည်။"</string>
<string name="select_automatically" msgid="1046727200631770962">"ကွန်ရက်ကို အလိုအလျောက် ရွေးချယ်ရန်"</string>
<string name="network_select_title" msgid="7733107364757544558">"ကွန်ရက်"</string>
<string name="register_automatically" msgid="6017849844573519637">"အလိုအလျောက် မှတ်ပုံတင်ခြင်း…"</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"ပိုနှစ်သက်သော ကွန်ရက်အမျိုးအစား"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"ကွန်ရက် လုပ်ဆောင်မှုစနစ်အား ပြောင်းပါ"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"ပိုနှစ်သက်သော ကွန်ရက်အမျိုးအစား"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(တားမြစ်ထားသည်)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA သုံးလိုပါသည်"</item>
<item msgid="8442633436636425221">"GSM သာ"</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 11581e1..7c4cdf9 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"SIM-kortet tillater ingen tilkobling til dette nettverket."</string>
<string name="connect_later" msgid="2308119155752343975">"Kan ikke koble til dette nettverket akkurat nå. Prøv på nytt senere."</string>
<string name="registration_done" msgid="495135664535876612">"Registrert i nettverket."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Automatisk valg brukes allerede."</string>
<string name="select_automatically" msgid="1046727200631770962">"Velg nettverk automatisk"</string>
<string name="network_select_title" msgid="7733107364757544558">"Nettverk"</string>
<string name="register_automatically" msgid="6017849844573519637">"Automatisk registrering"</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Foretrukket nettverkstype"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Bytt nettverksmodus"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Foretrukket nettverkstype"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(forbudt)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA er foretrukket"</item>
<item msgid="8442633436636425221">"Bare GSM"</item>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index dc60367..8cdf311 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"तपाईंको SIM कार्डले यो नेटवर्कको लागि जडान अनुमति दिँदैन।"</string>
<string name="connect_later" msgid="2308119155752343975">"यो नेटवर्कमा अहिले जडान हुन सक्दैन। पछि प्रयास गर्नुहोस्।"</string>
<string name="registration_done" msgid="495135664535876612">"नेटवर्कमा दर्ता भयो।"</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"तपाईंले पहिल्यै स्वतः चयनको विकल्प छनौट गर्नुभएको छ।"</string>
<string name="select_automatically" msgid="1046727200631770962">"नेटवर्क स्वत:छान्नुहोस्"</string>
<string name="network_select_title" msgid="7733107364757544558">"नेटवर्क"</string>
<string name="register_automatically" msgid="6017849844573519637">"स्वतः दर्ता..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"रुचाइएको सञ्जाल प्रकार"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"नेटवर्क संचालन मोड परिवर्तन गर्नुहोस्"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"रुचाइएको सञ्जाल प्रकार"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(निषेध गरिएको)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA रुचाइयो"</item>
<item msgid="8442633436636425221">"GSM मात्र"</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 43a60a9..7bac40e 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"Je simkaart staat geen verbinding met dit netwerk toe."</string>
<string name="connect_later" msgid="2308119155752343975">"Kan nu geen verbinding maken met dit netwerk. Probeer het later opnieuw."</string>
<string name="registration_done" msgid="495135664535876612">"Geregistreerd op netwerk."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Al in automatische selectie."</string>
<string name="select_automatically" msgid="1046727200631770962">"Netwerk automatisch selecteren"</string>
<string name="network_select_title" msgid="7733107364757544558">"Netwerk"</string>
<string name="register_automatically" msgid="6017849844573519637">"Automatische registratie..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Voorkeursnetwerktype"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"De netwerkgebruiksmodus wijzigen"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Voorkeursnetwerktype"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(niet toegestaan)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"Voorkeur voor GSM/WCDMA"</item>
<item msgid="8442633436636425221">"Alleen GSM"</item>
@@ -241,7 +241,7 @@
<string name="roaming_warning" msgid="1603164667540144353">"Er kunnen hoge roamingkosten in rekening worden gebracht."</string>
<string name="roaming_alert_title" msgid="3654815360303826008">"Gegevensroaming toestaan?"</string>
<string name="data_usage_title" msgid="8759619109516889802">"Datagebruik"</string>
- <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> mobiele data gebruikt tussen <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+ <string name="data_usage_template" msgid="8526428824844656364">"<xliff:g id="ID_1">%1$s</xliff:g> mobiele data gebruikt van <xliff:g id="ID_2">%2$s</xliff:g>"</string>
<string name="advanced_options_title" msgid="8074895510265488035">"Geavanceerd"</string>
<string name="carrier_settings_euicc" msgid="6714062862127226405">"Provider"</string>
<string name="keywords_carrier_settings_euicc" msgid="783429609643157743">"provider, esim, sim, euicc"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index a652ce0..d5d0218 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"ਤੁਹਾਡਾ SIM ਇਸ ਨੈਟਵਰਕ ਲਈ ਇੱਕ ਕਨੈਕਸ਼ਨ ਦੀ ਆਗਿਆ ਨਹੀਂ ਦਿੰਦਾ।"</string>
<string name="connect_later" msgid="2308119155752343975">"ਹੁਣ ਇਸ ਨੈਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਨਹੀਂ ਕਰ ਸਕਦਾ। ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
<string name="registration_done" msgid="495135664535876612">"ਨੈਟਵਰਕ ਤੇ ਰਜਿਸਟਰ ਕੀਤਾ।"</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"ਪਹਿਲਾਂ ਹੀ ਸਵੈਚਲਿਤ ਚੋਣ ਵਿਕਲਪ ਚੁਣਿਆ ਹੋਇਆ ਹੈ।"</string>
<string name="select_automatically" msgid="1046727200631770962">"ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਨੈੱਟਵਰਕ ਚੁਣੋ"</string>
<string name="network_select_title" msgid="7733107364757544558">"ਨੈੱਟਵਰਕ"</string>
<string name="register_automatically" msgid="6017849844573519637">"ਸਵੈਚਲਿਤ ਰਜਿਸਟਰੇਸ਼ਨ…"</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਪ੍ਰਕਾਰ"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"ਨੈਟਵਰਕ ਓਪਰੇਟਿੰਗ ਮੋਡ ਬਦਲੋ"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਪ੍ਰਕਾਰ"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(ਵਰਜਿਤ)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA ਤਰਜੀਹੀ"</item>
<item msgid="8442633436636425221">"ਸਿਰਫ਼ GSM"</item>
@@ -336,9 +336,9 @@
<string name="enable_disable_retail_directory" msgid="1357809784475660303">"ਰੀਟੇਲ ਡਾਇਰੈਕਟਰੀ"</string>
<string name="retail_directory_enable" msgid="3280626290436111496">"ਰੀਟੇਲ ਡਾਇਰੈਕਟਰੀ ਸਮਰਥਿਤ"</string>
<string name="retail_directory_disable" msgid="6479739816662879027">"ਰੀਟੇਲ ਡਾਇਰੈਕਟਰੀ ਅਸਮਰਥਿਤ"</string>
- <string name="enable_disable_advertisements" msgid="5999495926176182128">"ਇਸ਼ਤਿਹਾਰ"</string>
- <string name="advertisements_enable" msgid="2050305021264683786">"ਇਸ਼ਤਿਹਾਰ ਸਮਰਥਿਤ"</string>
- <string name="advertisements_disable" msgid="8350985908788707935">"ਇਸ਼ਤਿਹਾਰ ਅਸਮਰਥਿਤ"</string>
+ <string name="enable_disable_advertisements" msgid="5999495926176182128">"ਵਿਗਿਆਪਨ"</string>
+ <string name="advertisements_enable" msgid="2050305021264683786">"ਵਿਗਿਆਪਨ ਸਮਰਥਿਤ"</string>
+ <string name="advertisements_disable" msgid="8350985908788707935">"ਵਿਗਿਆਪਨ ਅਸਮਰਥਿਤ"</string>
<string name="enable_disable_stock_quotes" msgid="6397810445293533603">"ਸਟੌਕ ਕੋਟਸ"</string>
<string name="stock_quotes_enable" msgid="4384802470887170543">"ਸਟੌਕ ਕੋਟਸ ਸਮਰਥਿਤ"</string>
<string name="stock_quotes_disable" msgid="4781450084565594998">"ਸਟੌਕ ਕੋਟਸ ਅਸਮਰਥਿਤ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 79aabbe..f7a3640 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"Karta SIM nie pozwala na połączenia z tą siecią."</string>
<string name="connect_later" msgid="2308119155752343975">"Nie można teraz połączyć się z tą siecią. Spróbuj ponownie później."</string>
<string name="registration_done" msgid="495135664535876612">"Zarejestrowano w sieci."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Wybór automatyczny jest już włączony."</string>
<string name="select_automatically" msgid="1046727200631770962">"Automatycznie wybieraj sieć"</string>
<string name="network_select_title" msgid="7733107364757544558">"Sieć"</string>
<string name="register_automatically" msgid="6017849844573519637">"Automatyczna rejestracja..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Preferowany typ sieci"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Zmień tryb działania sieci"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Preferowany typ sieci"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(dostęp zabroniony)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"Preferowany GSM/WCDMA"</item>
<item msgid="8442633436636425221">"Tylko GSM"</item>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index b208368..7d994d3 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -119,7 +119,7 @@
<string name="sum_cfnrc_disabled" msgid="2684474391807469832">"Desativado"</string>
<string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"O seu operador não suporta a desativação do reencaminhamento de chamadas quando o telemóvel não está acessível."</string>
<string name="updating_title" msgid="6146755386174019046">"Definições de chamadas"</string>
- <string name="call_settings_admin_user_only" msgid="4526094783818216374">"As definições de chamadas só podem ser alteradas pelo utilizador administrador."</string>
+ <string name="call_settings_admin_user_only" msgid="4526094783818216374">"As definições de chamadas só podem ser alteradas pelo utilizador gestor."</string>
<string name="call_settings_with_label" msgid="3401177261468593519">"Definições (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="7970259216988931777">"Erro nas definições de chamada"</string>
<string name="reading_settings" msgid="1920291699287055284">"A ler as definições..."</string>
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"O cartão SIM não permite uma ligação a esta rede."</string>
<string name="connect_later" msgid="2308119155752343975">"De momento, não é possível estabelecer ligação com esta rede. Tente novamente mais tarde."</string>
<string name="registration_done" msgid="495135664535876612">"Registado na rede."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"A seleção automática já está ativada."</string>
<string name="select_automatically" msgid="1046727200631770962">"Selecionar automaticamente a rede"</string>
<string name="network_select_title" msgid="7733107364757544558">"Rede"</string>
<string name="register_automatically" msgid="6017849844573519637">"Registo automático..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Tipo de rede preferencial"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Alterar o modo de funcionamento em rede"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Tipo de rede preferencial"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(proibida)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA preferido"</item>
<item msgid="8442633436636425221">"Apenas GSM"</item>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 3a06298..0d3d5d5 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"Seu cartão SIM não permite uma conexão com esta rede."</string>
<string name="connect_later" msgid="2308119155752343975">"Não é possível se conectar a esta rede agora. Tente novamente mais tarde."</string>
<string name="registration_done" msgid="495135664535876612">"Registrado na rede."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Já está na seleção automática."</string>
<string name="select_automatically" msgid="1046727200631770962">"Selecionar a rede automaticamente"</string>
<string name="network_select_title" msgid="7733107364757544558">"Rede"</string>
<string name="register_automatically" msgid="6017849844573519637">"Registro automático..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Tipo de rede preferencial"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Alterar o modo de operação de rede"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Tipo de rede preferencial"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(proibido)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA preferencial"</item>
<item msgid="8442633436636425221">"Somente GSM"</item>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 7b42568..6962f0f 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"Cardul dvs. SIM nu permite conexiunea la această rețea."</string>
<string name="connect_later" msgid="2308119155752343975">"Nu se poate efectua conectarea la această rețea chiar acum. Încercați din nou mai târziu."</string>
<string name="registration_done" msgid="495135664535876612">"Înregistrat în rețea."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Deja în selecție automată."</string>
<string name="select_automatically" msgid="1046727200631770962">"Selectați automat rețeaua"</string>
<string name="network_select_title" msgid="7733107364757544558">"Rețea"</string>
<string name="register_automatically" msgid="6017849844573519637">"Înregistrare automată..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Tipul de rețea preferat"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Schimbați modul de operare a rețelei"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Tipul de rețea preferat"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(interzis)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA preferată"</item>
<item msgid="8442633436636425221">"Numai GSM"</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 7d08768..c896712 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"Ваша SIM-карта не поддерживает подключение к этой сети."</string>
<string name="connect_later" msgid="2308119155752343975">"Не удалось подключиться к сети. Повторите попытку позже."</string>
<string name="registration_done" msgid="495135664535876612">"Регистрация в сети завершена."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Всегда выбирается автоматически"</string>
<string name="select_automatically" msgid="1046727200631770962">"Выбирать сеть автоматически"</string>
<string name="network_select_title" msgid="7733107364757544558">"Сеть"</string>
<string name="register_automatically" msgid="6017849844573519637">"Автоматическая регистрация..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Тип сети"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Изменить режим работы сети"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Тип сети"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(доступ запрещен)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA (предпочтительный режим)"</item>
<item msgid="8442633436636425221">"Только GSM"</item>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 32ad788..1145b46 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"ඔබගේ SIM කාඩ් පත මෙම ජාලයට සම්බන්ධතාවයකට අවසර නොදේ."</string>
<string name="connect_later" msgid="2308119155752343975">"මෙම අවස්ථාවේදී මෙම ජාලයට සම්බන්ධ විය නොහැක. පසුව යළි උත්සාහ කරන්න."</string>
<string name="registration_done" msgid="495135664535876612">"ජාලය මත ලියාපදිංචි වෙමින්."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"දැනටමත් ස්වයංක්රිය තේරීමේ සිටී."</string>
<string name="select_automatically" msgid="1046727200631770962">"ස්වයංක්රියව ජාලය තෝරන්න"</string>
<string name="network_select_title" msgid="7733107364757544558">"ජාලය"</string>
<string name="register_automatically" msgid="6017849844573519637">"ස්වයංක්රීය ලියාපදිංචිය..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"ප්රියකරන ජාල වර්ගය"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"ජාල මෙහෙයුම් ආකාරය වෙනස් කරන්න"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"ප්රියකරන ජාල වර්ගය"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(තහනම්)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA කැමතියි"</item>
<item msgid="8442633436636425221">"GSM පමණි"</item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 425f013..b3808c1 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"Vaša SIM karta nepovoľuje pripojenie k tejto sieti."</string>
<string name="connect_later" msgid="2308119155752343975">"V tejto chvíli sa nedá pripojiť k sieti. Skúste to znova neskôr."</string>
<string name="registration_done" msgid="495135664535876612">"Prihlásenie k sieti prebehlo úspešne."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Už v automatickom výbere"</string>
<string name="select_automatically" msgid="1046727200631770962">"Vybrať sieť automaticky"</string>
<string name="network_select_title" msgid="7733107364757544558">"Sieť"</string>
<string name="register_automatically" msgid="6017849844573519637">"Automatická registrácia..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Preferovaný typ siete"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Zmeniť prevádzkový režim siete"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Preferovaný typ siete"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(zakázané)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA – preferované"</item>
<item msgid="8442633436636425221">"Iba GSM"</item>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 944d301..5fb71d2 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"Kartica SIM ne dovoljuje povezave s tem omrežjem."</string>
<string name="connect_later" msgid="2308119155752343975">"S tem omrežjem trenutno ni mogoče vzpostaviti povezave. Poskusite znova pozneje."</string>
<string name="registration_done" msgid="495135664535876612">"Registrirano v omrežju."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Že vključeno v samodejno izbiro."</string>
<string name="select_automatically" msgid="1046727200631770962">"Samodejno izberi omrežje"</string>
<string name="network_select_title" msgid="7733107364757544558">"Omrežje"</string>
<string name="register_automatically" msgid="6017849844573519637">"Samodejna registracija ..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Prednostna vrsta omrežja"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Sprememba načina delovanja omrežja"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Prednostna vrsta omrežja"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(prepovedano)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"Prednostno GSM/WCDMA"</item>
<item msgid="8442633436636425221">"Samo GSM"</item>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 8523267..ca77dbb 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"Karta SIM nuk lejon lidhje me këtë rrjet."</string>
<string name="connect_later" msgid="2308119155752343975">"Nuk mund të lidhet me këtë rrjet tani. Provo sërish më vonë."</string>
<string name="registration_done" msgid="495135664535876612">"Regjistruar në rrjet."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Tashmë në zgjedhjen automatike."</string>
<string name="select_automatically" msgid="1046727200631770962">"Zgjidh automatikisht rrjetin"</string>
<string name="network_select_title" msgid="7733107364757544558">"Rrjeti"</string>
<string name="register_automatically" msgid="6017849844573519637">"Regjistrim automatik…"</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Lloji i preferuar i rrjetit"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Ndrysho modalitetin e operimit të rrjetit"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Lloji i preferuar i rrjetit"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(ndalohet)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA i preferuar"</item>
<item msgid="8442633436636425221">"Vetëm GSM"</item>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 1fd876c..15fafeb 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"SIM картица не дозвољава везу са овом мрежом."</string>
<string name="connect_later" msgid="2308119155752343975">"Тренутно није могуће повезати се са овом мрежом. Пробајте поново касније."</string>
<string name="registration_done" msgid="495135664535876612">"Регистровано на мрежи."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Већ је у аутоматском избору."</string>
<string name="select_automatically" msgid="1046727200631770962">"Аутоматски изабери мрежу"</string>
<string name="network_select_title" msgid="7733107364757544558">"Мрежа"</string>
<string name="register_automatically" msgid="6017849844573519637">"Аутоматска регистрација..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Жељени тип мреже"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Промена режима рада мреже"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Жељени тип мреже"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(забрањено)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA има предност"</item>
<item msgid="8442633436636425221">"Само GSM"</item>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index edaf4ef..9ea4a62 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"Ditt SIM-kort tillåter inte anslutning till detta nätverk."</string>
<string name="connect_later" msgid="2308119155752343975">"Det går inte att ansluta till det här nätverket just nu. Försök igen senare."</string>
<string name="registration_done" msgid="495135664535876612">"Registrerad på nätverk."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Redan automatiskt val."</string>
<string name="select_automatically" msgid="1046727200631770962">"Välj nätverk automatiskt"</string>
<string name="network_select_title" msgid="7733107364757544558">"Nätverk"</string>
<string name="register_automatically" msgid="6017849844573519637">"Automatisk registrering ..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Önskad nätverkstyp"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Ändra nätverksläge"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Önskad nätverkstyp"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(förbjudet)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"Föredrar GSM/WCDMA"</item>
<item msgid="8442633436636425221">"Endast GSM"</item>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index f9ec573..874108a 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"SIM kadi yako hairuhusu muunganisho wa mtandao huu."</string>
<string name="connect_later" msgid="2308119155752343975">"Haiwezi kuunganisha na mtandao huu hivi sasa. Jaribu tena baadaye."</string>
<string name="registration_done" msgid="495135664535876612">"Imesajiliwa katika mtandao"</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Tayari iko katika hali ya kuchaguliwa kiotomatiki."</string>
<string name="select_automatically" msgid="1046727200631770962">"Chagua mtandao kiotomatiki"</string>
<string name="network_select_title" msgid="7733107364757544558">"Mtandao"</string>
<string name="register_automatically" msgid="6017849844573519637">"Usajili otomatiki..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Aina ya mtandao unaoupendelea"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Badilisha gumzo ya utendaji wa mtandao"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Aina ya mtandao unaoupendelea"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(hairuhusiwi)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA inapendelewa"</item>
<item msgid="8442633436636425221">"GSM pekee"</item>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index d41d614..a2ded72 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"சிம் கார்டு, நெட்வொர்க்கில் இணைப்பதை அனுமதிக்கவில்லை."</string>
<string name="connect_later" msgid="2308119155752343975">"இப்போது இந்த நெட்வொர்க்குடன் இணைக்க முடியவில்லை. மீண்டும் முயற்சிக்கவும்."</string>
<string name="registration_done" msgid="495135664535876612">"நெட்வொர்க்கில் பதிவுசெய்யப்பட்டது."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"ஏற்கனவே தன்னியக்க தேர்வில் உள்ளது."</string>
<string name="select_automatically" msgid="1046727200631770962">"நெட்வொர்க்கைத் தானாகத் தேர்ந்தெடு"</string>
<string name="network_select_title" msgid="7733107364757544558">"நெட்வொர்க்"</string>
<string name="register_automatically" msgid="6017849844573519637">"தானியங்கு பதிவு…"</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"தேர்ந்தெடுத்த நெட்வொர்க் வகை"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"நெட்வொர்க் செயல்பாட்டிற்கான பயன்முறையை மாற்று"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"தேர்ந்தெடுத்த நெட்வொர்க் வகை"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(தடுக்கப்பட்டது)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMAக்கு முன்னுரிமை"</item>
<item msgid="8442633436636425221">"GSM மட்டும்"</item>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 8e1d635..61f82fb 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"మీ SIM కార్డు ఈ నెట్వర్క్కు కనెక్షన్ను అనుమతించదు."</string>
<string name="connect_later" msgid="2308119155752343975">"ప్రస్తుతం ఈ నెట్వర్క్కు కనెక్ట్ చేయడం సాధ్యపడదు. తర్వాత మళ్లీ ప్రయత్నించండి."</string>
<string name="registration_done" msgid="495135664535876612">"నెట్వర్క్లో నమోదు అయింది."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"ఇప్పటికే స్వయంచాలక ఎంపికలో ఉంది."</string>
<string name="select_automatically" msgid="1046727200631770962">"నెట్వర్క్ను స్వయంచాలకంగా ఎంచుకోండి"</string>
<string name="network_select_title" msgid="7733107364757544558">"నెట్వర్క్"</string>
<string name="register_automatically" msgid="6017849844573519637">"స్వయంచాలక నమోదు…"</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"ప్రాధాన్య నెట్వర్క్ రకం"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"నెట్వర్క్ ఆపరేటింగ్ మోడ్ను మార్చండి"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"ప్రాధాన్య నెట్వర్క్ రకం"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(నిషేధించబడింది)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMAకు ప్రాధాన్యత"</item>
<item msgid="8442633436636425221">"GSM మాత్రమే"</item>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index bd897c3..e63de90 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"ซิมการ์ดของคุณไม่อนุญาตให้เชื่อมต่อกับเครือข่ายนี้"</string>
<string name="connect_later" msgid="2308119155752343975">"ไม่สามารถเชื่อมต่อเครือข่ายนี้ได้ในขณะนี้ ลองอีกครั้งในภายหลัง"</string>
<string name="registration_done" msgid="495135664535876612">"ลงทะเบียนบนเครือข่ายแล้ว"</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"อยู่ในการเลือกอัตโนมัติแล้ว"</string>
<string name="select_automatically" msgid="1046727200631770962">"เลือกเครือข่ายโดยอัตโนมัติ"</string>
<string name="network_select_title" msgid="7733107364757544558">"เครือข่าย"</string>
<string name="register_automatically" msgid="6017849844573519637">"การลงทะเบียนอัตโนมัติ..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"ประเภทเครือข่ายที่ต้องการ"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"เปลี่ยนโหมดปฏิบัติการของเครือข่าย"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"ประเภทเครือข่ายที่ต้องการ"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(ห้ามใช้)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"ต้องการ GSM/WCDMA"</item>
<item msgid="8442633436636425221">"GSM เท่านั้น"</item>
@@ -399,7 +399,7 @@
<string name="tty_mode_option_summary" msgid="1073835131534808732">"ตั้งค่าโหมด TTY"</string>
<string name="auto_retry_mode_title" msgid="4073265511427813322">"ลองซ้ำอัตโนมัติ"</string>
<string name="auto_retry_mode_summary" msgid="4973886004067532288">"เปิดใช้งานโหมดลองซ้ำอัตโนมัติ"</string>
- <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"ไม่อนุญาตการเปลี่ยนโหมด TTY ในระหว่างแฮงเอาท์วิดีโอ"</string>
+ <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"ไม่อนุญาตการเปลี่ยนโหมด TTY ในระหว่าง Hangouts วิดีโอ"</string>
<string name="menu_add" msgid="1882023737425114762">"เพิ่มรายชื่อติดต่อ"</string>
<string name="menu_edit" msgid="7143003705504672374">"แก้ไขรายชื่อติดต่อ"</string>
<string name="menu_delete" msgid="3977150783449642851">"ลบรายชื่อติดต่อ"</string>
@@ -512,7 +512,7 @@
<string name="onscreenManageCallsText" msgid="5473231160123254154">"จัดการการโทร"</string>
<string name="onscreenManageConferenceText" msgid="6485935856534311346">"จัดการการประชุม"</string>
<string name="onscreenAudioText" msgid="1710087112800041743">"เสียง"</string>
- <string name="onscreenVideoCallText" msgid="4800924186056115442">"แฮงเอาท์วิดีโอ"</string>
+ <string name="onscreenVideoCallText" msgid="4800924186056115442">" Hangouts วิดีโอ"</string>
<string name="importSimEntry" msgid="6614358325359736031">"นำเข้า"</string>
<string name="importAllSimEntries" msgid="1503181169636198673">"นำเข้าทั้งหมด"</string>
<string name="importingSimContacts" msgid="7374056215462575769">"กำลังนำเข้าสมุดโทรศัพท์ในซิม"</string>
@@ -588,8 +588,8 @@
<string name="voicemail_change_pin_dialog_title" msgid="6035421908626121564">"เปลี่ยน PIN"</string>
<string name="preference_category_ringtone" msgid="5197960752529332721">"เสียงเรียกเข้าและสั่น"</string>
<string name="pstn_connection_service_label" msgid="1743245930577325900">"ซิมการ์ดในตัว"</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_title" msgid="7237253660669000899">"เปิด Hangouts วิดีโอ"</string>
+ <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"หากต้องการเปิด Hangouts วิดีโอ คุณจะต้องเปิดใช้โหมด 4G LTE ที่ปรับปรุงแล้วในการตั้งค่าเครือข่าย"</string>
<string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"การตั้งค่าเครือข่าย"</string>
<string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"ปิด"</string>
<string name="sim_label_emergency_calls" msgid="4847699229529306397">"หมายเลขฉุกเฉิน"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 4c1f9fc..fb2b8b3 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"Hindi pinapayagan ng iyong SIM card ang koneksyon sa network na ito."</string>
<string name="connect_later" msgid="2308119155752343975">"Hindi makakonekta sa network na ito sa ngayon. Subukang muli sa ibang pagkakataon."</string>
<string name="registration_done" msgid="495135664535876612">"Nakarehistro sa network."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Nasa awtomatiko nang pagpili."</string>
<string name="select_automatically" msgid="1046727200631770962">"Awtomatikong piliin ang network"</string>
<string name="network_select_title" msgid="7733107364757544558">"Network"</string>
<string name="register_automatically" msgid="6017849844573519637">"Awtomatikong pagpaparehistro..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Gustong uri ng network"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Baguhin ang network operating mode"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Gustong uri ng network"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(pinagbabawal)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"Mas gusto ang GSM/WCDMA"</item>
<item msgid="8442633436636425221">"GSM lang"</item>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index a2c5211..513a495 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"SIM kartınız bu ağa bağlanmaya izin vermiyor."</string>
<string name="connect_later" msgid="2308119155752343975">"Şu an bu ağa bağlanılamıyor. Daha sonra tekrar deneyin."</string>
<string name="registration_done" msgid="495135664535876612">"Ağa kaydedildi."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Zaten otomatik seçim modunda."</string>
<string name="select_automatically" msgid="1046727200631770962">"Ağı otomatik seç"</string>
<string name="network_select_title" msgid="7733107364757544558">"Ağ"</string>
<string name="register_automatically" msgid="6017849844573519637">"Otomatik kayıt..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Tercih edilen ağ türü"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Ağın çalışma modunu değiştir"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Tercih edilen ağ türü"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(yasak)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA tercih edilen"</item>
<item msgid="8442633436636425221">"Yalnızca GSM"</item>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index fcb6c2f..19dfb05 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"Ваша SIM-карта не дозволяє під’єднання до цієї мережі."</string>
<string name="connect_later" msgid="2308119155752343975">"Зараз неможливо під’єднатися до цієї мережі. Повторіть спробу пізніше."</string>
<string name="registration_done" msgid="495135664535876612">"Зареєстровано у мережі"</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Уже додано до автоматичного вибору."</string>
<string name="select_automatically" msgid="1046727200631770962">"Автоматично вибирати мережу"</string>
<string name="network_select_title" msgid="7733107364757544558">"Мережа"</string>
<string name="register_automatically" msgid="6017849844573519637">"Автоматична реєстрація..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Тип мережі"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Змінити режим роботи мережі"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Тип мережі"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(заборонено)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"Рекомендовано GSM/WCDMA"</item>
<item msgid="8442633436636425221">"Лише GSM"</item>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index b0d30e5..aa28f17 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"آپ کا SIM کارڈ اس نیٹ ورک سے کنکشن کی اجازت نہیں دیتا ہے۔"</string>
<string name="connect_later" msgid="2308119155752343975">"ابھی اس نیٹ ورک سے مربوط نہیں ہوسکتا۔ بعد میں دوبارہ کوشش کریں۔"</string>
<string name="registration_done" msgid="495135664535876612">"نیٹ ورک پر رجسٹرڈ ہوگیا۔"</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"پہلے سے ہی خودکار انتخاب میں ہے۔"</string>
<string name="select_automatically" msgid="1046727200631770962">"نیٹ ورک خودکار طور پر منتخب کریں"</string>
<string name="network_select_title" msgid="7733107364757544558">"نیٹ ورک"</string>
<string name="register_automatically" msgid="6017849844573519637">"خود کار رجسٹریشن…"</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"ترجیحی نیٹ ورک کی قسم"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"نیٹ ورک آپریٹنگ طرز تبدیل کریں"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"ترجیحی نیٹ ورک کی قسم"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(ممنوع)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA ترجیحی"</item>
<item msgid="8442633436636425221">"صرف GSM"</item>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 787fb2a..0795a1a 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"SIM kartangiz ushbu tarmoqqa ulanishga ruxsat bermaydi."</string>
<string name="connect_later" msgid="2308119155752343975">"Ushbu tarmoqqa hozirgi vaqtda ulanib bo‘lmaydi. Keyinroq urinib ko‘ring."</string>
<string name="registration_done" msgid="495135664535876612">"Tarmoqda ro‘yxatdan o‘tgan."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Avtomatik tanlash rejimiga allaqachon o‘rnatilgan."</string>
<string name="select_automatically" msgid="1046727200631770962">"Tarmoqni avtomatik tanlash"</string>
<string name="network_select_title" msgid="7733107364757544558">"Tarmoq"</string>
<string name="register_automatically" msgid="6017849844573519637">"Avtomatik ro‘yxatdan o‘tish…"</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Tarmoq turi"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Tarmoq rejimini o‘zgartiring"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Tarmoq turi"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(taqiqlangan)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA (tavsiya qilinadi)"</item>
<item msgid="8442633436636425221">"Faqat GSM"</item>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index a5c212f..7cc50a8 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"Thẻ SIM của bạn không cho phép kết nối với mạng này."</string>
<string name="connect_later" msgid="2308119155752343975">"Không thể kết nối với mạng này ngay bây giờ. Hãy thử lại sau."</string>
<string name="registration_done" msgid="495135664535876612">"Đã đăng ký trên mạng."</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Đã chọn lựa chọn tự động."</string>
<string name="select_automatically" msgid="1046727200631770962">"Tự động chọn mạng"</string>
<string name="network_select_title" msgid="7733107364757544558">"Mạng"</string>
<string name="register_automatically" msgid="6017849844573519637">"Đăng ký tự động..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Loại mạng ưu tiên"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Thay đổi chế độ hoạt động của mạng"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Loại mạng ưu tiên"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(cấm)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA được ưu tiên"</item>
<item msgid="8442633436636425221">"Chỉ GSM"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 936c423..686c6ad 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"您的SIM卡不允许连接到此网络。"</string>
<string name="connect_later" msgid="2308119155752343975">"目前无法连接到此网络，请稍后重试。"</string>
<string name="registration_done" msgid="495135664535876612">"已在网络上注册。"</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"已设为自动选择。"</string>
<string name="select_automatically" msgid="1046727200631770962">"自动选择网络"</string>
<string name="network_select_title" msgid="7733107364757544558">"网络"</string>
<string name="register_automatically" msgid="6017849844573519637">"自动注册..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"首选网络类型"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"更改网络运行方式"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"首选网络类型"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"（禁止）"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"首选 GSM/WCDMA"</item>
<item msgid="8442633436636425221">"仅限 GSM"</item>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 376fc5d..9b76dd4 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"您的 SIM 卡無法連接這個網絡。"</string>
<string name="connect_later" msgid="2308119155752343975">"目前無法連接這個網絡，請稍後再試。"</string>
<string name="registration_done" msgid="495135664535876612">"已在網絡上完成註冊。"</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"已選取自動選取功能。"</string>
<string name="select_automatically" msgid="1046727200631770962">"自動選取網絡"</string>
<string name="network_select_title" msgid="7733107364757544558">"網絡"</string>
<string name="register_automatically" msgid="6017849844573519637">"自動註冊..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"偏好的網絡類型"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"更改網絡操作模式"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"偏好的網絡類型"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(禁止)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"首選 GSM/WCDMA"</item>
<item msgid="8442633436636425221">"只限 GSM"</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 7b8a2a5..491e070 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"您的 SIM 卡無法連上這個網路。"</string>
<string name="connect_later" msgid="2308119155752343975">"目前無法連上這個網路，請稍後再試。"</string>
<string name="registration_done" msgid="495135664535876612">"註冊網路成功。"</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"已自動選取。"</string>
<string name="select_automatically" msgid="1046727200631770962">"自動選取網路"</string>
<string name="network_select_title" msgid="7733107364757544558">"網路"</string>
<string name="register_automatically" msgid="6017849844573519637">"自動註冊…"</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"偏好的網路類型"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"變更網路操作模式"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"偏好的網路類型"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(已禁止)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"GSM/WCDMA 優先"</item>
<item msgid="8442633436636425221">"僅限 GSM"</item>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 1a47377..677babd 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -167,14 +167,14 @@
<string name="not_allowed" msgid="5613353860205691579">"Ikhadi lakho le-SIM alivumeli uxhumano kulenethiwekhi."</string>
<string name="connect_later" msgid="2308119155752343975">"Ayikwazi ukuxhuma kunethiwekhi okwamanje. Zama futhi ngemva kwesikhashana."</string>
<string name="registration_done" msgid="495135664535876612">"Ibhalisiwe kwinethiwekhi"</string>
- <!-- no translation found for already_auto (6067116884321285507) -->
- <skip />
+ <string name="already_auto" msgid="6067116884321285507">"Sekuvele kusokhethweni lokuzenzakalela."</string>
<string name="select_automatically" msgid="1046727200631770962">"Khetha ngokuzenzakalela inethiwekhi"</string>
<string name="network_select_title" msgid="7733107364757544558">"Inethiwekhi"</string>
<string name="register_automatically" msgid="6017849844573519637">"Ukubhalisa okuzenzakalelayo..."</string>
<string name="preferred_network_mode_title" msgid="2336624679902659306">"Uhlobo lwenethiwekhi oluncamelayo"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Shintsha imodi esebenzayo yenethiwekhi"</string>
<string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Uhlobo lwenethiwekhi oluncamelayo"</string>
+ <string name="forbidden_network" msgid="4384929668343563440">"(kunqatshelwe)"</string>
<string-array name="preferred_network_mode_choices">
<item msgid="3628460389382468528">"Okukhethwayo kwe-GSM / WCDMA"</item>
<item msgid="8442633436636425221">"I-GSM kuphela"</item>
diff --git a/sip/res/values-in/strings.xml b/sip/res/values-in/strings.xml
index c2f40b7..1c59a30 100644
--- a/sip/res/values-in/strings.xml
+++ b/sip/res/values-in/strings.xml
@@ -76,5 +76,5 @@
<string name="no_voip" msgid="3038021971231952704">"Panggilan SIP tidak didukung"</string>
<string name="sip_system_decide" msgid="5577696249416700671">"Otomatis"</string>
<string name="sip_always_send_keepalive" msgid="4773022409239823318">"Selalu kirim"</string>
- <string name="sip_connection_service_label" msgid="6935325004265884453">"Panggilan SIP bawaan"</string>
+ <string name="sip_connection_service_label" msgid="6935325004265884453">"Panggilan SIP built-in"</string>
</resources>
diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index 1d264fb..e5527bc 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -42,6 +42,7 @@
import android.telecom.PhoneAccountHandle;
import android.telecom.TelecomManager;
import android.telephony.CarrierConfigManager;
+import android.telephony.ims.feature.ImsFeature;
import android.telephony.PhoneStateListener;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
@@ -50,6 +51,7 @@
import android.widget.Toast;
import com.android.ims.ImsConfig;
+import com.android.ims.ImsException;
import com.android.ims.ImsManager;
import com.android.internal.telephony.CallForwardInfo;
import com.android.internal.telephony.Phone;
@@ -105,6 +107,7 @@
private static final String ENABLE_VIDEO_CALLING_KEY = "button_enable_video_calling";
private Phone mPhone;
+ private ImsManager mImsMgr;
private SubscriptionInfoHelper mSubscriptionInfoHelper;
private TelecomManager mTelecomManager;
@@ -188,6 +191,17 @@
mTelecomManager = TelecomManager.from(this);
}
+ private void updateImsManager(Phone phone) {
+ log("updateImsManager :: phone.getContext()=" + phone.getContext()
+ + " phone.getPhoneId()=" + phone.getPhoneId());
+ mImsMgr = ImsManager.getInstance(phone.getContext(), phone.getPhoneId());
+ if (mImsMgr == null) {
+ log("updateImsManager :: Could not get ImsManager instance!");
+ } else {
+ log("updateImsManager :: mImsMgr=" + mImsMgr);
+ }
+ }
+
private final PhoneStateListener mPhoneStateListener = new PhoneStateListener() {
@Override
public void onCallStateChanged(int state, String incomingNumber) {
@@ -210,6 +224,7 @@
protected void onResume() {
super.onResume();
+ updateImsManager(mPhone);
PreferenceScreen preferenceScreen = getPreferenceScreen();
if (preferenceScreen != null) {
preferenceScreen.removeAll();
@@ -347,6 +362,19 @@
}
wifiCallingSettings.setSummary(resId);
}
+
+ try {
+ if (mImsMgr.getImsServiceStatus() != ImsFeature.STATE_READY) {
+ log("Feature state not ready so remove vt and wfc settings for "
+ + " phone =" + mPhone.getPhoneId());
+ prefSet.removePreference(wifiCallingSettings);
+ prefSet.removePreference(mEnableVideoCalling);
+ }
+ } catch (ImsException ex) {
+ log("Exception when trying to get ImsServiceStatus: " + ex);
+ prefSet.removePreference(wifiCallingSettings);
+ prefSet.removePreference(mEnableVideoCalling);
+ }
}
/**
diff --git a/src/com/android/phone/CallForwardEditPreference.java b/src/com/android/phone/CallForwardEditPreference.java
index ef92349..8a82e05 100644
--- a/src/com/android/phone/CallForwardEditPreference.java
+++ b/src/com/android/phone/CallForwardEditPreference.java
@@ -12,7 +12,10 @@
import android.os.AsyncResult;
import android.os.Handler;
import android.os.Message;
+import android.os.PersistableBundle;
+import android.telephony.CarrierConfigManager;
import android.telephony.PhoneNumberUtils;
+import android.telephony.TelephonyManager;
import android.text.BidiFormatter;
import android.text.SpannableString;
import android.text.TextDirectionHeuristics;
@@ -26,7 +29,6 @@
public class CallForwardEditPreference extends EditPhoneNumberPreference {
private static final String LOG_TAG = "CallForwardEditPreference";
- private static final boolean DBG = (PhoneGlobals.DBG_LEVEL >= 2);
private static final String SRC_TAGS[] = {"{0}"};
private CharSequence mSummaryOnTemplate;
@@ -44,6 +46,8 @@
private Phone mPhone;
CallForwardInfo callForwardInfo;
private TimeConsumingPreferenceListener mTcpListener;
+ // Should we replace CF queries containing an invalid number with "Voicemail"
+ private boolean mReplaceInvalidCFNumber = false;
public CallForwardEditPreference(Context context, AttributeSet attrs) {
super(context, attrs);
@@ -58,16 +62,18 @@
CommandsInterface.CF_REASON_UNCONDITIONAL);
a.recycle();
- if (DBG) Log.d(LOG_TAG, "mServiceClass=" + mServiceClass + ", reason=" + reason);
+ Log.d(LOG_TAG, "mServiceClass=" + mServiceClass + ", reason=" + reason);
}
public CallForwardEditPreference(Context context) {
this(context, null);
}
- void init(TimeConsumingPreferenceListener listener, boolean skipReading, Phone phone) {
+ void init(TimeConsumingPreferenceListener listener, boolean skipReading, Phone phone,
+ boolean replaceInvalidCFNumber) {
mPhone = phone;
mTcpListener = listener;
+ mReplaceInvalidCFNumber = replaceInvalidCFNumber;
if (!skipReading) {
mPhone.getCallForwardingOption(reason,
@@ -98,8 +104,7 @@
protected void onDialogClosed(boolean positiveResult) {
super.onDialogClosed(positiveResult);
- if (DBG) Log.d(LOG_TAG, "mButtonClicked=" + mButtonClicked
- + ", positiveResult=" + positiveResult);
+ Log.d(LOG_TAG, "mButtonClicked=" + mButtonClicked + ", positiveResult=" + positiveResult);
// Ignore this event if the user clicked the cancel button, or if the dialog is dismissed
// without any button being pressed (back button press or click event outside the dialog).
if (this.mButtonClicked != DialogInterface.BUTTON_NEGATIVE) {
@@ -109,17 +114,17 @@
int time = (reason != CommandsInterface.CF_REASON_NO_REPLY) ? 0 : 20;
final String number = getPhoneNumber();
- if (DBG) Log.d(LOG_TAG, "callForwardInfo=" + callForwardInfo);
+ Log.d(LOG_TAG, "callForwardInfo=" + callForwardInfo);
if (action == CommandsInterface.CF_ACTION_REGISTRATION
&& callForwardInfo != null
&& callForwardInfo.status == 1
&& number.equals(callForwardInfo.number)) {
// no change, do nothing
- if (DBG) Log.d(LOG_TAG, "no change, do nothing");
+ Log.d(LOG_TAG, "no change, do nothing");
} else {
// set to network
- if (DBG) Log.d(LOG_TAG, "reason=" + reason + ", action=" + action
+ Log.d(LOG_TAG, "reason=" + reason + ", action=" + action
+ ", number=" + number);
// Display no forwarding number while we're waiting for
@@ -145,10 +150,30 @@
void handleCallForwardResult(CallForwardInfo cf) {
callForwardInfo = cf;
- if (DBG) Log.d(LOG_TAG, "handleGetCFResponse done, callForwardInfo=" + callForwardInfo);
+ Log.d(LOG_TAG, "handleGetCFResponse done, callForwardInfo=" + callForwardInfo);
+ // In some cases, the network can send call forwarding URIs for voicemail that violate the
+ // 3gpp spec. This can cause us to receive "numbers" that are sequences of letters. In this
+ // case, we must detect these series of characters and replace them with "Voicemail".
+ // PhoneNumberUtils#formatNumber returns null if the number is not valid.
+ if (mReplaceInvalidCFNumber && (PhoneNumberUtils.formatNumber(callForwardInfo.number,
+ getCurrentCountryIso()) == null)) {
+ callForwardInfo.number = getContext().getString(R.string.voicemail);
+ Log.i(LOG_TAG, "handleGetCFResponse: Overridding CF number");
+ }
setToggled(callForwardInfo.status == 1);
- setPhoneNumber(callForwardInfo.number);
+ boolean displayVoicemailNumber = false;
+ if (TextUtils.isEmpty(callForwardInfo.number)) {
+ PersistableBundle carrierConfig =
+ PhoneGlobals.getInstance().getCarrierConfigForSubId(mPhone.getSubId());
+ if (carrierConfig != null) {
+ displayVoicemailNumber = carrierConfig.getBoolean(CarrierConfigManager
+ .KEY_DISPLAY_VOICEMAIL_NUMBER_AS_DEFAULT_CALL_FORWARDING_NUMBER_BOOL);
+ Log.d(LOG_TAG, "display voicemail number as default");
+ }
+ }
+ String voicemailNumber = mPhone.getVoiceMailNumber();
+ setPhoneNumber(displayVoicemailNumber ? voicemailNumber : callForwardInfo.number);
}
private void updateSummaryText() {
@@ -174,6 +199,19 @@
}
+ /**
+ * @return The ISO 3166-1 two letters country code of the country the user is in based on the
+ * network location.
+ */
+ private String getCurrentCountryIso() {
+ final TelephonyManager telephonyManager =
+ (TelephonyManager) getContext().getSystemService(Context.TELEPHONY_SERVICE);
+ if (telephonyManager == null) {
+ return "";
+ }
+ return telephonyManager.getNetworkCountryIso().toUpperCase();
+ }
+
// Message protocol:
// what: get vs. set
// arg1: action -- register vs. disable
@@ -195,7 +233,7 @@
}
private void handleGetCFResponse(Message msg) {
- if (DBG) Log.d(LOG_TAG, "handleGetCFResponse: done");
+ Log.d(LOG_TAG, "handleGetCFResponse: done");
mTcpListener.onFinished(CallForwardEditPreference.this, msg.arg2 != MESSAGE_SET_CF);
@@ -203,7 +241,7 @@
callForwardInfo = null;
if (ar.exception != null) {
- if (DBG) Log.d(LOG_TAG, "handleGetCFResponse: ar.exception=" + ar.exception);
+ Log.d(LOG_TAG, "handleGetCFResponse: ar.exception=" + ar.exception);
if (ar.exception instanceof CommandException) {
mTcpListener.onException(CallForwardEditPreference.this,
(CommandException) ar.exception);
@@ -220,12 +258,12 @@
}
CallForwardInfo cfInfoArray[] = (CallForwardInfo[]) ar.result;
if (cfInfoArray.length == 0) {
- if (DBG) Log.d(LOG_TAG, "handleGetCFResponse: cfInfoArray.length==0");
+ Log.d(LOG_TAG, "handleGetCFResponse: cfInfoArray.length==0");
setEnabled(false);
mTcpListener.onError(CallForwardEditPreference.this, RESPONSE_ERROR);
} else {
for (int i = 0, length = cfInfoArray.length; i < length; i++) {
- if (DBG) Log.d(LOG_TAG, "handleGetCFResponse, cfInfoArray[" + i + "]="
+ Log.d(LOG_TAG, "handleGetCFResponse, cfInfoArray[" + i + "]="
+ cfInfoArray[i]);
if ((mServiceClass & cfInfoArray[i].serviceClass) != 0) {
// corresponding class
@@ -239,6 +277,13 @@
if (msg.arg2 == MESSAGE_SET_CF &&
msg.arg1 == CommandsInterface.CF_ACTION_DISABLE &&
info.status == 1) {
+ // Skip showing error dialog since some operators return
+ // active status even if disable call forward succeeded.
+ // And they don't like the error dialog.
+ if (isSkipCFFailToDisableDialog()) {
+ Log.d(LOG_TAG, "Skipped Callforwarding fail-to-disable dialog");
+ continue;
+ }
CharSequence s;
switch (reason) {
case CommandsInterface.CF_REASON_BUSY:
@@ -272,12 +317,30 @@
AsyncResult ar = (AsyncResult) msg.obj;
if (ar.exception != null) {
- if (DBG) Log.d(LOG_TAG, "handleSetCFResponse: ar.exception=" + ar.exception);
+ Log.d(LOG_TAG, "handleSetCFResponse: ar.exception=" + ar.exception);
// setEnabled(false);
}
- if (DBG) Log.d(LOG_TAG, "handleSetCFResponse: re get");
+ Log.d(LOG_TAG, "handleSetCFResponse: re get");
mPhone.getCallForwardingOption(reason,
obtainMessage(MESSAGE_GET_CF, msg.arg1, MESSAGE_SET_CF, ar.exception));
}
}
+
+ /*
+ * Get the config of whether skip showing CF fail-to-disable dialog
+ * from carrier config manager.
+ *
+ * @return boolean value of the config
+ */
+ private boolean isSkipCFFailToDisableDialog() {
+ PersistableBundle carrierConfig =
+ PhoneGlobals.getInstance().getCarrierConfigForSubId(mPhone.getSubId());
+ if (carrierConfig != null) {
+ return carrierConfig.getBoolean(
+ CarrierConfigManager.KEY_SKIP_CF_FAIL_TO_DISABLE_DIALOG_BOOL);
+ } else {
+ // by default we should not skip
+ return false;
+ }
+ }
}
diff --git a/src/com/android/phone/CallNotifier.java b/src/com/android/phone/CallNotifier.java
index 3f44130..d084e92 100644
--- a/src/com/android/phone/CallNotifier.java
+++ b/src/com/android/phone/CallNotifier.java
@@ -44,10 +44,15 @@
import android.util.ArrayMap;
import android.util.Log;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import com.android.internal.telephony.SubscriptionController;
+
/**
* Phone app module that listens for phone state changes and various other
* events from the telephony layer, and triggers any resulting UI behavior
@@ -68,7 +73,8 @@
private Map<Integer, CallNotifierPhoneStateListener> mPhoneStateListeners =
new ArrayMap<Integer, CallNotifierPhoneStateListener>();
-
+ private Map<Integer, Boolean> mCFIStatus = new ArrayMap<Integer, Boolean>();
+ private Map<Integer, Boolean> mMWIStatus = new ArrayMap<Integer, Boolean>();
private PhoneGlobals mApplication;
private CallManager mCM;
private BluetoothHeadset mBluetoothHeadset;
@@ -140,7 +146,7 @@
new OnSubscriptionsChangedListener() {
@Override
public void onSubscriptionsChanged() {
- updatePhoneStateListeners();
+ updatePhoneStateListeners(true);
}
});
}
@@ -571,14 +577,26 @@
SHOW_MESSAGE_NOTIFICATION_TIME);
}
- public void updatePhoneStateListeners() {
+ public void updatePhoneStateListeners(boolean isRefresh) {
List<SubscriptionInfo> subInfos = mSubscriptionManager.getActiveSubscriptionInfoList();
- // Unregister phone listeners for inactive subscriptions.
- Iterator<Integer> itr = mPhoneStateListeners.keySet().iterator();
- while (itr.hasNext()) {
- int subId = itr.next();
+ // Sort sub id list based on slot id, so that CFI/MWI notifications will be updated for
+ // slot 0 first then slot 1. This is needed to ensure that when CFI or MWI is enabled for
+ // both slots, user always sees icon related to slot 0 on left side followed by that of
+ // slot 1.
+ List<Integer> subIdList = new ArrayList<Integer>(mPhoneStateListeners.keySet());
+ Collections.sort(subIdList, new Comparator<Integer>() {
+ public int compare(Integer sub1, Integer sub2) {
+ int slotId1 = SubscriptionController.getInstance().getSlotIndex(sub1);
+ int slotId2 = SubscriptionController.getInstance().getSlotIndex(sub2);
+ return slotId1 > slotId2 ? 0 : -1;
+ }
+ });
+
+ for (int subIdCounter = (subIdList.size() - 1); subIdCounter >= 0; subIdCounter--) {
+ int subId = subIdList.get(subIdCounter);
if (subInfos == null || !containsSubId(subInfos, subId)) {
+ Log.d(LOG_TAG, "updatePhoneStateListeners: Hide the outstanding notifications.");
// Hide the outstanding notifications.
mApplication.notificationMgr.updateMwi(subId, false);
mApplication.notificationMgr.updateCfi(subId, false);
@@ -586,7 +604,16 @@
// Listening to LISTEN_NONE removes the listener.
mTelephonyManager.listen(
mPhoneStateListeners.get(subId), PhoneStateListener.LISTEN_NONE);
- itr.remove();
+ mPhoneStateListeners.remove(subId);
+ } else {
+ Log.d(LOG_TAG, "updatePhoneStateListeners: update CF notifications.");
+
+ if (mCFIStatus.containsKey(subId)) {
+ mApplication.notificationMgr.updateCfi(subId, mCFIStatus.get(subId));
+ }
+ if (mMWIStatus.containsKey(subId)) {
+ mApplication.notificationMgr.updateMwi(subId, mMWIStatus.get(subId), isRefresh);
+ }
}
}
@@ -757,14 +784,16 @@
@Override
public void onMessageWaitingIndicatorChanged(boolean visible) {
if (VDBG) log("onMessageWaitingIndicatorChanged(): " + this.mSubId + " " + visible);
- mApplication.notificationMgr.updateMwi(this.mSubId, visible);
+ mMWIStatus.put(this.mSubId, visible);
+ updatePhoneStateListeners(false);
}
@Override
public void onCallForwardingIndicatorChanged(boolean visible) {
Log.i(LOG_TAG, "onCallForwardingIndicatorChanged(): subId=" + this.mSubId
+ ", visible=" + (visible ? "Y" : "N"));
- mApplication.notificationMgr.updateCfi(this.mSubId, visible);
+ mCFIStatus.put(this.mSubId, visible);
+ updatePhoneStateListeners(false);
}
};
diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index a26e3d8..2114ad8 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -169,8 +169,17 @@
switch (msg.what) {
case EVENT_CLEAR_CONFIG:
{
+ /* Ignore clear configuration request if device is being shutdown. */
+ Phone phone = PhoneFactory.getPhone(phoneId);
+ if (phone != null) {
+ if (phone.isShuttingDown()) {
+ break;
+ }
+ }
+
if (mConfigFromDefaultApp[phoneId] == null
&& mConfigFromCarrierApp[phoneId] == null) break;
+
mConfigFromDefaultApp[phoneId] = null;
mConfigFromCarrierApp[phoneId] = null;
mServiceConnection[phoneId] = null;
diff --git a/src/com/android/phone/EditPhoneNumberPreference.java b/src/com/android/phone/EditPhoneNumberPreference.java
index 98d9ce9..74b8a45 100644
--- a/src/com/android/phone/EditPhoneNumberPreference.java
+++ b/src/com/android/phone/EditPhoneNumberPreference.java
@@ -123,8 +123,8 @@
setDialogLayoutResource(R.layout.pref_dialog_editphonenumber);
//create intent to bring up contact list
- mContactListIntent = new Intent(Intent.ACTION_GET_CONTENT);
- mContactListIntent.setType(Phone.CONTENT_ITEM_TYPE);
+ mContactListIntent = new Intent(Intent.ACTION_PICK);
+ mContactListIntent.setType(Phone.CONTENT_TYPE);
//get the edit phone number default settings
TypedArray a = context.obtainStyledAttributes(attrs,
diff --git a/src/com/android/phone/EmergencyCallbackModeExitDialog.java b/src/com/android/phone/EmergencyCallbackModeExitDialog.java
index f5509b9..765c52d 100644
--- a/src/com/android/phone/EmergencyCallbackModeExitDialog.java
+++ b/src/com/android/phone/EmergencyCallbackModeExitDialog.java
@@ -24,7 +24,7 @@
import android.content.ComponentName;
import android.content.Context;
import android.content.DialogInterface;
-import android.content.DialogInterface.OnDismissListener;
+import android.content.DialogInterface.OnCancelListener;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.ServiceConnection;
@@ -48,7 +48,7 @@
*
* @see EmergencyCallbackModeService
*/
-public class EmergencyCallbackModeExitDialog extends Activity implements OnDismissListener {
+public class EmergencyCallbackModeExitDialog extends Activity implements OnCancelListener {
private static final String TAG = "EmergencyCallbackMode";
@@ -246,7 +246,7 @@
finish();
}
}).create();
- mAlertDialog.setOnDismissListener(this);
+ mAlertDialog.setOnCancelListener(this);
return mAlertDialog;
case EXIT_ECM_IN_EMERGENCY_CALL_DIALOG:
@@ -263,7 +263,7 @@
finish();
}
}).create();
- mAlertDialog.setOnDismissListener(this);
+ mAlertDialog.setOnCancelListener(this);
return mAlertDialog;
case EXIT_ECM_PROGRESS_DIALOG:
@@ -299,10 +299,10 @@
}
/**
- * Closes activity when dialog is dismissed
+ * Closes activity when dialog is canceled
*/
@Override
- public void onDismiss(DialogInterface dialog) {
+ public void onCancel(DialogInterface dialog) {
EmergencyCallbackModeExitDialog.this.setResult(RESULT_OK, (new Intent())
.putExtra(EXTRA_EXIT_ECM_RESULT, false));
finish();
diff --git a/src/com/android/phone/GsmUmtsCallForwardOptions.java b/src/com/android/phone/GsmUmtsCallForwardOptions.java
index 5a16edc..77cc6cc 100644
--- a/src/com/android/phone/GsmUmtsCallForwardOptions.java
+++ b/src/com/android/phone/GsmUmtsCallForwardOptions.java
@@ -10,6 +10,7 @@
import android.os.Bundle;
import android.preference.Preference;
import android.preference.PreferenceScreen;
+import android.telephony.CarrierConfigManager;
import android.util.Log;
import android.view.MenuItem;
@@ -18,7 +19,6 @@
public class GsmUmtsCallForwardOptions extends TimeConsumingPreferenceActivity {
private static final String LOG_TAG = "GsmUmtsCallForwardOptions";
- private final boolean DBG = (PhoneGlobals.DBG_LEVEL >= 2);
private static final String NUM_PROJECTION[] = {
android.provider.ContactsContract.CommonDataKinds.Phone.NUMBER
@@ -46,6 +46,7 @@
private Bundle mIcicle;
private Phone mPhone;
private SubscriptionInfoHelper mSubscriptionInfoHelper;
+ private boolean mReplaceInvalidCFNumbers;
@Override
protected void onCreate(Bundle icicle) {
@@ -58,6 +59,13 @@
getActionBar(), getResources(), R.string.call_forwarding_settings_with_label);
mPhone = mSubscriptionInfoHelper.getPhone();
+ CarrierConfigManager carrierConfig = (CarrierConfigManager)
+ getSystemService(CARRIER_CONFIG_SERVICE);
+ if (carrierConfig != null) {
+ mReplaceInvalidCFNumbers = carrierConfig.getConfig().getBoolean(
+ CarrierConfigManager.KEY_CALL_FORWARDING_MAP_NON_NUMBER_TO_VOICEMAIL_BOOL);
+ }
+
PreferenceScreen prefSet = getPreferenceScreen();
mButtonCFU = (CallForwardEditPreference) prefSet.findPreference(BUTTON_CFU_KEY);
mButtonCFB = (CallForwardEditPreference) prefSet.findPreference(BUTTON_CFB_KEY);
@@ -94,8 +102,8 @@
if (mFirstResume) {
if (mIcicle == null) {
- if (DBG) Log.d(LOG_TAG, "start to init ");
- mPreferences.get(mInitIndex).init(this, false, mPhone);
+ Log.d(LOG_TAG, "start to init ");
+ mPreferences.get(mInitIndex).init(this, false, mPhone, mReplaceInvalidCFNumbers);
} else {
mInitIndex = mPreferences.size();
@@ -106,7 +114,7 @@
cf.number = bundle.getString(KEY_NUMBER);
cf.status = bundle.getInt(KEY_STATUS);
pref.handleCallForwardResult(cf);
- pref.init(this, true, mPhone);
+ pref.init(this, true, mPhone, mReplaceInvalidCFNumbers);
}
}
mFirstResume = false;
@@ -133,7 +141,7 @@
public void onFinished(Preference preference, boolean reading) {
if (mInitIndex < mPreferences.size()-1 && !isFinishing()) {
mInitIndex++;
- mPreferences.get(mInitIndex).init(this, false, mPhone);
+ mPreferences.get(mInitIndex).init(this, false, mPhone, mReplaceInvalidCFNumbers);
}
super.onFinished(preference, reading);
@@ -141,9 +149,9 @@
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
- if (DBG) Log.d(LOG_TAG, "onActivityResult: done");
+ Log.d(LOG_TAG, "onActivityResult: done");
if (resultCode != RESULT_OK) {
- if (DBG) Log.d(LOG_TAG, "onActivityResult: contact picker result not OK.");
+ Log.d(LOG_TAG, "onActivityResult: contact picker result not OK.");
return;
}
Cursor cursor = null;
@@ -151,7 +159,7 @@
cursor = getContentResolver().query(data.getData(),
NUM_PROJECTION, null, null, null);
if ((cursor == null) || (!cursor.moveToFirst())) {
- if (DBG) Log.d(LOG_TAG, "onActivityResult: bad contact data, no results found.");
+ Log.d(LOG_TAG, "onActivityResult: bad contact data, no results found.");
return;
}
diff --git a/src/com/android/phone/LocationAccessPolicy.java b/src/com/android/phone/LocationAccessPolicy.java
index 9f863a3..6f2a5ec 100644
--- a/src/com/android/phone/LocationAccessPolicy.java
+++ b/src/com/android/phone/LocationAccessPolicy.java
@@ -45,18 +45,27 @@
*
* @param pkgName Package name of the application requesting access
* @param uid The uid of the package
+ * @param message Message to add to the exception if no location permission
* @return boolean true or false if permissions is granted
*/
static boolean canAccessCellLocation(@NonNull Context context, @NonNull String pkgName,
- int uid) throws SecurityException {
+ int uid, String message) throws SecurityException {
context.getSystemService(AppOpsManager.class).checkPackage(uid, pkgName);
// We always require the location permission and also require the
// location mode to be on for non-legacy apps. Legacy apps are
// required to be in the foreground to at least mitigate the case
// where a legacy app the user is not using tracks their location.
- if (!hasUidLocationPermission(context, pkgName, uid)
- || (!isLocationModeEnabled(context, UserHandle.getUserId(uid)))
- && !isLegacyForeground(context, pkgName)) {
+
+ // Grating ACCESS_FINE_LOCATION to an app automatically grants it ACCESS_COARSE_LOCATION.
+ context.enforceCallingOrSelfPermission(Manifest.permission.ACCESS_COARSE_LOCATION, message);
+ final int opCode = AppOpsManager.permissionToOpCode(
+ Manifest.permission.ACCESS_COARSE_LOCATION);
+ if (opCode != AppOpsManager.OP_NONE && context.getSystemService(AppOpsManager.class)
+ .noteOp(opCode, uid, pkgName) != AppOpsManager.MODE_ALLOWED) {
+ return false;
+ }
+ if (!isLocationModeEnabled(context, UserHandle.getUserId(uid))
+ && !isLegacyForeground(context, pkgName)) {
return false;
}
// If the user or profile is current, permission is granted.
@@ -103,21 +112,6 @@
== PackageManager.PERMISSION_GRANTED;
}
- private static boolean hasUidLocationPermission(@NonNull Context context,
- @NonNull String pkgName, int uid) {
- // Grating ACCESS_FINE_LOCATION to an app automatically grants it ACCESS_COARSE_LOCATION.
- if ((context.checkCallingOrSelfPermission(
- Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED)) {
- final int opCode = AppOpsManager.permissionToOpCode(
- Manifest.permission.ACCESS_COARSE_LOCATION);
- if (opCode != AppOpsManager.OP_NONE) {
- return context.getSystemService(AppOpsManager.class).noteOp(opCode, uid, pkgName)
- == AppOpsManager.MODE_ALLOWED;
- }
- }
- return false;
- }
-
private static boolean isCurrentProfile(@NonNull Context context, int uid) {
final int currentUser = ActivityManager.getCurrentUser();
final int callingUserId = UserHandle.getUserId(uid);
diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index d79c188..b5efabf 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -55,6 +55,7 @@
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.telephony.euicc.EuiccManager;
+import android.telephony.ims.feature.ImsFeature;
import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
@@ -64,6 +65,7 @@
import android.widget.TabHost;
import com.android.ims.ImsConfig;
+import com.android.ims.ImsException;
import com.android.ims.ImsManager;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -97,6 +99,16 @@
}
@Override
+ protected void onNewIntent(Intent intent) {
+ setIntent(intent);
+ MobileNetworkFragment fragment = (MobileNetworkFragment) getFragmentManager()
+ .findFragmentById(R.id.network_setting_content);
+ if (fragment != null) {
+ fragment.onIntentUpdate(intent);
+ }
+ }
+
+ @Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.network_setting);
@@ -122,7 +134,6 @@
return super.onOptionsItemSelected(item);
}
-
/**
* Whether to show the entry point to eUICC settings.
*
@@ -232,6 +243,7 @@
private UserManager mUm;
private Phone mPhone;
+ private ImsManager mImsMgr;
private MyHandler mHandler;
private boolean mOkClicked;
private boolean mExpandAdvancedFields;
@@ -259,17 +271,11 @@
public void onCallStateChanged(int state, String incomingNumber) {
if (DBG) log("PhoneStateListener.onCallStateChanged: state=" + state);
- Activity activity = getActivity();
- if (activity == null) {
- return;
- }
-
int subId = mPhone != null
? mPhone.getSubId() : SubscriptionManager.INVALID_SUBSCRIPTION_ID;
PersistableBundle carrierConfig =
PhoneGlobals.getInstance().getCarrierConfigForSubId(subId);
- boolean enabled = is4gLtePrefEnabled(activity.getApplicationContext(),
- carrierConfig);
+ boolean enabled = is4gLtePrefEnabled(carrierConfig);
Preference pref = getPreferenceScreen().findPreference(BUTTON_4G_LTE_KEY);
if (pref != null) pref.setEnabled(enabled && hasActiveSubscriptions());
@@ -339,6 +345,12 @@
}
}
+ public void onIntentUpdate(Intent intent) {
+ if (!mUnavailable) {
+ updateCurrentTab(intent);
+ }
+ }
+
/**
* Invoked on each preference click in this hierarchy, overrides
* PreferenceActivity's implementation. Used to make sure we track the
@@ -434,6 +446,15 @@
}
};
+ private int getSlotIdFromIntent(Intent intent) {
+ Bundle data = intent.getExtras();
+ int subId = -1;
+ if (data != null) {
+ subId = data.getInt(Settings.EXTRA_SUB_ID, -1);
+ }
+ return SubscriptionManager.getSlotIndex(subId);
+ }
+
private void initializeSubscriptions() {
final Activity activity = getActivity();
if (activity == null || activity.isDestroyed()) {
@@ -563,14 +584,24 @@
final SubscriptionInfo sir = mSubscriptionManager
.getActiveSubscriptionInfoForSimSlotIndex(slotId);
if (sir != null) {
- mPhone = PhoneFactory.getPhone(
- SubscriptionManager.getPhoneId(sir.getSubscriptionId()));
+ int phoneId = SubscriptionManager.getPhoneId(sir.getSubscriptionId());
+ if (SubscriptionManager.isValidPhoneId(phoneId)) {
+ mPhone = PhoneFactory.getPhone(phoneId);
+ mImsMgr = ImsManager.getInstance(getContext(), phoneId);
+ }
}
if (mPhone == null) {
// Do the best we can
mPhone = PhoneGlobals.getPhone();
}
Log.i(LOG_TAG, "updatePhone:- slotId=" + slotId + " sir=" + sir);
+
+ mImsMgr = ImsManager.getInstance(mPhone.getContext(), mPhone.getPhoneId());
+ if (mImsMgr == null) {
+ log("updatePhone :: Could not get ImsManager instance!");
+ } else if (DBG) {
+ log("updatePhone :: mImsMgr=" + mImsMgr);
+ }
}
private TabHost.TabContentFactory mEmptyTabContent = new TabHost.TabContentFactory() {
@@ -585,6 +616,13 @@
mEmptyTabContent);
}
+ private void updateCurrentTab(Intent intent) {
+ int slotId = getSlotIdFromIntent(intent);
+ if (slotId >= 0 && mTabHost != null && mTabHost.getCurrentTab() != slotId) {
+ mTabHost.setCurrentTab(slotId);
+ }
+ }
+
@Override
public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
@@ -683,6 +721,7 @@
getActivity().setContentView(R.layout.telephony_disallowed_preference_screen);
} else {
initializeSubscriptions();
+ updateCurrentTab(getActivity().getIntent());
}
}
@@ -714,11 +753,6 @@
return;
}
- final Activity activity = getActivity();
- if (activity == null || activity.isDestroyed()) {
- Log.e(LOG_TAG, "onResume:- with no valid activity.");
- return;
- }
// upon resumption from the sub-activity, make sure we re-enable the
// preferences.
getPreferenceScreen().setEnabled(true);
@@ -733,15 +767,10 @@
updatePreferredNetworkUIFromDb();
}
- if (ImsManager.isVolteEnabledByPlatform(activity)
- && ImsManager.isVolteProvisionedOnDevice(activity)) {
- mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);
- }
+ mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);
// NOTE: Buttons will be enabled/disabled in mPhoneStateListener
- boolean enh4glteMode = ImsManager.isEnhanced4gLteModeSettingEnabledByUser(activity)
- && ImsManager.isNonTtyOrTtyOnVolteEnabled(activity);
- mButton4glte.setChecked(enh4glteMode);
+ updateEnhanced4gLteState();
// Video calling and WiFi calling state might have changed.
updateCallingCategory();
@@ -988,13 +1017,7 @@
android.util.Log.d(LOG_TAG, "keep ltePref");
}
- if (hideEnhanced4gLteSettings(getActivity(), carrierConfig)) {
- Preference pref = prefSet.findPreference(BUTTON_4G_LTE_KEY);
- if (pref != null) {
- prefSet.removePreference(pref);
- }
- }
-
+ updateEnhanced4gLteState();
updateCallingCategory();
// Enable link to CMAS app settings depending on the value in config.xml.
@@ -1040,8 +1063,7 @@
* but you do need to remember that this all needs to work when subscriptions
* change dynamically such as when hot swapping sims.
*/
- boolean canChange4glte = is4gLtePrefEnabled(activity.getApplicationContext(),
- carrierConfig);
+ boolean canChange4glte = is4gLtePrefEnabled(carrierConfig);
boolean useVariant4glteTitle = carrierConfig.getBoolean(
CarrierConfigManager.KEY_ENHANCED_4G_LTE_TITLE_VARIANT_BOOL);
int enhanced4glteModeTitleId = useVariant4glteTitle ?
@@ -1054,7 +1076,6 @@
mButton4glte.setEnabled(hasActiveSubscriptions && canChange4glte);
mLteDataServicePref.setEnabled(hasActiveSubscriptions);
Preference ps;
- PreferenceScreen root = getPreferenceScreen();
ps = findPreference(BUTTON_CELL_BROADCAST_SETTINGS);
if (ps != null) {
ps.setEnabled(hasActiveSubscriptions);
@@ -1211,25 +1232,33 @@
.obtainMessage(MyHandler.MESSAGE_SET_PREFERRED_NETWORK_TYPE));
}
} else if (preference == mButton4glte) {
- SwitchPreference enhanced4gModePref = (SwitchPreference) preference;
- boolean enhanced4gMode = !enhanced4gModePref.isChecked();
- enhanced4gModePref.setChecked(enhanced4gMode);
- ImsManager.setEnhanced4gLteModeSetting(getActivity(),
- enhanced4gModePref.isChecked());
+ boolean enhanced4gMode = !mButton4glte.isChecked();
+ mButton4glte.setChecked(enhanced4gMode);
+ mImsMgr.setEnhanced4gLteModeSetting(mButton4glte.isChecked());
} else if (preference == mButtonDataRoam) {
if (DBG) log("onPreferenceTreeClick: preference == mButtonDataRoam.");
//normally called on the toggle click
if (!mButtonDataRoam.isChecked()) {
- // MetricsEvent with no value update.
- MetricsLogger.action(getContext(),
- getMetricsEventCategory(getPreferenceScreen(), mButtonDataRoam));
- // First confirm with a warning dialog about charges
- mOkClicked = false;
- RoamingDialogFragment fragment = new RoamingDialogFragment();
- fragment.show(getFragmentManager(), ROAMING_TAG);
- // Don't update the toggle unless the confirm button is actually pressed.
- return false;
+ PersistableBundle carrierConfig =
+ PhoneGlobals.getInstance().getCarrierConfigForSubId(mPhone.getSubId());
+ if (carrierConfig != null && carrierConfig.getBoolean(
+ CarrierConfigManager.KEY_DISABLE_CHARGE_INDICATION_BOOL)) {
+ mPhone.setDataRoamingEnabled(true);
+ MetricsLogger.action(getContext(),
+ getMetricsEventCategory(getPreferenceScreen(), mButtonDataRoam),
+ true);
+ } else {
+ // MetricsEvent with no value update.
+ MetricsLogger.action(getContext(),
+ getMetricsEventCategory(getPreferenceScreen(), mButtonDataRoam));
+ // First confirm with a warning dialog about charges
+ mOkClicked = false;
+ RoamingDialogFragment fragment = new RoamingDialogFragment();
+ fragment.show(getFragmentManager(), ROAMING_TAG);
+ // Don't update the toggle unless the confirm button is actually pressed.
+ return false;
+ }
} else {
mPhone.setDataRoamingEnabled(false);
MetricsLogger.action(getContext(),
@@ -1241,7 +1270,7 @@
// If mButton4glte is not checked, mVideoCallingPref should be disabled.
// So it only makes sense to call phoneMgr.enableVideoCalling if it's checked.
if (mButton4glte.isChecked()) {
- PhoneGlobals.getInstance().phoneMgr.enableVideoCalling((boolean) objValue);
+ mImsMgr.setVtSetting((boolean) objValue);
return true;
} else {
loge("mVideoCallingPref should be disabled if mButton4glte is not checked.");
@@ -1260,9 +1289,10 @@
return true;
}
- private boolean is4gLtePrefEnabled(Context context, PersistableBundle carrierConfig) {
+ private boolean is4gLtePrefEnabled(PersistableBundle carrierConfig) {
return (mTelephonyManager.getCallState() == TelephonyManager.CALL_STATE_IDLE)
- && ImsManager.isNonTtyOrTtyOnVolteEnabled(context)
+ && mImsMgr != null
+ && mImsMgr.isNonTtyOrTtyOnVolteEnabled()
&& carrierConfig.getBoolean(
CarrierConfigManager.KEY_EDITABLE_ENHANCED_4G_LTE_BOOL);
}
@@ -1619,14 +1649,16 @@
} else {
removePref = true;
}
- } else if (!ImsManager.isWfcEnabledByPlatform(mPhone.getContext())
- || !ImsManager.isWfcProvisionedOnDevice(mPhone.getContext())) {
+ } else if (mImsMgr == null
+ || !mImsMgr.isWfcEnabledByPlatform()
+ || !mImsMgr.isWfcProvisionedOnDevice()) {
removePref = true;
} else {
int resId = com.android.internal.R.string.wifi_calling_off_summary;
- if (ImsManager.isWfcEnabledByUser(mPhone.getContext())) {
- boolean isRoaming = mButtonDataRoam.isChecked();
- int wfcMode = ImsManager.getWfcMode(mPhone.getContext(), isRoaming);
+ if (mImsMgr.isWfcEnabledByUser()) {
+ boolean isRoaming = mTelephonyManager.isNetworkRoaming();
+ int wfcMode = mImsMgr.getWfcMode(isRoaming);
+
switch (wfcMode) {
case ImsConfig.WfcModeFeatureValueConstants.WIFI_ONLY:
resId = com.android.internal.R.string.wfc_mode_wifi_only_summary;
@@ -1652,6 +1684,34 @@
}
}
+ private void updateEnhanced4gLteState() {
+ if (mButton4glte == null) {
+ return;
+ }
+
+ PersistableBundle carrierConfig = PhoneGlobals.getInstance()
+ .getCarrierConfigForSubId(mPhone.getSubId());
+
+ try {
+ if ((mImsMgr == null
+ || mImsMgr.getImsServiceStatus() != ImsFeature.STATE_READY
+ || !mImsMgr.isVolteEnabledByPlatform()
+ || !mImsMgr.isVolteProvisionedOnDevice()
+ || carrierConfig.getBoolean(
+ CarrierConfigManager.KEY_HIDE_ENHANCED_4G_LTE_BOOL))) {
+ getPreferenceScreen().removePreference(mButton4glte);
+ } else {
+ // NOTE: Buttons will be enabled/disabled in mPhoneStateListener
+ boolean enh4glteMode = mImsMgr.isEnhanced4gLteModeSettingEnabledByUser()
+ && mImsMgr.isNonTtyOrTtyOnVolteEnabled();
+ mButton4glte.setChecked(enh4glteMode);
+ }
+ } catch (ImsException ex) {
+ log("Exception when trying to get ImsServiceStatus: " + ex);
+ getPreferenceScreen().removePreference(mButton4glte);
+ }
+ }
+
private void updateVideoCallState() {
if (mVideoCallingPref == null || mCallingCategory == null) {
return;
@@ -1660,30 +1720,23 @@
PersistableBundle carrierConfig = PhoneGlobals.getInstance()
.getCarrierConfigForSubId(mPhone.getSubId());
- boolean removePref = false;
-
- if (ImsManager.isVtEnabledByPlatform(mPhone.getContext())
- && ImsManager.isVtProvisionedOnDevice(mPhone.getContext())
+ if (mImsMgr != null
+ && mImsMgr.isVtEnabledByPlatform()
+ && mImsMgr.isVtProvisionedOnDevice()
&& (carrierConfig.getBoolean(
- CarrierConfigManager.KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS)
- || mPhone.mDcTracker.isDataEnabled())) {
- boolean enhanced4gLteEnabled = mButton4glte.isChecked();
- mVideoCallingPref.setEnabled(enhanced4gLteEnabled);
- boolean currentValue = enhanced4gLteEnabled
- ? PhoneGlobals.getInstance().phoneMgr.isVideoCallingEnabled(
- getContext().getOpPackageName()) : false;
- mVideoCallingPref.setChecked(currentValue);
- if (enhanced4gLteEnabled) {
+ CarrierConfigManager.KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS)
+ || mPhone.mDcTracker.isDataEnabled())) {
+ mCallingCategory.addPreference(mVideoCallingPref);
+ if (!mButton4glte.isChecked()) {
+ mVideoCallingPref.setEnabled(false);
+ mVideoCallingPref.setChecked(false);
+ } else {
+ mVideoCallingPref.setEnabled(true);
+ mVideoCallingPref.setChecked(mImsMgr.isVtEnabledByUser());
mVideoCallingPref.setOnPreferenceChangeListener(this);
}
} else {
- removePref = true;
- }
-
- if (removePref) {
mCallingCategory.removePreference(mVideoCallingPref);
- } else {
- mCallingCategory.addPreference(mVideoCallingPref);
}
}
diff --git a/src/com/android/phone/NotificationMgr.java b/src/com/android/phone/NotificationMgr.java
index 3d20545..b50ab39 100644
--- a/src/com/android/phone/NotificationMgr.java
+++ b/src/com/android/phone/NotificationMgr.java
@@ -36,6 +36,7 @@
import android.os.UserManager;
import android.preference.PreferenceManager;
import android.provider.ContactsContract.PhoneLookup;
+import android.provider.Settings;
import android.telecom.DefaultDialerManager;
import android.telecom.PhoneAccount;
import android.telecom.PhoneAccountHandle;
@@ -45,7 +46,6 @@
import android.telephony.ServiceState;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
-import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
import android.util.ArrayMap;
@@ -124,27 +124,6 @@
mSubscriptionManager = SubscriptionManager.from(mContext);
mTelecomManager = TelecomManager.from(mContext);
mTelephonyManager = (TelephonyManager) app.getSystemService(Context.TELEPHONY_SERVICE);
-
- mSubscriptionManager.addOnSubscriptionsChangedListener(
- new OnSubscriptionsChangedListener() {
- @Override
- public void onSubscriptionsChanged() {
- updateActivePhonesMwi();
- }
- });
- }
-
- public void updateActivePhonesMwi() {
- List<SubscriptionInfo> subInfos = mSubscriptionManager.getActiveSubscriptionInfoList();
-
- if (subInfos == null) {
- return;
- }
-
- for (int i = 0; i < subInfos.size(); i++) {
- int subId = subInfos.get(i).getSubscriptionId();
- refreshMwi(subId);
- }
}
/**
@@ -196,7 +175,7 @@
if (mMwiVisible.containsKey(subId)) {
boolean mwiVisible = mMwiVisible.get(subId);
if (mwiVisible) {
- updateMwi(subId, mwiVisible, true /* isRefresh */);
+ mApp.notifier.updatePhoneStateListeners(true);
}
}
}
@@ -264,6 +243,10 @@
}
int resId = android.R.drawable.stat_notify_voicemail;
+ if (mTelephonyManager.getPhoneCount() > 1) {
+ resId = (phone.getPhoneId() == 0) ? R.drawable.stat_notify_voicemail_sub1
+ : R.drawable.stat_notify_voicemail_sub2;
+ }
// This Notification can get a lot fancier once we have more
// information about the current voicemail messages.
@@ -484,14 +467,18 @@
}
String notificationTitle;
+ int resId = R.drawable.stat_sys_phone_call_forward;
if (mTelephonyManager.getPhoneCount() > 1) {
+ int slotId = SubscriptionManager.getSlotIndex(subId);
+ resId = (slotId == 0) ? R.drawable.stat_sys_phone_call_forward_sub1
+ : R.drawable.stat_sys_phone_call_forward_sub2;
notificationTitle = subInfo.getDisplayName().toString();
} else {
notificationTitle = mContext.getString(R.string.labelCF);
}
Notification.Builder builder = new Notification.Builder(mContext)
- .setSmallIcon(R.drawable.stat_sys_phone_call_forward)
+ .setSmallIcon(resId)
.setColor(subInfo.getIconTint())
.setContentTitle(notificationTitle)
.setContentText(mContext.getString(R.string.sum_cfu_enabled_indicator))
@@ -512,24 +499,33 @@
builder.build(),
UserHandle.ALL);
} else {
- mNotificationManager.cancelAsUser(
- Integer.toString(subId) /* tag */,
- CALL_FORWARD_NOTIFICATION,
- UserHandle.ALL);
+ List<UserInfo> users = mUserManager.getUsers(true);
+ for (UserInfo user : users) {
+ if (user.isManagedProfile()) {
+ continue;
+ }
+ UserHandle userHandle = user.getUserHandle();
+ mNotificationManager.cancelAsUser(
+ Integer.toString(subId) /* tag */,
+ CALL_FORWARD_NOTIFICATION,
+ userHandle);
+ }
}
}
/**
* Shows the "data disconnected due to roaming" notification, which
* appears when you lose data connectivity because you're roaming and
- * you have the "data roaming" feature turned off.
+ * you have the "data roaming" feature turned off for the given {@code subId}.
*/
- void showDataDisconnectedRoaming() {
+ /* package */ void showDataDisconnectedRoaming(int subId) {
if (DBG) log("showDataDisconnectedRoaming()...");
// "Mobile network settings" screen / dialog
Intent intent = new Intent(mContext, com.android.phone.MobileNetworkSettings.class);
- PendingIntent contentIntent = PendingIntent.getActivity(mContext, 0, intent, 0);
+ intent.putExtra(Settings.EXTRA_SUB_ID, subId);
+ intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+ PendingIntent contentIntent = PendingIntent.getActivity(mContext, subId, intent, 0);
final CharSequence contentText = mContext.getText(R.string.roaming_reenable_message);
diff --git a/src/com/android/phone/PhoneGlobals.java b/src/com/android/phone/PhoneGlobals.java
index 98b94cc..3fc3c7c 100644
--- a/src/com/android/phone/PhoneGlobals.java
+++ b/src/com/android/phone/PhoneGlobals.java
@@ -207,7 +207,7 @@
break;
case EVENT_DATA_ROAMING_DISCONNECTED:
- notificationMgr.showDataDisconnectedRoaming();
+ notificationMgr.showDataDisconnectedRoaming(msg.arg1);
break;
case EVENT_DATA_ROAMING_OK:
@@ -842,7 +842,9 @@
mNoDataDueToRoaming = true;
Log.d(LOG_TAG, "Show roaming disconnected notification");
mDataRoamingNotifLog.log("Show");
- mHandler.sendEmptyMessage(EVENT_DATA_ROAMING_DISCONNECTED);
+ Message msg = mHandler.obtainMessage(EVENT_DATA_ROAMING_DISCONNECTED);
+ msg.arg1 = mDefaultDataSubId;
+ msg.sendToTarget();
} else if (mNoDataDueToRoaming && (dataAllowed
|| !reasons.containsOnly(DataDisallowedReasonType.ROAMING_DISABLED))) {
// Otherwise dismiss the notification we showed earlier.
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index e67d344..ea57c81 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -154,8 +154,6 @@
private static final int EVENT_SET_PREFERRED_NETWORK_TYPE_DONE = 24;
private static final int CMD_SEND_ENVELOPE = 25;
private static final int EVENT_SEND_ENVELOPE_DONE = 26;
- private static final int CMD_INVOKE_OEM_RIL_REQUEST_RAW = 27;
- private static final int EVENT_INVOKE_OEM_RIL_REQUEST_RAW_DONE = 28;
private static final int CMD_TRANSMIT_APDU_BASIC_CHANNEL = 29;
private static final int EVENT_TRANSMIT_APDU_BASIC_CHANNEL_DONE = 30;
private static final int CMD_EXCHANGE_SIM_IO = 31;
@@ -721,21 +719,6 @@
handleNullReturnEvent(msg, "setPreferredNetworkType");
break;
- case CMD_INVOKE_OEM_RIL_REQUEST_RAW:
- request = (MainThreadRequest)msg.obj;
- onCompleted = obtainMessage(EVENT_INVOKE_OEM_RIL_REQUEST_RAW_DONE, request);
- mPhone.invokeOemRilRequestRaw((byte[])request.argument, onCompleted);
- break;
-
- case EVENT_INVOKE_OEM_RIL_REQUEST_RAW_DONE:
- ar = (AsyncResult)msg.obj;
- request = (MainThreadRequest)ar.userObj;
- request.result = ar;
- synchronized (request) {
- request.notifyAll();
- }
- break;
-
case CMD_SET_VOICEMAIL_NUMBER:
request = (MainThreadRequest) msg.obj;
onCompleted = obtainMessage(EVENT_SET_VOICEMAIL_NUMBER_DONE, request);
@@ -1640,7 +1623,7 @@
@Override
public Bundle getCellLocation(String callingPackage) {
if (!LocationAccessPolicy.canAccessCellLocation(mPhone.getContext(),
- callingPackage, Binder.getCallingUid())) {
+ callingPackage, Binder.getCallingUid(), "getCellLocation")) {
return null;
}
@@ -1708,7 +1691,7 @@
@SuppressWarnings("unchecked")
public List<NeighboringCellInfo> getNeighboringCellInfo(String callingPackage) {
if (!LocationAccessPolicy.canAccessCellLocation(mPhone.getContext(),
- callingPackage, Binder.getCallingUid())) {
+ callingPackage, Binder.getCallingUid(), "getNeighboringCellInfo")) {
return null;
}
@@ -1736,7 +1719,7 @@
@Override
public List<CellInfo> getAllCellInfo(String callingPackage) {
if (!LocationAccessPolicy.canAccessCellLocation(mPhone.getContext(),
- callingPackage, Binder.getCallingUid())) {
+ callingPackage, Binder.getCallingUid(), "getAllCellInfo")) {
return null;
}
@@ -3067,39 +3050,6 @@
}
@Override
- @Deprecated
- public int invokeOemRilRequestRaw(byte[] oemReq, byte[] oemResp) {
- enforceModifyPermission();
-
- int returnValue = 0;
- try {
- AsyncResult result = (AsyncResult)sendRequest(CMD_INVOKE_OEM_RIL_REQUEST_RAW, oemReq);
- if(result.exception == null) {
- if (result.result != null) {
- byte[] responseData = (byte[])(result.result);
- if(responseData.length > oemResp.length) {
- Log.w(LOG_TAG, "Buffer to copy response too small: Response length is " +
- responseData.length + "bytes. Buffer Size is " +
- oemResp.length + "bytes.");
- }
- System.arraycopy(responseData, 0, oemResp, 0, responseData.length);
- returnValue = responseData.length;
- }
- } else {
- CommandException ex = (CommandException) result.exception;
- returnValue = ex.getCommandError().ordinal();
- if(returnValue > 0) returnValue *= -1;
- }
- } catch (RuntimeException e) {
- Log.w(LOG_TAG, "sendOemRilRequestRaw: Runtime Exception");
- returnValue = (CommandException.Error.GENERIC_FAILURE.ordinal());
- if(returnValue > 0) returnValue *= -1;
- }
-
- return returnValue;
- }
-
- @Override
public void setRadioCapability(RadioAccessFamily[] rafs) {
try {
ProxyController.getInstance().setRadioCapability(rafs);
diff --git a/src/com/android/phone/settings/VoicemailSettingsActivity.java b/src/com/android/phone/settings/VoicemailSettingsActivity.java
index 04e8bf5..4d55421 100644
--- a/src/com/android/phone/settings/VoicemailSettingsActivity.java
+++ b/src/com/android/phone/settings/VoicemailSettingsActivity.java
@@ -24,6 +24,7 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
+import android.os.PersistableBundle;
import android.os.UserManager;
import android.preference.Preference;
import android.preference.PreferenceActivity;
@@ -31,6 +32,7 @@
import android.preference.SwitchPreference;
import android.provider.ContactsContract.CommonDataKinds;
import android.provider.Settings;
+import android.telephony.CarrierConfigManager;
import android.telephony.TelephonyManager;
import android.text.BidiFormatter;
import android.text.TextDirectionHeuristics;
@@ -250,6 +252,10 @@
mSubMenuVoicemailSettings.setParentActivity(this, VOICEMAIL_PREF_ID, this);
mSubMenuVoicemailSettings.setDialogOnClosedListener(this);
mSubMenuVoicemailSettings.setDialogTitle(R.string.voicemail_settings_number_label);
+ if (!getBooleanCarrierConfig(
+ CarrierConfigManager.KEY_EDITABLE_VOICEMAIL_NUMBER_SETTING_BOOL)) {
+ mSubMenuVoicemailSettings.setEnabled(false);
+ }
}
mVoicemailProviders = (VoicemailProviderListPreference) findPreference(
@@ -545,6 +551,23 @@
}
}
+ /**
+ * Get the boolean config from carrier config manager.
+ *
+ * @param key config key defined in CarrierConfigManager
+ * @return boolean value of corresponding key.
+ */
+ private boolean getBooleanCarrierConfig(String key) {
+ PersistableBundle b = PhoneGlobals.getInstance()
+ .getCarrierConfigForSubId(mPhone.getSubId());
+ if (b != null) {
+ return b.getBoolean(key);
+ } else {
+ // Return static default defined in CarrierConfigManager.
+ return CarrierConfigManager.getDefaultConfig().getBoolean(key);
+ }
+ }
+
//*********************************************************************************************
// Activity Dialog Methods
diff --git a/src/com/android/services/telephony/DisconnectCauseUtil.java b/src/com/android/services/telephony/DisconnectCauseUtil.java
index a420100..48a283a 100644
--- a/src/com/android/services/telephony/DisconnectCauseUtil.java
+++ b/src/com/android/services/telephony/DisconnectCauseUtil.java
@@ -67,6 +67,7 @@
return DisconnectCause.LOCAL;
case android.telephony.DisconnectCause.NORMAL:
+ case android.telephony.DisconnectCause.NORMAL_UNSPECIFIED:
return DisconnectCause.REMOTE;
case android.telephony.DisconnectCause.OUTGOING_CANCELED:
diff --git a/testapps/EmbmsServiceTestApp/src/com/android/phone/testapps/embmsmw/EmbmsSampleDownloadService.java b/testapps/EmbmsServiceTestApp/src/com/android/phone/testapps/embmsmw/EmbmsSampleDownloadService.java
index dcb7320..128793f 100644
--- a/testapps/EmbmsServiceTestApp/src/com/android/phone/testapps/embmsmw/EmbmsSampleDownloadService.java
+++ b/testapps/EmbmsServiceTestApp/src/com/android/phone/testapps/embmsmw/EmbmsSampleDownloadService.java
@@ -32,6 +32,7 @@
import android.os.RemoteException;
import android.telephony.MbmsDownloadSession;
import android.telephony.mbms.DownloadRequest;
+import android.telephony.mbms.DownloadStateCallback;
import android.telephony.mbms.FileInfo;
import android.telephony.mbms.FileServiceInfo;
import android.telephony.mbms.MbmsDownloadSessionCallback;
@@ -142,6 +143,13 @@
}
@Override
+ public int registerStateCallback(DownloadRequest downloadRequest,
+ DownloadStateCallback callback) throws RemoteException {
+ mDownloadStateCallbacks.put(downloadRequest, callback);
+ return MbmsErrors.SUCCESS;
+ }
+
+ @Override
public int cancelDownload(DownloadRequest downloadRequest) {
FrontendAppIdentifier appKey = new FrontendAppIdentifier(
Binder.getCallingUid(), downloadRequest.getSubscriptionId());
@@ -175,6 +183,8 @@
// A map of app-identifiers to (maps of service-ids to sets of temp file uris in use)
private final Map<FrontendAppIdentifier, Map<String, Set<Uri>>> mTempFilesInUse =
new ConcurrentHashMap<>();
+ private final Map<DownloadRequest, DownloadStateCallback> mDownloadStateCallbacks =
+ new ConcurrentHashMap<>();
private HandlerThread mHandlerThread;
private Handler mHandler;
@@ -323,6 +333,16 @@
private void downloadSingleFile(FrontendAppIdentifier appKey, DownloadRequest request,
UriPathPair tempFile, FileInfo fileToDownload) {
int result = MbmsDownloadSession.RESULT_SUCCESSFUL;
+ // Test Callback
+ DownloadStateCallback c = mDownloadStateCallbacks.get(request);
+ if (c != null) {
+ c.onProgressUpdated(request, fileToDownload, 0, 10, 0, 10);
+ }
+ // Test Callback
+ if (c != null) {
+ c.onStateUpdated(request, fileToDownload,
+ MbmsDownloadSession.STATUS_ACTIVELY_DOWNLOADING);
+ }
try {
// Get the ParcelFileDescriptor for the single temp file we requested
ParcelFileDescriptor tempFileFd = getContentResolver().openFileDescriptor(
@@ -346,10 +366,12 @@
} catch (IOException e) {
result = MbmsDownloadSession.RESULT_CANCELLED;
}
-
+ // Test Callback
+ if (c != null) {
+ c.onProgressUpdated(request, fileToDownload, 10, 10, 10, 10);
+ }
// Take a round-trip through the download request serialization to exercise it
- DownloadRequest request1 = new DownloadRequest.Builder()
- .setSource(request.getSourceUri())
+ DownloadRequest request1 = new DownloadRequest.Builder(request.getSourceUri())
.setSubscriptionId(request.getSubscriptionId())
.setServiceId(request.getFileServiceId())
.setOpaqueData(request.getOpaqueData())
diff --git a/testapps/EmbmsTestDownloadApp/res/layout/activity_main.xml b/testapps/EmbmsTestDownloadApp/res/layout/activity_main.xml
index 076bc37..1aea6a5 100644
--- a/testapps/EmbmsTestDownloadApp/res/layout/activity_main.xml
+++ b/testapps/EmbmsTestDownloadApp/res/layout/activity_main.xml
@@ -105,9 +105,31 @@
android:layout_row="4"
android:layout_column="0"
android:text="@string/cancel_download_button" />
+ <Button
+ android:id="@+id/register_state_callback_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_row="5"
+ android:layout_column="0"
+ android:text="@string/register_state_callback_button" />
+ <Button
+ android:id="@+id/register_progress_callback_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_row="5"
+ android:layout_column="1"
+ android:text="@string/register_progress_callback_button" />
+ <Button
+ android:id="@+id/register_all_callback_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_row="6"
+ android:layout_column="0"
+ android:text="@string/register_all_callback_button" />
+
<Spinner
android:id="@+id/active_downloads"
- android:layout_row="4"
+ android:layout_row="7"
android:layout_column="1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
diff --git a/testapps/EmbmsTestDownloadApp/res/values/donottranslate_strings.xml b/testapps/EmbmsTestDownloadApp/res/values/donottranslate_strings.xml
index 13d9fc2..b032b26 100644
--- a/testapps/EmbmsTestDownloadApp/res/values/donottranslate_strings.xml
+++ b/testapps/EmbmsTestDownloadApp/res/values/donottranslate_strings.xml
@@ -24,4 +24,7 @@
<string name="request_spurious_temp_files_button">Request more temp files</string>
<string name="delay_download_button">Delay download</string>
<string name="cancel_download_button">Cancel download</string>
+ <string name="register_state_callback_button">Register State Cb</string>
+ <string name="register_progress_callback_button">Register Progress Cb</string>
+ <string name="register_all_callback_button">Register All Cbs</string>
</resources>
\ No newline at end of file
diff --git a/testapps/EmbmsTestDownloadApp/src/com/android/phone/testapps/embmsdownload/EmbmsTestDownloadApp.java b/testapps/EmbmsTestDownloadApp/src/com/android/phone/testapps/embmsdownload/EmbmsTestDownloadApp.java
index 23f2cc5..4083f67 100644
--- a/testapps/EmbmsTestDownloadApp/src/com/android/phone/testapps/embmsdownload/EmbmsTestDownloadApp.java
+++ b/testapps/EmbmsTestDownloadApp/src/com/android/phone/testapps/embmsdownload/EmbmsTestDownloadApp.java
@@ -28,6 +28,8 @@
import android.telephony.MbmsDownloadSession;
import android.telephony.SubscriptionManager;
import android.telephony.mbms.DownloadRequest;
+import android.telephony.mbms.DownloadStateCallback;
+import android.telephony.mbms.FileInfo;
import android.telephony.mbms.FileServiceInfo;
import android.telephony.mbms.MbmsDownloadSessionCallback;
import android.util.Log;
@@ -274,6 +276,112 @@
mDownloadManager.cancelDownload(request);
mDownloadRequestAdapter.remove(request);
});
+
+ Button registerProgressCallback =
+ (Button) findViewById(R.id.register_progress_callback_button);
+ registerProgressCallback.setOnClickListener((view) -> {
+ if (mDownloadManager == null) {
+ Toast.makeText(EmbmsTestDownloadApp.this,
+ "No download service bound", Toast.LENGTH_SHORT).show();
+ return;
+ }
+ DownloadRequest req = (DownloadRequest) downloadRequestSpinner.getSelectedItem();
+ if (req == null) {
+ Toast.makeText(EmbmsTestDownloadApp.this,
+ "No DownloadRequest Pending for progress...", Toast.LENGTH_SHORT).show();
+ return;
+ }
+ mDownloadManager.registerStateCallback(req, new DownloadStateCallback(
+ DownloadStateCallback.PROGRESS_UPDATES) {
+ @Override
+ public void onProgressUpdated(DownloadRequest request, FileInfo fileInfo,
+ int currentDownloadSize, int fullDownloadSize, int currentDecodedSize,
+ int fullDecodedSize) {
+ Toast.makeText(EmbmsTestDownloadApp.this,
+ "Progress Updated (" + fileInfo + ") cd: " + currentDecodedSize
+ + " fd: " + fullDownloadSize, Toast.LENGTH_SHORT).show();
+ }
+
+ @Override
+ public void onStateUpdated(DownloadRequest request, FileInfo fileInfo,
+ @MbmsDownloadSession.DownloadStatus int state) {
+ // only registered for state callback, this shouldn't happen!
+ Toast.makeText(EmbmsTestDownloadApp.this,
+ "State ERROR: received state update for callback that didn't filter it",
+ Toast.LENGTH_SHORT).show();
+ }
+ }, sInstance.getMainThreadHandler());
+ });
+
+ Button registerStateCallback =
+ (Button) findViewById(R.id.register_state_callback_button);
+ registerStateCallback.setOnClickListener((view) -> {
+ if (mDownloadManager == null) {
+ Toast.makeText(EmbmsTestDownloadApp.this,
+ "No download service bound", Toast.LENGTH_SHORT).show();
+ return;
+ }
+ DownloadRequest req = (DownloadRequest) downloadRequestSpinner.getSelectedItem();
+ if (req == null) {
+ Toast.makeText(EmbmsTestDownloadApp.this,
+ "No DownloadRequest Pending for state...", Toast.LENGTH_SHORT).show();
+ return;
+ }
+ mDownloadManager.registerStateCallback(req, new DownloadStateCallback(
+ DownloadStateCallback.STATE_UPDATES) {
+ @Override
+ public void onProgressUpdated(DownloadRequest request, FileInfo fileInfo,
+ int currentDownloadSize, int fullDownloadSize, int currentDecodedSize,
+ int fullDecodedSize) {
+ // only registered for state callback, this shouldn't happen!
+ Toast.makeText(EmbmsTestDownloadApp.this,
+ "Progress ERROR: received progress update for callback that didn't "
+ + "filter it", Toast.LENGTH_SHORT).show();
+ }
+
+ @Override
+ public void onStateUpdated(DownloadRequest request, FileInfo fileInfo,
+ @MbmsDownloadSession.DownloadStatus int state) {
+ Toast.makeText(EmbmsTestDownloadApp.this,
+ "State Updated (" + fileInfo + ") state: " + state,
+ Toast.LENGTH_SHORT).show();
+ }
+ }, sInstance.getMainThreadHandler());
+ });
+
+ Button registerAllCallbacks =
+ (Button) findViewById(R.id.register_all_callback_button);
+ registerAllCallbacks.setOnClickListener((view) -> {
+ if (mDownloadManager == null) {
+ Toast.makeText(EmbmsTestDownloadApp.this,
+ "No download service bound", Toast.LENGTH_SHORT).show();
+ return;
+ }
+ DownloadRequest req = (DownloadRequest) downloadRequestSpinner.getSelectedItem();
+ if (req == null) {
+ Toast.makeText(EmbmsTestDownloadApp.this,
+ "No DownloadRequest Pending for state...", Toast.LENGTH_SHORT).show();
+ return;
+ }
+ mDownloadManager.registerStateCallback(req, new DownloadStateCallback() {
+ @Override
+ public void onProgressUpdated(DownloadRequest request, FileInfo fileInfo,
+ int currentDownloadSize, int fullDownloadSize, int currentDecodedSize,
+ int fullDecodedSize) {
+ Toast.makeText(EmbmsTestDownloadApp.this,
+ "Progress Updated (" + fileInfo + ") cd: " + currentDecodedSize
+ + " fd: " + fullDownloadSize, Toast.LENGTH_SHORT).show();
+ }
+
+ @Override
+ public void onStateUpdated(DownloadRequest request, FileInfo fileInfo,
+ @MbmsDownloadSession.DownloadStatus int state) {
+ Toast.makeText(EmbmsTestDownloadApp.this,
+ "State Updated (" + fileInfo + ") state: " + state,
+ Toast.LENGTH_SHORT).show();
+ }
+ }, sInstance.getMainThreadHandler());
+ });
}
@Override
@@ -321,9 +429,8 @@
Intent completionIntent = new Intent(DOWNLOAD_DONE_ACTION);
completionIntent.setClass(this, DownloadCompletionReceiver.class);
- DownloadRequest request = new DownloadRequest.Builder()
+ DownloadRequest request = new DownloadRequest.Builder(sourceUriBuilder.build())
.setServiceInfo(info)
- .setSource(sourceUriBuilder.build())
.setAppIntent(completionIntent)
.setSubscriptionId(SubscriptionManager.getDefaultSubscriptionId())
.build();
diff --git a/tests/src/com/android/phone/tests/CallForwardInfoTest.java b/tests/src/com/android/phone/tests/CallForwardInfoTest.java
new file mode 100644
index 0000000..acf5955
--- /dev/null
+++ b/tests/src/com/android/phone/tests/CallForwardInfoTest.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.phone.tests;
+
+import android.support.test.runner.AndroidJUnit4;
+import android.telephony.PhoneNumberUtils;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Locale;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+/**
+ * Tests Related to CallForwardInfoTest
+ */
+@RunWith(AndroidJUnit4.class)
+public class CallForwardInfoTest {
+
+ @Test
+ public void testCallForwardNumberResponses() {
+ // Test numbers in correct formats
+ assertNotNull(PhoneNumberUtils.formatNumber("+12345678900", Locale.US.getCountry()));
+ assertNotNull(PhoneNumberUtils.formatNumber("123-456-7890", Locale.US.getCountry()));
+ assertNotNull(PhoneNumberUtils.formatNumber("#123", Locale.US.getCountry()));
+ assertNotNull(PhoneNumberUtils.formatNumber("*12", Locale.US.getCountry()));
+ // Test invalid numbers
+ assertNull(PhoneNumberUtils.formatNumber("a", Locale.US.getCountry()));
+ assertNull(PhoneNumberUtils.formatNumber("a1", Locale.US.getCountry()));
+ }
+}
